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

fix ignore for multiple nicks and whatever

Browse Source
This commit is contained in:
reality 2014-01-06 18:19:18 +00:00
parent 36aab19204
commit 62efc4b2b9
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/ignore/ignore.js
View File

@ -276,7 +276,7 @@ var ignore = function(dbot) {
dbot.api.users.getUser(ignores.id, function(user) { dbot.api.users.getUser(ignores.id, function(user) {
if(user) { if(user) {
_.each(ignores.ignores, function(module) { _.each(ignores.ignores, function(module) {
dbot.instance.ignoreTag(user.primaryNick, module); dbot.instance.ignoreTag(user.currentNick, module);
}); });
} }
}); });
@ -287,7 +287,18 @@ var ignore = function(dbot) {
dbot.instance.ignoreTag(channel.name, module); dbot.instance.ignoreTag(channel.name, module);
}); });
}, function(err) { }); }, function(err) { });
};
dbot.api.event.addHook('new_current_nick', function(user, oldNick) {
this.api.getUserIgnores(user, function(err, ignores) {
if(ignores) {
_.each(ignores.ignores, function(module) {
dbot.instance.removeIgnore(oldNick, module);
dbot.instance.ignoreTag(user.currentNick, module);
});
}
}.bind(this));
}.bind(this));
}.bind(this);
}; };
exports.fetch = function(dbot) { exports.fetch = function(dbot) {

6
modules/users/users.js
View File

@ -103,7 +103,10 @@ var users = function(dbot) {
} }
this.db.save('users', event.rUser.id, event.rUser, function(err) { this.db.save('users', event.rUser.id, event.rUser, function(err) {
if(!isKnown) {
dbot.api.event.emit('new_user_alias', [ event.rUser, event.newNick ]); dbot.api.event.emit('new_user_alias', [ event.rUser, event.newNick ]);
}
dbot.api.event.emit('new_current_nick', [ event.rUser, event.user ]);
}); });
}.bind(this)); }.bind(this));
}.bind(this); }.bind(this);
@ -137,9 +140,10 @@ var users = function(dbot) {
this.internalAPI.createUser(event.server, event.user, done); this.internalAPI.createUser(event.server, event.user, done);
} else { } else {
if(event.user !== user.currentNick) { if(event.user !== user.currentNick) {
var oldNick = user.currentNick;
user.currentNick = event.user; user.currentNick = event.user;
this.db.save('users', user.id, user, function() { this.db.save('users', user.id, user, function() {
dbot.api.event.emit('new_current_nick', [ user ]); dbot.api.event.emit('new_current_nick', [ user, oldNick ]);
done(user); done(user);
}); });
} else { } else {