From 732a1e3d3bc73826307b1ec26472aeb1a4de17d5 Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Sun, 14 Apr 2013 14:34:30 +0000
Subject: [PATCH] ~ckick command to channelKick on behalf of dbot. Add
 countSilently kick option. [#261]

---
 modules/kick/config.json  |  5 ++--
 modules/kick/kick.js      | 63 +++++----------------------------------
 modules/kick/strings.json |  3 ++
 modules/web/config.json   |  4 +--
 4 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/modules/kick/config.json b/modules/kick/config.json
index 558129d..d765613 100644
--- a/modules/kick/config.json
+++ b/modules/kick/config.json
@@ -1,6 +1,7 @@
 {
     "dbKeys": [ "kicks", "kickers" ],
-    "dependencies": [ "command" ],
+    "dependencies": [ "command", "report", "users" ],
     "help": "http://github.com/reality/depressionbot/blob/master/modules/kick/README.md",
-    "ignorable": true
+    "ignorable": true,
+    "countSilently": true
 }
diff --git a/modules/kick/kick.js b/modules/kick/kick.js
index 37e4b95..f00720d 100644
--- a/modules/kick/kick.js
+++ b/modules/kick/kick.js
@@ -1,56 +1,7 @@
 var _ = require('underscore')._;
 
 var kick = function(dbot) {
-    var commands = {
-        // Give the number of times a given user has been kicked and has kicked
-        // other people.
-        '~kickcount': function(event) {
-            var username = event.params[1];
-
-            if(!_.has(dbot.db.kicks, username)) {
-                var kicks = '0';
-            } else {
-                var kicks = dbot.db.kicks[username];
-            }
-
-            if(!_.has(dbot.db.kickers, username)) {
-                var kicked = '0';
-            } else {
-                var kicked = dbot.db.kickers[username];
-            }
-
-            event.reply(dbot.t('user_kicks', {
-                'user': username, 
-                'kicks': kicks, 
-                'kicked': kicked
-            }));
-        },
-
-        // Output a list of the people who have been kicked the most and those
-        // who have kicked other people the most.
-        '~kickstats': function(event) {
-            var orderedKickLeague = function(list, topWhat) {
-                var kickArr = _.chain(list)
-                    .pairs()
-                    .sortBy(function(kick) { return kick[1] })
-                    .reverse()
-                    .first(10)
-                    .value();
-
-                var kickString = "Top " + topWhat + ": ";
-                for(var i=0;i<kickArr.length;i++) {
-                    kickString += kickArr[i][0] + " (" + kickArr[i][1] + "), ";
-                }
-
-                return kickString.slice(0, -2);
-            };
-
-            event.reply(orderedKickLeague(dbot.db.kicks, 'Kicked'));
-            event.reply(orderedKickLeague(dbot.db.kickers, 'Kickers'));
-        }
-    };
-    this.commands = commands;
-
+    
     this.api = {
         'ban': function(server, user, channel) {
             dbot.instance.connections[server].send('MODE ' + channel + ' +b ' + user + '!*@*');
@@ -79,11 +30,13 @@ var kick = function(dbot) {
                 dbot.db.kickers[event.user] += 1;
             }
 
-            event.reply(event.kickee + '-- (' + dbot.t('user_kicks', {
-                'user': event.kickee, 
-                'kicks': dbot.db.kicks[event.kickee], 
-                'kicked': dbot.db.kickers[event.kickee]
-            }) + ')');
+            if(!this.config.countSilently) {
+                event.reply(event.kickee + '-- (' + dbot.t('user_kicks', {
+                    'user': event.kickee, 
+                    'kicks': dbot.db.kicks[event.kickee], 
+                    'kicked': dbot.db.kickers[event.kickee]
+                }) + ')');
+            }
         }
     };
     this.on = 'KICK';
diff --git a/modules/kick/strings.json b/modules/kick/strings.json
index 5c11a74..674795a 100644
--- a/modules/kick/strings.json
+++ b/modules/kick/strings.json
@@ -10,5 +10,8 @@
         "es": "No expulsás {botname}",
         "na'vi": "Ngal {botname}it ke tsun tsrive'i",
         "cy": "Ni ddylech cicio {botname}"
+    },
+    "ckicked": {
+        "en": "Attention: {kicker} has kicked {kickee} from {channel}. The reason given was: \"{reason}.\""
     }
 }
diff --git a/modules/web/config.json b/modules/web/config.json
index f714ecc..1b7646b 100644
--- a/modules/web/config.json
+++ b/modules/web/config.json
@@ -1,6 +1,6 @@
 {
-    "webHost": "localhost",
-    "webPort": 8080,
+    "webHost": "nourishedcloud.com",
+    "webPort": 9001,
     "externalPath": false,
     "help": "https://github.com/reality/depressionbot/blob/master/modules/web/README.md"
 }