Rework the state structure so comments live as part of images, not separately

[zombocom-ai] / index.js

diff --git a/index.js b/index.js
index 1239ea2fab43360d621942d40ecd95cacced79f3..4108ebc2c1a3e35fac22d93079b07fc1b4608f60 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);
 });
@@ -77,9 +77,6 @@ io.on('connection', (socket) => {
 
     // Replay old comments and images to a newly-joining client
     socket.emit('reset');
-    state.comments.forEach((comment) => {
-        socket.emit('comment', comment)
-    });
     state.images.forEach((image) => {
         socket.emit('image', image)
     });
@@ -91,16 +88,17 @@ io.on('connection', (socket) => {
     });
 
     // When any client comments, send that to all clients (including sender)
-    socket.on('comment', (comment_text) => {
-        comment = { name: socket.request.session.name,
-                    text: comment_text }
+    socket.on('comment', (comment) => {
+        comment.name = socket.request.session.name;
         io.emit('comment', comment);
-        state.comments.push(comment);
+        image = state.images.find(image => image.id == comment.image_id);
+        delete comment.image_id;
+        image.comments.push(comment);
     });
 
     // Generate an image when requested
     socket.on('generate', (request) => {
-        console.log(`Generating image with code=${request['code']} and prompt=${request['prompt']}`);
+        console.log(`Generating image for ${socket.request.session.name} with code=${request['code']} and prompt=${request['prompt']}`);
         async function generate_image(code, prompt) {
             var promise;
             if (code) {
@@ -112,7 +110,7 @@ io.on('connection', (socket) => {
             child.stdout.on('data', (data) => {
                 const images = JSON.parse(data);
                 images.forEach((image) => {
-                    console.log(`Emitting image to clients: ${image}`);
+                    image.id = state.images.length;
                     io.emit('image', image);
                     state.images.push(image);
                 });