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

refactor {group,inbox}-chatReporter variables

Browse Source
This commit is contained in:
negue
2018-12-06 23:55:18 +01:00
parent b912a83f22
commit 1c17b415f0
3 changed files with 75 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,11 +5,12 @@ import ChatReporter from './chatReporter';
import {
BadRequest,
} from '../errors';
import { getGroupUrl, sendTxn } from '../email';
import { getUserInfo, sendTxn} from '../email';
import slack from '../slack';
import apiError from '../apiError';
import * as inboxLib from '../inbox';
import {getAuthorEmailFromMessage} from '../chat';
const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL').split(',').map((email) => {
return { email, canSend: true };
@@ -48,16 +49,12 @@ export default class InboxChatReporter extends ChatReporter {
_id: 'N/A',
};
await super.notify(group, message);
const groupUrl = getGroupUrl(group);
sendTxn(FLAG_REPORT_EMAILS, 'flag-report-to-mods-with-comments', this.emailVariables.concat([
{name: 'GROUP_NAME', content: group.name},
{name: 'GROUP_TYPE', content: group.type},
{name: 'GROUP_ID', content: group._id},
{name: 'GROUP_URL', content: groupUrl || 'N/A'},
let emailVariables = await this.getMessageVariables(group, message);
emailVariables = emailVariables.concat([
{name: 'REPORTER_COMMENT', content: userComment || ''},
]));
]);
sendTxn(FLAG_REPORT_EMAILS, 'flag-report-to-mods-with-comments', emailVariables);
slack.sendInboxFlagNotification({
authorEmail: this.authorEmail,
@@ -67,6 +64,33 @@ export default class InboxChatReporter extends ChatReporter {
});
}
async getAuthorVariables (message) {
const messageUser = {
user: message.user,
username: message.username,
uuid: message.uuid,
email: await getAuthorEmailFromMessage(message),
};
const reporter = {
user: this.user.profile.name,
username: this.user.auth.local.username,
uuid: this.user._id,
email: getUserInfo(this.user, ['email']).email,
};
// if message.sent, the reporter is the author of this message
const sendingUser = message.sent ? reporter : messageUser;
const recipient = message.sent ? messageUser : reporter;
this.authorEmail = sendingUser.email;
return [
...this.createGenericAuthorVariables('AUTHOR', sendingUser),
...this.createGenericAuthorVariables('RECIPIENT', recipient),
];
}
updateMessageAndSave (message, ...changedFields) {
for (const changedField of changedFields) {
message.markModified(changedField);