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

something something channel users

Browse Source
This commit is contained in:
reality 2014-04-11 23:19:31 +00:00
parent 5644675b74
commit f48e4c3942
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/quotes/quotes.js
View File

@ -17,7 +17,7 @@ var quotes = function(dbot) {
var ref = this.internalAPI.cleanRef(quoteRefs[0].replace(/^~~/,'').replace(/~~$/,'').trim());
if(ref === '-nicks-') {
dbot.api.users.getRandomChannelUser(server, channel, function(user) {
quote = quote.replace('~~' + ref + '~~', user.currentNick);
quote = quote.replace('~~' + ref + '~~', user);
this.internalAPI.interpolatedQuote(server, channel,
username, key, quote, callback);
}.bind(this));

23
modules/users/api.js
View File

@ -89,22 +89,13 @@ var api = function(dbot) {
},
'getRandomChannelUser': function(server, cName, callback) {
var channel;
this.db.search('channel_users', {
'server': server,
'name': cName
}, function(result) {
channel = result;
}, function(err) {
if(!err && channel) {
if(!_.isUndefined(channel.users)) {
var randomUser = channel.users[_.random(0, channel.users.length - 1)];
this.api.getUser(randomUser, callback);
} else {
callback(false);
}
}
}.bind(this));
if(_.has(dbot.instance.connections[server].channels, cName)) {
var nicks = _.keys(dbot.instance.connections[server].channels[cName].nicks);
var randomUser = nicks[_.random(0, nicks.length -1)]
callback(randomUser);
} else {
callback(false);
}
},
'getAllUsers': function(callback) {