From 99232ed417d1b6869cebab60ecc6692d3fa94db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 30 Jul 2023 03:35:16 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20Production=E3=83=93=E3=83=AB=E3=83=89?=
 =?UTF-8?q?=E3=81=A7=E9=80=9A=E5=A0=B1=E3=81=AE=E5=8D=B3=E6=99=82=E8=A7=A3?=
 =?UTF-8?q?=E6=B1=BA=E3=81=AE=E4=B8=80=E8=A6=A7=E3=81=8C=E8=A6=8B=E3=81=88?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#129)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/queue/processors/ReportAbuseProcessorService.ts       | 4 ++--
 packages/frontend/src/pages/admin/abuses.vue                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/queue/processors/ReportAbuseProcessorService.ts b/packages/backend/src/queue/processors/ReportAbuseProcessorService.ts
index b7366a648e..208b0eb7e6 100644
--- a/packages/backend/src/queue/processors/ReportAbuseProcessorService.ts
+++ b/packages/backend/src/queue/processors/ReportAbuseProcessorService.ts
@@ -71,14 +71,14 @@ export class ReportAbuseProcessorService {
 			const isReportContentPatternMatched = resolver.reportContentPattern ? new RE2(resolver.reportContentPattern).test(job.data.comment) : true;
 
 			if (isTargetUserPatternMatched && isReporterPatternMatched && isReportContentPatternMatched) {
-				if (resolver.forward && job.data.targetUserHost !== null) {
+				if (resolver.forward && job.data.targetUserHost !== null && job.data.reporterHost === null) {
 					this.queueService.deliver(actor, this.apRendererService.addContext(this.apRendererService.renderFlag(actor, targetUser.uri!, job.data.comment)), targetUser.inbox, false);
 				}
 
 				await this.abuseUserReportsRepository.update(job.data.id, {
 					resolved: true,
 					assigneeId: actor.id,
-					forwarded: resolver.forward && job.data.targetUserHost !== null,
+					forwarded: resolver.forward && job.data.targetUserHost !== null && job.data.reporterHost === null,
 				});
 
 				return;
diff --git a/packages/frontend/src/pages/admin/abuses.vue b/packages/frontend/src/pages/admin/abuses.vue
index 32d2f7498c..f55de26449 100644
--- a/packages/frontend/src/pages/admin/abuses.vue
+++ b/packages/frontend/src/pages/admin/abuses.vue
@@ -57,7 +57,7 @@
 						<MkAbuseReportResolver v-model="editingResolver" :data="(resolver as any)" :editable="editableResolver === resolver.id">
 							<template #button>
 								<div v-if="editableResolver !== resolver.id">
-									<MkButton primary inline :class="$style['button-margin']" @click="edit(resolver.id)"><i class="ti ti-pencil"></i> {{ i18n.ts.edit }}</MkButton>
+									<MkButton primary inline :class="$style.button-margin" @click="edit(resolver.id)"><i class="ti ti-pencil"></i> {{ i18n.ts.edit }}</MkButton>
 									<MkButton danger inline @click="deleteResolver(resolver.id)"><i class="ti ti-trash"></i> {{ i18n.ts.remove }}</MkButton>
 								</div>
 								<div v-else>