Merge pull request #4703 from withspectrum/2.7.3

2.7.3

Author: brianlovin

api/routes/api/email.js

@@ -61,6 +61,7 @@ emailRouter.get('/unsubscribe', (req, res) => {
       case 'newThreadCreated':
       case 'newMessageInThreads':
       case 'newDirectMessage':
+      case 'newMention':
         return unsubscribeUserFromEmailNotification(userId, type).then(() =>
           res
             .status(200)

athena/queues/mention-notification.js

@@ -46,10 +46,10 @@ export default async ({ data }: Job<MentionNotificationJobData>) => {
   // in a private channel where the user is not a member. Users can still be
   // mentioned in public channels where they are not a member
   const thread = await getThreadById(threadId);
-
   // if for some reason no thread was found, or the thread was deleted
   // dont send any notification about the mention
   if (!thread || thread.deletedAt) return;
+  debug('got thread');
 
   const { isPrivate: channelIsPrivate } = await getChannelById(
     thread.channelId
@@ -74,6 +74,7 @@ export default async ({ data }: Job<MentionNotificationJobData>) => {
   ) {
     return;
   }
+  debug('user is member in community');
 
   // see if a usersThreads record exists. If it does, and notifications are muted, we
   // should not send an email. If the record doesn't exist, it means the person being
@@ -120,8 +121,10 @@ export default async ({ data }: Job<MentionNotificationJobData>) => {
   ]);
 
   // if the user shouldn't get an email, just add an in-app notif
-  if (!shouldEmail)
+  if (!shouldEmail) {
+    debug('recipient doesnt have an email');
     return storeUsersNotifications(storedNotification.id, recipient.id);
+  }
 
   // if the mention was in a message, get the data about the message
   const messagePromise = messageId ? await getMessageById(messageId) : null;

athena/queues/private-community-request-approved.js

@@ -6,7 +6,7 @@ import Raven from 'shared/raven';
 import { getCommunityById } from '../models/community';
 import { storeNotification } from '../models/notification';
 import { storeUsersNotifications } from 'shared/db/queries/usersNotifications';
-import { getUsers } from 'shared/db/queries/user';
+import { getUserById } from 'shared/db/queries/user';
 import { fetchPayload } from '../utils/payloads';
 import isEmail from 'validator/lib/isEmail';
 import { sendPrivateCommunityRequestApprovedEmailQueue } from 'shared/bull/queues';
@@ -41,25 +41,26 @@ export default async (job: Job<PrivateCommunityRequestApprovedJobData>) => {
   const updatedNotification = await storeNotification(nextNotificationRecord);
 
   const community = await getCommunityById(communityId);
-  const recipients = await getUsers([userId]);
-  const filteredRecipients = recipients.filter(
-    user => user && isEmail(user.email)
-  );
-  const usersNotificationPromises = filteredRecipients.map(recipient =>
-    storeUsersNotifications(updatedNotification.id, recipient.id)
+  const recipient = await getUserById(userId);
+
+  const canSendEmail = recipient && recipient.email && isEmail(recipient.email);
+
+  const notificationPromise = storeUsersNotifications(
+    updatedNotification.id,
+    recipient.id
   );
 
-  const usersEmailPromises = filteredRecipients.map(recipient =>
+  const emailPromise =
+    canSendEmail &&
     sendPrivateCommunityRequestApprovedEmailQueue.add({
       // $FlowIssue
       recipient,
       community,
-    })
-  );
+    });
 
   return await Promise.all([
-    ...usersEmailPromises, // handle emails separately
-    ...usersNotificationPromises, // update or store usersNotifications in-app
+    emailPromise, // handle emails separately
+    notificationPromise, // update or store usersNotifications in-app
   ]).catch(err => {
     console.error('❌ Error in job:\n');
     console.error(err);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "@babel/preset-flow": "^7.0.0",

scripts/deploy.js

@@ -75,9 +75,12 @@ if (servers.indexOf('hyperion') > -1) {
     stdio: 'inherit',
   });
   console.log('Aliasing to hyperion.workers.spectrum.chat');
-  exec(now('alias hyperion.workers.spectrum.chat'), {
-    stdio: 'inherit',
-  });
+  exec(
+    now(`alias hyperion.${flags.prod ? 'workers' : 'alpha'}.spectrum.chat`),
+    {
+      stdio: 'inherit',
+    }
+  );
   console.log('Clearing cache');
   exec(
     now(

shared/db/db.js

@@ -59,9 +59,9 @@ poolMaster.on('queueing', size => {
   statsd.gauge('db.query_queue.size', size);
 });
 
-poolMaster.on('size', size => {
-  statsd.gauge('db.connections.count', size);
-});
+setInterval(() => {
+  statsd.gauge('db.connections.count', poolMaster.getLength());
+}, 5000);
 
 // Exit the process on unhealthy db in test env
 if (process.env.TEST_DB) {

shared/imgix/signCommunity.js

@@ -8,7 +8,19 @@ export const signCommunity = (community: DBCommunity, expires?: number): DBCommu
 
   return {
     ...rest,
-    profilePhoto: signImageUrl(profilePhoto, { w: 256, h: 256, expires }),
-    coverPhoto: signImageUrl(coverPhoto, { w: 1280, h: 384, expires }),
+    profilePhoto: signImageUrl(profilePhoto, { 
+      w: 256, 
+      h: 256, 
+      dpr: 2, 
+      auto: 'compress',
+      expires 
+    }),
+    coverPhoto: signImageUrl(coverPhoto, { 
+      w: 1280, 
+      h: 384, 
+      dpr: 2, 
+      q: 100,
+      expires 
+    }),
   };
 };

shared/imgix/signThread.js

@@ -1,6 +1,7 @@
 // @flow
 import type { DBThread } from 'shared/types';
 import { signImageUrl } from 'shared/imgix';
+const url = require('url');
 
 const signBody = (body?: string, expires?: number): string => {
   if (!body) {
@@ -32,7 +33,19 @@ const signBody = (body?: string, expires?: number): string => {
     const { src } = returnBody.entityMap[key].data;
 
     // transform the body inline with signed image urls
-    returnBody.entityMap[key].data.src = signImageUrl(src, { expires });
+    const imageUrlStoredAsSigned =
+      src.indexOf('https://spectrum.imgix.net') >= 0;
+    // if the image was stored in the db as a signed url (eg. after the plaintext update to the thread editor)
+    // we need to remove all query params from the src, then re-sign in order to avoid duplicate signatures
+    // or sending down a url with an expired signature
+    if (imageUrlStoredAsSigned) {
+      const pathname = url.parse(src).pathname;
+      // always attempt to use the parsed pathname, but fall back to the original src
+      const sanitized = decodeURIComponent(pathname || src);
+      returnBody.entityMap[key].data.src = signImageUrl(sanitized, { expires });
+    } else {
+      returnBody.entityMap[key].data.src = signImageUrl(src, { expires });
+    }
   });
 
   return JSON.stringify(returnBody);

shared/imgix/signUser.js

@@ -10,11 +10,15 @@ export const signUser = (user: DBUser, expires?: number): DBUser => {
     profilePhoto: signImageUrl(profilePhoto, {
       w: 256,
       h: 256,
+      dpr: 2,
+      auto: 'compress',
       expires,
     }),
     coverPhoto: signImageUrl(coverPhoto, {
       w: 1280,
       h: 384,
+      dpr: 2,
+      q: 100,
       expires,
     }),
   };

src/components/loading/style.js

@@ -300,8 +300,7 @@ export const GridProfile = styled.div`
   grid-template-areas: 'cover cover' 'meta content';
   grid-column-gap: 32px;
   width: 100%;
-  min-width: 100%;
-  max-width: 100%;
+  max-width: 1280px;
   height: 100%;
   min-height: 100vh;
   background-color: ${theme.bg.default};