Merge pull request #4162 from withspectrum/2.5.55

2.5.55

Author: brianlovin

api/mutations/directMessageThread/createDirectMessageThread.js

@@ -5,6 +5,7 @@ import {
   checkForExistingDMThread,
   getDirectMessageThread,
   createDirectMessageThread,
+  setDirectMessageThreadLastActive,
 } from '../../models/directMessageThread';
 import { uploadImage } from '../../utils/file-storage';
 import { storeMessage } from '../../models/message';
@@ -132,6 +133,7 @@ export default requireAuth(
     if (existingThread) {
       return await Promise.all([
         setUserLastSeenInDirectMessageThread(threadId, user.id),
+        setDirectMessageThreadLastActive(threadId),
         handleStoreMessage(message),
       ]).then(() => threadToReturn);
     }

api/queries/directMessageThread/participants.js

@@ -1,12 +1,10 @@
 // @flow
 import type { GraphQLContext } from '../../';
 import { canViewDMThread } from '../../utils/permissions';
+import { signImageUrl } from 'shared/imgix';
 
-export default async (
-  { id }: { id: string },
-  _: any,
-  { loaders, user }: GraphQLContext
-) => {
+export default async ({ id }: { id: string }, _: any, ctx: GraphQLContext) => {
+  const { loaders, user, getImageSignatureExpiration } = ctx;
   if (!user || !user.id) return null;
 
   const canViewThread = await canViewDMThread(user.id, id, loaders);
@@ -15,6 +13,20 @@ export default async (
 
   return loaders.directMessageParticipants.load(id).then(results => {
     if (!results || results.length === 0) return null;
-    return results.reduction;
+    return results.reduction.map(user => {
+      return {
+        ...user,
+        coverPhoto: signImageUrl(user.coverPhoto, {
+          w: 1280,
+          h: 384,
+          expires: getImageSignatureExpiration(),
+        }),
+        profilePhoto: signImageUrl(user.profilePhoto, {
+          w: 256,
+          h: 256,
+          expires: getImageSignatureExpiration(),
+        }),
+      };
+    });
   });
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.4.54",
+  "version": "2.4.55",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "babel-cli": "^6.24.1",