krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix flagging in the new inbox collection - move flag private message to api/v4

Browse Source
This commit is contained in:
negue
2018-10-02 21:23:29 +02:00
parent 60a6f6f2f6
commit 7e80406181
4 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/server/libs/chatReporting/inboxChatReporter.js
View File

@@ -10,6 +10,7 @@ import slack from '../slack';
import apiError from '../apiError';
import _find from 'lodash/find';
import * as inboxLib from '../inbox';
const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL').split(',').map((email) => {
return { email, canSend: true };
@@ -33,7 +34,7 @@ export default class InboxChatReporter extends ChatReporter {
this.inboxUser = await User.findOne({_id: this.req.query.userId});
}
let messages = this.inboxUser.inbox.messages;
const messages = await inboxLib.getUserInbox(this.inboxUser);
const message = _find(messages, (m) => m.id === this.req.params.messageId);
if (!message) throw new NotFound(this.res.t('messageGroupChatNotFound'));
@@ -70,10 +71,7 @@ export default class InboxChatReporter extends ChatReporter {
updateMessageAndSave (message, updateFunc) {
updateFunc(message);
this.inboxUser.inbox.messages[message.id] = message;
this.inboxUser.markModified('inbox.messages');
return this.inboxUser.save();
return inboxLib.updateMessage(message);
}
flagInboxMessage (message) {