Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.
Merged

2.5.55 #4162

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
checkForExistingDMThread,
getDirectMessageThread,
createDirectMessageThread,
setDirectMessageThreadLastActive,
} from '../../models/directMessageThread';
import { uploadImage } from '../../utils/file-storage';
import { storeMessage } from '../../models/message';
Expand Down Expand Up @@ -132,6 +133,7 @@ export default requireAuth(
if (existingThread) {
return await Promise.all([
setUserLastSeenInDirectMessageThread(threadId, user.id),
setDirectMessageThreadLastActive(threadId),
handleStoreMessage(message),
]).then(() => threadToReturn);
}
Expand Down
24 changes: 18 additions & 6 deletions api/queries/directMessageThread/participants.js
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -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(),
}),
};
});
});
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Spectrum",
"version": "2.4.54",
"version": "2.4.55",
"license": "BSD-3-Clause",
"devDependencies": {
"babel-cli": "^6.24.1",
Expand Down