From 0062dde196283e0614f0077d84b75b5885ea67be Mon Sep 17 00:00:00 2001
From: Luke Slater <tinmachin3@gmail.com>
Date: Sun, 15 Apr 2012 21:43:02 +0100
Subject: [PATCH] Command map changed round the other way. Modules have name
 and ignorable properties. Ignore and unignore commands, which currently
 effect actual commands but not listeners yet.

---
 modules/admin.js       |  6 +++-
 modules/autoshorten.js |  6 +++-
 modules/command.js     | 80 +++++++++++++++++++++++++++++++++++++++---
 modules/dice.js        |  6 +++-
 modules/drama.js       |  6 +++-
 modules/js.js          |  6 +++-
 modules/kick.js        |  5 ++-
 modules/modehate.js    |  6 +++-
 modules/puns.js        |  6 +++-
 modules/quotes.js      |  6 +++-
 modules/spelling.js    |  6 +++-
 modules/web.js         |  6 +++-
 modules/youare.js      |  6 +++-
 run.js                 |  5 ++-
 14 files changed, 137 insertions(+), 19 deletions(-)

diff --git a/modules/admin.js b/modules/admin.js
index d20a488..7c5962f 100644
--- a/modules/admin.js
+++ b/modules/admin.js
@@ -134,7 +134,11 @@ var adminCommands = function(dbot) {
             }
         },
 
-        'on': 'PRIVMSG'
+        'on': 'PRIVMSG',
+
+        'name': 'admin',
+
+        'ignorable': false
     };
 };
 
diff --git a/modules/autoshorten.js b/modules/autoshorten.js
index 3f5c92a..eb0cf7c 100644
--- a/modules/autoshorten.js
+++ b/modules/autoshorten.js
@@ -27,7 +27,11 @@ var autoshorten = function(dbot) {
             }
         },
 
-        'on': 'PRIVMSG'
+        'on': 'PRIVMSG',
+
+        'name': 'autoshorten',
+
+        'ignorable': true
     };
 }
 
diff --git a/modules/command.js b/modules/command.js
index fcbb291..55b3168 100644
--- a/modules/command.js
+++ b/modules/command.js
@@ -6,7 +6,69 @@ var command = function(dbot) {
     return {
         'onLoad': function() {
             return {
-                '~ignore': null
+                '~ignore': function(data, params) {
+                    var ignorableModules = [];
+                    for(var i=0;i<dbot.modules.length;i++) {
+                        if(dbot.modules[i].ignorable != null && dbot.modules[i].ignorable == true) {
+                            ignorableModules.push(dbot.modules[i].name);
+                        }
+                    }
+
+                    var usageString = 'Usage: ~ignore [module]. Modules you can ignore are: ';
+                    for(var i=0;i<ignorableModules.length;i++) {
+                        usageString += ignorableModules[i] + ", ";
+                    }
+                    usageString = usageString.slice(0, -2) + '.';
+
+                    if(params[1] == undefined) {
+                        dbot.say(data.channel, data.user + ': ' + usageString);
+                    } else {
+                        if(dbot.moduleNames.include(params[1])) {
+                            if(!dbot.db.ignores.hasOwnProperty(data.user)) {
+                                dbot.db.ignores[data.user] = [];
+                            }
+
+                            if(dbot.db.ignores[data.user].include(params[1])) {
+                                dbot.say(data.channel, data.user + ': You\'re already ignoring that module.');
+                            } else {
+                                dbot.db.ignores[data.user].push(params[1]);
+                                dbot.say(data.channel, data.user + ': Now ignoring ' + params[1]);
+                            }
+                        } else {
+                            dbot.say(data.channel, data.user + ': That isn\'t a valid module name. ' + 
+                                usageString);
+                        }
+                    }
+                }, 
+
+                '~unignore': function(data, params) {
+                    var ignoredModules = [];
+                    if(dbot.db.ignores.hasOwnProperty(data.user)) {
+                        ignoredModules = dbot.db.ignores[data.user];
+                    }
+
+                    var usageString = 'Usage: ~unignore [module]. Modules you are currently ignoring: ';
+                    if(ignoredModules.length == 0) {
+                        usageString += 'None.';
+                    } else {
+                        for(var i=0;i<ignoredModules.length;i++) {
+                            usageString += ignoredModules[i] + ", ";
+                        }
+                        usageString = usageString.slice(0, -2) + '.';
+                    }
+
+                    if(params[1] == undefined) {
+                        dbot.say(data.channel, data.user + ': ' + usageString);
+                    } else {
+                        if(ignoredModules.include(params[1]) == false) {
+                            dbot.say(data.channel, data.user + 
+                                    ': You\'re not ignoring that module or it doesn\'t exist. ' + usageString);
+                        } else {
+                            dbot.db.ignores[data.user].splice(dbot.db.ignores[data.user].indexOf(params[1]), 1);
+                            dbot.say(data.channel, data.user + ': No longer ignoring ' + params[1]);
+                        }
+                    }
+                }
             };
         },
 
@@ -20,8 +82,14 @@ var command = function(dbot) {
                     dbot.say(data.channel, data.user + 
                         ' is banned from using this command. Commence incineration.'); 
                 } else {
-                    dbot.commands[params[0]](data, params);
-                    dbot.save();
+                    var commandBelongsTo = dbot.commandMap[params[0]];
+                    if(dbot.db.ignores.hasOwnProperty(data.user) && 
+                            dbot.db.ignores[data.user].include(commandBelongsTo)) {
+                        // do nothing
+                    } else {
+                        dbot.commands[params[0]](data, params);
+                        dbot.save();
+                    }
                 }
             } else {
                 var q = data.message.valMatch(/^~([\d\w\s-]*)/, 2);
@@ -61,7 +129,11 @@ var command = function(dbot) {
             }
         },
 
-        'on': 'PRIVMSG'
+        'on': 'PRIVMSG',
+
+        'name': 'command',
+
+        'ignorable': false
     };
 };
 
