Merge pull request #16 from OpSimple/master

A new way to handle the spammers

5 files changed, 120 insertions, 3 deletions

diff --git a/documentation/DOCUMENTATION.md b/documentation/DOCUMENTATION.md
index b070dfa..c535cd7 100644
--- a/documentation/DOCUMENTATION.md
+++ b/documentation/DOCUMENTATION.md
@@ -34,6 +34,8 @@ hack.chat has three permission levels. When you access a command, hack.chat auto
 |`ban`|`nick`|Disconnects the target nickname in the same channel as the calling socket and adds it to the rate limiter.|
 |`kick`|`nick`|Silently forces target client(s) into another channel. `nick` may be `string` or `array` of `string`s.|
 |`unban`|`ip` or `hash`|Removes the target ip from the rate limiter.|
+|`dumb`|`nick`|Mutes a user's (spammer's) texts such that it is displayable to the user only.|
+|`speak`|`ip` or `hash`|Unmutes the user's (spammer's) texts and makes it displayable to everyone again.|
 
 # `admin`
 
diff --git a/server/src/commands/core/chat.js b/server/src/commands/core/chat.js
index bce6adb..80241d5 100644
--- a/server/src/commands/core/chat.js
+++ b/server/src/commands/core/chat.js
@@ -48,7 +48,15 @@ exports.run = async (core, server, socket, data) => {
     payload.trip = socket.trip;
   }
 
-  server.broadcast( payload, { channel: socket.channel });
+  if(core.muzzledHashes && core.muzzledHashes[socket.hash]){
+      server.broadcast( payload, { channel: socket.channel, hash: socket.hash });
+      if(core.muzzledHashes[socket.hash].allies){
+          server.broadcast( payload, { channel: socket.channel, nick: core.muzzledHashes[socket.hash].allies });
+      }
+  } else {
+      //else send it to everyone
+      server.broadcast( payload, { channel: socket.channel});
+  }
 
   core.managers.stats.increment('messages-sent');
 };
@@ -59,4 +67,4 @@ exports.info = {
   name: 'chat',
   usage: 'chat {text}',
   description: 'Broadcasts passed `text` field to the calling users channel'
-};
\ No newline at end of file
+};
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
+};
diff --git a/server/src/commands/mod/dumb.js b/server/src/commands/mod/dumb.js
new file mode 100644
index 0000000..ef2c5b2
--- /dev/null
+++ b/server/src/commands/mod/dumb.js
@@ -0,0 +1,63 @@
+/* 
+ * Description: Make a user (spammer) dumb
+ * Author: simple
+ */
+
+exports.init = (core) => {
+    core.muzzledHashes = {};
+}
+
+exports.run = async (core, server, socket, data) => {
+  if (socket.uType == 'user') {
+    // ignore if not mod or admin
+    return;
+  }
+
+  if (typeof data.nick !== 'string') {
+    return;
+  }
+  
+  let badClient = server.findSockets({ channel: socket.channel, nick: data.nick });
+
+  if (badClient.length === 0) {
+    server.reply({
+      cmd: 'warn',
+      text: 'Could not find user in channel'
+    }, socket);
+
+    return;
+  }
+
+  badClient = badClient[0];
+
+  if (badClient.uType !== 'user') {
+    server.reply({
+      cmd: 'warn',
+      text: 'This trick wont work on mods and admin'
+    }, socket);
+
+    return;
+  }
+  
+  let record = core.muzzledHashes[badClient.hash] = {
+      dumb:true
+  }
+  
+  if(data.allies && Array.isArray(data.allies)){
+      record.allies = data.allies;
+  }
+  
+  server.broadcast({
+    cmd: 'info',
+    text: `${socket.nick} muzzled ${data.nick} in ${socket.channel}, userhash: ${badClient.hash}`
+  }, { uType: 'mod' });
+  
+}
+
+exports.requiredData = ['nick'];
+
+exports.info = {
+  name: 'dumb',
+  usage: 'dumb {nick} [allies...]',
+  description: 'Cleanly disable a user messages and make him dumb'
+};
diff --git a/server/src/commands/mod/speak.js b/server/src/commands/mod/speak.js
new file mode 100644
index 0000000..422ad2c
--- /dev/null
+++ b/server/src/commands/mod/speak.js
@@ -0,0 +1,43 @@
+/* 
+ * Description: Pardon a dumb user to be able to speak again
+ * Author: simple
+ */
+
+
+exports.run = async (core, server, socket, data) => {
+  if (socket.uType == 'user') {
+    // ignore if not mod or admin
+    return;
+  }
+
+  if (typeof data.ip !== 'string' && typeof data.hash !== 'string') {
+    server.reply({
+      cmd: 'warn',
+      text: "hash:'targethash' or ip:'1.2.3.4' is required"
+    }, socket);
+
+    return;
+  }
+  
+  let target;
+
+  if (typeof data.ip === 'string') {
+    target = getSocketHash(data.ip);
+  } else {
+    target = data.hash;
+  }
+  
+  delete core.muzzledHashes[target];
+  
+  server.broadcast({
+    cmd: 'info',
+    text: `${socket.nick} unmuzzled : ${target}`
+  }, { uType: 'mod' });
+  
+}
+
+exports.info = {
+  name: 'speak',
+  usage: 'speak {[ip || hash]}',
+  description: 'Pardon a dumb user to be able to speak again'
+};