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

do [#568]

Browse Source
This commit is contained in:
reality 2013-08-24 17:39:04 +00:00
parent 16607a68d2
commit ec72489300
2 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
modules/report/pages.js
View File

@ -1,21 +1,47 @@
var _ = require('underscore')._;
var _ = require('underscore')._,
async = require('async');
var pages = function(dbot) {
var pages = {
'/notify': function(req, res) {
res.render('servers', {
'name': dbot.config.name,
'servers': _.keys(dbot.config.servers)
});
},
'/notify/:server': function(req, res) {
var server = req.params.server;
var server = req.params.server,
userCount = {},
users = [];
this.db.scan('notifies', function(notify) {
if(!_.has(userCount, notify.user)) {
userCount[notify.user] = 0;
} else {
userCount[notify.user]++;
}
}, function() {
userCount = _.map(userCount, function(value, key) {
return {
'id': key,
'count': value
}
});
async.eachSeries(userCount, function(userCount, next) {
dbot.api.users.getUser(userCount.id, function(user) {
userCount['name'] = user.primaryNick;
users.push(userCount);
next();
});
}, function() {
res.render('channels', {
'name': dbot.config.name,
'server': server,
'users': users,
'channels': _.keys(dbot.instance.connections[server].channels)
});
});
});
},
'/notify/:server/missing': function(req, res) {
@ -23,8 +49,9 @@ var pages = function(dbot) {
user = req.user,
notifies = this.pending[user.id];
async.eachSeries
res.render('missing_notifies', {
'name': dbot.config.name,
'user': user.primaryNick,
'notifies': _.sortBy(notifies, 'time')
});
@ -46,12 +73,25 @@ var pages = function(dbot) {
}, function(notify) {
notifies.push(notify);
}, function(err) {
var pNickCache = {};
async.eachSeries(notifies, function(notify, next) {
if(!_.has(pNickCache, notify.user)) {
dbot.api.users.getUser(notify.user, function(user) {
pNickCache[notify.user] = user.primaryNick;
notify.user = user.primaryNick;
next();
});
} else {
notify.user = pNickCache[notify.user];
next();
}
}, function() {
res.render('notifies', {
'name': dbot.config.name,
'server': server,
'notifies': _.sortBy(notifies, 'time')
});
});
});
}
};

2
modules/report/report.js
View File

@ -139,7 +139,7 @@ var report = function(dbot) {
'id': id,
'server': event.server,
'channel': channelName,
'user': event.user,
'user': event.rUser.id,
'time': new Date().getTime(),
'message': message
}, function() {});