From 7a138aee0eb0190a32d13bd7fe3a65f3de4c2196 Mon Sep 17 00:00:00 2001
From: Chocolate Pie <106949016+chocolate-pie@users.noreply.github.com>
Date: Mon, 19 Jun 2023 18:36:32 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=83=AA=E3=82=BD=E3=83=AB=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=81=AE=E9=80=9A=E5=A0=B1=E3=82=92=E8=A7=A3=E6=B1=BA?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E5=88=A4=E5=AE=9A=E5=9F=BA=E6=BA=96=E3=81=8C?=
 =?UTF-8?q?=E9=96=93=E9=81=95=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../queue/processors/ReportAbuseProcessorService.ts   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/queue/processors/ReportAbuseProcessorService.ts b/packages/backend/src/queue/processors/ReportAbuseProcessorService.ts
index f66601918a..30ac1d0383 100644
--- a/packages/backend/src/queue/processors/ReportAbuseProcessorService.ts
+++ b/packages/backend/src/queue/processors/ReportAbuseProcessorService.ts
@@ -68,11 +68,14 @@ export class ReportAbuseProcessorService {
 		const reporterAcct = reporter.host ? `${reporter.username.toLowerCase()}@${reporter.host}` : reporter.username.toLowerCase();
 
 		for (const resolver of resolvers) {
-			const isTargetUserPatternMatched = resolver.targetUserPattern ? new RE2(resolver.targetUserPattern).test(targetUserAcct) : false;
-			const isReporterPatternMatched = resolver.reporterPattern ? new RE2(resolver.reporterPattern).test(reporterAcct) : false;
-			const isReportContentPatternMatched = resolver.reportContentPattern ? new RE2(resolver.reportContentPattern).test(job.data.comment) : false;
+			if (!(resolver.targetUserPattern || resolver.reporterPattern || resolver.reportContentPattern)) {
+				continue;
+			}
+			const isTargetUserPatternMatched = resolver.targetUserPattern ? new RE2(resolver.targetUserPattern).test(targetUserAcct) : true;
+			const isReporterPatternMatched = resolver.reporterPattern ? new RE2(resolver.reporterPattern).test(reporterAcct) : true;
+			const isReportContentPatternMatched = resolver.reportContentPattern ? new RE2(resolver.reportContentPattern).test(job.data.comment) : true;
 
-			if (isTargetUserPatternMatched || isReporterPatternMatched || isReportContentPatternMatched) {
+			if (isTargetUserPatternMatched && isReporterPatternMatched && isReportContentPatternMatched) {
 				if (resolver.forward && job.data.targetUserHost !== null) {
 					const targetUser = await this.usersRepository.findOneByOrFail({ id: job.data.targetUserId });
 					this.queueService.deliver(actor, this.apRendererService.addContext(this.apRendererService.renderFlag(actor, targetUser.uri!, job.data.comment)), targetUser.inbox, false);