krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

add population to join and update routes of challenges and groups, remove chat flags info everywhere

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-02-03 11:29:19 +01:00
parent a8dc529449
commit 1daf87531a
9 changed files with 114 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/src/controllers/api-v3/chat.js
View File

@@ -38,7 +38,7 @@ 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, group.chat);
res.respond(200, Group.toJSONCleanChat(group, user).chat);
},
};
@@ -88,7 +88,7 @@ api.postChat = {
let savedGroup = await group.save();
if (chatUpdated) {
res.respond(200, {chat: savedGroup.chat});
res.respond(200, {chat: Group.toJSONCleanChat(savedGroup, user).chat});
} else {
res.respond(200, {message: savedGroup.chat[0]});
}
@@ -138,7 +138,7 @@ api.likeChat = {
{_id: group._id, 'chat.id': message.id},
update
);
res.respond(200, message);
res.respond(200, message); // TODO what if the message is flagged and shouldn't be returned?
},
};
@@ -385,9 +385,9 @@ api.deleteChat = {
);
if (chatUpdated) {
group = group.toJSON();
removeFromArray(group.chat, {id: chatId});
res.respond(200, group.chat);
let chatRes = Group.toJSONCleanChat(group, user).chat;
removeFromArray(chatRes, {id: chatId});
res.respond(200, chatRes);
} else {
res.respond(200, {});
}