From cf9fd316e94fe513a4dbc8a44a5b4e5cddd55a12 Mon Sep 17 00:00:00 2001 From: OpSimple <35542206+OpSimple@users.noreply.github.com> Date: Fri, 1 Jun 2018 01:04:39 +0530 Subject: Added hashes into each socket Added implicit declaration of hashes into each socket while the user joins. --- server/src/commands/core/join.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'server/src/commands/core') diff --git a/server/src/commands/core/join.js b/server/src/commands/core/join.js index f2b2c9d..4875b0e 100644 --- a/server/src/commands/core/join.js +++ b/server/src/commands/core/join.js @@ -115,6 +115,7 @@ exports.run = async (core, server, socket, data) => { socket.uType = uType; socket.nick = nick; socket.channel = channel; + socket.hash = server.getSocketHash(socket); if (trip !== null) socket.trip = trip; nicks.push(socket.nick); @@ -132,4 +133,4 @@ exports.info = { name: 'join', usage: 'join {channel} {nick}', description: 'Place calling socket into target channel with target nick & broadcast event to channel' -}; \ No newline at end of file +}; -- cgit v1.2.1 From 60246bc2fb4968e8bba3a2cc5eba244c826a694f Mon Sep 17 00:00:00 2001 From: OpSimple <35542206+OpSimple@users.noreply.github.com> Date: Fri, 1 Jun 2018 01:18:18 +0530 Subject: Added checking for muzzled user --- server/src/commands/core/chat.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'server/src/commands/core') diff --git a/server/src/commands/core/chat.js b/server/src/commands/core/chat.js index bce6adb..86f69c3 100644 --- a/server/src/commands/core/chat.js +++ b/server/src/commands/core/chat.js @@ -48,7 +48,12 @@ exports.run = async (core, server, socket, data) => { payload.trip = socket.trip; } - server.broadcast( payload, { channel: socket.channel }); + if(core.muzzledHashes[socket.hash]){ + server.broadcast( payload, { channel: socket.channel, hash: socket.hash }); + } else { + //else send it to everyone + server.broadcast( payload, { channel: socket.channel}); + } core.managers.stats.increment('messages-sent'); }; @@ -59,4 +64,4 @@ exports.info = { name: 'chat', usage: 'chat {text}', description: 'Broadcasts passed `text` field to the calling users channel' -}; \ No newline at end of file +}; -- cgit v1.2.1 From eb830e11b79cd71cc460f92a43264e567ba6de88 Mon Sep 17 00:00:00 2001 From: OpSimple <35542206+OpSimple@users.noreply.github.com> Date: Fri, 1 Jun 2018 03:42:25 +0530 Subject: Added an extra loop for allies Added an extra loop so as to deliver the muzzled user's texts to all of the allies --- server/src/commands/core/chat.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'server/src/commands/core') diff --git a/server/src/commands/core/chat.js b/server/src/commands/core/chat.js index 86f69c3..db23a28 100644 --- a/server/src/commands/core/chat.js +++ b/server/src/commands/core/chat.js @@ -50,6 +50,12 @@ exports.run = async (core, server, socket, data) => { if(core.muzzledHashes[socket.hash]){ server.broadcast( payload, { channel: socket.channel, hash: socket.hash }); + if(core.muzzledHashes[socket.hash].allies){ + let aqs = core.muzzledHashes[socket.hash].allies; + for(let i=0; i < aqs.length; i++){ + server.broadcast( payload, { channel: socket.channel, nick: aqs[i] }); + } + } } else { //else send it to everyone server.broadcast( payload, { channel: socket.channel}); -- cgit v1.2.1 From 2134334591d3072538585f4dba3960cb3f889969 Mon Sep 17 00:00:00 2001 From: OpSimple <35542206+OpSimple@users.noreply.github.com> Date: Fri, 1 Jun 2018 13:18:17 +0530 Subject: Update chat.js --- server/src/commands/core/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/src/commands/core') diff --git a/server/src/commands/core/chat.js b/server/src/commands/core/chat.js index db23a28..0e339ba 100644 --- a/server/src/commands/core/chat.js +++ b/server/src/commands/core/chat.js @@ -48,7 +48,7 @@ exports.run = async (core, server, socket, data) => { payload.trip = socket.trip; } - if(core.muzzledHashes[socket.hash]){ + if(core.muzzledHashes && core.muzzledHashes[socket.hash]){ server.broadcast( payload, { channel: socket.channel, hash: socket.hash }); if(core.muzzledHashes[socket.hash].allies){ let aqs = core.muzzledHashes[socket.hash].allies; -- cgit v1.2.1 From a9b020fa02e41a9ac5e59428d0ac4e1f6b6555fc Mon Sep 17 00:00:00 2001 From: OpSimple <35542206+OpSimple@users.noreply.github.com> Date: Fri, 1 Jun 2018 23:45:38 +0530 Subject: Solved uneeded variable creation --- server/src/commands/core/chat.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'server/src/commands/core') diff --git a/server/src/commands/core/chat.js b/server/src/commands/core/chat.js index 0e339ba..80241d5 100644 --- a/server/src/commands/core/chat.js +++ b/server/src/commands/core/chat.js @@ -51,10 +51,7 @@ exports.run = async (core, server, socket, data) => { if(core.muzzledHashes && core.muzzledHashes[socket.hash]){ server.broadcast( payload, { channel: socket.channel, hash: socket.hash }); if(core.muzzledHashes[socket.hash].allies){ - let aqs = core.muzzledHashes[socket.hash].allies; - for(let i=0; i < aqs.length; i++){ - server.broadcast( payload, { channel: socket.channel, nick: aqs[i] }); - } + server.broadcast( payload, { channel: socket.channel, nick: core.muzzledHashes[socket.hash].allies }); } } else { //else send it to everyone -- cgit v1.2.1