Fix Multiple Device Self Message Issue (#405)

hyochan · Jun 4, 2021 · 508a2a4 · 508a2a4
1 parent 3f460ec
commit 508a2a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/client/src/relay/updaters.tsx b/client/src/relay/updaters.tsx
@@ -39,7 +39,17 @@ function prependMessageToChannel(
     'Message',
   );
 
-  ConnectionHandler.insertEdgeBefore(messagesConnection, newMessageEdge);
+  // Insert new edge if the message is not already in connection.
+
+  const existingEdges = messagesConnection?.getLinkedRecords('edges') ?? [];
+
+  if (
+    !existingEdges.find(
+      (edge) =>
+        edge.getLinkedRecord('node')?.getDataID() === messageProxy.getDataID(),
+    )
+  )
+    ConnectionHandler.insertEdgeBefore(messagesConnection, newMessageEdge);
 }
 
 /**

diff --git a/server/src/resolvers/Message/subscription.ts b/server/src/resolvers/Message/subscription.ts
@@ -25,10 +25,7 @@ export const onMessage = subscriptionField('onMessage', {
         },
       });
 
-      const correctChannel = !!membership; // Message is sent to the auth user's channel.
-      const fromSelf = payload.senderId === userId; // Message is sent by the auth user.
-
-      return correctChannel && !fromSelf;
+      return !!membership; // Message is sent to the auth user's channel.
     },
   ),
   resolve: (payload) => {