Merge pull request #2979 from withspectrum/2.2.8

2.2.8

Author: brianlovin

api/loaders/channel.js

@@ -7,7 +7,6 @@ import {
 import { getChannelsSettings } from '../models/channelSettings';
 import createLoader from './create-loader';
 import { getPendingUsersInChannels } from '../models/usersChannels';
-import type { Loader } from './types';
 
 export const __createChannelLoader = createLoader(channels =>
   getChannels(channels)

api/loaders/index.js

@@ -37,6 +37,7 @@ import {
 } from './directMessageThread';
 import { __createReactionLoader } from './reaction';
 import { __createStripeCustomersLoader } from './stripe';
+import { __createMessageLoader } from './message';
 import type { DataLoaderOptions } from './types';
 
 // Create all the necessary loaders to be attached to the GraphQL context for each request
@@ -70,6 +71,7 @@ const createLoaders = (options?: DataLoaderOptions) => ({
   directMessageThread: __createDirectMessageThreadLoader(options),
   directMessageParticipants: __createDirectMessageParticipantsLoader(options),
   directMessageSnippet: __createDirectMessageSnippetLoader(options),
+  message: __createMessageLoader(options),
   messageReaction: __createReactionLoader(options),
 });
 

api/loaders/message.js

@@ -0,0 +1,14 @@
+// @flow
+import { getManyMessages } from '../models/message';
+import createLoader from './create-loader';
+import type { Loader } from './types';
+
+export const __createMessageLoader = createLoader((messages: string[]) =>
+  getManyMessages(messages)
+);
+
+export default () => {
+  throw new Error(
+    '⚠️ Do not import loaders directly, get them from the GraphQL context instead! ⚠️'
+  );
+};

api/loaders/user.js

@@ -12,7 +12,6 @@ import {
 import { getUsersPermissionsInChannels } from '../models/usersChannels';
 import { getThreadsNotificationStatusForUsers } from '../models/usersThreads';
 import createLoader from './create-loader';
-import type { Loader } from './types';
 
 export const __createUserLoader = createLoader(users => getUsers(users), 'id');
 

api/models/communitySettings.js

@@ -31,11 +31,12 @@ export const getCommunitiesSettings = (
     .getAll(...communityIds, { index: 'communityId' })
     .run()
     .then(data => {
-      if (!data || data.length === 0)
+      if (!data || data.length === 0) {
         return Array.from({ length: communityIds.length }, (_, index) => ({
           ...defaultSettings,
           communityId: communityIds[index],
         }));
+      }
 
       if (data.length === communityIds.length) {
         return data.map(
@@ -50,12 +51,23 @@ export const getCommunitiesSettings = (
       }
 
       if (data.length < communityIds.length) {
-        return communityIds.map(community => {
-          const record = data.find(o => o.communityId === community);
+        return communityIds.map(communityId => {
+          const record = data.find(o => o.communityId === communityId);
+          if (record) return record;
+          return {
+            ...defaultSettings,
+            communityId,
+          };
+        });
+      }
+
+      if (data.length > communityIds.length) {
+        return communityIds.map(communityId => {
+          const record = data.find(o => o.communityId === communityId);
           if (record) return record;
           return {
             ...defaultSettings,
-            communityId: community,
+            communityId,
           };
         });
       }

api/models/message.js

@@ -11,7 +11,6 @@ import { createChangefeed } from 'shared/changefeed-utils';
 import { setThreadLastActive } from './thread';
 
 export type MessageTypes = 'text' | 'media';
-// TODO: Fix this
 export type Message = Object;
 
 export const getMessage = (messageId: string): Promise<Message> => {
@@ -25,6 +24,16 @@ export const getMessage = (messageId: string): Promise<Message> => {
     });
 };
 
+export const getManyMessages = (messageIds: string[]): Promise<Message[]> => {
+  return db
+    .table('messages')
+    .getAll(...messageIds)
+    .run()
+    .then(messages => {
+      return messages.filter(message => message && !message.deletedAt);
+    });
+};
+
 type BackwardsPaginationOptions = { last?: number, before?: number | Date };
 
 const getBackwardsMessages = (

api/mutations/message/addMessage.js

@@ -4,7 +4,7 @@ import { EditorState } from 'draft-js';
 import type { GraphQLContext } from '../../';
 import UserError from '../../utils/UserError';
 import { uploadImage } from '../../utils/file-storage';
-import { storeMessage } from '../../models/message';
+import { storeMessage, getMessage } from '../../models/message';
 import { setDirectMessageThreadLastActive } from '../../models/directMessageThread';
 import { setUserLastSeenInDirectMessageThread } from '../../models/usersDirectMessageThreads';
 import { createMemberInChannel } from '../../models/usersChannels';
@@ -25,6 +25,7 @@ type AddMessageInput = {
     content: {
       body: string,
     },
+    parentId?: string,
     file?: FileUpload,
   },
 };
@@ -86,6 +87,12 @@ export default async (
     }
   }
 
+  if (message.parentId) {
+    const parent = await getMessage(message.parentId);
+    if (parent.threadId !== message.threadId)
+      throw new UserError('You can only quote messages from the same thread.');
+  }
+
   // construct the shape of the object to be stored in the db
   let messageForDb = Object.assign({}, message);
   if (message.file && message.messageType === 'media') {

api/queries/community/brandedLogin.js

@@ -1,6 +1,5 @@
 // @flow
 import type { DBCommunity } from 'shared/types';
-import { getCommunitySettings } from '../../models/communitySettings';
 import type { GraphQLContext } from '../../';
 
 export default async (

api/queries/message/index.js

@@ -5,6 +5,7 @@ import sender from './sender';
 import author from './author';
 import thread from './thread';
 import reactions from './reactions';
+import parent from './parent';
 
 module.exports = {
   Query: {
@@ -16,5 +17,6 @@ module.exports = {
     sender, // deprecated
     thread,
     reactions,
+    parent,
   },
 };

api/queries/message/parent.js

@@ -0,0 +1,12 @@
+// @flow
+import type { DBMessage } from 'shared/types';
+import type { GraphQLContext } from '../../';
+
+export default (
+  { parentId }: DBMessage,
+  _: void,
+  { loaders }: GraphQLContext
+) => {
+  if (!parentId) return null;
+  return loaders.message.load(parentId);
+};