krgamestudios/chat-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ready for PR/review

Browse Source
This commit is contained in:
Keith Campbell
2022-01-02 18:00:16 -05:00
parent ab73d05471
commit 2aedb6e938
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/chat/index.js
+22 -22
View File
@@ -46,11 +46,8 @@ const chat = io => {
socket.join(socket.user.room); socket.join(socket.user.room);
//broadcast to this room
socket.broadcast.to(socket.user.room).emit('message', {timestamp: log.createdAt, emphasis: true, text: `${socket.user.username} entered chat` });
//log //log
chatlog.create({ const log = await chatlog.create({
notification: true, notification: true,
username: socket.user.username, username: socket.user.username,
text: `${socket.user.username} entered chat`, text: `${socket.user.username} entered chat`,
@@ -58,6 +55,9 @@ const chat = io => {
emphasis: true emphasis: true
}); });
//broadcast to this room
socket.broadcast.to(socket.user.room).emit('message', {timestamp: log.createdAt, emphasis: true, text: `${socket.user.username} entered chat` });
//send backlog to the user //send backlog to the user
chatlog.findAll({ chatlog.findAll({
where: { where: {
@@ -129,7 +129,7 @@ const chat = io => {
socket.broadcast.to(socket.user.room || '.error').emit('message', { emphasis: true, text: `${socket.user.username} left chat` }); socket.broadcast.to(socket.user.room || '.error').emit('message', { emphasis: true, text: `${socket.user.username} left chat` });
//log //log
chatlog.create({ const log = await chatlog.create({
notification: true, notification: true,
username: socket.user.username, username: socket.user.username,
text: `${socket.user.username} left chat`, text: `${socket.user.username} left chat`,
@@ -164,11 +164,8 @@ const executeCommand = (io, socket, command) => {
break; break;
} }
//broadcast to the old room
socket.broadcast.to(socket.user.room).emit('message', { emphasis: true, text: `${socket.user.username} left the room (going to ${room})` });
//log //log
chatlog.create({ const log = await chatlog.create({
notification: true, notification: true,
username: socket.user.username, username: socket.user.username,
text: `${socket.user.username} left the room`, text: `${socket.user.username} left the room`,
@@ -176,16 +173,16 @@ const executeCommand = (io, socket, command) => {
emphasis: true emphasis: true
}); });
//broadcast to the old room
socket.broadcast.to(socket.user.room).emit('message', { timestamp: log.createdAt, emphasis: true, text: `${socket.user.username} left the room (going to ${room})` });
//move //move
socket.leave(socket.user.room); socket.leave(socket.user.room);
socket.user.room = room; socket.user.room = room;
socket.join(socket.user.room); socket.join(socket.user.room);
//broadcast to the new room
socket.broadcast.to(socket.user.room).emit('message', { emphasis: true, text: `${socket.user.username} entered the room` });
//log //log
chatlog.create({ const log = await chatlog.create({
notification: true, notification: true,
username: socket.user.username, username: socket.user.username,
text: `${socket.user.username} entered the room`, text: `${socket.user.username} entered the room`,
@@ -193,6 +190,9 @@ const executeCommand = (io, socket, command) => {
emphasis: true emphasis: true
}); });
//broadcast to the new room
socket.broadcast.to(socket.user.room).emit('message', {timestamp: log.createdAt, emphasis: true, text: `${socket.user.username} entered the room` });
//update the user //update the user
socket.emit('message', {timestamp: log.createdAt, emphasis: true, text: `Entered room ${socket.user.room}` }); socket.emit('message', {timestamp: log.createdAt, emphasis: true, text: `Entered room ${socket.user.room}` });
break; break;
@@ -224,12 +224,9 @@ const executeCommand = (io, socket, command) => {
until: interval, until: interval,
reason: reason reason: reason
}); });
//broadcast
io.to(socket.user.room).emit('message', { strong: true, emphasis: true, text: `${username} has been muted for ${minutes} minute${minutes != 1 ? 's' : ''}${reason ? ': ' : ''}${reason}` });
//log //log
chatlog.create({ const log = await chatlog.create({
notification: true, notification: true,
username: socket.user.username, username: socket.user.username,
text: `${username} has been muted for ${minutes} minute${minutes != 1 ? 's' : ''}: ${reason}`, text: `${username} has been muted for ${minutes} minute${minutes != 1 ? 's' : ''}: ${reason}`,
@@ -238,6 +235,9 @@ const executeCommand = (io, socket, command) => {
emphasis: true emphasis: true
}); });
//broadcast
io.to(socket.user.room).emit('message', { timestamp: log.createdAt, strong: true, emphasis: true, text: `${username} has been muted for ${minutes} minute${minutes != 1 ? 's' : ''}${reason ? ': ' : ''}${reason}` });
break; break;
} }
@@ -267,11 +267,8 @@ const executeCommand = (io, socket, command) => {
break; break;
} }
//broadcast
io.to(socket.user.room).emit('message', { emphasis: true, text: `${username} has been unmuted` });
//log //log
chatlog.create({ const log = await chatlog.create({
notification: true, notification: true,
username: socket.user.username, username: socket.user.username,
text: `${username} has been unmuted`, text: `${username} has been unmuted`,
@@ -279,6 +276,9 @@ const executeCommand = (io, socket, command) => {
emphasis: true emphasis: true
}); });
//broadcast
io.to(socket.user.room).emit('message', {timestamp: log.createdAt, emphasis: true, text: `${username} has been unmuted` });
break; break;
} }