mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 15:48:04 +01:00
* Corrected recipient email address in reported PM Slack notification Corrected the recipient email address in the Slack notification sent to moderators when a user reports their own private message. * Installed new dependencies * Removed personal comments Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
This commit is contained in:
@@ -31,7 +31,7 @@ export default class InboxChatReporter extends ChatReporter {
|
||||
if (validationErrors) throw validationErrors;
|
||||
|
||||
if (this.user.contributor.admin && this.req.query.userId) {
|
||||
this.inboxUser = await User.findOne({ _id: this.req.query.userId });
|
||||
this.inboxUser = await User.findOne({ _id: this.req.query.userId }).exec();
|
||||
}
|
||||
|
||||
const message = await inboxLib.getUserInboxMessage(this.inboxUser, this.req.params.messageId);
|
||||
@@ -57,7 +57,7 @@ export default class InboxChatReporter extends ChatReporter {
|
||||
sendTxn(FLAG_REPORT_EMAILS, 'flag-report-to-mods-with-comments', emailVariables);
|
||||
|
||||
slack.sendInboxFlagNotification({
|
||||
authorEmail: this.authorEmail,
|
||||
messageUserEmail: this.messageUserEmail,
|
||||
flagger: this.user,
|
||||
message,
|
||||
userComment,
|
||||
@@ -83,7 +83,7 @@ export default class InboxChatReporter extends ChatReporter {
|
||||
const sendingUser = message.sent ? reporter : messageUser;
|
||||
const recipient = message.sent ? messageUser : reporter;
|
||||
|
||||
this.authorEmail = sendingUser.email;
|
||||
this.messageUserEmail = message.sent ? recipient.email : sendingUser.email;
|
||||
|
||||
return [
|
||||
...this.createGenericAuthorVariables('AUTHOR', sendingUser),
|
||||
|
||||
@@ -113,7 +113,7 @@ function sendFlagNotification ({
|
||||
}
|
||||
|
||||
function sendInboxFlagNotification ({
|
||||
authorEmail,
|
||||
messageUserEmail,
|
||||
flagger,
|
||||
message,
|
||||
userComment,
|
||||
@@ -143,7 +143,7 @@ function sendInboxFlagNotification ({
|
||||
const messageUserFormat = formatUser({
|
||||
displayName: message.user,
|
||||
name: message.username,
|
||||
email: authorEmail,
|
||||
email: messageUserEmail,
|
||||
uuid: message.uuid,
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user