Merge pull request #3479 from withspectrum/v2.4.17

v2.4.17

Author: mxstbr

api/routes/api/email.js

@@ -193,16 +193,13 @@ emailRouter.get('/validate', (req, res) => {
 
   // and send a database request to update the user record with this email
   try {
-    return updateUserEmail(userId, email).then(
-      user =>
-        IS_PROD
-          ? res.redirect(
-              `https://spectrum.chat/users/${user.username}/settings`
-            )
-          : res.redirect(
-              `http://localhost:3000/users/${user.username}/settings`
-            )
-    );
+    return updateUserEmail(userId, email).then(user => {
+      const rootRedirect = IS_PROD
+        ? `https://spectrum.chat`
+        : `http://localhost:3000`;
+      if (!user.username) return res.redirect(rootRedirect);
+      return res.redirect(`${rootRedirect}/users/${user.username}/settings`);
+    });
   } catch (err) {
     console.error(err);
     return res

athena/queues/new-message-in-thread/buffer-email.js

@@ -164,7 +164,26 @@ const bufferMessageNotificationEmail = async (
       thread.id
     }`
   );
-  const job = await bufferNewMessageEmailQueue.getJob(recipient.email);
+  let job = await bufferNewMessageEmailQueue.getJob(recipient.email);
+  // Try to remove the job if it exists. This fails sometimes due to a
+  // race condition where the getJob returns a failed or active job.
+  // We circumvent that issue by simply pretending like no job exists
+  // and adding a new one
+  // Ref: withspectrum/spectrum#3189
+  if (job) {
+    debug(`timeout exists for ${recipient.email}, clearing`);
+    try {
+      await job.remove();
+    } catch (err) {
+      try {
+        await job.finished();
+        // Note(@mxstbr): This throws if the job fails to complete
+        // but we don't care if that happens, so we ignore it
+      } catch (err) {}
+
+      job = null;
+    }
+  }
   if (!job) {
     debug(
       `creating new timeout for ${
@@ -185,9 +204,6 @@ const bufferMessageNotificationEmail = async (
     );
   } else {
     const timeout = job.data;
-    // If we already have a timeout going
-    debug(`timeout exists for ${recipient.email}, clearing`);
-    await job.remove();
     debug(`adding new thread to ${recipient.email}'s threads`);
     timeout.threads.push(thread);
     timeout.notifications.push(notification);

config-overrides.js

@@ -95,7 +95,10 @@ module.exports = function override(config, env) {
     plugin => !isServiceWorkerPlugin(plugin)
   );
   // Get all public files so they're cached by the SW
-  let externals = [];
+  let externals = [
+    'https://www.google-analytics.com/analytics.js',
+    'https://cdn.amplitude.com/libs/amplitude-4.2.1-min.gz.js',
+  ];
   walkFolder('./public/', file => {
     // HOTFIX: Don't cache images
     if (file.indexOf('img') > -1 && file.indexOf('homescreen-icon') === -1)

cypress/integration/community_settings_billing_spec.js

@@ -141,7 +141,7 @@ describe('Community settings billing tab', () => {
       // click the moderator item in dropdown
       cy
         .get('[data-cy="community-settings-members-list"]')
-        .contains('Can edit and delete conversations')
+        .contains('can moderate conversations')
         .click();
 
       // admin email verification modal should appear
@@ -252,7 +252,7 @@ describe('Community settings billing tab', () => {
       // click the moderator item in dropdown
       cy
         .get('[data-cy="community-settings-members-list"]')
-        .contains('Can edit and delete conversations')
+        .contains('can moderate conversations')
         .click();
 
       // admin email verification modal should appear

package.json

@@ -1,11 +1,11 @@
 {
   "name": "Spectrum",
-  "version": "2.4.16",
+  "version": "2.4.17",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "babel-cli": "^6.24.1",
-    "babel-eslint": "^8.2.2",
-    "babel-jest": "^22.4.3",
+    "babel-eslint": "^8.2.5",
+    "babel-jest": "^22.4.4",
     "babel-plugin-import-inspector": "^2.0.0",
     "babel-plugin-inline-import-graphql-ast": "^2.0.4",
     "babel-plugin-styled-components": "^1.1.7",
@@ -15,19 +15,19 @@
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
-    "babel-preset-env": "^1.5.2",
+    "babel-preset-env": "^1.7.0",
     "backpack-core": "^0.4.1",
     "bundle-buddy-webpack-plugin": "^0.3.0",
     "cheerio": "^1.0.0-rc.2",
-    "cross-env": "^5.0.5",
+    "cross-env": "^5.2.0",
     "eslint": "^4.1.1",
     "eslint-config-react-app": "^2.1.0",
-    "eslint-plugin-flowtype": "^2.34.1",
-    "eslint-plugin-import": "^2.6.0",
+    "eslint-plugin-flowtype": "^2.49.3",
+    "eslint-plugin-import": "^2.13.0",
     "eslint-plugin-jest": "^21.6.1",
     "eslint-plugin-jsx-a11y": "^5.1.1",
-    "eslint-plugin-promise": "^3.6.0",
-    "eslint-plugin-react": "^7.1.0",
+    "eslint-plugin-promise": "^3.8.0",
+    "eslint-plugin-react": "^7.10.0",
     "flow-bin": "0.66",
     "forever": "^0.15.3",
     "is-html": "^1.1.0",
@@ -36,13 +36,13 @@
     "prettier": "^1.0.0",
     "raw-loader": "^0.5.1",
     "react-app-rewire-hot-loader": "^1.0.1",
-    "react-hot-loader": "^4.3.1",
+    "react-hot-loader": "^4.3.3",
     "react-scripts": "^1.0.0",
     "rimraf": "^2.6.1",
     "sw-precache-webpack-plugin": "^0.11.4",
     "uuid": "^3.0.1",
     "wait-on": "^2.1.0",
-    "webpack-bundle-analyzer": "^2.9.1",
+    "webpack-bundle-analyzer": "^2.13.1",
     "write-file-webpack-plugin": "^4.3.2"
   },
   "dependencies": {
@@ -63,7 +63,7 @@
     "aws-sdk": "2.200.0",
     "axios": "^0.17.1",
     "bad-words": "^1.6.1",
-    "body-parser": "^1.17.1",
+    "body-parser": "^1.18.3",
     "bull": "3.3.10",
     "casual": "^1.5.19",
     "common-tags": "^1.7.2",
@@ -78,13 +78,13 @@
     "debug": "^2.6.8",
     "draft-js": "npm:draft-js-fork-mxstbr",
     "draft-js-code-editor-plugin": "0.2.1",
-    "draft-js-drag-n-drop-plugin": "2.0.0-rc9",
+    "draft-js-drag-n-drop-plugin": "^2.0.3",
     "draft-js-embed-plugin": "^1.2.0",
     "draft-js-focus-plugin": "2.0.0-rc2",
-    "draft-js-image-plugin": "2.0.0-rc8",
+    "draft-js-image-plugin": "^2.0.5",
     "draft-js-import-markdown": "^1.2.1",
     "draft-js-linkify-plugin": "^2.0.0-beta1",
-    "draft-js-markdown-plugin": "^2.1.0",
+    "draft-js-markdown-plugin": "^3.0.0",
     "draft-js-plugins-editor": "^2.0.4",
     "draft-js-prism-plugin": "0.1.3",
     "draftjs-to-markdown": "^0.4.2",
@@ -101,12 +101,12 @@
     "graphql-cost-analysis": "^0.1.1",
     "graphql-date": "^1.0.3",
     "graphql-depth-limit": "^1.1.0",
-    "graphql-log": "0.1.2",
-    "graphql-server-express": "1.3.0",
-    "graphql-subscriptions": "0.5.6",
+    "graphql-log": "0.1.3",
+    "graphql-server-express": "1.3.6",
+    "graphql-subscriptions": "0.5.8",
     "graphql-tag": "^2.9.2",
-    "graphql-tools": "^3.0.2",
-    "helmet": "^3.12.0",
+    "graphql-tools": "^3.0.4",
+    "helmet": "^3.12.1",
     "highlight.js": "^9.10.0",
     "history": "^4.6.1",
     "hoist-non-react-statics": "^2.3.1",
@@ -121,13 +121,13 @@
     "jsonwebtoken": "^8.0.1",
     "keygrip": "^1.0.2",
     "linkify-it": "^2.0.3",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.10",
     "lodash.intersection": "^4.4.0",
     "markdown-draft-js": "^0.6.3",
-    "moment": "^2.18.1",
+    "moment": "^2.22.2",
     "node-env-file": "^0.1.8",
-    "now-env": "^3.0.1",
-    "offline-plugin": "^5.0.3",
+    "now-env": "^3.1.0",
+    "offline-plugin": "^5.0.5",
     "optics-agent": "^1.1.2",
     "passport": "^0.3.2",
     "passport-facebook": "^2.1.1",
@@ -139,10 +139,10 @@
     "prismjs": "^1.8.1",
     "query-string": "^5.0.0",
     "raf": "^3.4.0",
-    "raven": "^2.0.2",
+    "raven": "^2.6.3",
     "raven-js": "^3.18.1",
     "react": "^16.4.0",
-    "react-apollo": "^2.1.6",
+    "react-apollo": "^2.1.8",
     "react-app-rewire-styled-components": "^3.0.0",
     "react-app-rewired": "^1.5.2",
     "react-clipboard.js": "^2.0.0",
@@ -159,36 +159,36 @@
     "react-stripe-checkout": "^2.2.5",
     "react-stripe-elements": "^1.4.1",
     "react-textarea-autosize": "^6.1.0",
-    "react-transition-group": "^2.2.0",
+    "react-transition-group": "^2.4.0",
     "react-trend": "^1.2.4",
-    "recompose": "0.26.x",
-    "redraft": "0.8.0",
+    "recompose": "^0.27.1",
+    "redraft": "0.10.1",
     "redux": "^3.6.0",
-    "redux-thunk": "^2.2.0",
-    "request": "^2.85.0",
+    "redux-thunk": "^2.3.0",
+    "request": "^2.87.0",
     "rethinkdb-changefeed-reconnect": "^0.3.2",
     "rethinkdb-inspector": "^0.3.3",
     "rethinkdb-migrate": "^1.1.0",
     "rethinkdbdash": "^2.3.29",
     "sanitize-filename": "^1.6.1",
-    "serialize-javascript": "^1.4.0",
+    "serialize-javascript": "^1.5.0",
     "session-rethinkdb": "^2.0.0",
     "sha1": "^1.1.1",
     "shortid": "^2.2.8",
     "slate": "^0.20.1",
-    "slate-markdown": "0.1.0",
+    "slate-markdown": "0.1.1",
     "slugg": "^1.1.0",
     "stopword": "^0.1.9",
     "string-replace-to-array": "^1.0.3",
     "string-similarity": "^1.2.0",
     "stripe": "^4.15.0",
     "striptags": "2.x",
-    "styled-components": "3.1.x",
+    "styled-components": "^3.3.3",
     "subscriptions-transport-ws": "0.9.x",
     "then-queue": "^1.3.0",
     "toobusy-js": "^0.5.1",
     "validator": "^9.0.0",
-    "web-push": "^3.2.2"
+    "web-push": "^3.3.2"
   },
   "resolutions": {
     "immutable": "3.7.4",

shared/bull/types.js

@@ -24,6 +24,7 @@ export type Job<JobData> = {|
   id: string,
   data: JobData,
   remove: () => Promise<void>,
+  finished: () => Promise<void>,
 |};
 
 type JobOptions = {|

shared/graphql/queries/thread/getThreadMessageConnection.js

@@ -53,7 +53,7 @@ export const getThreadMessageConnectionOptions = {
     };
 
     // Any thread with less than 50 messages just load all of 'em
-    if (props.threadMessageCount >= 50) {
+    if (props.thread.messageCount >= 50) {
       // If the thread was active after the user last saw it, only load the new messages
       if (props.lastSeen) {
         if (

shared/notification-to-text.js

@@ -1,6 +1,4 @@
-import onlyContainsEmoji from 'shared/only-contains-emoji';
 import sentencify from 'shared/sentencify';
-import { timeDifferenceShort } from 'shared/time-difference';
 import sortByDate from 'shared/sort-by-date';
 import { toState, toPlainText } from 'shared/draft-utils';
 
@@ -16,13 +14,6 @@ const sortThreads = (entities, currentUser) => {
   return threads;
 };
 
-// parse date => modifiedAt to timeAgo
-const parseNotificationDate = date => {
-  const now = new Date().getTime();
-  const timestamp = new Date(date).getTime();
-  return timeDifferenceShort(now, timestamp);
-};
-
 export const parseActors = (actors, currentUser) => {
   const filteredActors = actors
     .filter(actor => actor.id !== currentUser.id)
@@ -31,12 +22,13 @@ export const parseActors = (actors, currentUser) => {
 };
 
 const EVENT_VERB = {
-  MESSAGE_CREATED: 'replied',
+  MESSAGE_CREATED: 'replied in',
   REACTION_CREATED: 'liked',
   CHANNEL_CREATED: 'created in',
   USER_JOINED_COMMUNITY: 'joined',
   MENTION_MESSAGE: 'mentioned you in',
   MENTION_THREAD: 'mentioned you in',
+  THREAD_REACTION_CREATED: 'liked',
 };
 
 const contextToString = (context, currentUser) => {
@@ -45,18 +37,23 @@ const contextToString = (context, currentUser) => {
     case 'THREAD': {
       const payload = context.payload;
       const isCreator = payload.creatorId === currentUser.id;
-      const str = isCreator ? 'in your thread' : 'in';
+      const str = isCreator ? 'your thread' : '';
       return `${str} ${payload.content.title}`;
     }
     case 'DIRECT_MESSAGE_THREAD': {
       return 'in a direct message thread';
     }
+    case 'THREAD_REACTION': {
+      return 'your thread';
+    }
     case 'MESSAGE':
       return 'your reply';
     case 'COMMUNITY':
       return context.payload.name;
     case 'CHANNEL':
       return context.payload.name;
+    default:
+      return;
   }
 };
 
@@ -84,16 +81,13 @@ const parseNotification = notification => {
 
 const formatNotification = (incomingNotification, currentUserId) => {
   const notification = parseNotification(incomingNotification);
-
   const actors =
     notification.actors &&
     parseActors(notification.actors, { id: currentUserId });
   const event = notification.event && EVENT_VERB[notification.event];
   const context =
     notification.context &&
     contextToString(notification.context, { id: currentUserId });
-  const date =
-    notification.modifiedAt && parseNotificationDate(notification.modifiedAt);
 
   let title = `${actors} ${event} ${context}`;
   let href, body;
@@ -171,6 +165,16 @@ const formatNotification = (incomingNotification, currentUserId) => {
           : message.content.body;
       break;
     }
+    case 'THREAD_REACTION_CREATED': {
+      const thread = notification.context.payload;
+
+      href = `/thread/${thread.id}`;
+      body =
+        thread.type === 'draftjs'
+          ? toPlainText(toState(thread.content.body))
+          : thread.content.body;
+      break;
+    }
     case 'CHANNEL_CREATED': {
       const entities = notification.entities;
       const newChannelCount =
@@ -187,6 +191,7 @@ const formatNotification = (incomingNotification, currentUserId) => {
       title = `${actors} ${event} ${context}`;
       break;
     }
+
     case 'MENTION_THREAD': {
       // sort and order the threads
       const threads = sortThreads(notification.entities, { id: currentUserId });
@@ -221,6 +226,8 @@ const formatNotification = (incomingNotification, currentUserId) => {
       title = `${actors} invited you to join their community, ${context}`;
       break;
     }
+    default:
+      return;
   }
 
   const data = href && {