Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #5078

Browse Source
This commit is contained in:
barisusakli
2016-10-03 20:35:36 +03:00
parent 128ef884bf
commit fe50c8d124
6 changed files with 136 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controllers/accounts/chats.js
View File

@@ -30,10 +30,13 @@ chatsController.get = function(req, res, callback) {
if (!uid) {
return callback();
}
messaging.getRecentChats(uid, 0, 19, next);
messaging.getRecentChats(req.uid, uid, 0, 19, next);
},
function(_recentChats, next) {
recentChats = _recentChats;
if (!recentChats) {
return callback();
}
if (!req.params.roomid) {
return res.render('chats', {
rooms: recentChats.rooms,
@@ -48,12 +51,13 @@ chatsController.get = function(req, res, callback) {
messaging.isUserInRoom(req.uid, req.params.roomid, next);
},
function(inRoom, next) {
if (!inRoom && parseInt(req.uid, 10) === parseInt(uid, 10)) {
if (!inRoom) {
return callback();
}
async.parallel({
users: async.apply(messaging.getUsersInRoom, req.params.roomid, 0, -1),
messages: async.apply(messaging.getMessages, {
callerUid: req.uid,
uid: uid,
roomId: req.params.roomid,
since: 'recent',