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

fix some more mergeuser issues [#470]

Browse Source
This commit is contained in:
reality 2013-05-26 13:29:21 +00:00
parent f69f999118
commit d9850d19d5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/users/commands.js
View File

@ -95,9 +95,9 @@ var commands = function(dbot) {
this.api.resolveUser(event.server, primaryUser, function(user) {
if(user) {
this.api.resolveUser(event.server, secondaryUser, function(oldUser) {
if(secondaryUser) {
if(oldUser) {
user.aliases.push(oldUser.primaryNick);
user.aliases.concat(oldUser.aliases);
user.aliases = _.union(user.aliases, oldUser.aliases);
this.internalAPI.mergeChannelUsers(event.server, oldUser, user);
this.db.del('users', oldUser.id, function(err) {
if(!err) {