From 789deeabac4b7c3119904a006caa59a35c0c0df6 Mon Sep 17 00:00:00 2001 From: Lilly Schramm Date: Wed, 18 Jun 2025 20:08:06 +0200 Subject: fix(backend): Send Abuse Reports To Set Maintainer E-Mail --- .../src/core/AbuseReportNotificationService.ts | 29 +++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'packages/backend/src/core') diff --git a/packages/backend/src/core/AbuseReportNotificationService.ts b/packages/backend/src/core/AbuseReportNotificationService.ts index 9bca795479..a67e5e19a7 100644 --- a/packages/backend/src/core/AbuseReportNotificationService.ts +++ b/packages/backend/src/core/AbuseReportNotificationService.ts @@ -82,6 +82,25 @@ export class AbuseReportNotificationService implements OnApplicationShutdown { } } + /** + * Collects all email addresses that a abuse report should be sent to. + */ + @bindThis + public async getRecipientEMailAddresses(): Promise { + const recipientEMailAddresses = await this.fetchEMailRecipients().then(it => it + .filter(it => it.isActive && it.userProfile?.emailVerified) + .map(it => it.userProfile?.email) + .filter(x => x != null), + ); + + recipientEMailAddresses.push( + ...(this.meta.email ? [this.meta.email] : []), + ...(this.meta.maintainerEmail ? [this.meta.maintainerEmail] : []), + ); + + return recipientEMailAddresses; + } + /** * Mailを用いて{@link abuseReports}の内容を管理者各位に通知する. * メールアドレスの送信先は以下の通り. @@ -96,15 +115,7 @@ export class AbuseReportNotificationService implements OnApplicationShutdown { return; } - const recipientEMailAddresses = await this.fetchEMailRecipients().then(it => it - .filter(it => it.isActive && it.userProfile?.emailVerified) - .map(it => it.userProfile?.email) - .filter(x => x != null), - ); - - recipientEMailAddresses.push( - ...(this.meta.email ? [this.meta.email] : []), - ); + const recipientEMailAddresses = await this.getRecipientEMailAddresses(); if (recipientEMailAddresses.length <= 0) { return; -- cgit v1.2.3-freya From 372e141bcf133708c23368043d3fdda26f8890da Mon Sep 17 00:00:00 2001 From: Lilly Schramm Date: Wed, 18 Jun 2025 20:25:32 +0200 Subject: refactor(backend): Resolve Nested Conditionals --- packages/backend/src/core/AbuseReportNotificationService.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'packages/backend/src/core') diff --git a/packages/backend/src/core/AbuseReportNotificationService.ts b/packages/backend/src/core/AbuseReportNotificationService.ts index a67e5e19a7..307f22586e 100644 --- a/packages/backend/src/core/AbuseReportNotificationService.ts +++ b/packages/backend/src/core/AbuseReportNotificationService.ts @@ -93,10 +93,13 @@ export class AbuseReportNotificationService implements OnApplicationShutdown { .filter(x => x != null), ); - recipientEMailAddresses.push( - ...(this.meta.email ? [this.meta.email] : []), - ...(this.meta.maintainerEmail ? [this.meta.maintainerEmail] : []), - ); + if (this.meta.email) { + recipientEMailAddresses.push(this.meta.email); + } + + if (this.meta.maintainerEmail) { + recipientEMailAddresses.push(this.meta.maintainerEmail); + } return recipientEMailAddresses; } -- cgit v1.2.3-freya