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

yee [#531]

Browse Source
This commit is contained in:
reality 2013-07-14 13:25:11 +00:00
parent b86987dc48
commit 08843950dd
1 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
modules/users/users.js
View File

@ -17,7 +17,7 @@ var users = function(dbot) {
'primaryNick': nick, 'primaryNick': nick,
'currentNick': nick, 'currentNick': nick,
'server': server, 'server': server,
'channels': [ ], 'channels': [],
'aliases': [] 'aliases': []
}, function(err, result) { }, function(err, result) {
if(!err) { if(!err) {
@ -33,7 +33,9 @@ var users = function(dbot) {
'id': id, 'id': id,
'server': server, 'server': server,
'name': name, 'name': name,
'users': [] 'users': [],
'op': [],
'voice': []
}, function(err, result) { }, function(err, result) {
if(!err) { if(!err) {
dbot.api.event.emit('new_channel', [ result ]); dbot.api.event.emit('new_channel', [ result ]);
@ -42,7 +44,7 @@ var users = function(dbot) {
}); });
}.bind(this), }.bind(this),
'addChannelUser': function(channel, user, callback) { 'addChannelUser': function(channel, user, staff, callback) {
if(!_.include(channel.users, user.id)) { if(!_.include(channel.users, user.id)) {
channel.users.push(user.id); channel.users.push(user.id);
} }
@ -50,6 +52,15 @@ var users = function(dbot) {
user.channels.push(channel.id); user.channels.push(channel.id);
} }
if(!channel.op) channel.op = [];
if(!channel.voice) channel.voice = [];
if(staff.op) {
channel.op.push(user.id);
} else if(staff.voice) {
channel.voice.push(user.id);
}
this.db.save('users', user.id, user, function(err) { this.db.save('users', user.id, user, function(err) {
this.db.save('channel_users', channel.id, channel, function(err) { this.db.save('channel_users', channel.id, channel, function(err) {
dbot.api.event.emit('new_channel_user', [ user, channel ]); dbot.api.event.emit('new_channel_user', [ user, channel ]);
@ -58,6 +69,41 @@ var users = function(dbot) {
}.bind(this)); }.bind(this));
}.bind(this), }.bind(this),
'modChannelStaff': function(channel, user, staff, callback) {
var needsUpdating = false;
if(!channel.op) {
channel.op = [];
needsUpdating = true;
}
if(!channel.voice) {
channel.voice = [];
needsUpdating = true;
}
if(!_.include(channel.op, user.id) && staff.op) {
channel.op.push(user.id);
needsUpdating = true;
} else if(!_.include(channel.voice, user.id) && staff.voice) {
channel.voice.push(user.id);
needsUpdating = true;
} else if(_.include(channel.op, user.id) && !staff.op) {
channel.op = _.without(channel.op, user.id);
needsUpdating = true;
} else if(_.include(channel.voice, user.id) && !staff.voice) {
channel.voice = _.without(channel.voice, user.id);
needsUpdating = true;
}
if(needsUpdating) {
this.db.save('channel_users', channel.id, channel, function(err) {
callback(err);
});
} else {
callback();
}
}.bind(this),
'updateChannelPrimaryUser': function(server, oldUser, newUser) { 'updateChannelPrimaryUser': function(server, oldUser, newUser) {
this.db.search('channel_users', { 'server': server }, function(channel) { this.db.search('channel_users', { 'server': server }, function(channel) {
channel.users = _.without(channel.users, oldUser); channel.users = _.without(channel.users, oldUser);
@ -98,10 +144,10 @@ var users = function(dbot) {
if(event.action == 'JOIN' && event.user != dbot.config.name) { if(event.action == 'JOIN' && event.user != dbot.config.name) {
if(!event.rUser) { if(!event.rUser) {
this.internalAPI.createUser(event.server, event.user, function(user) { this.internalAPI.createUser(event.server, event.user, function(user) {
this.internalAPI.addChannelUser(event.rChannel, user, function() {}); this.internalAPI.addChannelUser(event.rChannel, user, {}, function() {});
}.bind(this)); }.bind(this));
} else if(!_.include(event.rUser.channels, event.rChannel.id)) { } else if(!_.include(event.rUser.channels, event.rChannel.id)) {
this.internalAPI.addChannelUser(event.rChannel, event.rUser, function() {}); this.internalAPI.addChannelUser(event.rChannel, event.rUser, {}, function() {});
} }
if(event.rUser.currentNick != event.user) { if(event.rUser.currentNick != event.user) {
@ -150,12 +196,14 @@ var users = function(dbot) {
dbot.instance.addListener('366', 'users', function(event) { dbot.instance.addListener('366', 'users', function(event) {
var checkChannel = function(channel) { var checkChannel = function(channel) {
async.eachSeries(_.keys(event.channel.nicks), function(nick, next) { async.eachSeries(_.keys(event.channel.nicks), function(nick, next) {
var staff = event.channel.nicks[nick];
this.api.resolveUser(event.server, nick, function(user) { this.api.resolveUser(event.server, nick, function(user) {
var checkChannelUser = function(user) { var checkChannelUser = function(user) {
if(!_.include(channel.users, user.id)) { if(!_.include(channel.users, user.id)) {
this.internalAPI.addChannelUser(channel, user, next); this.internalAPI.addChannelUser(channel, user, staff, next);
} else { } else {
next(); this.internalAPI.modChannelStaff(channel, user, staff, next);
} }
}.bind(this); }.bind(this);