a

macwilko · Dec 31, 2023 · 11c03c0 · 11c03c0
1 parent e36ae18
commit 11c03c0
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/app/components/channel-feed.jsx b/app/components/channel-feed.jsx
@@ -45,33 +45,37 @@ export default function ChannelFeed(props) {
             try {
                 const update = JSON.parse(newMessageJson.message);
 
-                if (update.user.handle == channel.user.handle) {
-                    return;
-                }
-
                 if (messages.length > 0) {
 
-                    const idx = messages.length - 1;
-                    const last = messages[idx];
+                    const idx = messages.map((m) => m.id).indexOf(update.id);
 
-                    if (last.id == update.id) {
+                    if (idx >= 0) {
 
                         let mp = [...messages];
 
-                        mp[idx] = update; //
+                        mp[idx] = update;
 
                         setMessages(mp, () => {
+                            if (update.user.handle == channel.user.handle) {
+                                return
+                            }
                             const feed = feedRef.current;
                             feed.scrollTop = feed.scrollHeight;
                         });
                     } else {
                         setMessages([...messages, update], () => {
+                            if (update.user.handle == channel.user.handle) {
+                                return
+                            }
                             const feed = feedRef.current;
                             feed.scrollTop = feed.scrollHeight;
                         });
                     }
                 } else {
                     setMessages([update], () => {
+                        if (update.user.handle == channel.user.handle) {
+                            return
+                        }
                         const feed = feedRef.current;
                         feed.scrollTop = feed.scrollHeight;
                     });
@@ -80,7 +84,7 @@ export default function ChannelFeed(props) {
                 console.error("encountered an error json decoding");
             }
         }
-    }, [messages, channel])
+    }, [messages, channel]);
 
     useEffect(() => {
         handleNewSocketMessage(lastJsonMessage);