Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 15:30:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2053

Browse Source
This commit is contained in:
barisusakli
2014-09-15 16:26:25 -04:00
parent da86c46b4c
commit 9a96458f79
5 changed files with 89 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/controllers/accounts.js
View File

@@ -500,20 +500,21 @@ accountsController.getChats = function(req, res, next) {
return next(err);
}
// Remove entries if they were already present as a followed contact
//Remove entries if they were already present as a followed contact
if (results.contacts && results.contacts.length) {
var contactUids = results.contacts.map(function(contact) {
return parseInt(contact.uid, 10);
});
results.recentChats = results.recentChats.filter(function(chatObj) {
results.recentChats.users = results.recentChats.users.filter(function(chatObj) {
return contactUids.indexOf(parseInt(chatObj.uid, 10)) === -1;
});
}
if (!req.params.userslug) {
return res.render('chats', {
chats: results.recentChats,
chats: results.recentChats.users,
nextStart: results.recentChats.nextStart,
contacts: results.contacts
});
}
@@ -532,7 +533,8 @@ accountsController.getChats = function(req, res, next) {
}
res.render('chats', {
chats: results.recentChats,
chats: results.recentChats.users,
nextStart: results.recentChats.nextStart,
contacts: results.contacts,
meta: data.toUser,
messages: data.messages