Remove karma related commands because they're stupid, moved kick-related commands into the kick module.

modules/karma.js

@@ -1,30 +0,0 @@
-var karma = function(dbot) {
-    var dbot = dbot;
-
-    return {
-        'listener': function(data) {
-            if(data.user == 'aisbot' && data.channel == 'aisbot' &&
-                    dbot.waitingForKarma != false && data.message.match(/is at/)) {
-                var split = data.message.split(' ');
-                var target = split[0];
-                var karma = split[3];
-
-                if(karma.startsWith('-')) {
-                    dbot.say(dbot.waitingForKarma, target + dbot.db.hatedPhrases.random() + ' (' + karma + ')');
-                } else if(karma == '0') {
-                    dbot.say(dbot.waitingForKarma, target + dbot.db.neutralPhrases.random() + ' (0)');
-                } else {
-                    dbot.say(dbot.waitingForKarma, target + dbot.db.lovedPhrases.random() + ' (' + karma + ')');
-                }
-
-                dbot.waitingForKarma = false;
-            }
-        },
-
-        'on': 'PRIVMSG'
-    }
-};
-
-exports.fetch = function(dbot) {
-    return karma(dbot);
-};

modules/kick.js

@@ -1,7 +1,54 @@
 var kick = function(dbot) {
     var dbot = dbot;
     
+    var commands = {
+        // Give the number of times a given user has been kicked and has kicked
+        // other people.
+        '~kickcount': function(data, params) {
+            if(!dbot.db.kicks.hasOwnProperty(params[1])) {
+                var kicks = '0';
+            } else {
+                var kicks = dbot.db.kicks[params[1]];
+            }
+
+            if(!dbot.db.kickers.hasOwnProperty(params[1])) {
+                var kicked = '0';
+            } else {
+                var kicked = dbot.db.kickers[params[1]];
+            }
+
+            dbot.say(data.channel, params[1] + ' has been kicked ' + kicks + ' times and has kicked people ' + kicked + ' times.');
+        },
+
+        // Output a list of the people who have been kicked the most and those
+        // who have kicked other people the most.
+        '~kickstats': function(data, params) {
+            var orderedKickLeague = function(list, topWhat) {
+                var kickArr = [];
+                for(var kickUser in list) {
+                    if(list.hasOwnProperty(kickUser)) {
+                        kickArr.push([kickUser, list[kickUser]]);
+                    }
+                }
+
+                kickArr = kickArr.sort(function(a, b) { return a[1] - b[1]; });
+                kickArr = kickArr.slice(kickArr.length - 10).reverse();
+                var kickString = "Top " + topWhat + ": ";
+
+                for(var i=0;i<kickArr.length;i++) {
+                    kickString += kickArr[i][0] + " (" + kickArr[i][1] + "), ";
+                }
+
+                return kickString.slice(0, -2);
+            };
+
+            dbot.say(data.channel, orderedKickLeague(dbot.db.kicks, 'Kicked'));
+            dbot.say(data.channel, orderedKickLeague(dbot.db.kickers, 'Kickers'));
+        }
+    };
+
     return {
+        // Counts kicks
         'listener': function(data) {
            if(data.kickee == dbot.name) {
                 dbot.instance.join(data.channel);
@@ -35,7 +82,12 @@ var kick = function(dbot) {
             }
         },
 
-        on: 'KICK'
+        on: 'KICK',
+        
+        'onLoad': function() {
+            return commands;
+        }
+
     };
 };
 

modules/user.js

@@ -1,66 +0,0 @@
-// Commands that probably belong elsewhere.
-var userCommands = function(dbot) {
-    var dbot = dbot;
-
-    var commands = {
-        // Give a karma comment for a given user
-        '~kc': function(data, params) {
-            dbot.say('aisbot', '.karma ' + data.message.split(' ')[1]);
-            dbot.waitingForKarma = data.channel;
-        },
-
-        // Give the number of times a given user has been kicked and has kicked
-        // other people.
-        '~kickcount': function(data, params) {
-            if(!dbot.db.kicks.hasOwnProperty(params[1])) {
-                var kicks = '0';
-            } else {
-                var kicks = dbot.db.kicks[params[1]];
-            }
-
-            if(!dbot.db.kickers.hasOwnProperty(params[1])) {
-                var kicked = '0';
-            } else {
-                var kicked = dbot.db.kickers[params[1]];
-            }
-
-            dbot.say(data.channel, params[1] + ' has been kicked ' + kicks + ' times and has kicked people ' + kicked + ' times.');
-        },
-
-        // Output a list of the people who have been kicked the most and those
-        // who have kicked other people the most.
-        '~kickstats': function(data, params) {
-            var orderedKickLeague = function(list, topWhat) {
-                var kickArr = [];
-                for(var kickUser in list) {
-                    if(list.hasOwnProperty(kickUser)) {
-                        kickArr.push([kickUser, list[kickUser]]);
-                    }
-                }
-
-                kickArr = kickArr.sort(function(a, b) { return a[1] - b[1]; });
-                kickArr = kickArr.slice(kickArr.length - 10).reverse();
-                var kickString = "Top " + topWhat + ": ";
-
-                for(var i=0;i<kickArr.length;i++) {
-                    kickString += kickArr[i][0] + " (" + kickArr[i][1] + "), ";
-                }
-
-                return kickString.slice(0, -2);
-            };
-
-            dbot.say(data.channel, orderedKickLeague(dbot.db.kicks, 'Kicked'));
-            dbot.say(data.channel, orderedKickLeague(dbot.db.kickers, 'Kickers'));
-        }
-    };
-
-    return {
-        'onLoad': function() {
-            return commands;
-        }
-    };
-};
-
-exports.fetch = function(dbot) {
-    return userCommands(dbot);
-};

run.js

@@ -16,7 +16,6 @@ var DBot = function(timers) {
     this.moduleNames = this.config.modules || [ 'js', 'admin', 'karma', 'kick', 'modehate', 'quotes', 'puns', 'spelling', 'user', 'web', 'youare' ];
 
     this.timers = timers.create();
-    this.waitingForKarma = false;
 
     this.instance = jsbot.createJSBot(this.name, this.server, this.port, this, function() {
             if(this.config.hasOwnProperty('channels')) {