Merge remote-tracking branch 'origin/main'

[zombocom-ai] / index.js

diff --git a/index.js b/index.js
index 4108ebc2c1a3e35fac22d93079b07fc1b4608f60..07da00a59a99919049ac8d9c6319e2a7a0a42c83 100644 (file)
--- a/index.js
+++ b/index.js
@@ -85,15 +85,30 @@ io.on('connection', (socket) => {
         console.log("Received set-name event: " + name);
         socket.request.session.name = name;
         socket.request.session.save();
+       // Complete the round trip to the client
+       socket.emit('inform-name', socket.request.session.name);
     });
 
     // When any client comments, send that to all clients (including sender)
     socket.on('comment', (comment) => {
+        const images = state.images;
+
+        // Send comment to clients after adding commenter's name
         comment.name = socket.request.session.name;
         io.emit('comment', comment);
-        image = state.images.find(image => image.id == comment.image_id);
+
+        const index = images.findIndex(image => image.id == comment.image_id);
+
+        // Before adding the comment to server's state, drop the image_id
         delete comment.image_id;
+
+        // Now add the comment to the image, remove the image from the
+        // images array and then add it back at the end, (so it appears
+        // as the most-recently-modified image for any new clients)
+        const image = images[index];
         image.comments.push(comment);
+        images.splice(index, 1);
+        images.push(image);
     });
 
     // Generate an image when requested
@@ -111,6 +126,7 @@ io.on('connection', (socket) => {
                 const images = JSON.parse(data);
                 images.forEach((image) => {
                     image.id = state.images.length;
+                   image.comments = [];
                     io.emit('image', image);
                     state.images.push(image);
                 });