diff --git a/modules/atheme/atheme.js b/modules/atheme/atheme.js index 1f87a83..ba8ddcd 100644 --- a/modules/atheme/atheme.js +++ b/modules/atheme/atheme.js @@ -54,7 +54,7 @@ var atheme = function(dbot) { this.listener = function(event) { if(event.user === 'ChanServ') { var flags = event.params.match(/(\d+)\s+([^ ]+)\s+(\+\w+)\s+\((\#[\w\.]+)\)/), - end = event.params.match(/end of \u0002(\#\w+)\u0002 flags listing/i); + end = event.params.match(/end of \u0002(\#[\w\.]+)\u0002 flags listing/i); if(flags && _.has(this.flagStack[event.server], flags[4])) { this.flagStack[event.server][flags[4]].flags[flags[2]] = flags[3]; diff --git a/modules/lastfm/lastfm.js b/modules/lastfm/lastfm.js index 77b7f8a..e0ab247 100644 --- a/modules/lastfm/lastfm.js +++ b/modules/lastfm/lastfm.js @@ -15,7 +15,7 @@ var lastfm = function(dbot) { 'getLastFM': function(server, nick, callback) { dbot.api.profile.getProfile(server, nick, function(err, user, profile) { if(user) { - if(profile && _.has(profile.profile, 'lastfm')) { + if(profile && _.has(profile.profile, 'lastfm') && _.isString(profile.profile.lastfm)) { callback(user, profile.profile.lastfm.toLowerCase()); } else { callback(user, null); diff --git a/modules/quotes/strings.json b/modules/quotes/strings.json index b489fc0..9feaaa2 100644 --- a/modules/quotes/strings.json +++ b/modules/quotes/strings.json @@ -1,6 +1,6 @@ { "category_not_found": { - "en": "Nobody loves {category}", + "en": "Everyone is rather ambivalent towards the matter of {category}", "es": "Nadie ama a {category}", "na'vi": "{category} yawne ke lu kawturu.", "cy": "Does neb yn caru {category}", diff --git a/modules/users/commands.js b/modules/users/commands.js index 0bfcb14..8c914c0 100644 --- a/modules/users/commands.js +++ b/modules/users/commands.js @@ -97,7 +97,7 @@ var commands = function(dbot) { } else { event.reply(dbot.t('unknown_alias', { 'alias': nick })); } - }); + }.bind(this)); }, '~mergeusers': function(event) { diff --git a/modules/users/users.js b/modules/users/users.js index c6de710..0656b23 100644 --- a/modules/users/users.js +++ b/modules/users/users.js @@ -44,7 +44,7 @@ var users = function(dbot) { }.bind(this), // Remove an alias record - 'removeAlias': function(server, alias) { + 'removeAlias': function(server, alias, callback) { var id = alias + '.' + server; this.db.del('user_aliases', id, function(err) { callback(err); diff --git a/modules/web/api.js b/modules/web/api.js index 1d02a77..79680ed 100644 --- a/modules/web/api.js +++ b/modules/web/api.js @@ -1,3 +1,5 @@ +var _ = require('underscore')._; + var api = function(dbot) { return { 'getUrl': function(path) {