Georg/dbot
1
0
Fork 0
forked from GitHub/dbot
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #319 from JohnMaguire2013/quotes

Browse Source 
fixing some minor bugs in quotes module
This commit is contained in:
reality 2013-03-21 07:31:45 -07:00
commit 7fdf145e26
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/quotes/commands.js
View File

@ -110,7 +110,7 @@ var commands = function(dbot) {
'category': key 'category': key
})); }));
} else { } else {
event.reply(dbot.t('no_quotes', {'category': q[1]})); event.reply(dbot.t('no_quotes', {'category': key}));
} }
} else { } else {
event.reply(dbot.t('rmlast_spam')); event.reply(dbot.t('rmlast_spam'));
@ -187,21 +187,30 @@ var commands = function(dbot) {
}, },
'~rq': function(event) { '~rq': function(event) {
var category = _.keys(quotes)[_.random(0, _.size(quotes) -1)]; if(_.keys(quotes).length > 0) {
event.reply(category + ': ' + this.internalAPI.interpolatedQuote(event.server, event.channel.name, category)); var category = _.keys(quotes)[_.random(0, _.size(quotes) -1)];
event.reply(category + ': ' + this.internalAPI.interpolatedQuote(event.server, event.channel.name, category));
} else {
event.reply(dbot.t('no_results'));
}
}, },
'~link': function(event) { '~link': function(event) {
var key = event.input[1].toLowerCase(); var key = event.input[1].toLowerCase();
if(_.has(quotes, key)) { if(_.has(quotes, key)) {
event.reply(dbot.t('quote_link', { if(_.has(dbot.config, 'web') && _.has(dbot.config.web, 'webHost') &&
'category': key, _.has(dbot.config.web, 'webPort')) {
'url': dbot.t('url', { event.reply(dbot.t('quote_link', {
'host': dbot.config.web.webHost, 'category': key,
'port': dbot.config.web.webPort, 'url': dbot.t('url', {
'path': 'quotes/' + encodeURIComponent(key) 'host': dbot.config.web.webHost,
}) 'port': dbot.config.web.webPort,
})); 'path': 'quotes/' + encodeURIComponent(key)
})
}));
} else {
event.reply(dbot.t('web_not_configured'));
}
} else { } else {
event.reply(dbot.t('category_not_found', { 'category': key })); event.reply(dbot.t('category_not_found', { 'category': key }));
} }
@ -213,7 +222,7 @@ var commands = function(dbot) {
commands['~qsearch'].regex = [/^~qsearch ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3]; commands['~qsearch'].regex = [/^~qsearch ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
commands['~rm'].regex = [/^~rm ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3]; commands['~rm'].regex = [/^~rm ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
commands['~rmlast'].regex = [/^~rmlast ([\d\w\s-]*)/, 2]; commands['~rmlast'].regex = [/^~rmlast ([\d\w\s-]*)/, 2];
commands['~qadd'].regex = [/^~qadd ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3]; commands['~qadd'].regex = [/^~qadd ([\d\w-]+[\d\w\s-]*)[ ]?=[ ]?(.+)$/, 3];
commands['~link'].regex = [/^~link ([\d\w\s-]*)/, 2]; commands['~link'].regex = [/^~link ([\d\w\s-]*)/, 2];
commands['~rmconfirm'].access = 'moderator'; commands['~rmconfirm'].access = 'moderator';

3
modules/quotes/strings.json
View File

@ -126,5 +126,8 @@
"rm_cache_limit": { "rm_cache_limit": {
"en": "Attention: Too many quotes removed, rmCache must be cleared or reinstated manually with ~rmconfirm or ~rmdeny.", "en": "Attention: Too many quotes removed, rmCache must be cleared or reinstated manually with ~rmconfirm or ~rmdeny.",
"na'vi": "Oel zerok 'upxareti apxay set, sweylu txo nga 'aivku upxareti ìlä ~rmconfirm fu ~rmdeny." "na'vi": "Oel zerok 'upxareti apxay set, sweylu txo nga 'aivku upxareti ìlä ~rmconfirm fu ~rmdeny."
},
"web_not_configured": {
"en": "Cannot link to category. Web module is either not loaded or misconfigured."
} }
} }