move mapMessage-call to getUserInbox

HabitRPG · Jul 12, 2019 · e7d46ee · e7d46ee
1 parent 805706b
commit e7d46ee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/website/server/controllers/api-v4/inbox.js b/website/server/controllers/api-v4/inbox.js
@@ -113,9 +113,9 @@ api.getInboxMessages = {
     const page = req.query.page;
     const conversation = req.query.conversation;
 
-    const userInbox = (await inboxLib.getUserInbox(user, {
-      page, conversation,
-    })).map(newChat => newChat.mapMessage(user));
+    const userInbox = await inboxLib.getUserInbox(user, {
+      page, conversation, mapProps: true,
+    });
 
     res.respond(200, userInbox);
   },

diff --git a/website/server/libs/inbox/index.js b/website/server/libs/inbox/index.js
@@ -30,11 +30,15 @@ export async function sentMessage (sender, receiver, message, translate) {
   return messageSent;
 }
 
-export async function getUserInbox (user, options = {asArray: true, page: 0, conversation: null}) {
+export async function getUserInbox (user, options = {asArray: true, page: 0, conversation: null, mapProps: false}) {
   if (typeof options.asArray === 'undefined') {
     options.asArray = true;
   }
 
+  if (typeof options.mapProps === 'undefined') {
+    options.mapProps = false;
+  }
+
   const findObj = {ownerId: user._id};
 
   if (options.conversation) {
@@ -51,7 +55,13 @@ export async function getUserInbox (user, options = {asArray: true, page: 0, con
       .skip(PM_PER_PAGE * Number(options.page));
   }
 
-  const messages = (await query.exec()).map(msg => msg.toJSON());
+  const messages = (await query.exec()).map(msg => {
+    if (options.mapProps) {
+      msg.mapMessage(user);
+    }
+
+    return msg.toJSON();
+  });
 
   if (options.asArray) {
     return messages;