Added group toJSON conversion and fixed syntax errors

HabitRPG · Jan 23, 2016 · 2063070 · 2063070
1 parent febc48c
commit 2063070
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/test/helpers/api-integration/api-classes.js b/test/helpers/api-integration/api-classes.js
@@ -80,9 +80,7 @@ export class ApiGroup extends ApiObject {
 
     let update = { chat };
 
-    this.update(update, '$push');
-
-    return this;
+    return await this.update(update);
   }
 }
 

diff --git a/website/src/controllers/api-v3/groups.js b/website/src/controllers/api-v3/groups.js
@@ -153,6 +153,7 @@ api.getGroup = {
     if (!group) throw new NotFound(res.t('groupNotFound'));
 
     if (!user.contributor.admin) {
+      group = group.toJSON();
       _.remove(group.chat, function removeChat (chat) {
         chat.flags = {};
         return chat.flagCount >= 2;