GitHub/dbot
3
0
Fork 1
mirror of https://github.com/reality/dbot.git synced 2024-12-18 00:22:35 +01:00
Code Issues Projects Releases Wiki Activity

command can use nickserv [#421]

Browse Source
This commit is contained in:
reality 2013-04-23 19:07:23 +00:00
parent c37e9cded7
commit 8475aa46e8
4 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/command/api.js
View File

@ -17,22 +17,24 @@ var api = function(dbot) {
/** /**
* Does the user have the correct access level to use the command? * Does the user have the correct access level to use the command?
*/ */
'hasAccess': function(user, command) { 'hasAccess': function(server, user, command, callback) {
var access = true;
var accessNeeded = dbot.commands[command].access; var accessNeeded = dbot.commands[command].access;
if(accessNeeded == 'admin') { if(accessNeeded == 'admin' || accessNeeded == 'moderator') {
if(!_.include(dbot.config.admins, user)) { if(!_.include(dbot.config[accessNeeded + 's'], user)) { // lol
access = false; callback(false);
} } else {
} else if(accessNeeded == 'moderator') { if(_.has(dbot.modules, 'nickserv') && this.config.useNickserv == true) {
if(!_.include(dbot.config.moderators, user) && dbot.api.nickserv.auth(server, user, function(result) {
!_.include(dbot.config.admins, user)) { callback(result);
access = false; });
} else {
callback(true);
} }
} }
} else {
return access; callback(true);
}
}, },
/** /**

5
modules/command/command.js
View File

@ -24,9 +24,10 @@ var command = function(dbot) {
if(this.api.isBanned(event.user, commandName)) { if(this.api.isBanned(event.user, commandName)) {
event.reply(dbot.t('command_ban', {'user': event.user})); event.reply(dbot.t('command_ban', {'user': event.user}));
} else { } else {
this.api.hasAccess(event.server, event.user, commandName, function(result) {
if(result) {
if(!this.api.isIgnoring(event.user, commandName) && if(!this.api.isIgnoring(event.user, commandName) &&
!this.api.isIgnoring(event.channel, commandName) && !this.api.isIgnoring(event.channel, commandName) &&
this.api.hasAccess(event.user, commandName) &&
dbot.commands[commandName].disabled !== true) { dbot.commands[commandName].disabled !== true) {
if(this.api.applyRegex(commandName, event)) { if(this.api.applyRegex(commandName, event)) {
try { try {
@ -56,6 +57,8 @@ var command = function(dbot) {
} }
} }
} }
}.bind(this));
}
}.bind(this); }.bind(this);
this.on = 'PRIVMSG'; this.on = 'PRIVMSG';
}; };

1
modules/command/config.json
View File

@ -1,5 +1,6 @@
{ {
"ignorable": false, "ignorable": false,
"help": "http://github.com/reality/depressionbot/blob/master/modules/command/README.md", "help": "http://github.com/reality/depressionbot/blob/master/modules/command/README.md",
"useNickserv": false,
"dbKeys": [ "ignores", "bans" ] "dbKeys": [ "ignores", "bans" ]
} }

1
modules/nickserv/nickserv.js
View File

@ -18,6 +18,7 @@ var nickserv = function(dbot) {
statusRegex = this.config.servers[event.server].matcher, statusRegex = this.config.servers[event.server].matcher,
acceptableState = this.config.servers[event.server].acceptableState; acceptableState = this.config.servers[event.server].acceptableState;
if(event.user == nickserv) { if(event.user == nickserv) {
var info = event.params.match(statusRegex); var info = event.params.match(statusRegex);
if(info && _.has(this.authStack, event.server)) { if(info && _.has(this.authStack, event.server)) {