forked from GitHub/dbot
do [close #552]
This commit is contained in:
parent
da025dafbb
commit
0d927881b4
@ -18,6 +18,18 @@ var pages = function(dbot) {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
'/report/:server/missing': function(req, res) {
|
||||||
|
var server = req.params.server,
|
||||||
|
user = req.user,
|
||||||
|
notifies = this.pending[user.id];
|
||||||
|
|
||||||
|
res.render('missing_notifies', {
|
||||||
|
'name': dbot.config.name,
|
||||||
|
'user': user.primaryNick,
|
||||||
|
'notifies': notifies
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
'/report/:server/:channel': function(req, res) {
|
'/report/:server/:channel': function(req, res) {
|
||||||
var server = req.params.server,
|
var server = req.params.server,
|
||||||
channel = req.params.channel,
|
channel = req.params.channel,
|
||||||
@ -35,20 +47,6 @@ var pages = function(dbot) {
|
|||||||
'notifies': notifies
|
'notifies': notifies
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
|
||||||
|
|
||||||
'/report/:server/missing/:user': function(req, res) {
|
|
||||||
var server = req.params.server,
|
|
||||||
nick = req.params.user;
|
|
||||||
|
|
||||||
dbot.api.users.resolveUser(server, nick, function(user) {
|
|
||||||
var notifies = this.pending[user.id];
|
|
||||||
res.render('missing_notifies', {
|
|
||||||
'name': dbot.config.name,
|
|
||||||
'user': nick,
|
|
||||||
'notifies': notifies
|
|
||||||
});
|
|
||||||
}.bind(this));
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -59,8 +59,7 @@ var report = function(dbot) {
|
|||||||
if(_.has(this.pending, event.rUser.id) && this.pNotify[event.rUser.id] === true) {
|
if(_.has(this.pending, event.rUser.id) && this.pNotify[event.rUser.id] === true) {
|
||||||
dbot.say(event.server, event.user, dbot.t('missed_notifies', {
|
dbot.say(event.server, event.user, dbot.t('missed_notifies', {
|
||||||
'user': event.rUser.primaryNick,
|
'user': event.rUser.primaryNick,
|
||||||
'link': dbot.api.web.getUrl('report/' + event.server +
|
'link': dbot.api.web.getUrl('report/' + event.server + '/missing')
|
||||||
'/missing/' + event.rUser.primaryNick)
|
|
||||||
}));
|
}));
|
||||||
this.pNotify = false;
|
this.pNotify = false;
|
||||||
}
|
}
|
||||||
|
@ -24,14 +24,11 @@ var webInterface = function(dbot) {
|
|||||||
this.app.use(this.app.router);
|
this.app.use(this.app.router);
|
||||||
|
|
||||||
passport.serializeUser(function(user, done) {
|
passport.serializeUser(function(user, done) {
|
||||||
console.log('serialising ' + user);
|
|
||||||
done(null, user.id);
|
done(null, user.id);
|
||||||
});
|
});
|
||||||
|
|
||||||
passport.deserializeUser(function(id, done) {
|
passport.deserializeUser(function(id, done) {
|
||||||
dbot.api.users.getUser(id, function(user) {
|
dbot.api.users.getUser(id, function(user) {
|
||||||
console.log(id);
|
|
||||||
console.log(user);
|
|
||||||
done(null, user);
|
done(null, user);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@ -176,7 +173,6 @@ var webInterface = function(dbot) {
|
|||||||
return next();
|
return next();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log(req);
|
|
||||||
res.render('login', {
|
res.render('login', {
|
||||||
'message': 'You need to log in to access this module.',
|
'message': 'You need to log in to access this module.',
|
||||||
'redirect': req.originalUrl
|
'redirect': req.originalUrl
|
||||||
@ -191,7 +187,6 @@ var webInterface = function(dbot) {
|
|||||||
this.commands = {
|
this.commands = {
|
||||||
'~setwebpass': function(event) {
|
'~setwebpass': function(event) {
|
||||||
var newPass = event.input[1];
|
var newPass = event.input[1];
|
||||||
console.log(newPass);
|
|
||||||
this.api.getWebUser(event.rUser.id, function(webUser) {
|
this.api.getWebUser(event.rUser.id, function(webUser) {
|
||||||
if(!webUser) {
|
if(!webUser) {
|
||||||
webUser = {
|
webUser = {
|
||||||
|
@ -2,6 +2,8 @@ extends ../layout
|
|||||||
|
|
||||||
block content
|
block content
|
||||||
h3 Notifications Missed by #{user.primaryNick}
|
h3 Notifications Missed by #{user.primaryNick}
|
||||||
|
div#backlink
|
||||||
|
a(href='/report') « Notifications
|
||||||
p
|
p
|
||||||
if notifies
|
if notifies
|
||||||
div#profile_datatable
|
div#profile_datatable
|
||||||
|
@ -4,6 +4,8 @@ block content
|
|||||||
h3 Servers
|
h3 Servers
|
||||||
div#backlink
|
div#backlink
|
||||||
a(href='/') « Home
|
a(href='/') « Home
|
||||||
|
div
|
||||||
|
a(href='/report/'+user.server+'/missing') My Missed Notifications
|
||||||
ul#quotelist
|
ul#quotelist
|
||||||
-each server in servers
|
-each server in servers
|
||||||
a(href='/report/'+server)
|
a(href='/report/'+server)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user