sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-04-14 19:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "load user info per conversation.id (#11368)" (#11372)

Browse source 
This reverts commit f3372716d9.
This commit is contained in:
Matteo Pagliazzi 2019-09-22 13:11:52 +02:00 committed by GitHub
parent 326ec5c0e3
commit 3948f63290
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
website/server/libs/inbox/index.js
View file

@ -1,7 +1,6 @@
import {mapInboxMessage, inboxModel as Inbox} from '../../models/message';
import {getUserInfo, sendTxn as sendTxnEmail} from '../email';
import {sendNotification as sendPushNotification} from '../pushNotifications';
import { model as User } from '../../models/user';
const PM_PER_PAGE = 10;
@ -90,6 +89,8 @@ export async function listConversations (owner) {
username: {$last: '$username' },
timestamp: {$last: '$timestamp'},
text: {$last: '$text'},
userStyles: {$last: '$userStyles'},
contributor: {$last: '$contributor'},
count: {$sum: 1},
},
},
@ -98,32 +99,9 @@ export async function listConversations (owner) {
const conversationsList = await query.exec();
const usersQuery = {
_id: {$in: conversationsList.map(c => c._id) },
};
const usersAr = await User.find(usersQuery, {
_id: 1,
contributor: 1,
items: 1,
preferences: 1,
stats: 1,
}).exec();
const usersMap = {};
for (const usr of usersAr) {
usersMap[usr._id] = usr;
}
const conversations = conversationsList.map((res) => ({
uuid: res._id,
...res,
userStyles: {
items: usersMap[res._id].items,
preferences: usersMap[res._id].preferences,
stats: usersMap[res._id].stats,
},
contributor: usersMap[res._id].contributor,
}));
return conversations;