GitHub/dbot
3
0
Fork 1
mirror of https://github.com/reality/dbot.git synced 2024-11-24 04:49:25 +01:00
Code Issues Projects Releases Wiki Activity

merge [#439]

Browse Source
This commit is contained in:
reality 2013-05-17 07:40:46 +00:00
commit 9d03364a23
5 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.json.sample
View File

@ -17,5 +17,6 @@
"language": "en", "language": "en",
"debugMode": false, "debugMode": false,
"debugLevel": 1, "debugLevel": 1,
"repoRoot": "https://github.com/reality/depressionbot/",
"version": "Depressionbot IRC bot 0.4-dev - Lovingly crafted by The DepressionBot Foundation (a charity arm of the Official Aberystwyth Open Source International Development League)." "version": "Depressionbot IRC bot 0.4-dev - Lovingly crafted by The DepressionBot Foundation (a charity arm of the Official Aberystwyth Open Source International Development League)."
} }

45
modules/command/commands.js
View File

@ -1,4 +1,5 @@
var _ = require('underscore')._; var _ = require('underscore')._,
request = require('request');
var commands = function(dbot) { var commands = function(dbot) {
return { return {
@ -18,41 +19,27 @@ var commands = function(dbot) {
'~help': function(event) { '~help': function(event) {
var moduleName = event.params[1]; var moduleName = event.params[1];
if(!moduleName) { if(!moduleName || !_.has(dbot.modules, moduleName)) {
helpfulModules = _.filter(dbot.modules, function(element, index, array) {
return _.has(dbot.config[element], 'help');
});
event.reply(dbot.t('usage', { event.reply(dbot.t('usage', {
'command': '~help', 'command': '~help',
'usage': '~help [module]' 'usage': '~help [module]'
})); }));
event.reply(dbot.t('loaded_modules_with_help', { event.reply(dbot.t('loaded_modules', {
'modules': helpfulModules.join(', ') 'modules': _.keys(dbot.modules).join(', ')
}));
return;
}
if(!_.has(dbot.modules, moduleName)) {
if(_.has(dbot.commands, moduleName)) {
var moduleName = dbot.commands[moduleName].module;
} else {
var moduleName = undefined;
}
}
if(moduleName && _.has(dbot.config[moduleName], 'help')) {
var help = dbot.config[moduleName].help;
event.reply(dbot.t('help_link', {
'module': moduleName,
'link': help
})); }));
} else { } else {
if(!moduleName) { var helpLink = dbot.config.repoRoot +
moduleName = event.params[1]; 'blob/master/modules/' + moduleName + '/README.md';
if(dbot.config[moduleName].help) {
helpLink = dbot.config[moduleName].help;
} }
event.reply(dbot.t('no_help', { 'module': moduleName }))
} // TODO: Check it exists
event.reply(dbot.t('help_link', {
'module': moduleName,
'link': helpLink
}));
}
} }
}; };
}; };

6
modules/command/strings.json
View File

@ -33,8 +33,8 @@
"na'vi": "Fì{module}ìri oel ke tsun run srungit", "na'vi": "Fì{module}ìri oel ke tsun run srungit",
"nl": "Geen hulp gevonden voor {module}." "nl": "Geen hulp gevonden voor {module}."
}, },
"loaded_modules_with_help": { "loaded_modules": {
"en": "Loaded modules with help information: {modules}.", "en": "Loaded modules: {modules}.",
"nl": "Geladen modules die hulpinformatie bevatten: {modules}." "nl": "Geladen modules: {modules}."
} }
} }

3
modules/quotes/config.json
View File

@ -2,5 +2,6 @@
"dbType": "redis", "dbType": "redis",
"dependencies": [ "users", "event" ], "dependencies": [ "users", "event" ],
"rmLimit": 10, "rmLimit": 10,
"ignorable": true "ignorable": true,
"quotesOnJoin": false
} }

12
modules/quotes/quotes.js
View File

@ -156,11 +156,13 @@ var quotes = function(dbot) {
}); });
} }
} else if(event.action == 'JOIN') { } else if(event.action == 'JOIN') {
var userQuote = this.api.getQuote(event.user, function(quote) { if(this.config.quotesOnJoin == true) {
if(quote) { this.api.getQuote(event.user, function(quote) {
event.reply(event.user + ': ' + quote); if(quote) {
} event.reply(event.user + ': ' + quote);
}); }
});
}
} }
}.bind(this); }.bind(this);
this.on = ['PRIVMSG', 'JOIN']; this.on = ['PRIVMSG', 'JOIN'];