From 5bf666d11dd721bc4d52fc39545552c8ead2718d Mon Sep 17 00:00:00 2001
From: Tamion <70228790+notTamion@users.noreply.github.com>
Date: Mon, 28 Oct 2024 20:23:18 +0100
Subject: [PATCH 1/2] fix(plugin): make NoBlockedMessages not hide likely
 spammers

---
 src/plugins/noBlockedMessages/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/noBlockedMessages/index.ts b/src/plugins/noBlockedMessages/index.ts
index d3b37b02673..4478b2a081f 100644
--- a/src/plugins/noBlockedMessages/index.ts
+++ b/src/plugins/noBlockedMessages/index.ts
@@ -77,6 +77,7 @@ export default definePlugin({
     },
 
     shouldHide(props: MessageDeleteProps) {
-        return !props?.collapsedReason?.message.includes("deleted");
+        const message = props?.collapsedReason?.message;
+        return !message.includes("deleted") && !message.includes("spammer");
     }
 });

From 47879363e72946f3a586c7627eb69c3b38afb0e8 Mon Sep 17 00:00:00 2001
From: Tamion <70228790+notTamion@users.noreply.github.com>
Date: Tue, 29 Oct 2024 08:49:35 +0100
Subject: [PATCH 2/2] i18n

---
 src/plugins/noBlockedMessages/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/noBlockedMessages/index.ts b/src/plugins/noBlockedMessages/index.ts
index 4478b2a081f..bd179f722ae 100644
--- a/src/plugins/noBlockedMessages/index.ts
+++ b/src/plugins/noBlockedMessages/index.ts
@@ -22,6 +22,7 @@ import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { Message } from "discord-types/general";
+import {i18n} from "@webpack/common";
 
 const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked");
 
@@ -78,6 +79,6 @@ export default definePlugin({
 
     shouldHide(props: MessageDeleteProps) {
         const message = props?.collapsedReason?.message;
-        return !message.includes("deleted") && !message.includes("spammer");
+        return !message.includes("deleted") && message !== i18n.Messages.HIDDEN_SPAM_MESSAGE_COUNT.message;
     }
 });