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

Merge branch 'betterusers' of github.com:reality/dbot into betterusers

Browse Source
This commit is contained in:
reality 2014-09-08 21:02:16 +00:00
commit 5551e8545f
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/atheme/atheme.js
View File

@ -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];

2
modules/lastfm/lastfm.js
View File

@ -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);

2
modules/quotes/strings.json
View File

@ -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}",

2
modules/users/commands.js
View File

@ -97,7 +97,7 @@ var commands = function(dbot) {
} else {
event.reply(dbot.t('unknown_alias', { 'alias': nick }));
}
});
}.bind(this));
},
'~mergeusers': function(event) {

2
modules/users/users.js
View File

@ -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);

2
modules/web/api.js
View File

@ -1,3 +1,5 @@
var _ = require('underscore')._;
var api = function(dbot) {
return {
'getUrl': function(path) {