From c38b515f332ce851b7118507f6bb7016cf129a5f Mon Sep 17 00:00:00 2001
From: Vermium Sifell <vermium@zyner.org>
Date: Sun, 17 Apr 2022 22:55:04 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20delete=20message=20now=20say=20u?=
 =?UTF-8?q?ser=20said=20word=20as=20should?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/events/messageDelete/modules/counter.ts | 22 ++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/events/messageDelete/modules/counter.ts b/src/events/messageDelete/modules/counter.ts
index 8ec93fd..d2c207e 100644
--- a/src/events/messageDelete/modules/counter.ts
+++ b/src/events/messageDelete/modules/counter.ts
@@ -18,11 +18,19 @@ export default async (message: Message) => {
       `No counter found for guild: ${guild?.name} (${guild?.id})`
     );
   const { word } = counter;
-  if (content === word) {
-    channel?.send(`${author} said **${word}**.`);
-    logger?.verbose(`${author} said ${word} in ${channel}`);
-    return logger?.verbose(
-      `User: ${author?.tag} (${author?.id}) in guild: ${guild?.name} (${guild?.id}) said the counter word: ${word}`
-    );
-  }
+
+  const messages = await message.channel.messages.fetch({ limit: 1 });
+  const lastMessage = messages.last();
+
+  if (!lastMessage) return;
+
+  if (content !== word) return;
+
+  if (lastMessage.author.id === message.author.id) return;
+
+  channel?.send(`${author} said **${word}**.`);
+  logger?.verbose(`${author} said ${word} in ${channel}`);
+  return logger?.verbose(
+    `User: ${author?.tag} (${author?.id}) in guild: ${guild?.name} (${guild?.id}) said the counter word: ${word}`
+  );
 };