amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: don't return early -- should fix #626 (!604)

Browse Source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/604

Closes #626

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
This commit is contained in:
Amelia Yukii 2024-08-21 19:26:09 +00:00
commit 971795c3b8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/core/AbuseReportService.ts
View File

@ -98,9 +98,9 @@ export class AbuseReportService {
const shouldForward = paramsMap.get(report.id)!.forward; const shouldForward = paramsMap.get(report.id)!.forward;
if (shouldForward && report.targetUserHost != null) { 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 { } else {
return targetUserMap.set(report.id, null); targetUserMap.set(report.id, null);
} }
} }

2
packages/frontend/src/pages/admin/abuses.vue
View File

@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkSpacer :contentMax="900"> <MkSpacer :contentMax="900">
<div :class="$style.root" class="_gaps"> <div :class="$style.root" class="_gaps">
<div :class="$style.subMenus" class="_gaps"> <div :class="$style.subMenus" class="_gaps">
<MkButton link to="/admin/abuse-report-notification-recipient" primary>{{ "通知設定" }}</MkButton> <MkButton link to="/admin/abuse-report-notification-recipient" primary>{{ i18n.ts.notificationSetting }}</MkButton>
</div> </div>
<div :class="$style.inputs" class="_gaps"> <div :class="$style.inputs" class="_gaps">