diff --git a/modules/dice.js b/modules/dice.js
index f29c2f9..847a257 100644
--- a/modules/dice.js
+++ b/modules/dice.js
@@ -88,7 +88,11 @@ var dice = function(dbot) {
     return {
         'onLoad': function() {
             return commands;
-        }
+        },
+
+        'name': 'dice',
+
+        'ignorable': true
     };
 }
 
diff --git a/modules/drama.js b/modules/drama.js
index d68cca8..27949b5 100644
--- a/modules/drama.js
+++ b/modules/drama.js
@@ -84,7 +84,11 @@ var drama = function(dbot) {
             }
         },
 
-        'on': 'PRIVMSG'
+        'on': 'PRIVMSG',
+
+        'name': 'drama',
+
+        'ignorable': false
     };
 }
 
diff --git a/modules/js.js b/modules/js.js
index cf08699..fd43b4a 100644
--- a/modules/js.js
+++ b/modules/js.js
@@ -27,7 +27,11 @@ var js = function(dbot) {
     return {
         'onLoad': function() {
             return commands;
-        }
+        },
+
+        'name': 'js',
+
+        'ignorable': true 
     };
 };
 
diff --git a/modules/kick.js b/modules/kick.js
index 64e17bb..62739e3 100644
--- a/modules/kick.js
+++ b/modules/kick.js
@@ -86,8 +86,11 @@ var kick = function(dbot) {
         
         'onLoad': function() {
             return commands;
-        }
+        },
 
+        'name': 'kick',
+
+        'ignorable': false
     };
 };
 
diff --git a/modules/modehate.js b/modules/modehate.js
index b769198..4bc25eb 100644
--- a/modules/modehate.js
+++ b/modules/modehate.js
@@ -10,7 +10,11 @@ var modehate = function(dbot) {
             }
         },
 
-        'on': 'MODE'
+        'on': 'MODE',
+
+        'name': 'modehate',
+
+        'ignorable': false
     };
 };
 
diff --git a/modules/puns.js b/modules/puns.js
index 6f5357d..675f92c 100644
--- a/modules/puns.js
+++ b/modules/puns.js
@@ -12,7 +12,11 @@ var puns = function(dbot) {
             }
         },
 
-        'on': 'JOIN'
+        'on': 'JOIN',
+
+        'name': 'puns',
+
+        'ignorable': true
     };
 }
 
diff --git a/modules/quotes.js b/modules/quotes.js
index 7f20c37..fdbf6d3 100644
--- a/modules/quotes.js
+++ b/modules/quotes.js
@@ -299,7 +299,11 @@ var quotes = function(dbot) {
             }
         },
 
-        'on': 'PRIVMSG'
+        'on': 'PRIVMSG',
+
+        'name': 'quotes',
+
+        'ignorable': true
     };
 };
 
diff --git a/modules/spelling.js b/modules/spelling.js
index a50ed9a..bfd1c77 100644
--- a/modules/spelling.js
+++ b/modules/spelling.js
@@ -58,7 +58,11 @@ var spelling = function(dbot) {
             }
         },
 
-        'on': 'PRIVMSG'
+        'on': 'PRIVMSG',
+
+        'name': 'spelling',
+
+        'ignorable': true
     }
 } 
 
diff --git a/modules/web.js b/modules/web.js
index e3ac0fa..c11c516 100644
--- a/modules/web.js
+++ b/modules/web.js
@@ -42,7 +42,11 @@ var webInterface = function(dbot) {
     return { 
         'onDestroy': function() {
             app.close();
-        }
+        },
+
+        'name': 'web',
+
+        'ignorable': false
     };
 };
 
diff --git a/modules/youare.js b/modules/youare.js
index 062305a..7152f3d 100644
--- a/modules/youare.js
+++ b/modules/youare.js
@@ -8,7 +8,11 @@ var youAre = function(dbot) {
             }
         },
 
-        'on': 'PRIVMSG'
+        'on': 'PRIVMSG',
+
+        'name': 'youare',
+
+        'ignorable': false
     };
 };
 
diff --git a/run.js b/run.js
index 02d7ad1..9b78ef6 100644
--- a/run.js
+++ b/run.js
@@ -40,7 +40,7 @@ var DBot = function(timers) {
         this.db.locks = [];
     }
     if(!this.db.hasOwnProperty("ignores")) {
-        this.db.locks = {};
+        this.db.ignores = {};
     }
     
     // Load the strings file
@@ -125,7 +125,6 @@ DBot.prototype.reloadModules = function() {
             var rawModule = require('./modules/' + name);
             var module = rawModule.fetch(this);
             this.rawModules.push(rawModule);
-            this.commandMap[name] = [];
 
             if(module.listener) {
                 this.instance.addListener(module.on, module.listener);
@@ -136,7 +135,7 @@ DBot.prototype.reloadModules = function() {
                 for(key in newCommands) {
                     if(newCommands.hasOwnProperty(key) && Object.prototype.isFunction(newCommands[key])) {
                         this.commands[key] = newCommands[key];
-                        this.commandMap[name].push(key);
+                        this.commandMap[key] = name;
                     }
                 }
             }