From 7af71d1457c19b874094a712a0c8f10928f4e100 Mon Sep 17 00:00:00 2001
From: Mateus Etto <mateus.etto@gmail.com>
Date: Sun, 18 Feb 2018 19:44:17 +0900
Subject: [PATCH] Fix errors

---
 website/server/controllers/api-v3/chat.js | 9 ++++++---
 website/server/models/group.js            | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/website/server/controllers/api-v3/chat.js b/website/server/controllers/api-v3/chat.js
index 19cf4a53ce..0968a0a823 100644
--- a/website/server/controllers/api-v3/chat.js
+++ b/website/server/controllers/api-v3/chat.js
@@ -74,7 +74,8 @@ api.getChat = {
     let group = await Group.getGroup({user, groupId: req.params.groupId, fields: 'chat'});
     if (!group) throw new NotFound(res.t('groupNotFound'));
 
-    res.respond(200, await Group.toJSONCleanChat(group, user).chat);
+    let toJSON = await Group.toJSONCleanChat(group, user);
+    res.respond(200, toJSON.chat);
   },
 };
 
@@ -194,7 +195,8 @@ api.postChat = {
     }
 
     if (chatUpdated) {
-      res.respond(200, {chat: await Group.toJSONCleanChat(savedGroup, user).chat});
+      let toJSON = await Group.toJSONCleanChat(savedGroup, user);
+      res.respond(200, {chat: toJSON.chat});
     } else {
       res.respond(200, {message: savedGroup.chat[0]});
     }
@@ -486,7 +488,8 @@ api.deleteChat = {
     ).exec();
 
     if (chatUpdated) {
-      let chatRes = await Group.toJSONCleanChat(group, user).chat;
+      let toJSON = await Group.toJSONCleanChat(group, user);
+      let chatRes = toJSON.chat;
       removeFromArray(chatRes, {id: chatId});
       res.respond(200, chatRes);
     } else {
diff --git a/website/server/models/group.js b/website/server/models/group.js
index 4cb43d2655..838186a343 100644
--- a/website/server/models/group.js
+++ b/website/server/models/group.js
@@ -331,9 +331,9 @@ async function translateSystemMessages (group, user) {
   }
   await Bluebird.map(Object.keys(usernames), async (username) => {
     let usr = await User
-          .findById(username)
-          .select(nameFields)
-          .exec();
+      .findById(username)
+      .select(nameFields)
+      .exec();
     usernames[username] = usr.profile.name;
   });
   for (let i = 0; i < group.chat.length; i++) {