From 73e5c5ccfe408e58eb4bb927c71a77e0fceb22c4 Mon Sep 17 00:00:00 2001 From: neelkamath Date: Fri, 11 May 2018 20:46:12 +0530 Subject: Remove forgettable, unused, occasionally harmful (w.r.t. ES6) directive --- server/src/commands/core/move.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'server/src/commands/core/move.js') diff --git a/server/src/commands/core/move.js b/server/src/commands/core/move.js index 862025c..9e50f4f 100644 --- a/server/src/commands/core/move.js +++ b/server/src/commands/core/move.js @@ -2,8 +2,6 @@ Description: Generates a semi-unique channel name then broadcasts it to each client */ -'use strict'; - exports.run = async (core, server, socket, data) => { if (server._police.frisk(socket.remoteAddress, 6)) { server.reply({ -- cgit v1.2.1 From acbad15f2bc4a6733407bc17e1a5b4190ed3b287 Mon Sep 17 00:00:00 2001 From: neelkamath Date: Sat, 12 May 2018 14:13:12 +0530 Subject: Remove unused object fields --- server/src/commands/core/move.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'server/src/commands/core/move.js') diff --git a/server/src/commands/core/move.js b/server/src/commands/core/move.js index 9e50f4f..9462468 100644 --- a/server/src/commands/core/move.js +++ b/server/src/commands/core/move.js @@ -76,8 +76,4 @@ exports.run = async (core, server, socket, data) => { exports.requiredData = ['channel']; -exports.info = { - name: 'move', - usage: 'move {channel}', - description: 'This will change the current channel to the new one provided' -}; +exports.info = { name: 'move' }; -- cgit v1.2.1 From 343157350f627b9495184246a90033a1c41f1a2c Mon Sep 17 00:00:00 2001 From: Neel Kamath Date: Sun, 13 May 2018 16:03:22 +0530 Subject: Re-add module documentation --- server/src/commands/core/move.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'server/src/commands/core/move.js') diff --git a/server/src/commands/core/move.js b/server/src/commands/core/move.js index 9462468..c5efafd 100644 --- a/server/src/commands/core/move.js +++ b/server/src/commands/core/move.js @@ -76,4 +76,8 @@ exports.run = async (core, server, socket, data) => { exports.requiredData = ['channel']; -exports.info = { name: 'move' }; +exports.info = { + name: 'move', + usage: 'move {channel}', + description: 'This will change the current channel to the new one provided' +}; \ No newline at end of file -- cgit v1.2.1 From 2bb5ced363b692a5696b176bc317fe525c0c05df Mon Sep 17 00:00:00 2001 From: Neel Kamath Date: Sun, 13 May 2018 16:09:55 +0530 Subject: Flatten --- server/src/commands/core/move.js | 83 ---------------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 server/src/commands/core/move.js (limited to 'server/src/commands/core/move.js') diff --git a/server/src/commands/core/move.js b/server/src/commands/core/move.js deleted file mode 100644 index c5efafd..0000000 --- a/server/src/commands/core/move.js +++ /dev/null @@ -1,83 +0,0 @@ -/* - Description: Generates a semi-unique channel name then broadcasts it to each client -*/ - -exports.run = async (core, server, socket, data) => { - if (server._police.frisk(socket.remoteAddress, 6)) { - server.reply({ - cmd: 'warn', - text: 'You are changing channels too fast. Wait a moment before trying again.' - }, socket); - - return; - } - - if (typeof data.channel !== 'string') { - return; - } - - if (data.channel === socket.channel) { - // They are trying to rejoin the channel - return; - } - - const currentNick = socket.nick.toLowerCase(); - let userExists = server.findSockets({ - channel: data.channel, - nick: (targetNick) => targetNick.toLowerCase() === currentNick - }); - - if (userExists.length > 0) { - // That nickname is already in that channel - return; - } - - let peerList = server.findSockets({ channel: socket.channel }); - - if (peerList.length > 1) { - for (let i = 0, l = peerList.length; i < l; i++) { - server.reply({ - cmd: 'onlineRemove', - nick: peerList[i].nick - }, socket); - - if (socket.nick !== peerList[i].nick){ - server.reply({ - cmd: 'onlineRemove', - nick: socket.nick - }, peerList[i]); - } - } - } - - let newPeerList = server.findSockets({ channel: data.channel }); - let moveAnnouncement = { - cmd: 'onlineAdd', - nick: socket.nick, - trip: socket.trip || 'null', - hash: server.getSocketHash(socket) - }; - let nicks = []; - - for (let i = 0, l = newPeerList.length; i < l; i++) { - server.reply(moveAnnouncement, newPeerList[i]); - nicks.push(newPeerList[i].nick); - } - - nicks.push(socket.nick); - - server.reply({ - cmd: 'onlineSet', - nicks: nicks - }, socket); - - socket.channel = data.channel; -}; - -exports.requiredData = ['channel']; - -exports.info = { - name: 'move', - usage: 'move {channel}', - description: 'This will change the current channel to the new one provided' -}; \ No newline at end of file -- cgit v1.2.1 From 949404cd1aad8492ae0338130f16054adfa38ab7 Mon Sep 17 00:00:00 2001 From: Neel Kamath Date: Sun, 13 May 2018 16:37:56 +0530 Subject: Prevent fucking shit up --- server/src/commands/core/move.js | 83 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 server/src/commands/core/move.js (limited to 'server/src/commands/core/move.js') diff --git a/server/src/commands/core/move.js b/server/src/commands/core/move.js new file mode 100644 index 0000000..c5efafd --- /dev/null +++ b/server/src/commands/core/move.js @@ -0,0 +1,83 @@ +/* + Description: Generates a semi-unique channel name then broadcasts it to each client +*/ + +exports.run = async (core, server, socket, data) => { + if (server._police.frisk(socket.remoteAddress, 6)) { + server.reply({ + cmd: 'warn', + text: 'You are changing channels too fast. Wait a moment before trying again.' + }, socket); + + return; + } + + if (typeof data.channel !== 'string') { + return; + } + + if (data.channel === socket.channel) { + // They are trying to rejoin the channel + return; + } + + const currentNick = socket.nick.toLowerCase(); + let userExists = server.findSockets({ + channel: data.channel, + nick: (targetNick) => targetNick.toLowerCase() === currentNick + }); + + if (userExists.length > 0) { + // That nickname is already in that channel + return; + } + + let peerList = server.findSockets({ channel: socket.channel }); + + if (peerList.length > 1) { + for (let i = 0, l = peerList.length; i < l; i++) { + server.reply({ + cmd: 'onlineRemove', + nick: peerList[i].nick + }, socket); + + if (socket.nick !== peerList[i].nick){ + server.reply({ + cmd: 'onlineRemove', + nick: socket.nick + }, peerList[i]); + } + } + } + + let newPeerList = server.findSockets({ channel: data.channel }); + let moveAnnouncement = { + cmd: 'onlineAdd', + nick: socket.nick, + trip: socket.trip || 'null', + hash: server.getSocketHash(socket) + }; + let nicks = []; + + for (let i = 0, l = newPeerList.length; i < l; i++) { + server.reply(moveAnnouncement, newPeerList[i]); + nicks.push(newPeerList[i].nick); + } + + nicks.push(socket.nick); + + server.reply({ + cmd: 'onlineSet', + nicks: nicks + }, socket); + + socket.channel = data.channel; +}; + +exports.requiredData = ['channel']; + +exports.info = { + name: 'move', + usage: 'move {channel}', + description: 'This will change the current channel to the new one provided' +}; \ No newline at end of file -- cgit v1.2.1