From c5fb9f8f24bebf0aa54113a77ff9ce971a56e1ac Mon Sep 17 00:00:00 2001
From: ant0n <ant0n0x0AC7@mailfence.com>
Date: Sun, 12 Nov 2023 19:41:08 +0000
Subject: [PATCH] Update src/plugins/replyPingControl/index.ts

Co-authored-by: rini <nil@dissoc.cc>
---
 src/plugins/replyPingControl/index.ts | 41 +++++++++++----------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/plugins/replyPingControl/index.ts b/src/plugins/replyPingControl/index.ts
index 891856e5b..5c6f6dd6c 100644
--- a/src/plugins/replyPingControl/index.ts
+++ b/src/plugins/replyPingControl/index.ts
@@ -24,37 +24,28 @@ export default definePlugin({
     authors: [Devs.ant0n, Devs.MrDiamond],
     settings,
 
-    patches: [
-        {
-            find: "_channelMessages",
-            replacement: {
-                match: /receiveMessage\((\i)\)\{/,
-                replace: "$&$self.modifyMentions($1);"
-            }
+    patches: [{
+        find: "_channelMessages",
+        replacement: {
+            match: /receiveMessage\((\i)\)\{/,
+            replace: "$&$self.modifyMentions($1);"
         }
-    ],
+    }],
 
     modifyMentions(message: MessageJSON) {
+        const user = UserStore.getCurrentUser();
 
-        if (!this.isReplyToCurrentUser(message)) return;
+        if (this.getRepliedMessage(message)?.author.id !== user.id)
+            return;
 
-        if (settings.store.alwaysPingOnReply) {
-            if (!message.mentions.some(mention => mention.id === UserStore.getCurrentUser().id)) {
-                message.mentions.push(this.getCurrentUserMention());
-            }
-        } else {
-
-            message.mentions = message.mentions.filter(mention => mention.id !== UserStore.getCurrentUser().id);
-        }
+        if (!settings.store.alwaysPingOnReply)
+            message.mentions = message.mentions.filter(mention => mention.id !== user.id);
+        else if (!message.mentions.some(mention => mention.id === user.id))
+            message.mentions.push(user as any);
     },
 
-    isReplyToCurrentUser(message: MessageJSON) {
-        if (!message.message_reference) return false;
-        const repliedMessage = MessageStore.getMessage(message.channel_id, message.message_reference.message_id);
-        return repliedMessage && repliedMessage.author.id === UserStore.getCurrentUser().id;
+    getRepliedMessage(message: MessageJSON) {
+        const ref = message.message_reference;
+        return ref && MessageStore.getMessage(ref.channel_id, ref.message_id);
     },
-
-    getCurrentUserMention() {
-        return UserStore.getCurrentUser() as unknown as UserJSON;
-    }
 });