From 32062fbc0547e1821824ea362eb7481dbd06f910 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Sun, 5 Nov 2023 20:17:58 -0600
Subject: [PATCH 01/26] Keyword Notify

---
 src/plugins/keywordNotify/index.tsx | 75 +++++++++++++++++++++++++++++
 src/utils/constants.ts              |  4 ++
 2 files changed, 79 insertions(+)
 create mode 100644 src/plugins/keywordNotify/index.tsx

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
new file mode 100644
index 000000000..3633a0db5
--- /dev/null
+++ b/src/plugins/keywordNotify/index.tsx
@@ -0,0 +1,75 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 exhq
+ *
+ * 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 { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { TextArea, useState, Forms } from "@webpack/common";
+import { definePluginSettings } from "@api/Settings";
+import { DataStore } from "@api/index";
+
+let regexes = [];
+
+async function setRegexes(regs: string) {
+    regexes = regs.split("\n");
+    await DataStore.set("KeywordNotify_rules", regexes);
+}
+
+const settings = definePluginSettings({
+    replace: {
+        type: OptionType.COMPONENT,
+        description: "",
+        component: () => {
+            const [value, setValue] = useState(regexes.join("\n"));
+            return (
+                <>
+                    <Forms.FormTitle tag="h4">Keyword Regexes (newline-separated)</Forms.FormTitle>
+                    <TextArea
+                        placeholder={"example|regex\n\\d+"}
+                        spellCheck={false}
+                        value={value}
+                        onChange={setValue}
+                        onBlur={() => setRegexes(value)}
+                    />
+                </>
+            );
+        }
+    },
+});
+
+export default definePlugin({
+    name: "KeywordNotify",
+    authors: [Devs.camila314],
+    description: "Sends a notification if a given message matches certain keywords or regexes",
+    settings,
+    patches: [{
+	    find: "isRawMessageMentioned:",
+	    replacement: {
+            match: /isRawMessageMentioned:function\(\){return (.{1,2}).{1,512}function \1\(.{1,512}?=(.{1,2});return/,
+            replace: "$& Vencord.Plugins.plugins.KeywordNotify.contains($2) ||"
+	    }
+	}],
+
+    async start() {
+        regexes = await DataStore.get("KeywordNotify_rules") ?? [];
+    },
+
+    contains(e) {
+        //console.log("message: ", e);
+        return regexes.some(a => e.rawMessage.content.match(new RegExp(a)));
+    }
+});
\ No newline at end of file
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index aeadcdbfb..6562d3064 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -379,6 +379,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "ProffDea",
         id: 609329952180928513n
     },
+    camila314: {
+        name: "camila314",
+        id: 738592270617542716n
+    }
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From c8df5e044b56c48caffa1920efa7e75dc401ac2e Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Tue, 7 Nov 2023 18:22:33 -0600
Subject: [PATCH 02/26] update keyword notify

---
 src/plugins/keywordNotify/index.tsx | 77 +++++++++++++++++++++++------
 src/plugins/keywordNotify/style.css |  9 ++++
 2 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 src/plugins/keywordNotify/style.css

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 3633a0db5..9eee42d45 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -16,35 +16,81 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { TextArea, useState, Forms } from "@webpack/common";
-import { definePluginSettings } from "@api/Settings";
 import { DataStore } from "@api/index";
+import { definePluginSettings } from "@api/Settings";
+import { DeleteIcon } from "@components/Icons";
+import { Devs } from "@utils/constants";
+import { Flex } from "@components/Flex";
+import { TextInput, useState, Forms, Button } from "@webpack/common";
+import { useForceUpdater } from "@utils/react";
+import "./style.css";
 
 let regexes = [];
 
-async function setRegexes(regs: string) {
-    regexes = regs.split("\n");
+async function setRegexes(idx: number, reg: string) {
+    regexes[idx] = reg;
     await DataStore.set("KeywordNotify_rules", regexes);
 }
 
+async function removeRegex(idx: number, updater: () => void) {
+    regexes.splice(idx, 1);
+    await DataStore.set("KeywordNotify_rules", regexes);
+    updater();
+}
+
+async function addRegex(updater: () => void) {
+    regexes.push("");
+    await DataStore.set("KeywordNotify_rules", regexes);
+    updater();
+}
+
 const settings = definePluginSettings({
     replace: {
         type: OptionType.COMPONENT,
         description: "",
         component: () => {
-            const [value, setValue] = useState(regexes.join("\n"));
+            const update = useForceUpdater();
+            const [values, setValues] = useState(regexes);
+
+            const elements = regexes.map((a, i) => {
+                const setValue = (v: string) => {
+                    let valuesCopy = [...values];
+                    valuesCopy[i] = v;
+                    setValues(valuesCopy);
+                }
+
+                return (
+                    <>
+                        <Forms.FormTitle tag="h4">Keyword Regex {i + 1}</Forms.FormTitle>
+
+                        <Flex flexDirection="row">
+                            <div style={{flexGrow: 1}}>
+                                <TextInput
+                                    placeholder={"example|regex"}
+                                    spellCheck={false}
+                                    value={values[i]}
+                                    onChange={setValue}
+                                    onBlur={() => setRegexes(i, values[i])}
+                                />
+                            </div>
+
+                            <Button
+                                onClick={() => removeRegex(i, update)}
+                                look={Button.Looks.BLANK}
+                                size={Button.Sizes.ICON}
+                                className="keywordnotify-delete">
+                                <DeleteIcon />
+                            </Button>
+                        </Flex>
+                    </>
+                )
+            });
+
             return (
                 <>
-                    <Forms.FormTitle tag="h4">Keyword Regexes (newline-separated)</Forms.FormTitle>
-                    <TextArea
-                        placeholder={"example|regex\n\\d+"}
-                        spellCheck={false}
-                        value={value}
-                        onChange={setValue}
-                        onBlur={() => setRegexes(value)}
-                    />
+                    {elements}
+                    <div><Button onClick={() => addRegex(update)}>Add Regex</Button></div>
                 </>
             );
         }
@@ -69,7 +115,6 @@ export default definePlugin({
     },
 
     contains(e) {
-        //console.log("message: ", e);
-        return regexes.some(a => e.rawMessage.content.match(new RegExp(a)));
+        return regexes.some(a => a != "" && e.rawMessage.content.match(new RegExp(a)));
     }
 });
\ No newline at end of file
diff --git a/src/plugins/keywordNotify/style.css b/src/plugins/keywordNotify/style.css
new file mode 100644
index 000000000..b6829225d
--- /dev/null
+++ b/src/plugins/keywordNotify/style.css
@@ -0,0 +1,9 @@
+.keywordnotify-delete:hover {
+    color: var(--status-danger);
+}
+
+.keywordnotify-delete {
+    padding: 0px,
+    color: var(--primary-400);
+    transition: color 0.2s ease-in-out;
+}
\ No newline at end of file

From 6d4d38c2d55f66ce4e27378a59e629468fd9b95a Mon Sep 17 00:00:00 2001
From: camila <47485054+camila314@users.noreply.github.com>
Date: Sat, 11 Nov 2023 17:50:25 -0600
Subject: [PATCH 03/26] Update src/plugins/keywordNotify/index.tsx

Co-authored-by: ant0n <antonickadoo@gmail.com>
---
 src/plugins/keywordNotify/index.tsx | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 9eee42d45..c0070ee9c 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -1,20 +1,8 @@
 /*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 exhq
- *
- * 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/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated, camila314, and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import definePlugin, { OptionType } from "@utils/types";
 import { DataStore } from "@api/index";

From defa669d0b5a6ba8cea545d55c70f05bd9428f6b Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Sat, 11 Nov 2023 17:54:21 -0600
Subject: [PATCH 04/26] i have to have a readme

---
 src/plugins/keywordNotify/README.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/plugins/keywordNotify/README.md

diff --git a/src/plugins/keywordNotify/README.md b/src/plugins/keywordNotify/README.md
new file mode 100644
index 000000000..0a3e6e6e1
--- /dev/null
+++ b/src/plugins/keywordNotify/README.md
@@ -0,0 +1,3 @@
+# KeywordNotify
+
+Sends a notification when a message matches any number of regex cases.
\ No newline at end of file

From 99036977bb9eed0af364d108255e66404db85f0a Mon Sep 17 00:00:00 2001
From: camila <47485054+camila314@users.noreply.github.com>
Date: Sat, 11 Nov 2023 20:36:19 -0600
Subject: [PATCH 05/26] Update src/plugins/keywordNotify/index.tsx

Co-authored-by: AutumnVN <autumnvnchino@gmail.com>
---
 src/plugins/keywordNotify/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index c0070ee9c..96095a1c5 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -94,7 +94,7 @@ export default definePlugin({
 	    find: "isRawMessageMentioned:",
 	    replacement: {
             match: /isRawMessageMentioned:function\(\){return (.{1,2}).{1,512}function \1\(.{1,512}?=(.{1,2});return/,
-            replace: "$& Vencord.Plugins.plugins.KeywordNotify.contains($2) ||"
+            replace: "$& $self.contains($2) ||"
 	    }
 	}],
 

From c0fb89496f713956f9155df19fc5b5a2b848fafc Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Sat, 11 Nov 2023 22:36:37 -0600
Subject: [PATCH 06/26] KeywordNotify now highlights messages

---
 src/plugins/keywordNotify/index.tsx | 37 +++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 96095a1c5..b32af3370 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -10,11 +10,12 @@ import { definePluginSettings } from "@api/Settings";
 import { DeleteIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { Flex } from "@components/Flex";
-import { TextInput, useState, Forms, Button } from "@webpack/common";
+import { TextInput, useState, Forms, Button, UserStore, UserUtils } from "@webpack/common";
 import { useForceUpdater } from "@utils/react";
 import "./style.css";
 
 let regexes = [];
+let me = null;
 
 async function setRegexes(idx: number, reg: string) {
     regexes[idx] = reg;
@@ -90,19 +91,35 @@ export default definePlugin({
     authors: [Devs.camila314],
     description: "Sends a notification if a given message matches certain keywords or regexes",
     settings,
-    patches: [{
-	    find: "isRawMessageMentioned:",
-	    replacement: {
-            match: /isRawMessageMentioned:function\(\){return (.{1,2}).{1,512}function \1\(.{1,512}?=(.{1,2});return/,
-            replace: "$& $self.contains($2) ||"
-	    }
-	}],
+    patches: [
+        {
+    	    find: "}_dispatch(",
+    	    replacement: {
+                match: /}_dispatch\((.{1,2}),.{1,2}\){/,
+                replace: "$&$1=$self.modify($1);"
+    	    }
+    	}
+    ],
 
     async start() {
         regexes = await DataStore.get("KeywordNotify_rules") ?? [];
+        me = await UserUtils.getUser(UserStore.getCurrentUser().id);
     },
 
-    contains(e) {
-        return regexes.some(a => a != "" && e.rawMessage.content.match(new RegExp(a)));
+    applyRegexes(m) {
+        if (regexes.some(r => m.content.match(new RegExp(r)))) {
+            m.mentions.push(me);
+        }
+    },
+
+    modify(e) {
+        if (e.type == "MESSAGE_CREATE") {
+            this.applyRegexes(e.message);
+        } else if (e.type == "LOAD_MESSAGES_SUCCESS") {
+            for (let msg = 0; msg < e.messages.length; ++msg) {
+                this.applyRegexes(e.messages[msg]);
+            }
+        }
+        return e;
     }
 });
\ No newline at end of file

From 8ab224562a8c5aa375e9c51114cb49a3cce6c4fb Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Wed, 15 Nov 2023 23:06:49 -0600
Subject: [PATCH 07/26] fix newly generated rule causing mass pings

---
 src/plugins/keywordNotify/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index b32af3370..b7370e0eb 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -107,7 +107,7 @@ export default definePlugin({
     },
 
     applyRegexes(m) {
-        if (regexes.some(r => m.content.match(new RegExp(r)))) {
+        if (regexes.some(r => m.content.match(new RegExp(r))) && m != "") {
             m.mentions.push(me);
         }
     },

From 311c4bee3c2bdf9a74c3ed533f70d865086da213 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Thu, 16 Nov 2023 11:14:39 -0600
Subject: [PATCH 08/26] my bad. this time i actually fixed it

---
 src/plugins/keywordNotify/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index b7370e0eb..73a9bf275 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -107,7 +107,7 @@ export default definePlugin({
     },
 
     applyRegexes(m) {
-        if (regexes.some(r => m.content.match(new RegExp(r))) && m != "") {
+        if (regexes.some(r => r != "" && m.content.match(new RegExp(r)))) {
             m.mentions.push(me);
         }
     },

From 3cfe1dd9cce9ad44a585fbe8a77e7927d1db0a69 Mon Sep 17 00:00:00 2001
From: camila <47485054+camila314@users.noreply.github.com>
Date: Fri, 17 Nov 2023 00:35:11 -0600
Subject: [PATCH 09/26] Update src/plugins/keywordNotify/index.tsx

Co-authored-by: AutumnVN <autumnvnchino@gmail.com>
---
 src/plugins/keywordNotify/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 73a9bf275..6013b195c 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -95,7 +95,7 @@ export default definePlugin({
         {
     	    find: "}_dispatch(",
     	    replacement: {
-                match: /}_dispatch\((.{1,2}),.{1,2}\){/,
+                match: /}_dispatch\((\i),\i\){/,
                 replace: "$&$1=$self.modify($1);"
     	    }
     	}

From 808c664d9357033e769c75754edb149ac299ec8d Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Sun, 19 Nov 2023 18:25:11 -0600
Subject: [PATCH 10/26] no longer crashes on invalid regex

---
 src/plugins/keywordNotify/index.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 6013b195c..faacbe1a8 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -34,6 +34,14 @@ async function addRegex(updater: () => void) {
     updater();
 }
 
+function safeMatchesRegex(s: string, r: string) {
+    try {
+        return s.match(new RegExp(r));
+    } catch {
+        return false;
+    }
+}
+
 const settings = definePluginSettings({
     replace: {
         type: OptionType.COMPONENT,
@@ -107,7 +115,7 @@ export default definePlugin({
     },
 
     applyRegexes(m) {
-        if (regexes.some(r => r != "" && m.content.match(new RegExp(r)))) {
+        if (regexes.some(r => r != "" && safeMatchesRegex(m.content, r))) {
             m.mentions.push(me);
         }
     },

From 5648b16107c81bc31bb0dab5dfd1c729e23c52af Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:21:23 -0600
Subject: [PATCH 11/26] brand new inbox feature

---
 src/plugins/keywordNotify/index.tsx | 154 ++++++++++++++++++++++++++--
 1 file changed, 146 insertions(+), 8 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index faacbe1a8..760a6859a 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -10,12 +10,19 @@ import { definePluginSettings } from "@api/Settings";
 import { DeleteIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { Flex } from "@components/Flex";
-import { TextInput, useState, Forms, Button, UserStore, UserUtils } from "@webpack/common";
+import { TextInput, useState, Forms, Button, UserStore, UserUtils, TabBar, ChannelStore, SelectedChannelStore  } from "@webpack/common";
 import { useForceUpdater } from "@utils/react";
+import { findByCodeLazy, findByPropsLazy, mapMangledModuleLazy, filters } from "@webpack";
 import "./style.css";
 
 let regexes = [];
-let me = null;
+
+const MenuHeader = findByCodeLazy("useInDesktopNotificationCenterExperiment)(");
+const Popout = findByPropsLazy("ItemsPopout");
+const popoutClasses = findByPropsLazy("recentMentionsPopout");
+const MessageObject = findByCodeLazy("}isFirstMessageInForumPost");
+const createMessageRecord = mapMangledModuleLazy("createMessageRecord:", {fn: filters.byCode("MessageTypes.THREAD_CREATED")})
+
 
 async function setRegexes(idx: number, reg: string) {
     regexes[idx] = reg;
@@ -42,6 +49,31 @@ function safeMatchesRegex(s: string, r: string) {
     }
 }
 
+function highlightKeywords(s: string, r: Array<string>) {
+    let reg;
+    try {
+        reg = new RegExp(r.join("|"), "g");
+    } catch {
+        return [s];
+    }
+
+    let matches = s.match(reg);
+    if (!matches)
+        return [s];
+
+    let parts = [...matches.map((e) => {
+        let idx = s.indexOf(e);
+        let before = s.substring(0, idx);
+        s = s.substring(idx + e.length);
+        return before;
+    }, s), s];
+
+    return parts.map(e => [
+        (<span>{e}</span>),
+        matches.length ? (<span class="highlight">{matches.splice(0, 1)[0]}</span>) : []
+    ]);
+}
+
 const settings = definePluginSettings({
     replace: {
         type: OptionType.COMPONENT,
@@ -64,14 +96,13 @@ const settings = definePluginSettings({
                         <Flex flexDirection="row">
                             <div style={{flexGrow: 1}}>
                                 <TextInput
-                                    placeholder={"example|regex"}
+                                    placeholder="example|regex"
                                     spellCheck={false}
                                     value={values[i]}
                                     onChange={setValue}
                                     onBlur={() => setRegexes(i, values[i])}
                                 />
                             </div>
-
                             <Button
                                 onClick={() => removeRegex(i, update)}
                                 look={Button.Looks.BLANK}
@@ -106,20 +137,127 @@ export default definePlugin({
                 match: /}_dispatch\((\i),\i\){/,
                 replace: "$&$1=$self.modify($1);"
     	    }
-    	}
+    	},
+        {
+            find: "Messages.UNREADS_TAB_LABEL}",
+            replacement: {
+                match: /\i\?\(0,\i\.jsxs\)\(\i\.TabBar\.Item/,
+                replace: "$self.keywordTabBar(),$&"
+            }
+        },
+        {
+            find: "InboxTab.TODOS?(",
+            replacement: {
+                match: /:\i&&(\i)===\i\.InboxTab\.TODOS.{1,50}setTab:(\i),onJump:(\i),closePopout:(\i)/,
+                replace: ": $1 === 5 ? $self.tryKeywordMenu($2, $3, $4) $&"
+            }
+        },
+        {
+            find: ".default.guildFilter:null",
+            replacement: {
+                match: /function (\i)\(\i\){let{message:\i,gotoMessage/,
+                replace: "$self.renderMsg = $1; $&"
+            }
+        }
     ],
 
     async start() {
         regexes = await DataStore.get("KeywordNotify_rules") ?? [];
-        me = await UserUtils.getUser(UserStore.getCurrentUser().id);
+        this.me = await UserUtils.getUser(UserStore.getCurrentUser().id);
+        this.onUpdate = ()=>null;
+        this.keywordLog = [];
+
+        (await DataStore.get("KeywordNotify_log") ?? []).map((e) => JSON.parse(e)).forEach((e) => {
+            this.addToLog(e);
+        });
     },
 
     applyRegexes(m) {
         if (regexes.some(r => r != "" && safeMatchesRegex(m.content, r))) {
-            m.mentions.push(me);
+            m.mentions.push(this.me);
+
+            if (m.author.id != this.me.id)
+                this.addToLog(m);
         }
     },
 
+    addToLog(m) {
+        if (this.keywordLog.some((e) => e.id == m.id))
+            return;
+
+        let thing = createMessageRecord.fn(m);
+        this.keywordLog.push(thing);
+        this.keywordLog.sort((a, b) => b.timestamp - a.timestamp);
+
+        if (this.keywordLog.length > 50)
+            this.keywordLog.pop();
+
+        this.onUpdate();
+    },
+
+
+    keywordTabBar() {
+        return (
+            <TabBar.Item className="vc-settings-tab-bar-item" id={5}>
+                Keywords
+            </TabBar.Item>
+        );
+    },
+
+    tryKeywordMenu(setTab, onJump, closePopout) {
+        let header = (
+            <MenuHeader tab={5} setTab={setTab} closePopout={closePopout} badgeState={{badgeForYou: false}}/>
+        );
+
+        let channel = ChannelStore.getChannel(SelectedChannelStore.getChannelId());
+
+        let [keywordLog, setKeywordLog] = useState(this.keywordLog);
+        this.onUpdate = () => {
+            let newLog = [...this.keywordLog];
+            setKeywordLog(newLog);
+
+            DataStore.set("KeywordNotify_log", newLog.map((e) => JSON.stringify(e)));
+        };
+
+        let onDelete = (m) => {
+            this.keywordLog = this.keywordLog.filter((e) => e.id != m.id);
+            this.onUpdate();
+        };
+
+        let messageRender = (e, t) => {
+            console.log("Message: ", e.content);
+            let msg = this.renderMsg({
+                message: e,
+                gotoMessage: t,
+                dismissible: true
+            });
+
+            msg.props.children[0].props.children.props.onClick = () => onDelete(e);
+            msg.props.children[1].props.children[1].props.message.customRenderedContent = {
+                content: highlightKeywords(e.content, regexes)
+            };
+
+            return [msg];
+        };
+
+        return (
+            <>
+                <Popout.default
+                    className={popoutClasses.recentMentionsPopout}
+                    renderHeader={() => header}
+                    renderMessage={messageRender}
+                    channel={channel}
+                    onJump={onJump}
+                    onFetch={()=>null}
+                    onCloseMessage={onDelete}
+                    loadMore={()=>null}
+                    messages={keywordLog}
+                    renderEmptyState={()=>null}
+                />
+            </>
+        );
+    },
+
     modify(e) {
         if (e.type == "MESSAGE_CREATE") {
             this.applyRegexes(e.message);
@@ -130,4 +268,4 @@ export default definePlugin({
         }
         return e;
     }
-});
\ No newline at end of file
+});

From 52400852856d56ffff4832313f30a14861669c01 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Tue, 21 Nov 2023 06:47:18 -0600
Subject: [PATCH 12/26] remove default from find/replace

---
 src/plugins/keywordNotify/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 760a6859a..b92ec5c46 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -153,7 +153,7 @@ export default definePlugin({
             }
         },
         {
-            find: ".default.guildFilter:null",
+            find: ".guildFilter:null",
             replacement: {
                 match: /function (\i)\(\i\){let{message:\i,gotoMessage/,
                 replace: "$self.renderMsg = $1; $&"

From 5b647c307d35b445df9a5d3121a16dc92000bfa8 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Sat, 25 Nov 2023 11:48:10 -0600
Subject: [PATCH 13/26] fix small crash bug

---
 src/plugins/keywordNotify/index.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index b92ec5c46..4133ffe5c 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -232,6 +232,9 @@ export default definePlugin({
                 dismissible: true
             });
 
+            if (msg == null)
+                return [null];
+
             msg.props.children[0].props.children.props.onClick = () => onDelete(e);
             msg.props.children[1].props.children[1].props.message.customRenderedContent = {
                 content: highlightKeywords(e.content, regexes)

From 59902a3729b06219fcc182f871efe66cde6255e0 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Sat, 25 Nov 2023 17:13:19 -0600
Subject: [PATCH 14/26] no more mapMangledModule

---
 src/plugins/keywordNotify/index.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 4133ffe5c..d4bcbb2ba 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -21,7 +21,7 @@ const MenuHeader = findByCodeLazy("useInDesktopNotificationCenterExperiment)(");
 const Popout = findByPropsLazy("ItemsPopout");
 const popoutClasses = findByPropsLazy("recentMentionsPopout");
 const MessageObject = findByCodeLazy("}isFirstMessageInForumPost");
-const createMessageRecord = mapMangledModuleLazy("createMessageRecord:", {fn: filters.byCode("MessageTypes.THREAD_CREATED")})
+const createMessageRecord = findByPropsLazy("createMessageRecord", "updateMessageRecord");
 
 
 async function setRegexes(idx: number, reg: string) {
@@ -182,10 +182,10 @@ export default definePlugin({
     },
 
     addToLog(m) {
-        if (this.keywordLog.some((e) => e.id == m.id))
+        if (m == null || this.keywordLog.some((e) => e.id == m.id))
             return;
 
-        let thing = createMessageRecord.fn(m);
+        let thing = createMessageRecord.createMessageRecord(m);
         this.keywordLog.push(thing);
         this.keywordLog.sort((a, b) => b.timestamp - a.timestamp);
 
@@ -225,7 +225,6 @@ export default definePlugin({
         };
 
         let messageRender = (e, t) => {
-            console.log("Message: ", e.content);
             let msg = this.renderMsg({
                 message: e,
                 gotoMessage: t,

From 42b09a3d0b8e4b55688109d7eff7a5a3cea099c5 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Sat, 25 Nov 2023 17:18:42 -0600
Subject: [PATCH 15/26] bring back destructuring

---
 src/plugins/keywordNotify/index.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index d4bcbb2ba..b87ca3f4b 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -19,9 +19,8 @@ let regexes = [];
 
 const MenuHeader = findByCodeLazy("useInDesktopNotificationCenterExperiment)(");
 const Popout = findByPropsLazy("ItemsPopout");
-const popoutClasses = findByPropsLazy("recentMentionsPopout");
-const MessageObject = findByCodeLazy("}isFirstMessageInForumPost");
-const createMessageRecord = findByPropsLazy("createMessageRecord", "updateMessageRecord");
+const { recentMentionsPopout } = findByPropsLazy("recentMentionsPopout");
+const { createMessageRecord } = findByPropsLazy("createMessageRecord", "updateMessageRecord");
 
 
 async function setRegexes(idx: number, reg: string) {
@@ -185,7 +184,7 @@ export default definePlugin({
         if (m == null || this.keywordLog.some((e) => e.id == m.id))
             return;
 
-        let thing = createMessageRecord.createMessageRecord(m);
+        let thing = createMessageRecord(m);
         this.keywordLog.push(thing);
         this.keywordLog.sort((a, b) => b.timestamp - a.timestamp);
 
@@ -245,7 +244,7 @@ export default definePlugin({
         return (
             <>
                 <Popout.default
-                    className={popoutClasses.recentMentionsPopout}
+                    className={recentMentionsPopout}
                     renderHeader={() => header}
                     renderMessage={messageRender}
                     channel={channel}

From c7ed529a6cfc4ca0396c44e51f733784eaeb0891 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Sun, 26 Nov 2023 08:32:37 -0600
Subject: [PATCH 16/26] add ignore bots

---
 src/plugins/keywordNotify/index.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index b87ca3f4b..7ee70205b 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -74,7 +74,13 @@ function highlightKeywords(s: string, r: Array<string>) {
 }
 
 const settings = definePluginSettings({
-    replace: {
+    ignoreBots: {
+        type: OptionType.BOOLEAN,
+        description: "Ignore messages from bots",
+        default: true
+    },
+
+    keywords: {
         type: OptionType.COMPONENT,
         description: "",
         component: () => {
@@ -172,6 +178,9 @@ export default definePlugin({
     },
 
     applyRegexes(m) {
+        if (settings.store.ignoreBots && m.author.bot)
+            return;
+
         if (regexes.some(r => r != "" && safeMatchesRegex(m.content, r))) {
             m.mentions.push(this.me);
 

From b5804d548c4d975dfbadfe48f2e348ec0694ab0a Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Tue, 28 Nov 2023 02:09:34 -0600
Subject: [PATCH 17/26] someone made destructuring with strings not work lol

---
 src/plugins/keywordNotify/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 7ee70205b..1e9e54755 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -19,7 +19,8 @@ let regexes = [];
 
 const MenuHeader = findByCodeLazy("useInDesktopNotificationCenterExperiment)(");
 const Popout = findByPropsLazy("ItemsPopout");
-const { recentMentionsPopout } = findByPropsLazy("recentMentionsPopout");
+const recentMentionsPopoutClass = findByPropsLazy("recentMentionsPopout");
+
 const { createMessageRecord } = findByPropsLazy("createMessageRecord", "updateMessageRecord");
 
 
@@ -253,7 +254,7 @@ export default definePlugin({
         return (
             <>
                 <Popout.default
-                    className={recentMentionsPopout}
+                    className={recentMentionsPopoutClass.recentMentionsPopout}
                     renderHeader={() => header}
                     renderMessage={messageRender}
                     channel={channel}

From 0e9c1ebea833cd3228fdac95c8f35205569a2115 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:54:08 -0600
Subject: [PATCH 18/26] embed support

---
 src/plugins/keywordNotify/index.tsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 1e9e54755..5af576c08 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -182,7 +182,18 @@ export default definePlugin({
         if (settings.store.ignoreBots && m.author.bot)
             return;
 
-        if (regexes.some(r => r != "" && safeMatchesRegex(m.content, r))) {
+        let matches = false;
+
+        if (regexes.some(r => r != "" && (safeMatchesRegex(m.content, r)))) {
+            matches = true;
+        }
+        for (let embed of m.embeds) {
+            if (regexes.some(r => r != "" && (safeMatchesRegex(embed.description, r) || safeMatchesRegex(embed.title, r)))) {
+                matches = true;
+            }
+        }
+
+        if (matches) {
             m.mentions.push(this.me);
 
             if (m.author.id != this.me.id)

From 91f6541d8ae08bf47bee543df23e867797aae4e3 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Mon, 17 Jun 2024 23:42:50 -0500
Subject: [PATCH 19/26] Update

---
 src/plugins/keywordNotify/README.md |   2 +-
 src/plugins/keywordNotify/index.tsx | 403 +++++++++++++++++++---------
 src/plugins/keywordNotify/style.css |   9 +-
 3 files changed, 288 insertions(+), 126 deletions(-)

diff --git a/src/plugins/keywordNotify/README.md b/src/plugins/keywordNotify/README.md
index 0a3e6e6e1..0bc61d611 100644
--- a/src/plugins/keywordNotify/README.md
+++ b/src/plugins/keywordNotify/README.md
@@ -1,3 +1,3 @@
 # KeywordNotify
 
-Sends a notification when a message matches any number of regex cases.
\ No newline at end of file
+Allows for custom regex-defined keywords to notify the user exactly how a ping would. Adds a custom inbox for viewing keywords next to the mentions.
\ No newline at end of file
diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index eb240d006..d7aeedf9a 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -4,40 +4,41 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import definePlugin, { OptionType } from "@utils/types";
-import { DataStore } from "@api/index";
-import { definePluginSettings } from "@api/Settings";
-import { DeleteIcon } from "@components/Icons";
-import { Devs } from "@utils/constants";
-import { Flex } from "@components/Flex";
-import { TextInput, useState, Forms, Button, UserStore, UserUtils, TabBar, ChannelStore, SelectedChannelStore  } from "@webpack/common";
-import { useForceUpdater } from "@utils/react";
-import { findByCodeLazy, findByPropsLazy, mapMangledModuleLazy, filters } from "@webpack";
 import "./style.css";
 
-let regexes = [];
+import { DataStore } from "@api/index";
+import { definePluginSettings } from "@api/Settings";
+import { Flex } from "@components/Flex";
+import { DeleteIcon } from "@components/Icons";
+import { Devs } from "@utils/constants";
+import { Margins } from "@utils/margins";
+import { useForceUpdater } from "@utils/react";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { Button, ChannelStore, Forms, SearchableSelect,SelectedChannelStore, TabBar, TextInput, UserStore, UserUtils, useState } from "@webpack/common";
+import { Message, User } from "discord-types/general/index.js";
+
+let keywordEntries: Array<{ regex: string, listIds: Array<string>, listType: ListType }> = [];
+let currentUser: User;
+let keywordLog: Array<any> = [];
 
 const MenuHeader = findByCodeLazy(".useInDesktopNotificationCenterExperiment)()?");
-const Popout = findByPropsLazy("ItemsPopout");
+const Popout = findByCodeLazy("let{analyticsName:");
 const recentMentionsPopoutClass = findByPropsLazy("recentMentionsPopout");
+const KEYWORD_ENTRIES_KEY = "KeywordNotify_keywordEntries";
+const KEYWORD_LOG_KEY = "KeywordNotify_log";
 
 const { createMessageRecord } = findByPropsLazy("createMessageRecord", "updateMessageRecord");
 
-
-async function setRegexes(idx: number, reg: string) {
-    regexes[idx] = reg;
-    await DataStore.set("KeywordNotify_rules", regexes);
-}
-
-async function removeRegex(idx: number, updater: () => void) {
-    regexes.splice(idx, 1);
-    await DataStore.set("KeywordNotify_rules", regexes);
+async function addKeywordEntry(updater: () => void) {
+    keywordEntries.push({ regex: "", listIds: [], listType: ListType.BlackList });
+    await DataStore.set(KEYWORD_ENTRIES_KEY, keywordEntries);
     updater();
 }
 
-async function addRegex(updater: () => void) {
-    regexes.push("");
-    await DataStore.set("KeywordNotify_rules", regexes);
+async function removeKeywordEntry(idx: number, updater: () => void) {
+    keywordEntries.splice(idx, 1);
+    await DataStore.set(KEYWORD_ENTRIES_KEY, keywordEntries);
     updater();
 }
 
@@ -49,86 +50,201 @@ function safeMatchesRegex(s: string, r: string) {
     }
 }
 
+
+enum ListType {
+    BlackList = "BlackList",
+    Whitelist = "Whitelist"
+}
+
 function highlightKeywords(s: string, r: Array<string>) {
-    let reg;
+    let regex: RegExp;
     try {
-        reg = new RegExp(r.join("|"), "g");
+        regex = new RegExp(r.join("|"), "g");
     } catch {
         return [s];
     }
 
-    let matches = s.match(reg);
+    const matches = s.match(regex);
     if (!matches)
         return [s];
 
-    let parts = [...matches.map((e) => {
-        let idx = s.indexOf(e);
-        let before = s.substring(0, idx);
+    const parts = [...matches.map(e => {
+        const idx = s.indexOf(e);
+        const before = s.substring(0, idx);
         s = s.substring(idx + e.length);
         return before;
     }, s), s];
 
     return parts.map(e => [
         (<span>{e}</span>),
-        matches.length ? (<span class="highlight">{matches.splice(0, 1)[0]}</span>) : []
+        matches!.length ? (<span className="highlight">{matches!.splice(0, 1)[0]}</span>) : []
     ]);
 }
 
+function Collapsible({ title, children }) {
+    const [isOpen, setIsOpen] = useState(false);
+
+    return (
+        <div>
+            <Button
+                onClick={() => setIsOpen(!isOpen)}
+                look={Button.Looks.BLANK}
+                size={Button.Sizes.ICON}
+                className="keywordnotify-collapsible">
+                <div style={{ display: "flex", alignItems: "center" }}>
+                    <div style={{ marginLeft: "auto", color: "var(--text-muted)", paddingRight: "5px" }}>{isOpen ? "▼" : "▶"}</div>
+                    <Forms.FormTitle tag="h4">{title}</Forms.FormTitle>
+                </div>
+            </Button>
+            {isOpen && children}
+        </div>
+    );
+}
+
+function ListedIds({ listIds, setListIds }) {
+    const update = useForceUpdater();
+    const [values] = useState(listIds);
+
+    async function onChange(e: string, index: number) {
+        values[index] = e;
+        setListIds(values);
+        update();
+    }
+
+    const elements = values.map((currentValue: string, index: number) => {
+        return (
+            <Flex flexDirection="row" style={{ marginBottom: "5px" }}>
+                <div style={{ flexGrow: 1 }}>
+                    <TextInput
+                        placeholder="ID"
+                        spellCheck={false}
+                        value={currentValue}
+                        onChange={e => onChange(e, index)}
+                    />
+                </div>
+                <Button
+                    onClick={() => {
+                        values.splice(index, 1);
+                        setListIds(values);
+                        update();
+                    }}
+                    look={Button.Looks.BLANK}
+                    size={Button.Sizes.ICON}
+                    className="keywordnotify-delete">
+                    <DeleteIcon/>
+                </Button>
+            </Flex>
+        );
+    });
+
+    return (
+        <>
+            {elements}
+        </>
+    );
+}
+
+function ListTypeSelector({ listType, setListType }) {
+    return (
+        <SearchableSelect
+            options={[
+                { label: "Whitelist", value: ListType.Whitelist },
+                { label: "Blacklist", value: ListType.BlackList }
+            ]}
+            placeholder={"Select a list type"}
+            maxVisibleItems={2}
+            closeOnSelect={true}
+            value={listType}
+            onChange={setListType}
+        />
+    );
+}
+
+
+function KeywordEntries() {
+    const update = useForceUpdater();
+    const [values] = useState(keywordEntries);
+
+    async function setRegex(index: number, value: string) {
+        keywordEntries[index].regex = value;
+        await DataStore.set(KEYWORD_ENTRIES_KEY, keywordEntries);
+        update();
+    }
+
+    async function setListType(index: number, value: ListType) {
+        keywordEntries[index].listType = value;
+        await DataStore.set(KEYWORD_ENTRIES_KEY, keywordEntries);
+        update();
+    }
+
+    async function setListIds(index: number, value: Array<string>) {
+        keywordEntries[index].listIds = value ?? [];
+        await DataStore.set(KEYWORD_ENTRIES_KEY, keywordEntries);
+        update();
+    }
+
+    const elements = keywordEntries.map((entry, i) => {
+        return (
+            <>
+                <Collapsible title={`Keyword Entry ${i + 1}`}>
+                    <Flex flexDirection="row">
+                        <div style={{ flexGrow: 1 }}>
+                            <TextInput
+                                placeholder="example|regex"
+                                spellCheck={false}
+                                value={values[i].regex}
+                                onChange={e => setRegex(i, e)}
+                            />
+                        </div>
+                        <Button
+                            onClick={() => removeKeywordEntry(i, update)}
+                            look={Button.Looks.BLANK}
+                            size={Button.Sizes.ICON}
+                            className="keywordnotify-delete">
+                            <DeleteIcon/>
+                        </Button>
+                    </Flex>
+                    <Forms.FormDivider className={Margins.top8 + " " + Margins.bottom8}/>
+                    <Forms.FormTitle tag="h5">Whitelist/Blacklist</Forms.FormTitle>
+                    <Flex flexDirection="row">
+                        <div style={{ flexGrow: 1 }}>
+                            <ListedIds listIds={values[i].listIds} setListIds={e => setListIds(i, e)}/>
+                        </div>
+                    </Flex>
+                    <div className={Margins.top8 + " " + Margins.bottom8}/>
+                    <Flex flexDirection="row">
+                        <Button onClick={() => {
+                            values[i].listIds.push("");
+                            update();
+                        }}>Add ID</Button>
+                        <div style={{ flexGrow: 1 }}>
+                            <ListTypeSelector listType={values[i].listType} setListType={e => setListType(i, e)}/>
+                        </div>
+                    </Flex>
+                </Collapsible>
+            </>
+        );
+    });
+
+    return (
+        <>
+            {elements}
+            <div><Button onClick={() => addKeywordEntry(update)}>Add Keyword Entry</Button></div>
+        </>
+    );
+}
+
 const settings = definePluginSettings({
     ignoreBots: {
         type: OptionType.BOOLEAN,
         description: "Ignore messages from bots",
         default: true
     },
-
     keywords: {
         type: OptionType.COMPONENT,
         description: "",
-        component: () => {
-            const update = useForceUpdater();
-            const [values, setValues] = useState(regexes);
-
-            const elements = regexes.map((a, i) => {
-                const setValue = (v: string) => {
-                    let valuesCopy = [...values];
-                    valuesCopy[i] = v;
-                    setValues(valuesCopy);
-                }
-
-                return (
-                    <>
-                        <Forms.FormTitle tag="h4">Keyword Regex {i + 1}</Forms.FormTitle>
-
-                        <Flex flexDirection="row">
-                            <div style={{flexGrow: 1}}>
-                                <TextInput
-                                    placeholder="example|regex"
-                                    spellCheck={false}
-                                    value={values[i]}
-                                    onChange={setValue}
-                                    onBlur={() => setRegexes(i, values[i])}
-                                />
-                            </div>
-                            <Button
-                                onClick={() => removeRegex(i, update)}
-                                look={Button.Looks.BLANK}
-                                size={Button.Sizes.ICON}
-                                className="keywordnotify-delete">
-                                <DeleteIcon />
-                            </Button>
-                        </Flex>
-                    </>
-                )
-            });
-
-            return (
-                <>
-                    {elements}
-                    <div><Button onClick={() => addRegex(update)}>Add Regex</Button></div>
-                </>
-            );
-        }
-    },
+        component: () => <KeywordEntries/>
+    }
 });
 
 export default definePlugin({
@@ -138,12 +254,12 @@ export default definePlugin({
     settings,
     patches: [
         {
-    	    find: "}_dispatch(",
-    	    replacement: {
+            find: "}_dispatch(",
+            replacement: {
                 match: /}_dispatch\((\i),\i\){/,
                 replace: "$&$1=$self.modify($1);"
-    	    }
-    	},
+            }
+        },
         {
             find: "Messages.UNREADS_TAB_LABEL}",
             replacement: {
@@ -168,49 +284,81 @@ export default definePlugin({
     ],
 
     async start() {
-        regexes = await DataStore.get("KeywordNotify_rules") ?? [];
-        this.me = await UserUtils.getUser(UserStore.getCurrentUser().id);
-        this.onUpdate = ()=>null;
-        this.keywordLog = [];
+        keywordEntries = await DataStore.get(KEYWORD_ENTRIES_KEY) ?? [];
+        currentUser = await UserUtils.getUser(UserStore.getCurrentUser().id);
+        this.onUpdate = () => null;
 
-        (await DataStore.get("KeywordNotify_log") ?? []).map((e) => JSON.parse(e)).forEach((e) => {
+        (await DataStore.get(KEYWORD_LOG_KEY) ?? []).map(e => JSON.parse(e)).forEach(e => {
             this.addToLog(e);
         });
     },
 
-    applyRegexes(m) {
-        if (settings.store.ignoreBots && m.author.bot)
-            return;
-
+    applyKeywordEntries(m: Message) {
         let matches = false;
 
-        if (regexes.some(r => r != "" && (safeMatchesRegex(m.content, r)))) {
-            matches = true;
-        }
-        for (let embed of m.embeds) {
-            if (regexes.some(r => r != "" && (safeMatchesRegex(embed.description, r) || safeMatchesRegex(embed.title, r)))) {
+        keywordEntries.forEach(entry => {
+            if (entry.regex === "") {
+                return;
+            }
+
+            let listed = entry.listIds.some(id => id === m.channel_id || id === m.author.id);
+            if (!listed) {
+                const channel = ChannelStore.getChannel(m.channel_id);
+                if (channel != null) {
+                    listed = entry.listIds.some(id => id === channel.guild_id);
+                }
+            }
+
+            const whitelistMode = entry.listType === ListType.Whitelist;
+            if (!whitelistMode && listed) {
+                return;
+            }
+            if (whitelistMode && !listed) {
+                return;
+            }
+
+            if (settings.store.ignoreBots && m.author.bot) {
+                if (!whitelistMode || !entry.listIds.includes(m.author.id)) {
+                    return;
+                }
+            }
+
+            if (safeMatchesRegex(m.content, entry.regex)) {
                 matches = true;
             }
-        }
+
+            for (const embed of m.embeds as any) {
+                if (safeMatchesRegex(embed.description, entry.regex) || safeMatchesRegex(embed.title, entry.regex)) {
+                    matches = true;
+                } else if (embed.fields != null) {
+                    for (const field of embed.fields as Array<{ name: string, value: string }>) {
+                        if (safeMatchesRegex(field.value, entry.regex) || safeMatchesRegex(field.name, entry.regex)) {
+                            matches = true;
+                        }
+                    }
+                }
+            }
+        });
 
         if (matches) {
-            m.mentions.push(this.me);
+            // @ts-ignore
+            m.mentions.push(currentUser);
 
-            if (m.author.id != this.me.id)
+            if (m.author.id !== currentUser.id)
                 this.addToLog(m);
         }
     },
 
-    addToLog(m) {
-        if (m == null || this.keywordLog.some((e) => e.id == m.id))
+    addToLog(m: Message) {
+        if (m == null || keywordLog.some(e => e.id === m.id))
             return;
 
-        let thing = createMessageRecord(m);
-        this.keywordLog.push(thing);
-        this.keywordLog.sort((a, b) => b.timestamp - a.timestamp);
+        const thing = createMessageRecord(m);
+        keywordLog.push(thing);
+        keywordLog.sort((a, b) => b.timestamp - a.timestamp);
 
-        if (this.keywordLog.length > 50)
-            this.keywordLog.pop();
+        if (keywordLog.length > 50)
+            keywordLog.pop();
 
         this.onUpdate();
     },
@@ -225,27 +373,28 @@ export default definePlugin({
     },
 
     tryKeywordMenu(setTab, onJump, closePopout) {
-        let header = (
-            <MenuHeader tab={5} setTab={setTab} closePopout={closePopout} badgeState={{badgeForYou: false}}/>
+        const header = (
+            <MenuHeader tab={5} setTab={setTab} closePopout={closePopout} badgeState={{ badgeForYou: false }}/>
         );
 
-        let channel = ChannelStore.getChannel(SelectedChannelStore.getChannelId());
+        const channel = ChannelStore.getChannel(SelectedChannelStore.getChannelId());
 
-        let [keywordLog, setKeywordLog] = useState(this.keywordLog);
+        const [tempLogs, setKeywordLog] = useState(keywordLog);
         this.onUpdate = () => {
-            let newLog = [...this.keywordLog];
+            const newLog = [...keywordLog];
             setKeywordLog(newLog);
 
-            DataStore.set("KeywordNotify_log", newLog.map((e) => JSON.stringify(e)));
+            DataStore.set(KEYWORD_LOG_KEY, newLog.map(e => JSON.stringify(e)));
         };
 
-        let onDelete = (m) => {
-            this.keywordLog = this.keywordLog.filter((e) => e.id != m.id);
+        const onDelete = m => {
+            keywordLog = keywordLog.filter(e => e.id !== m.id);
             this.onUpdate();
         };
 
-        let messageRender = (e, t) => {
-            let msg = this.renderMsg({
+        const messageRender = (e, t) => {
+            console.log(this);
+            const msg = this.renderMsg({
                 message: e,
                 gotoMessage: t,
                 dismissible: true
@@ -256,36 +405,42 @@ export default definePlugin({
 
             msg.props.children[0].props.children.props.onClick = () => onDelete(e);
             msg.props.children[1].props.children[1].props.message.customRenderedContent = {
-                content: highlightKeywords(e.content, regexes)
+                content: highlightKeywords(e.content, keywordEntries.map(e => e.regex))
             };
 
             return [msg];
         };
 
+        /*return (
+            <>
+                <p>hi uwu</p>
+            </>
+        );*/
+
         return (
             <>
-                <Popout.default
+                <Popout
                     className={recentMentionsPopoutClass.recentMentionsPopout}
                     renderHeader={() => header}
                     renderMessage={messageRender}
                     channel={channel}
                     onJump={onJump}
-                    onFetch={()=>null}
+                    onFetch={() => null}
                     onCloseMessage={onDelete}
-                    loadMore={()=>null}
-                    messages={keywordLog}
-                    renderEmptyState={()=>null}
+                    loadMore={() => null}
+                    messages={tempLogs}
+                    renderEmptyState={() => null}
                 />
             </>
         );
     },
 
     modify(e) {
-        if (e.type == "MESSAGE_CREATE") {
-            this.applyRegexes(e.message);
-        } else if (e.type == "LOAD_MESSAGES_SUCCESS") {
+        if (e.type === "MESSAGE_CREATE") {
+            this.applyKeywordEntries(e.message);
+        } else if (e.type === "LOAD_MESSAGES_SUCCESS") {
             for (let msg = 0; msg < e.messages.length; ++msg) {
-                this.applyRegexes(e.messages[msg]);
+                this.applyKeywordEntries(e.messages[msg]);
             }
         }
         return e;
diff --git a/src/plugins/keywordNotify/style.css b/src/plugins/keywordNotify/style.css
index b6829225d..d549b694d 100644
--- a/src/plugins/keywordNotify/style.css
+++ b/src/plugins/keywordNotify/style.css
@@ -3,7 +3,14 @@
 }
 
 .keywordnotify-delete {
-    padding: 0px,
+    padding: 0;
     color: var(--primary-400);
     transition: color 0.2s ease-in-out;
+}
+
+.keywordnotify-collapsible {
+    display: flex;
+    align-items: center;
+    padding: 8px;
+    cursor: pointer;
 }
\ No newline at end of file

From f4967244223023e04025767b788f4948f5576fc9 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Mon, 17 Jun 2024 23:59:29 -0500
Subject: [PATCH 20/26] remove console log

---
 src/plugins/keywordNotify/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index d7aeedf9a..745009e25 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -393,7 +393,6 @@ export default definePlugin({
         };
 
         const messageRender = (e, t) => {
-            console.log(this);
             const msg = this.renderMsg({
                 message: e,
                 gotoMessage: t,

From 8b327866789f67cb9f84f466142dd1efd4a10b06 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Tue, 18 Jun 2024 00:03:59 -0500
Subject: [PATCH 21/26] remove useless comment

---
 src/plugins/keywordNotify/index.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 745009e25..612e49c89 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -410,12 +410,6 @@ export default definePlugin({
             return [msg];
         };
 
-        /*return (
-            <>
-                <p>hi uwu</p>
-            </>
-        );*/
-
         return (
             <>
                 <Popout

From 5c843bdbb7b0015d194e04b2aeb5c0d53b2e49c1 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Fri, 21 Jun 2024 14:07:01 -0500
Subject: [PATCH 22/26] make work again

---
 src/plugins/keywordNotify/index.tsx | 87 +++++++++++++++--------------
 src/plugins/keywordNotify/style.css |  6 +-
 2 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 612e49c89..f9c556078 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -6,40 +6,42 @@
 
 import "./style.css";
 
+import definePlugin, { OptionType } from "@utils/types";
+import { Button, ChannelStore, Forms, SearchableSelect,SelectedChannelStore, TabBar, TextInput, UserStore, UserUtils, useState } from "@webpack/common";
+import { classNameFactory } from "@api/Styles";
 import { DataStore } from "@api/index";
 import { definePluginSettings } from "@api/Settings";
-import { Flex } from "@components/Flex";
 import { DeleteIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
-import { Margins } from "@utils/margins";
-import { useForceUpdater } from "@utils/react";
-import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { Button, ChannelStore, Forms, SearchableSelect,SelectedChannelStore, TabBar, TextInput, UserStore, UserUtils, useState } from "@webpack/common";
+import { Flex } from "@components/Flex";
+import { Margins } from "@utils/margins";
 import { Message, User } from "discord-types/general/index.js";
+import { useForceUpdater } from "@utils/react";
 
 let keywordEntries: Array<{ regex: string, listIds: Array<string>, listType: ListType }> = [];
 let currentUser: User;
 let keywordLog: Array<any> = [];
 
-const MenuHeader = findByCodeLazy(".useInDesktopNotificationCenterExperiment)()?");
-const Popout = findByCodeLazy("let{analyticsName:");
+const MenuHeader = findByCodeLazy(".sv)()?(0,");
+const Popout = findByCodeLazy(".loadingMore&&null==");
 const recentMentionsPopoutClass = findByPropsLazy("recentMentionsPopout");
+const createMessageRecord = findByCodeLazy("THREAD_CREATED?[]:(0,");
 const KEYWORD_ENTRIES_KEY = "KeywordNotify_keywordEntries";
 const KEYWORD_LOG_KEY = "KeywordNotify_log";
 
-const { createMessageRecord } = findByPropsLazy("createMessageRecord", "updateMessageRecord");
+const cl = classNameFactory("vc-keywordnotify-");
 
-async function addKeywordEntry(updater: () => void) {
+async function addKeywordEntry(forceUpdate: () => void) {
     keywordEntries.push({ regex: "", listIds: [], listType: ListType.BlackList });
     await DataStore.set(KEYWORD_ENTRIES_KEY, keywordEntries);
-    updater();
+    forceUpdate();
 }
 
-async function removeKeywordEntry(idx: number, updater: () => void) {
+async function removeKeywordEntry(idx: number, forceUpdate: () => void) {
     keywordEntries.splice(idx, 1);
     await DataStore.set(KEYWORD_ENTRIES_KEY, keywordEntries);
-    updater();
+    forceUpdate();
 }
 
 function safeMatchesRegex(s: string, r: string) {
@@ -50,7 +52,6 @@ function safeMatchesRegex(s: string, r: string) {
     }
 }
 
-
 enum ListType {
     BlackList = "BlackList",
     Whitelist = "Whitelist"
@@ -90,7 +91,7 @@ function Collapsible({ title, children }) {
                 onClick={() => setIsOpen(!isOpen)}
                 look={Button.Looks.BLANK}
                 size={Button.Sizes.ICON}
-                className="keywordnotify-collapsible">
+                className={cl("collapsible")}>
                 <div style={{ display: "flex", alignItems: "center" }}>
                     <div style={{ marginLeft: "auto", color: "var(--text-muted)", paddingRight: "5px" }}>{isOpen ? "▼" : "▶"}</div>
                     <Forms.FormTitle tag="h4">{title}</Forms.FormTitle>
@@ -130,7 +131,7 @@ function ListedIds({ listIds, setListIds }) {
                     }}
                     look={Button.Looks.BLANK}
                     size={Button.Sizes.ICON}
-                    className="keywordnotify-delete">
+                    className={cl("delete")}>
                     <DeleteIcon/>
                 </Button>
             </Flex>
@@ -200,18 +201,18 @@ function KeywordEntries() {
                             onClick={() => removeKeywordEntry(i, update)}
                             look={Button.Looks.BLANK}
                             size={Button.Sizes.ICON}
-                            className="keywordnotify-delete">
+                            className={cl("delete")}>
                             <DeleteIcon/>
                         </Button>
                     </Flex>
-                    <Forms.FormDivider className={Margins.top8 + " " + Margins.bottom8}/>
+                    <Forms.FormDivider className={[Margins.top8, Margins.bottom8].join(" ") }/>
                     <Forms.FormTitle tag="h5">Whitelist/Blacklist</Forms.FormTitle>
                     <Flex flexDirection="row">
                         <div style={{ flexGrow: 1 }}>
                             <ListedIds listIds={values[i].listIds} setListIds={e => setListIds(i, e)}/>
                         </div>
                     </Flex>
-                    <div className={Margins.top8 + " " + Margins.bottom8}/>
+                    <div className={[Margins.top8, Margins.bottom8].join(" ") }/>
                     <Flex flexDirection="row">
                         <Button onClick={() => {
                             values[i].listIds.push("");
@@ -242,7 +243,6 @@ const settings = definePluginSettings({
     },
     keywords: {
         type: OptionType.COMPONENT,
-        description: "",
         component: () => <KeywordEntries/>
     }
 });
@@ -254,7 +254,7 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: "}_dispatch(",
+            find: "Dispatch.dispatch(...) called without an action type",
             replacement: {
                 match: /}_dispatch\((\i),\i\){/,
                 replace: "$&$1=$self.modify($1);"
@@ -268,9 +268,9 @@ export default definePlugin({
             }
         },
         {
-            find: "InboxTab.TODOS?(",
+            find: "location:\"RecentsPopout\"",
             replacement: {
-                match: /:\i&&(\i)===\i\.InboxTab\.TODOS.{1,50}setTab:(\i),onJump:(\i),closePopout:(\i)/,
+                match: /:(\i)===\i\.\i\.MENTIONS\?\(0,.+?setTab:(\i),onJump:(\i),badgeState:\i,closePopout:(\i)/,
                 replace: ": $1 === 5 ? $self.tryKeywordMenu($2, $3, $4) $&"
             }
         },
@@ -280,12 +280,19 @@ export default definePlugin({
                 match: /function (\i)\(\i\){let{message:\i,gotoMessage/,
                 replace: "$self.renderMsg = $1; $&"
             }
+        },
+        {
+            find: ".guildFilter:null",
+            replacement: {
+                match: /onClick:\(\)=>(\i\.\i\.deleteRecentMention\((\i)\.id\))/,
+                replace: "onClick: () => $2._keyword ? $self.deleteKeyword($2.id) : $1"
+            }
         }
     ],
 
     async start() {
         keywordEntries = await DataStore.get(KEYWORD_ENTRIES_KEY) ?? [];
-        currentUser = await UserUtils.getUser(UserStore.getCurrentUser().id);
+        currentUser = UserStore.getCurrentUser();
         this.onUpdate = () => null;
 
         (await DataStore.get(KEYWORD_LOG_KEY) ?? []).map(e => JSON.parse(e)).forEach(e => {
@@ -341,7 +348,6 @@ export default definePlugin({
         });
 
         if (matches) {
-            // @ts-ignore
             m.mentions.push(currentUser);
 
             if (m.author.id !== currentUser.id)
@@ -353,6 +359,10 @@ export default definePlugin({
         if (m == null || keywordLog.some(e => e.id === m.id))
             return;
 
+        DataStore.get(KEYWORD_LOG_KEY).then(log => {
+            DataStore.set(KEYWORD_LOG_KEY, [...log, JSON.stringify(m)]);
+        });
+
         const thing = createMessageRecord(m);
         keywordLog.push(thing);
         keywordLog.sort((a, b) => b.timestamp - a.timestamp);
@@ -363,6 +373,10 @@ export default definePlugin({
         this.onUpdate();
     },
 
+    deleteKeyword(id) {
+        keywordLog = keywordLog.filter(e => e.id !== id);
+        this.onUpdate();
+    },
 
     keywordTabBar() {
         return (
@@ -381,32 +395,23 @@ export default definePlugin({
 
         const [tempLogs, setKeywordLog] = useState(keywordLog);
         this.onUpdate = () => {
-            const newLog = [...keywordLog];
+            const newLog = Array.from(keywordLog);
             setKeywordLog(newLog);
-
-            DataStore.set(KEYWORD_LOG_KEY, newLog.map(e => JSON.stringify(e)));
-        };
-
-        const onDelete = m => {
-            keywordLog = keywordLog.filter(e => e.id !== m.id);
-            this.onUpdate();
         };
 
         const messageRender = (e, t) => {
+            e._keyword = true;
+
+            e.customRenderedContent = {
+                content: highlightKeywords(e.content, keywordEntries.map(e => e.regex))
+            };
+
             const msg = this.renderMsg({
                 message: e,
                 gotoMessage: t,
                 dismissible: true
             });
 
-            if (msg == null)
-                return [null];
-
-            msg.props.children[0].props.children.props.onClick = () => onDelete(e);
-            msg.props.children[1].props.children[1].props.message.customRenderedContent = {
-                content: highlightKeywords(e.content, keywordEntries.map(e => e.regex))
-            };
-
             return [msg];
         };
 
@@ -419,7 +424,7 @@ export default definePlugin({
                     channel={channel}
                     onJump={onJump}
                     onFetch={() => null}
-                    onCloseMessage={onDelete}
+                    onCloseMessage={this.deleteKeyword}
                     loadMore={() => null}
                     messages={tempLogs}
                     renderEmptyState={() => null}
diff --git a/src/plugins/keywordNotify/style.css b/src/plugins/keywordNotify/style.css
index d549b694d..7ddd397d2 100644
--- a/src/plugins/keywordNotify/style.css
+++ b/src/plugins/keywordNotify/style.css
@@ -1,14 +1,14 @@
-.keywordnotify-delete:hover {
+.vc-keywordnotify-delete:hover {
     color: var(--status-danger);
 }
 
-.keywordnotify-delete {
+.vc-keywordnotify-delete {
     padding: 0;
     color: var(--primary-400);
     transition: color 0.2s ease-in-out;
 }
 
-.keywordnotify-collapsible {
+.vc-keywordnotify-collapsible {
     display: flex;
     align-items: center;
     padding: 8px;

From 4e7e09f4ffeb6aa79fadc6f7f35806cd740b3550 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Sun, 23 Jun 2024 14:33:11 -0500
Subject: [PATCH 23/26] review changes

---
 src/plugins/keywordNotify/index.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index f9c556078..da7da2c7b 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -7,7 +7,7 @@
 import "./style.css";
 
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ChannelStore, Forms, SearchableSelect,SelectedChannelStore, TabBar, TextInput, UserStore, UserUtils, useState } from "@webpack/common";
+import { Button, ChannelStore, Forms, Select,SelectedChannelStore, TabBar, TextInput, UserStore, UserUtils, useState } from "@webpack/common";
 import { classNameFactory } from "@api/Styles";
 import { DataStore } from "@api/index";
 import { definePluginSettings } from "@api/Settings";
@@ -147,16 +147,17 @@ function ListedIds({ listIds, setListIds }) {
 
 function ListTypeSelector({ listType, setListType }) {
     return (
-        <SearchableSelect
+        <Select
             options={[
                 { label: "Whitelist", value: ListType.Whitelist },
                 { label: "Blacklist", value: ListType.BlackList }
             ]}
             placeholder={"Select a list type"}
-            maxVisibleItems={2}
+            isSelected={v => v === listType}
             closeOnSelect={true}
             value={listType}
-            onChange={setListType}
+            select={setListType}
+            serialize={v => v}
         />
     );
 }
@@ -303,7 +304,7 @@ export default definePlugin({
     applyKeywordEntries(m: Message) {
         let matches = false;
 
-        keywordEntries.forEach(entry => {
+        for (let entry of keywordEntries) {
             if (entry.regex === "") {
                 return;
             }
@@ -345,7 +346,7 @@ export default definePlugin({
                     }
                 }
             }
-        });
+        }
 
         if (matches) {
             m.mentions.push(currentUser);

From bac0ac1b6b2ea786fc7d7cb58a5e3fa51e9f94dd Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Mon, 24 Jun 2024 01:56:14 -0500
Subject: [PATCH 24/26] do good changes

---
 src/plugins/keywordNotify/index.tsx | 30 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index da7da2c7b..6b2db721b 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -44,9 +44,9 @@ async function removeKeywordEntry(idx: number, forceUpdate: () => void) {
     forceUpdate();
 }
 
-function safeMatchesRegex(s: string, r: string) {
+function safeMatchesRegex(str: string, regex: string) {
     try {
-        return s.match(new RegExp(r));
+        return str.match(new RegExp(regex));
     } catch {
         return false;
     }
@@ -57,24 +57,24 @@ enum ListType {
     Whitelist = "Whitelist"
 }
 
-function highlightKeywords(s: string, r: Array<string>) {
+function highlightKeywords(str: string, regexes: Array<string>) {
     let regex: RegExp;
     try {
-        regex = new RegExp(r.join("|"), "g");
+        regex = new RegExp(regexes.join("|"), "g");
     } catch {
-        return [s];
+        return [str];
     }
 
-    const matches = s.match(regex);
+    const matches = str.match(regex);
     if (!matches)
-        return [s];
+        return [str];
 
     const parts = [...matches.map(e => {
-        const idx = s.indexOf(e);
-        const before = s.substring(0, idx);
-        s = s.substring(idx + e.length);
+        const idx = str.indexOf(e);
+        const before = str.substring(0, idx);
+        str = str.substring(idx + e.length);
         return before;
-    }, s), s];
+    }, str), str];
 
     return parts.map(e => [
         (<span>{e}</span>),
@@ -318,17 +318,15 @@ export default definePlugin({
             }
 
             const whitelistMode = entry.listType === ListType.Whitelist;
+
             if (!whitelistMode && listed) {
                 return;
             }
             if (whitelistMode && !listed) {
                 return;
             }
-
-            if (settings.store.ignoreBots && m.author.bot) {
-                if (!whitelistMode || !entry.listIds.includes(m.author.id)) {
-                    return;
-                }
+            if (settings.store.ignoreBots && m.author.bot && (!whitelistMode || !entry.listIds.includes(m.author.id))) {
+                return;
             }
 
             if (safeMatchesRegex(m.content, entry.regex)) {

From a572da18f5a445bf629ec7d422d32d76e1d1e4e6 Mon Sep 17 00:00:00 2001
From: camila314 <47485054+camila314@users.noreply.github.com>
Date: Mon, 24 Jun 2024 02:46:52 -0500
Subject: [PATCH 25/26] Ignore case toggle

---
 src/plugins/keywordNotify/index.tsx | 61 +++++++++++++++++------------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 6b2db721b..8718337be 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -7,7 +7,7 @@
 import "./style.css";
 
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ChannelStore, Forms, Select,SelectedChannelStore, TabBar, TextInput, UserStore, UserUtils, useState } from "@webpack/common";
+import { Button, ChannelStore, Forms, Select, Switch, SelectedChannelStore, TabBar, TextInput, UserStore, UserUtils, useState } from "@webpack/common";
 import { classNameFactory } from "@api/Styles";
 import { DataStore } from "@api/index";
 import { definePluginSettings } from "@api/Settings";
@@ -19,7 +19,9 @@ import { Margins } from "@utils/margins";
 import { Message, User } from "discord-types/general/index.js";
 import { useForceUpdater } from "@utils/react";
 
-let keywordEntries: Array<{ regex: string, listIds: Array<string>, listType: ListType }> = [];
+type KeywordEntry = { regex: string, listIds: Array<string>, listType: ListType, ignoreCase: boolean };
+
+let keywordEntries: Array<KeywordEntry> = [];
 let currentUser: User;
 let keywordLog: Array<any> = [];
 
@@ -33,7 +35,7 @@ const KEYWORD_LOG_KEY = "KeywordNotify_log";
 const cl = classNameFactory("vc-keywordnotify-");
 
 async function addKeywordEntry(forceUpdate: () => void) {
-    keywordEntries.push({ regex: "", listIds: [], listType: ListType.BlackList });
+    keywordEntries.push({ regex: "", listIds: [], listType: ListType.BlackList, ignoreCase: false });
     await DataStore.set(KEYWORD_ENTRIES_KEY, keywordEntries);
     forceUpdate();
 }
@@ -44,9 +46,9 @@ async function removeKeywordEntry(idx: number, forceUpdate: () => void) {
     forceUpdate();
 }
 
-function safeMatchesRegex(str: string, regex: string) {
+function safeMatchesRegex(str: string, regex: string, flags: string) {
     try {
-        return str.match(new RegExp(regex));
+        return str.match(new RegExp(regex, flags));
     } catch {
         return false;
     }
@@ -57,29 +59,26 @@ enum ListType {
     Whitelist = "Whitelist"
 }
 
-function highlightKeywords(str: string, regexes: Array<string>) {
-    let regex: RegExp;
+function highlightKeywords(str: string, entries: Array<KeywordEntry>) {
+    let regexes: Array<RegExp>;
     try {
-        regex = new RegExp(regexes.join("|"), "g");
-    } catch {
+        regexes = entries.map(e => new RegExp(e.regex, "g" + (e.ignoreCase ? "i" : "")));
+    } catch (err) {
         return [str];
     }
 
-    const matches = str.match(regex);
-    if (!matches)
+    const matches = regexes.map(r => str.match(r)).flat().filter(e => e != null);
+    if (matches.length == 0) {
         return [str];
+    }
 
-    const parts = [...matches.map(e => {
-        const idx = str.indexOf(e);
-        const before = str.substring(0, idx);
-        str = str.substring(idx + e.length);
-        return before;
-    }, str), str];
+    const idx = str.indexOf(matches[0]);
 
-    return parts.map(e => [
-        (<span>{e}</span>),
-        matches!.length ? (<span className="highlight">{matches!.splice(0, 1)[0]}</span>) : []
-    ]);
+    return [
+        <span>{str.substring(0, idx)}</span>,
+        <span className="highlight">{matches[0]}</span>,
+        <span>{str.substring(idx + matches[0].length)}</span>
+    ];
 }
 
 function Collapsible({ title, children }) {
@@ -206,6 +205,16 @@ function KeywordEntries() {
                             <DeleteIcon/>
                         </Button>
                     </Flex>
+                    <Switch
+                        value={values[i].ignoreCase}
+                        onChange={() => {
+                            values[i].ignoreCase = !values[i].ignoreCase;
+                            update();
+                        }}
+                        style={{ marginTop: "0.5em", marginRight: "40px" }}
+                    >
+                        Ignore Case
+                    </Switch>
                     <Forms.FormDivider className={[Margins.top8, Margins.bottom8].join(" ") }/>
                     <Forms.FormTitle tag="h5">Whitelist/Blacklist</Forms.FormTitle>
                     <Flex flexDirection="row">
@@ -325,20 +334,22 @@ export default definePlugin({
             if (whitelistMode && !listed) {
                 return;
             }
+
             if (settings.store.ignoreBots && m.author.bot && (!whitelistMode || !entry.listIds.includes(m.author.id))) {
                 return;
             }
 
-            if (safeMatchesRegex(m.content, entry.regex)) {
+            const flags = entry.ignoreCase ? "i" : "";
+            if (safeMatchesRegex(m.content, entry.regex, flags)) {
                 matches = true;
             }
 
             for (const embed of m.embeds as any) {
-                if (safeMatchesRegex(embed.description, entry.regex) || safeMatchesRegex(embed.title, entry.regex)) {
+                if (safeMatchesRegex(embed.description, entry.regex, flags) || safeMatchesRegex(embed.title, entry.regex, flags)) {
                     matches = true;
                 } else if (embed.fields != null) {
                     for (const field of embed.fields as Array<{ name: string, value: string }>) {
-                        if (safeMatchesRegex(field.value, entry.regex) || safeMatchesRegex(field.name, entry.regex)) {
+                        if (safeMatchesRegex(field.value, entry.regex, flags) || safeMatchesRegex(field.name, entry.regex, flags)) {
                             matches = true;
                         }
                     }
@@ -402,7 +413,7 @@ export default definePlugin({
             e._keyword = true;
 
             e.customRenderedContent = {
-                content: highlightKeywords(e.content, keywordEntries.map(e => e.regex))
+                content: highlightKeywords(e.content, keywordEntries)
             };
 
             const msg = this.renderMsg({

From bfbb1f1aadbb890521a3eb94ae892d0919735049 Mon Sep 17 00:00:00 2001
From: x3rt <x3rtdev@gmail.com>
Date: Mon, 24 Jun 2024 10:35:24 -0600
Subject: [PATCH 26/26] Add x3rt to authors

---
 src/plugins/keywordNotify/index.tsx | 2 +-
 src/utils/constants.ts              | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/keywordNotify/index.tsx b/src/plugins/keywordNotify/index.tsx
index 8718337be..411930f37 100644
--- a/src/plugins/keywordNotify/index.tsx
+++ b/src/plugins/keywordNotify/index.tsx
@@ -259,7 +259,7 @@ const settings = definePluginSettings({
 
 export default definePlugin({
     name: "KeywordNotify",
-    authors: [Devs.camila314],
+    authors: [Devs.camila314, Devs.x3rt],
     description: "Sends a notification if a given message matches certain keywords or regexes",
     settings,
     patches: [
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index e764cd55a..39f1cfef3 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -382,6 +382,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "camila314",
         id: 738592270617542716n
     },
+    x3rt: {
+        name: "x3rt",
+        id: 131602100332396544n
+    },
     UlyssesZhan: {
         name: "UlyssesZhan",
         id: 586808226058862623n