From 7035f4a6897f574d455a467688379f3ba8797809 Mon Sep 17 00:00:00 2001 From: AtHeartEngineer Date: Wed, 6 Sep 2023 11:32:06 -0400 Subject: [PATCH] chore(.gitignore) ignore vscode settings refactor(websockets) remove systemMessage, add TotalMembers broadcast --- .gitignore | 1 + src/websockets/index.ts | 20 ++++---------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 0c3aa98..94104b1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dist/ .env thunder-tests/ coverage/ +.vscode/settings.json diff --git a/src/websockets/index.ts b/src/websockets/index.ts index 5b1f235..deedf7d 100644 --- a/src/websockets/index.ts +++ b/src/websockets/index.ts @@ -1,6 +1,6 @@ import { MessageI, RoomI } from 'discreetly-interfaces'; import { Socket, Server as SocketIOServer } from 'socket.io'; -import { findRoomById, createSystemMessages } from '../data/db/'; +import { findRoomById } from '../data/db/'; import { pp } from '../utils'; import { validateMessage } from '../data/messages'; import type { validateMessageResult } from '../data/messages'; @@ -46,20 +46,8 @@ export function websocketSetup(io: SocketIOServer) { io.to(roomID).emit('Members', userCount[roomID] ? userCount[roomID] : 0); }); - // TODO We need to rewrite this so it doesn't use `socket.on`, because this allows anyone to be able to broadcast a system message to any room. - // socket.on('systemMessage', (msg: string, roomID: bigint) => { - // const id = roomID.toString(); - // createSystemMessages(msg, id) - // .then(() => { - // if (roomID) { - // io.to(id).emit('systemMessage', msg); - // } else { - // io.emit('systemMessage', msg); - // } - // }) - // .catch((err) => { - // pp(err, 'error'); - // }); - // }); + setInterval(() => { + io.emit('TotalMembers', io.engine.clientsCount); + }, 10000); }); }