Merge pull request #4167 from withspectrum/2.4.56

2.4.56

Author: brianlovin

api/models/message.js

@@ -15,11 +15,11 @@ import {
 } from './thread';
 import { events } from 'shared/analytics';
 import { trackQueue } from 'shared/bull/queues';
+import type { DBMessage } from 'shared/types';
 
 export type MessageTypes = 'text' | 'media';
-export type Message = Object;
 
-export const getMessage = (messageId: string): Promise<Message> => {
+export const getMessage = (messageId: string): Promise<DBMessage> => {
   return db
     .table('messages')
     .get(messageId)
@@ -30,7 +30,7 @@ export const getMessage = (messageId: string): Promise<Message> => {
     });
 };
 
-export const getManyMessages = (messageIds: string[]): Promise<Message[]> => {
+export const getManyMessages = (messageIds: string[]): Promise<DBMessage[]> => {
   return db
     .table('messages')
     .getAll(...messageIds)
@@ -82,14 +82,14 @@ export const getMessages = (
     last,
     before,
   }: { ...BackwardsPaginationOptions, ...ForwardsPaginationOptions }
-): Promise<Array<Message>> => {
+): Promise<Array<DBMessage>> => {
   // $FlowIssue
   if (last || before) return getBackwardsMessages(threadId, { last, before });
   // $FlowIssue
   return getForwardMessages(threadId, { first, after });
 };
 
-export const getLastMessage = (threadId: string): Promise<Message> => {
+export const getLastMessage = (threadId: string): Promise<DBMessage> => {
   return db
     .table('messages')
     .getAll(threadId, { index: 'threadId' })
@@ -109,7 +109,7 @@ export const getLastMessages = (threadIds: Array<string>): Promise<Object> => {
 };
 
 // prettier-ignore
-export const getMediaMessagesForThread = (threadId: string): Promise<Array<Message>> => {
+export const getMediaMessagesForThread = (threadId: string): Promise<Array<DBMessage>> => {
   return db
     .table('messages')
     .getAll(threadId, { index: 'threadId' })
@@ -119,7 +119,7 @@ export const getMediaMessagesForThread = (threadId: string): Promise<Array<Messa
 };
 
 // prettier-ignore
-export const storeMessage = (message: Message, userId: string): Promise<Message> => {
+export const storeMessage = (message: Object, userId: string): Promise<DBMessage> => {
   // Insert a message
   return db
     .table('messages')
@@ -289,3 +289,56 @@ export const userHasMessagesInThread = (threadId: string, userId: string) => {
     .contains(userId)
     .run();
 };
+
+type EditInput = {
+  id: string,
+  content: {
+    body: string,
+  },
+};
+
+// prettier-ignore
+export const editMessage = (message: EditInput, userId: string): Promise<DBMessage> => {
+  // Insert a message
+  return db
+    .table('messages')
+    .get(message.id)
+    .update(
+      {
+        content: message.content,
+        modifiedAt: new Date(),
+        edits: db.branch(
+          db.row.hasFields('edits'), 
+          db.row('edits').append({
+            content: db.row('content'),
+            timestamp: db.row('modifiedAt'),
+          }),
+          [{ 
+            content: db.row('content'), 
+            timstamp: db.row('timestamp')
+          }]
+        ),
+      },
+      { returnChanges: 'always' }
+    )
+    .run()
+    .then(result => result.changes[0].new_val || result.changes[0].old_val)
+    .then(message => {
+      if (message.threadType === 'directMessageThread') {
+        trackQueue.add({
+          userId,
+          event: events.DIRECT_MESSAGE_EDITED,
+          context: { messageId: message.id },
+        });
+      }
+      if (message.threadType === 'story') {
+        trackQueue.add({
+          userId,
+          event: events.MESSAGE_EDITED,
+          context: { messageId: message.id },
+        });
+      }
+
+      return message;
+    });
+};

api/models/thread.js

@@ -219,7 +219,7 @@ export const getViewableThreadsByUser = async (
     ...publicChannelIds,
     ...publicCommunityIds,
   ];
-  const distinctIds = allIds.filter((x, i, a) => a.indexOf(x) == i);
+  const distinctIds = allIds.filter((x, i, a) => a.indexOf(x) === i);
   let validChannelIds = intersection(distinctIds, publishedChannelIds);
   let validCommunityIds = intersection(distinctIds, publishedCommunityIds);
 
@@ -317,11 +317,11 @@ export const getViewableParticipantThreadsByUser = async (
   const participantThreadIds = participantChannelIds.map(c => c.threadId);
   const distinctParticipantChannelIds = participantChannelIds
     .map(c => c.channelId)
-    .filter((x, i, a) => a.indexOf(x) == i);
+    .filter((x, i, a) => a.indexOf(x) === i);
 
   const distinctParticipantCommunityIds = participantCommunityIds
     .map(c => c.communityId)
-    .filter((x, i, a) => a.indexOf(x) == i);
+    .filter((x, i, a) => a.indexOf(x) === i);
 
   // get a list of all the channels that are public
   const publicChannelIds = await db
@@ -344,7 +344,7 @@ export const getViewableParticipantThreadsByUser = async (
     ...currentUsersCommunityIds,
     ...publicCommunityIds,
   ];
-  const distinctIds = allIds.filter((x, i, a) => a.indexOf(x) == i);
+  const distinctIds = allIds.filter((x, i, a) => a.indexOf(x) === i);
   let validChannelIds = intersection(
     distinctIds,
     distinctParticipantChannelIds

api/mutations/message/editMessage.js

@@ -0,0 +1,69 @@
+// @flow
+import type { GraphQLContext } from '../../';
+import UserError from '../../utils/UserError';
+import {
+  getMessage,
+  editMessage,
+  userHasMessagesInThread,
+  getMessages,
+} from '../../models/message';
+import { setThreadLastActive } from '../../models/thread';
+import { deleteParticipantInThread } from '../../models/usersThreads';
+import { getUserPermissionsInChannel } from '../../models/usersChannels';
+import { getUserPermissionsInCommunity } from '../../models/usersCommunities';
+import { events } from 'shared/analytics';
+import { isAuthedResolver as requireAuth } from '../../utils/permissions';
+import { trackQueue } from 'shared/bull/queues';
+
+type Args = {
+  input: {
+    id: string,
+    content: {
+      body: string,
+    },
+  },
+};
+
+export default requireAuth(async (_: any, args: Args, ctx: GraphQLContext) => {
+  const {
+    input: { id, content },
+  } = args;
+  const { user, loaders } = ctx;
+
+  const message = await getMessage(id);
+
+  if (!message) {
+    trackQueue.add({
+      userId: user.id,
+      event: events.MESSAGE_EDITED_FAILED,
+      properties: {
+        reason: 'message not found',
+      },
+    });
+    return new UserError('This message does not exist.');
+  }
+
+  if (content.body === message.content.body) {
+    return message;
+  }
+
+  const eventFailed =
+    message.threadType === 'story'
+      ? events.MESSAGE_EDITED_FAILED
+      : events.DIRECT_MESSAGE_EDITED_FAILED;
+
+  if (message.senderId !== user.id) {
+    trackQueue.add({
+      userId: user.id,
+      event: eventFailed,
+      context: { messageId: id },
+      properties: {
+        reason: 'message not sent by user',
+      },
+    });
+
+    return new UserError('You can only edit your own messages.');
+  }
+
+  return editMessage(args.input, user.id);
+});

api/mutations/message/index.js

@@ -1,10 +1,12 @@
 // @flow
 import addMessage from './addMessage';
 import deleteMessage from './deleteMessage';
+import editMessage from './editMessage';
 
 module.exports = {
   Mutation: {
     addMessage,
     deleteMessage,
+    editMessage,
   },
 };

api/types/Message.js

@@ -1,65 +1,70 @@
 // @flow
 const Message = /* GraphQL */ `
-	enum MessageTypes {
-		text
-		media
-		draftjs
-	}
+  enum MessageTypes {
+    text
+    media
+    draftjs
+  }
 
-	enum ThreadTypes {
-		story
-		directMessageThread
-	}
+  enum ThreadTypes {
+    story
+    directMessageThread
+  }
 
-	type MessageContent {
-		body: String!
-	}
+  type MessageContent {
+    body: String!
+  }
 
-	type ReactionData {
-		count: Int!
-		hasReacted: Boolean
-	}
+  type ReactionData {
+    count: Int!
+    hasReacted: Boolean
+  }
 
-	type Message {
-		id: ID!
-		timestamp: Date!
-		thread: Thread
-		content: MessageContent!
+  type Message {
+    id: ID!
+    timestamp: Date!
+    thread: Thread
+    content: MessageContent!
     author: ThreadParticipant! @cost(complexity: 2)
     reactions: ReactionData @cost(complexity: 1)
-		messageType: MessageTypes!
+    messageType: MessageTypes!
     parent: Message
+    modifiedAt: Date
+    sender: User! @deprecated(reason: "Use Message.author field instead")
+  }
 
-		sender: User! @deprecated(reason:"Use Message.author field instead")
-	}
+  input MessageContentInput {
+    body: String
+  }
 
-	input MessageContentInput {
-		body: String
-	}
-
-	input MessageInput {
-		threadId: ID!
-		threadType: ThreadTypes!
-		messageType: MessageTypes!
-		content: MessageContentInput!
+  input MessageInput {
+    threadId: ID!
+    threadType: ThreadTypes!
+    messageType: MessageTypes!
+    content: MessageContentInput!
     parentId: String
-		file: Upload
-	}
+    file: Upload
+  }
 
-	extend type Query {
-		message(id: ID!): Message
-		getMediaMessagesForThread(threadId: ID!): [Message]
-	}
+  extend type Query {
+    message(id: ID!): Message
+    getMediaMessagesForThread(threadId: ID!): [Message]
+  }
 
+  input EditMessageInput {
+    id: ID!
+    content: MessageContentInput
+  }
 
-	extend type Mutation {
-		addMessage(message: MessageInput!): Message
-		deleteMessage(id: ID!): Boolean
-	}
+  extend type Mutation {
+    addMessage(message: MessageInput!): Message
+    deleteMessage(id: ID!): Boolean
+    editMessage(input: EditMessageInput!): Message
+  }
 
-	extend type Subscription {
-		messageAdded(thread: ID!): Message
-	}
+  extend type Subscription {
+    messageAdded(thread: ID!): Message
+  }
 `;
 
 module.exports = Message;