Perform a complete round trip when setting a name

[zombocom-ai] / index.js

diff --git a/index.js b/index.js
index 20e79d04e52e9207cebc1c0c93ac05dfb95e3663..07da00a59a99919049ac8d9c6319e2a7a0a42c83 100644 (file)
--- a/index.js
+++ b/index.js
@@ -42,7 +42,7 @@ io.use(wrap(session_middleware));
 // Load comments at server startup
 fs.readFile(state_file, (err, data) => {
     if (err)
-        state = { images: [], comments: [] };
+        state = { images: [] };
     else
         state = JSON.parse(data);
 });
@@ -80,21 +80,35 @@ io.on('connection', (socket) => {
     state.images.forEach((image) => {
         socket.emit('image', image)
     });
-    state.comments.forEach((comment) => {
-        socket.emit('comment', comment)
-    });
 
     socket.on('set-name', (name) => {
         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);
-        state.comments.push(comment);
+
+        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,7 +125,8 @@ io.on('connection', (socket) => {
             child.stdout.on('data', (data) => {
                 const images = JSON.parse(data);
                 images.forEach((image) => {
-                    image.index = state.images.length;
+                    image.id = state.images.length;
+                   image.comments = [];
                     io.emit('image', image);
                     state.images.push(image);
                 });