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

poll uses event.rUser [#511]

Browse Source
This commit is contained in:
reality 2013-06-27 18:26:54 +00:00
parent f924686871
commit 7e2b717d0a
3 changed files with 85 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/dns/dns.js
View File

@ -16,6 +16,7 @@ var dns = function(dbot) {
} }
}); });
}, },
'~rdns': function(event) { '~rdns': function(event) {
ip = event.params[1]; ip = event.params[1];
dnsmod.reverse(ip, function (error, domain) { dnsmod.reverse(ip, function (error, domain) {

3
modules/kick/commands.js
View File

@ -55,9 +55,6 @@ var commands = function(dbot) {
if(this.config.network_name[event.server]) { if(this.config.network_name[event.server]) {
network = this.config.network_name[event.server]; network = this.config.network_name[event.server];
} }
console.log(timeout);
console.log(banee);
console.log(reason);
dbot.api.nickserv.getUserHost(event.server, banee, function(host) { dbot.api.nickserv.getUserHost(event.server, banee, function(host) {
// Add host record entry // Add host record entry

176
modules/poll/commands.js
View File

@ -13,63 +13,59 @@ var commands = function(dbot) {
_.each(options, function(item, index, list) { list[index] = [ item, 0 ]; }) _.each(options, function(item, index, list) { list[index] = [ item, 0 ]; })
votes = _.object(options); votes = _.object(options);
dbot.api.users.resolveUser(event.server, event.user, function(user) { this.db.create('poll', name, {
this.db.create('poll', name, { 'name': name,
'name': name, 'description': description,
'description': description, 'owner': event.rUser.id,
'owner': user.id, 'votes': votes,
'votes': votes, 'votees': {}
'votees': {} }, function(err, value) {
}, function(err, value) { if(!err) {
if(!err) { event.reply(dbot.t('poll_created', {
event.reply(dbot.t('poll_created', { 'name': name,
'name': name, 'description': description,
'description': description, 'url': dbot.api.web.getUrl('poll/' + name)
'url': dbot.api.web.getUrl('poll/' + name) }));
})); } else if(err instanceof AlreadyExistsError) {
} else if(err instanceof AlreadyExistsError) { event.reply(dbot.t('poll_exists', { 'name': name }));
event.reply(dbot.t('poll_exists', { 'name': name })); }
} });
});
}.bind(this));
}, },
'~addoption': function(event) { '~addoption': function(event) {
var name = event.input[1].toLowerCase(), var name = event.input[1].toLowerCase(),
option = event.input[2].toLowerCase(); option = event.input[2].toLowerCase();
dbot.api.users.resolveUser(event.server, event.user, function(user) { this.db.read('poll', name, function(err, poll) {
this.db.read('poll', name, function(err, poll) { if(!err) {
if(!err) { if(poll.owner === event.rUser.id) {
if(poll.owner === user.id) { if(!_.has(poll.votes, option)) {
if(!_.has(poll.votes, option)) { poll.votes[option] = 0;
poll.votes[option] = 0; this.db.save('poll', name, poll, function(err) {
this.db.save('poll', name, poll, function(err) { event.reply(dbot.t('option_added', {
event.reply(dbot.t('option_added', { 'user': event.user,
'user': event.user,
'name': name,
'option': option
}));
});
} else {
event.reply(dbot.t('option_exists', {
'option': option,
'name': name, 'name': name,
'user': event.user 'option': option
})); }));
} });
} else { } else {
event.reply(dbot.t('not_poll_owner', { event.reply(dbot.t('option_exists', {
'user': event.user, 'option': option,
'name': name 'name': name,
'user': event.user
})); }));
} }
} else { } else {
if(err instanceof NoSuchThingError) { event.reply(dbot.t('not_poll_owner', {
event.reply(dbot.t('poll_unexistent', { 'name': name })); 'user': event.user,
} 'name': name
}));
} }
}.bind(this)); } else {
if(err instanceof NoSuchThingError) {
event.reply(dbot.t('poll_unexistent', { 'name': name }));
}
}
}.bind(this)); }.bind(this));
}, },
@ -77,32 +73,30 @@ var commands = function(dbot) {
var name = event.input[1].toLowerCase(), var name = event.input[1].toLowerCase(),
option = event.input[2].toLowerCase(); option = event.input[2].toLowerCase();
dbot.api.users.resolveUser(event.server, event.user, function(user) { this.db.read('poll', name, function(err, poll) {
this.db.read('poll', name, function(err, poll) { if(!err) {
if(!err) { if(poll.owner === event.rUser.id) {
if(poll.owner === user.id) { if(_.has(poll.votes, option)) {
if(_.has(poll.votes, option)) { delete poll.votes[option];
delete poll.votes[option];
this.db.save('poll', name, poll, function(err) { this.db.save('poll', name, poll, function(err) {
event.reply(dbot.t('option_removed', { event.reply(dbot.t('option_removed', {
'user': event.user, 'user': event.user,
'name': name, 'name': name,
'option': option 'option': option
})); }));
}.bind(this)); }.bind(this));
} else {
event.reply(dbot.t('invalid_vote', { 'vote': option }));
}
} else { } else {
event.reply(dbot.t('not_poll_owner', { 'name': name })); event.reply(dbot.t('invalid_vote', { 'vote': option }));
} }
} else { } else {
if(err instanceof NoSuchThingError) { event.reply(dbot.t('not_poll_owner', { 'name': name }));
event.reply(dbot.t('poll_unexistent', { 'name': name }));
}
} }
}.bind(this)); } else {
if(err instanceof NoSuchThingError) {
event.reply(dbot.t('poll_unexistent', { 'name': name }));
}
}
}.bind(this)); }.bind(this));
}, },
@ -110,37 +104,35 @@ var commands = function(dbot) {
var name = event.input[1].toLowerCase(), var name = event.input[1].toLowerCase(),
vote = event.input[2].toLowerCase(); vote = event.input[2].toLowerCase();
dbot.api.users.resolveUser(event.server, event.user, function(user) { this.db.read('poll', name, function(err, poll) {
this.db.read('poll', name, function(err, poll) { if(!err) {
if(!err) { if(_.has(poll.votes, vote)) {
if(_.has(poll.votes, vote)) { if(_.has(poll.votees, event.rUser.id)) {
if(_.has(poll.votees, user.id)) { var oldVote = poll.votees[event.rUser.id];
var oldVote = poll.votees[user.id]; poll.votes[oldVote]--;
poll.votes[oldVote]--; poll.votes[vote]++;
poll.votes[vote]++; poll.votees[event.rUser.id] = vote;
poll.votees[user.id] = vote;
} else {
poll.votes[vote]++;
poll.votees[user.id] = vote;
}
this.db.save('poll', name, poll, function(err) {
event.reply(dbot.t('voted', {
'vote': vote,
'poll': name,
'count': poll.votes[vote],
'user': event.user
}));
}.bind(this));
} else { } else {
event.reply(dbot.t('invalid_vote', { 'vote': vote })); poll.votes[vote]++;
poll.votees[event.rUser.id] = vote;
} }
this.db.save('poll', name, poll, function(err) {
event.reply(dbot.t('voted', {
'vote': vote,
'poll': name,
'count': poll.votes[vote],
'user': event.user
}));
}.bind(this));
} else { } else {
if(err instanceof NoSuchThingError) { event.reply(dbot.t('invalid_vote', { 'vote': vote }));
event.reply(dbot.t('poll_unexistent', { 'name': name }));
}
} }
}.bind(this)); } else {
if(err instanceof NoSuchThingError) {
event.reply(dbot.t('poll_unexistent', { 'name': name }));
}
}
}.bind(this)); }.bind(this));
}, },