From 29074c0c90372eeffd0e69c468fb55bd607429d5 Mon Sep 17 00:00:00 2001
From: NyxiumYuuki <ATAWV5n2q8KG3kn>
Date: Sat, 29 May 2021 00:05:00 +0200
Subject: [PATCH] Add socket emit

---
 backend/service-message/server.js | 37 +++++++++++++++++--------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/backend/service-message/server.js b/backend/service-message/server.js
index 19651fe..bb685f7 100644
--- a/backend/service-message/server.js
+++ b/backend/service-message/server.js
@@ -5,11 +5,8 @@ const cors = require ('cors');
 const cookieParser = require('cookie-parser');
 const auth = require ('./auth');
 const bodyParser = require ('body-parser');
-const {sendError, sendMessage} = require ('./message');
 const messages = require('./mongodb-message');
 
-
-
 const app = express();
 const server = http.createServer(app);
 const io = new Server(server, {
@@ -30,29 +27,37 @@ app.get('/', (req, res) => {
 });
 
 io.on('connection',socket => {
-    let users = {}
+
+    let users = {};
 
     const session = auth.getSession(socket.request);
     const getUsername = auth.getUsername(session);
     if (getUsername === -1) {
-        return sendError(socket, 'not authenticated');
+        socket.emit('error','not authenticated');
     }
-
     console.log(`${getUsername} joined the chat.`);
-    socket.emit('general',`${getUsername} joined the chat.`);
+    socket.broadcast.emit('general',[{
+        username: 'Server',
+        date: new Date(),
+        channel: 'general',
+        message: `${getUsername} joined the chat.`
+    }]);
     users[socket.id] = getUsername;
-    messages.find({},(err, res) => {
+    messages.find({}, {'_id':0},{sort: {'date':1}},(err, res) => {
         if(err) throw err;
         if(res.length > 0){
-            const savedChat = res;
-            console.log(res);
-            socket.emit('general',savedChat);
+            //console.log(res, res.length);
+            socket.emit('general',res);
         }
+        socket.emit('general',[{
+            username: 'Server',
+            date: new Date(),
+            channel: 'general',
+            message: `${getUsername} joined the chat.`
+        }]);
     });
 
     socket.on('general',function(data){
-        socket.emit('general',data);
-
         const username = data.username;
         const date = Date.now();
         const channel = 'general';
@@ -66,16 +71,14 @@ io.on('connection',socket => {
             }
         ]).then(function(){
             console.log(data, "inserted");
+            socket.broadcast.emit('general',[data]);
+            socket.emit('general',[data]);
         }).catch(function(error){
             console.log("error",error);
         });
 
     });
 
-    socket.on('typing',(user)=>{
-        socket.broadcast.emit('notifyTyping',user)
-    })
-
     socket.on("disconnect", function() {
         console.log(`${getUsername} left the chat.`);
     });