Merge pull request #3586 from withspectrum/2.4.18

2.4.18

Author: brianlovin

analytics/package.json

@@ -8,8 +8,8 @@
     "amplitude": "^3.5.0",
     "bull": "3.3.10",
     "node-env-file": "^0.1.8",
-    "now-env": "^3.0.1",
-    "raven": "^2.1.1",
+    "now-env": "^3.1.0",
+    "raven": "^2.6.3",
     "rethinkdbdash": "^2.3.29",
     "sha1": "^1.1.1",
     "source-map-support": "^0.5.6",

analytics/yarn.lock

@@ -286,9 +286,9 @@ node-env-file@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/node-env-file/-/node-env-file-0.1.8.tgz#fccb7b050f735b5a33da9eb937cf6f1ab457fb69"
 
-now-env@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/now-env/-/now-env-3.0.4.tgz#f9ed88884bff8d208ad3eaf39cc3437dd1a591ad"
+now-env@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/now-env/-/now-env-3.1.0.tgz#e0198b67279d387229cfd4b25de4c2fc7156943f"
 
 object-keys@^1.0.8:
   version "1.0.11"
@@ -302,9 +302,9 @@ qs@^6.5.1:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
-raven@^2.1.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/raven/-/raven-2.6.0.tgz#3806a82c9ee8cd3e75c3b7ea7bb1935aad092d0c"
+raven@^2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/raven/-/raven-2.6.3.tgz#207475a12809277ef54eaceafe2597ff65262ab4"
   dependencies:
     cookie "0.3.1"
     md5 "^2.2.1"

