fixes for rich text menu updates and setting parameters on text doc vs within in RTF. Lots of lint cleanup.

1 files changed, 7 insertions, 33 deletions

diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index cb16bce72..cece8a1b7 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -79,7 +79,7 @@ export namespace WebSocket {
         timeMap[userEmail] = Date.now();
         socketMap.set(socket, userEmail + ' at ' + datetime);
         userOperations.set(userEmail, 0);
-        DashStats.logUserLogin(userEmail, socket);
+        DashStats.logUserLogin(userEmail);
     }
 
     function getField([id, callback]: [string, (result?: Transferable) => void]) {
@@ -417,38 +417,12 @@ export namespace WebSocket {
                 socket.in(room).emit('message', message);
             });
 
-            socket.on('create or join', room => {
-                console.log('Received request to create or join room ' + room);
-
-                const clientsInRoom = socket.rooms.has(room);
-                const numClients = clientsInRoom ? Object.keys(room.sockets).length : 0;
-                console.log('Room ' + room + ' now has ' + numClients + ' client(s)');
-
-                if (numClients === 0) {
-                    socket.join(room);
-                    console.log('Client ID ' + socket.id + ' created room ' + room);
-                    socket.emit('created', room, socket.id);
-                } else if (numClients === 1) {
-                    console.log('Client ID ' + socket.id + ' joined room ' + room);
-                    socket.in(room).emit('join', room);
-                    socket.join(room);
-                    socket.emit('joined', room, socket.id);
-                    socket.in(room).emit('ready');
-                } else {
-                    // max two clients
-                    socket.emit('full', room);
-                }
-            });
-
             socket.on('ipaddr', () => {
-                const ifaces = networkInterfaces();
-                for (const dev in ifaces) {
-                    ifaces[dev]?.forEach(details => {
-                        if (details.family === 'IPv4' && details.address !== '127.0.0.1') {
-                            socket.emit('ipaddr', details.address);
-                        }
-                    });
-                }
+                networkInterfaces().keys?.forEach(dev => {
+                    if (dev.family === 'IPv4' && dev.address !== '127.0.0.1') {
+                        socket.emit('ipaddr', dev.address);
+                    }
+                });
             });
 
             socket.on('bye', () => {
@@ -459,7 +433,7 @@ export namespace WebSocket {
                 const currentUser = socketMap.get(socket);
                 if (!(currentUser === undefined)) {
                     const currentUsername = currentUser.split(' ')[0];
-                    DashStats.logUserLogout(currentUsername, socket);
+                    DashStats.logUserLogout(currentUsername);
                     delete timeMap[currentUsername];
                 }
             });