From c58f76afa436971d500cb1418c28e47405f9398a Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Wed, 2 Oct 2024 12:04:10 -0400
Subject: [PATCH] Fix Some Issues With WriteUpperCase

---
 .../shakeSpearean.dev/index.ts                |  3 +-
 src/equicordplugins/writeUpperCase/index.ts   | 36 +++++++++----------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/equicordplugins/shakeSpearean.dev/index.ts b/src/equicordplugins/shakeSpearean.dev/index.ts
index 95c90d80..b546be82 100644
--- a/src/equicordplugins/shakeSpearean.dev/index.ts
+++ b/src/equicordplugins/shakeSpearean.dev/index.ts
@@ -12,13 +12,12 @@ import { MessageStore } from "@webpack/common";
 
 import { transferMessage } from "./native";
 
-
-
 const presendObject: SendListener = async (channelId, msg, extra) => {
     const messageRef = extra.replyOptions.messageReference;
     const repliedMessage = ((messageRef?.message_id && messageRef.channel_id) && MessageStore.getMessage(messageRef?.channel_id, messageRef?.message_id)) || undefined;
     msg.content = await transferMessage(msg, Settings.plugins.Shakespearean.model, repliedMessage);
 };
+
 export default definePlugin({
     name: "Shakespearean",
     description: "Makes every message you send shakespearean",
diff --git a/src/equicordplugins/writeUpperCase/index.ts b/src/equicordplugins/writeUpperCase/index.ts
index 4f5b2955..f8101098 100644
--- a/src/equicordplugins/writeUpperCase/index.ts
+++ b/src/equicordplugins/writeUpperCase/index.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { addPreSendListener, removePreSendListener } from "@api/MessageEvents";
+import { addPreSendListener, removePreSendListener, SendListener } from "@api/MessageEvents";
 import { definePluginSettings } from "@api/Settings";
 import { Devs, EquicordDevs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
@@ -19,6 +19,19 @@ const settings = definePluginSettings(
     }
 );
 
+const presendObject: SendListener = (_, msg) => {
+    const sentences = msg.content.split(/(?<=\w\.)\s/);
+    const blockedWordsArray: string[] = settings.store.blockedWords.split(", ");
+
+    msg.content = sentences.map(element => {
+        if (!blockedWordsArray.some(word => element.toLowerCase().startsWith(word.toLocaleLowerCase()))) {
+            return element.charAt(0).toUpperCase() + element.slice(1);
+        } else {
+            return element;
+        }
+    }).join(" ");
+};
+
 export default definePlugin({
     name: "WriteUpperCase",
     description: "Changes the first Letter of each Sentence in Message Inputs to Uppercase",
@@ -26,26 +39,9 @@ export default definePlugin({
     settings,
 
     start() {
-        this.preSend = addPreSendListener(async (_, message) => {
-            message.content = textProcessing(message.content);
-        });
+        addPreSendListener(presendObject);
     },
     stop() {
-        this.preSend = removePreSendListener(async (_, message) => {
-            message.content = textProcessing(message.content);
-        });
+        removePreSendListener(presendObject);
     }
 });
-
-function textProcessing(textInput: string): string {
-    const sentences = textInput.split(/(?<=\w\.)\s/);
-    const blockedWordsArray: string[] = settings.store.blockedWords.split(", ");
-
-    return sentences.map(element => {
-        if (!blockedWordsArray.some(word => element.toLowerCase().startsWith(word.toLocaleLowerCase()))) {
-            return element.charAt(0).toUpperCase() + element.slice(1);
-        } else {
-            return element;
-        }
-    }).join(" ");
-}