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

Merge branch 'master' of https://github.com/reality/depressionbot

Browse Source
This commit is contained in:
Luke Slater 2011-12-13 15:58:35 +00:00
commit 430d88e5d8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/quotes.js
View File

@ -5,7 +5,7 @@ var quotes = function(dbot) {
var commands = { var commands = {
'~q': function(data, params) { '~q': function(data, params) {
var q = data.message.valMatch(/^~q ([\d\w\s]*)/, 2); var q = data.message.valMatch(/^~q ([\d\w\s-]*)/, 2);
if(q) { if(q) {
q[1] = q[1].trim(); q[1] = q[1].trim();
key = q[1].toLowerCase(); key = q[1].toLowerCase();
@ -49,7 +49,7 @@ var quotes = function(dbot) {
'~rmlast': function(data, params) { '~rmlast': function(data, params) {
if(rmAllowed == true || data.user == dbot.admin) { if(rmAllowed == true || data.user == dbot.admin) {
var q = data.message.valMatch(/^~rmlast ([\d\w\s]*)/, 2); var q = data.message.valMatch(/^~rmlast ([\d\w\s-]*)/, 2);
if(q) { if(q) {
q[1] = q[1].trim() q[1] = q[1].trim()
key = q[1].toLowerCase(); key = q[1].toLowerCase();
@ -84,7 +84,7 @@ var quotes = function(dbot) {
}, },
'~qcount': function(data, params) { '~qcount': function(data, params) {
var q = data.message.valMatch(/^~qcount ([\d\w\s]*)/, 2); var q = data.message.valMatch(/^~qcount ([\d\w\s-]*)/, 2);
if(q) { if(q) {
q[1] = q[1].trim(); q[1] = q[1].trim();
key = q[1].toLowerCase(); key = q[1].toLowerCase();
@ -104,7 +104,7 @@ var quotes = function(dbot) {
}, },
'~qadd': function(data, params) { '~qadd': function(data, params) {
var q = data.message.valMatch(/^~qadd ([\d\w\s]*)=(.+)$/, 3); var q = data.message.valMatch(/^~qadd ([\d\w\s-]*)=(.+)$/, 3);
if(q) { if(q) {
key = q[1].toLowerCase(); key = q[1].toLowerCase();
if(!Object.isArray(quotes[key])) { if(!Object.isArray(quotes[key])) {
@ -129,7 +129,7 @@ var quotes = function(dbot) {
}, },
'~qset': function(data, params) { '~qset': function(data, params) {
var q = data.message.valMatch(/^~qset ([\d\w\s]*)=(.+)$/, 3); var q = data.message.valMatch(/^~qset ([\d\w\s-]*)=(.+)$/, 3);
if(q) { if(q) {
q[1] = q[1].trim(); q[1] = q[1].trim();
key = q[1].toLowerCase(); key = q[1].toLowerCase();

2
run.js
View File

@ -104,7 +104,7 @@ DBot.prototype.reloadModules = function() {
this.save(); this.save();
} }
} else { } else {
var q = data.message.valMatch(/^~([\d\w\s]*)/, 2); var q = data.message.valMatch(/^~([\d\w\s-]*)/, 2);
if(q) { if(q) {
if(this.db.bans['*'].include(data.user)) { if(this.db.bans['*'].include(data.user)) {
this.say(data.channel, data.user + this.say(data.channel, data.user +