Update GoodPerson

src/equicordplugins/goodPerson/index.ts

@@ -1,23 +1,10 @@
 /*
- * Vencord, a modification for Discord's desktop app
+ * Vencord, a Discord client mod
- * Copyright (c) 2024 nin0dev
+ * Copyright (c) 2025 Vendicated and contributors
- *
+ * SPDX-License-Identifier: GPL-3.0-or-later
- * This program is free software: you can redistribute it and/or modify
+ */
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
 
-import { addMessagePreSendListener, removeMessagePreSendListener } from "@api/MessageEvents";
+import { definePluginSettings, Settings } from "@api/Settings";
-import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { FluxDispatcher } from "@webpack/common";
@@ -34,7 +21,7 @@ const badRegexesSlurs = ["\\bn{1,}(i|!|1){1,}(b|g){2,}(a|@|e|3){1,}?"];
 const badVerbsGeneral = ["kill", "destroy"];
 const badNounsGeneral = ["shit", "bullshit", "bitch", "bastard", "die", "brainless"];
 /** * FUN ***/
-const badNounsFun = ["kotlin", "avast", "fres"];
+const badNounsFun = ["kotlin", "avast"];
 /** * REPLACEMENTS ***/
 const badVerbsReplacements = ["love", "eat", "deconstruct", "marry", "fart", "teach", "display", "plug", "explode", "undress", "finish", "freeze", "beat", "free", "brush", "allocate", "date", "melt", "breed", "educate", "injure", "change"];
 const badNounsReplacements = ["pasta", "kebab", "cake", "potato", "woman", "computer", "java", "hamburger", "monster truck", "osu!", "Ukrainian ball in search of gas game", "Anime", "Anime girl", "good", "keyboard", "NVIDIA RTX 3090 Graphics Card", "storm", "queen", "single", "umbrella", "mosque", "physics", "bath", "virus", "bathroom", "mom", "owner", "airport", "Avast Antivirus Free"];
@@ -76,14 +63,10 @@ export default definePlugin({
             default: true
         }
     }),
-    async start() {
+    onBeforeMessageSend: (c, msg) => {
-        this.preSend = addMessagePreSendListener((_channelId, msg) => {
+        // @ts-ignore
-            const newContent = this.replaceBadVerbs(this.replaceBadNouns(msg.content));
+        const newContent = Vencord.Plugins.plugins.GoodPerson.replaceBadVerbs(Vencord.Plugins.plugins.GoodPerson.replaceBadNouns(msg.content));
         msg.content = newContent;
-        });
-    },
-    stop() {
-        removeMessagePreSendListener(this.preSend);
     },
     getEnabledBadNouns() {
         const thingToReturn: string[] = [];
@@ -117,8 +100,8 @@ export default definePlugin({
         });
     },
     flux: {
-        async MESSAGE_CREATE
+        async MESSAGE_CREATE({ guildId, message }) {
-            ({ guildId, message }) {
+            if (Settings.plugins.GoodPerson.incoming) {
                 const msg = message;
                 // @ts-ignore
                 let newMessageContent = Vencord.Plugins.plugins.GoodPerson.replaceBadVerbs(Vencord.Plugins.plugins.GoodPerson.replaceBadNouns(msg.content));
@@ -131,10 +114,12 @@ export default definePlugin({
                         guildId
                     });
                 }
+            }
         },
-        async MESSAGE_UPDATE
+        async MESSAGE_UPDATE({ guildId, message }) {
-            ({ guildId, message }) {
+            if (Settings.plugins.GoodPerson.incoming) {
                 const msg = message;
+                if (msg.content.includes("-# <:husk:1280158956341297225> **GoodPerson made this message good. Reload your client to clear changes**")) return;
                 // @ts-ignore
                 let newMessageContent = Vencord.Plugins.plugins.GoodPerson.replaceBadVerbs(Vencord.Plugins.plugins.GoodPerson.replaceBadNouns(msg.content));
                 if (message.content !== newMessageContent) {
@@ -148,4 +133,5 @@ export default definePlugin({
                 }
             }
         }
+    }
 });

src/plugins/_core/supportHelper.tsx

@@ -22,7 +22,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { Link } from "@components/Link";
 import { openUpdaterModal } from "@components/VencordSettings/UpdaterTab";
-import { CONTRIB_ROLE_ID, Devs, DONOR_ROLE_ID, EQUIBOP_CONTRIB_ROLE_ID, EQUICORD_TEAM, GUILD_ID, SUPPORT_CHANNEL_ID, SUPPORT_CHANNEL_IDS, VC_CONTRIB_ROLE_ID, VC_DONOR_ROLE_ID, VC_KNOWN_ISSUES_CHANNEL_ID, VC_REGULAR_ROLE_ID, VC_SUPPORT_CHANNEL_ID, VENBOT_USER_ID, VENCORD_CONTRIB_ROLE_ID } from "@utils/constants";
+import { CONTRIB_ROLE_ID, Devs, DONOR_ROLE_ID, EQUIBOP_CONTRIB_ROLE_ID, EQUICORD_TEAM, GUILD_ID, SUPPORT_CHANNEL_ID, SUPPORT_CHANNEL_IDS, VC_CONTRIB_ROLE_ID, VC_DONOR_ROLE_ID, VC_GUILD_ID, VC_KNOWN_ISSUES_CHANNEL_ID, VC_REGULAR_ROLE_ID, VC_SUPPORT_CHANNEL_ID, VENBOT_USER_ID, VENCORD_CONTRIB_ROLE_ID } from "@utils/constants";
 import { sendMessage } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";