From c4e0bea93137d6cb21fa4fae90f3167ced50c06a Mon Sep 17 00:00:00 2001 From: dakkar Date: Mon, 19 Aug 2024 18:19:38 +0100 Subject: [PATCH 1/2] don't return early -- should fix #626 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I have no clue why I wrote that code 😭 --- packages/backend/src/core/AbuseReportService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/core/AbuseReportService.ts b/packages/backend/src/core/AbuseReportService.ts index 05f11870a1..007c3f1bf9 100644 --- a/packages/backend/src/core/AbuseReportService.ts +++ b/packages/backend/src/core/AbuseReportService.ts @@ -98,9 +98,9 @@ export class AbuseReportService { const shouldForward = paramsMap.get(report.id)!.forward; if (shouldForward && report.targetUserHost != null) { - return targetUserMap.set(report.id, await this.usersRepository.findOneByOrFail({ id: report.targetUserId })); + targetUserMap.set(report.id, await this.usersRepository.findOneByOrFail({ id: report.targetUserId })); } else { - return targetUserMap.set(report.id, null); + targetUserMap.set(report.id, null); } } From a408d32bb72ada9a4ad6bd1afe6e3fadb9b403db Mon Sep 17 00:00:00 2001 From: dakkar Date: Mon, 19 Aug 2024 20:49:47 +0100 Subject: [PATCH 2/2] fix button translation that Japanese string exactly matches that i18n key --- packages/frontend/src/pages/admin/abuses.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/pages/admin/abuses.vue b/packages/frontend/src/pages/admin/abuses.vue index fdc014a46e..c8a9ca7112 100644 --- a/packages/frontend/src/pages/admin/abuses.vue +++ b/packages/frontend/src/pages/admin/abuses.vue @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ "通知設定" }} + {{ i18n.ts.notificationSetting }}