GitHub/dbot
3
0
Fork 1
mirror of https://github.com/reality/dbot.git synced 2024-11-30 16:09:27 +01:00
Code Issues Projects Releases Wiki Activity

Remove existing ignoration functionality.

Browse Source
This commit is contained in:
Luke Slater 2012-04-15 20:04:34 +01:00
parent ea893be393
commit 7680e515a8
1 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modules/command.js
View File

@ -3,34 +3,10 @@
var command = function(dbot) { var command = function(dbot) {
var dbot = dbot; var dbot = dbot;
var ignoreCommands = function (data, params) {
if(data.channel == dbot.name) data.channel = data.user;
var targetCommand = params[1];
var ignoreMins = parseFloat(params[2]);
if(!dbot.sessionData.hasOwnProperty("ignoreCommands")) {
dbot.sessionData.ignoreCommands = {};
}
if(!dbot.sessionData.ignoreCommands.hasOwnProperty(targetCommand)) {
dbot.sessionData.ignoreCommands[targetCommand] = [];
}
if(dbot.sessionData.ignoreCommands[targetCommand].include(data.channel)) {
dbot.say(data.channel, "Already ignoring '" + targetCommand + "' in '" + data.channel + "'.");
} else {
dbot.sessionData.ignoreCommands[targetCommand].push(data.channel);
dbot.timers.addOnceTimer(ignoreMins * 60 * 1000, function() {
dbot.sessionData.ignoreCommands[targetCommand].splice(dbot.sessionData.ignoreCommands[targetCommand].indexOf(data.channel), 1);
dbot.say(data.channel, "No longer ignoring '" + targetCommand + "' in '" + data.channel + "'.");
});
dbot.say(data.channel, "Ignoring '" + targetCommand + "' in '" + data.channel + "' for the next " + ignoreMins + " minute" + (ignoreMins == 1 ? "" : "s") + ".");
}
};
return { return {
'onLoad': function() { 'onLoad': function() {
return { return {
'~ignore': ignoreCommands '~ignore': null
}; };
}, },
@ -38,22 +14,11 @@ var command = function(dbot) {
var params = data.message.split(' '); var params = data.message.split(' ');
if(data.channel == dbot.name) data.channel = data.user; if(data.channel == dbot.name) data.channel = data.user;
var ignoringCommand = false;
if(dbot.sessionData.hasOwnProperty("ignoreCommands")) {
if(dbot.sessionData.ignoreCommands.hasOwnProperty(params[0])) {
if(dbot.sessionData.ignoreCommands[params[0]].include(data.channel)) {
ignoringCommand = true;
}
}
}
if(dbot.commands.hasOwnProperty(params[0])) { if(dbot.commands.hasOwnProperty(params[0])) {
if((dbot.db.bans.hasOwnProperty(params[0]) && if((dbot.db.bans.hasOwnProperty(params[0]) &&
dbot.db.bans[params[0]].include(data.user)) || dbot.db.bans['*'].include(data.user)) { dbot.db.bans[params[0]].include(data.user)) || dbot.db.bans['*'].include(data.user)) {
dbot.say(data.channel, data.user + dbot.say(data.channel, data.user +
' is banned from using this command. Commence incineration.'); ' is banned from using this command. Commence incineration.');
} else if(ignoringCommand) {
// do nothing, this stops us falling through to the non-command stuff
} else { } else {
dbot.commands[params[0]](data, params); dbot.commands[params[0]](data, params);
dbot.save(); dbot.save();