api/migrations/config.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const fs = require('fs');
+const debug = require('debug')('migrations');
 
 const DEFAULT_CONFIG = {
   driver: 'rethinkdbdash',
@@ -13,10 +14,9 @@ const RUN_IN_PROD = !!process.env.AWS_RETHINKDB_PASSWORD;
 
 if (RUN_IN_PROD && process.argv[4] === 'down') {
   throw new Error('Do not drop the production database!!!!!');
-  process.exit(1);
 }
 
-if (RUN_IN_PROD) console.log('Running migration in production...');
+if (RUN_IN_PROD) debug('Running migration in production...');
 
 module.exports = !RUN_IN_PROD
   ? DEFAULT_CONFIG

api/migrations/seed/default/index.js

@@ -11,6 +11,7 @@ const defaultUsersCommunities = require('./usersCommunities');
 const defaultUsersChannels = require('./usersChannels');
 const defaultUsersSettings = require('./usersSettings')();
 const defaultMessages = require('./messages');
+const defaultReactions = require('./reactions');
 
 module.exports = {
   constants,
@@ -28,4 +29,5 @@ module.exports = {
   defaultNotifications: [],
   defaultCommunitySettings: [],
   defaultChannelSettings: [],
+  defaultReactions,
 };

api/migrations/seed/default/reactions.js

@@ -0,0 +1,13 @@
+// @flow
+const constants = require('./constants');
+const { DATE, MAX_ID } = constants;
+
+module.exports = [
+  {
+    id: '1',
+    messageId: '4',
+    type: 'like',
+    senderId: MAX_ID,
+    timestamp: new Date(DATE + 4),
+  },
+];

api/mutations/message/addMessage.js

@@ -107,7 +107,11 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
     }
     if (
       body.blocks.some(
-        ({ type }) => !type || (type !== 'unstyled' && type !== 'code-block')
+        ({ type }) =>
+          !type ||
+          (type !== 'unstyled' &&
+            type !== 'code-block' &&
+            type !== 'blockquote')
       )
     ) {
       trackQueue.add({

api/mutations/thread/editThread.js

@@ -132,7 +132,7 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
   const body =
     editedThread.content.body && JSON.parse(editedThread.content.body);
   const imageKeys = Object.keys(body.entityMap).filter(
-    key => body.entityMap[key].type === 'image'
+    key => body.entityMap[key].type.toLowerCase() === 'image'
   );
   urls.forEach((url, index) => {
     if (!body.entityMap[imageKeys[index]]) return;

api/mutations/thread/publishThread.js

@@ -438,13 +438,11 @@ export default requireAuth(
     // Replace the local image srcs with the remote image src
     const body = dbThread.content.body && JSON.parse(dbThread.content.body);
 
-    // $FlowFixMe
+    if (!body) return dbThread;
     const imageKeys = Object.keys(body.entityMap).filter(
-      // $FlowFixMe
-      key => body.entityMap[key].type === 'image'
+      key => body.entityMap[key].type.toLowerCase() === 'image'
     );
     urls.forEach((url, index) => {
-      // $FlowFixMe
       if (!body.entityMap[imageKeys[index]]) return;
       body.entityMap[imageKeys[index]].data.src = url;
     });

api/package.json

@@ -13,10 +13,10 @@
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
     "babel-preset-env": "^1.5.2",
     "backpack-core": "^0.4.1",
-    "body-parser": "^1.17.1",
+    "body-parser": "^1.18.3",
     "bull": "3.3.10",
     "casual": "^1.5.12",
-    "compression": "^1.7.1",
+    "compression": "^1.7.3",
     "cookie-parser": "^1.4.3",
     "cookie-session": "^2.0.0-beta.3",
     "cors": "^2.8.3",
@@ -36,7 +36,7 @@
     "draft-js-prism-plugin": "0.1.1",
     "draftjs-to-markdown": "^0.4.2",
     "emoji-regex": "^6.1.1",
-    "express": "^4.15.2",
+    "express": "^4.16.3",
     "express-session": "^1.15.2",
     "faker": "^4.1.0",
     "find-with-regex": "^1.0.2",
@@ -49,13 +49,13 @@
     "graphql-server-express": "1.3.0",
     "graphql-subscriptions": "0.4.x",
     "graphql-tools": "3.0.0",
-    "helmet": "^3.12.0",
+    "helmet": "^3.12.1",
     "highlight.js": "^9.10.0",
     "history": "^4.6.1",
     "hoist-non-react-statics": "^2.3.1",
     "hpp": "^0.2.2",
     "imgix-core-js": "^1.0.6",
-    "immutability-helper": "^2.2.0",
+    "immutability-helper": "^2.7.1",
     "isomorphic-fetch": "^2.2.1",
     "iterall": "^1.2.2",
     "jest": "^21.2.1",
@@ -64,15 +64,15 @@
     "keygrip": "^1.0.2",
     "linkify-it": "^2.0.3",
     "localstorage-memory": "^1.0.2",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.10",
     "lodash.intersection": "^4.4.0",
     "longjohn": "^0.2.12",
     "markdown-draft-js": "^0.6.3",
     "moment": "^2.18.1",
     "node-env-file": "^0.1.8",
-    "node-localstorage": "^1.3.0",
+    "node-localstorage": "^1.3.1",
     "now-env": "^3.0.1",
-    "offline-plugin": "^4.8.4",
+    "offline-plugin": "^4.9.1",
     "optics-agent": "^1.1.2",
     "passport": "^0.3.2",
     "passport-facebook": "^2.1.1",
@@ -82,18 +82,18 @@
     "postmark": "^1.4.1",
     "pre-commit": "^1.2.2",
     "prismjs": "^1.8.1",
-    "query-string": "^5.0.0",
+    "query-string": "5.1.1",
     "raven": "^2.0.2",
     "raven-js": "^3.18.1",
     "react": "^15.4.1",
-    "react-app-rewire-styled-components": "^3.0.0",
+    "react-app-rewire-styled-components": "^3.0.2",
     "react-app-rewired": "^1.0.5",
     "react-dom": "^15.4.1",
     "react-helmet": "5.x",
     "react-infinite-scroller-with-scroll-element": "^1.0.4",
     "react-loadable": "5.2.2",
     "react-modal": "^1.6.5",
-    "react-redux": "^5.0.2",
+    "react-redux": "^5.0.7",
     "react-remarkable": "^1.1.1",
     "react-router": "^4.0.0-beta.7",
     "react-router-dom": "^4.0.0-beta.7",
@@ -112,7 +112,7 @@
     "sanitize-filename": "^1.6.1",
     "serialize-javascript": "^1.4.0",
     "session-rethinkdb": "^2.0.0",
-    "shortid": "^2.2.8",
+    "shortid": "^2.2.12",
     "slate": "^0.20.1",
     "slate-markdown": "0.1.0",
     "slugg": "^1.1.0",

api/queries/search/searchCommunityMembers.js

@@ -33,6 +33,7 @@ export default (args: Args, { loaders, user }: GraphQLContext) => {
       if (searchFilter && !searchFilter.communityId) return [];
       const userIds = content.hits.map(o => o.objectID);
       const input = userIds.map(userId => {
+        /*eslint array-callback-return: "off"*/
         if (!searchFilter || !searchFilter.communityId) return;
         return [userId, searchFilter.communityId];
       });