From d23b8af79a67ca7b02919e1289a60c44783eb40d Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 12 Jul 2024 15:59:55 -0400
Subject: [PATCH] Fixes

---
 scripts/generateReport.ts                           |  3 ++-
 src/equicordplugins/messageLoggerEnhanced/index.tsx |  8 +-------
 src/plugins/friendsSince/index.tsx                  | 11 +----------
 src/plugins/moreUserTags/index.tsx                  |  7 +++----
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index aecf6a497..6dc3a0e8b 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -73,7 +73,8 @@ const IGNORED_DISCORD_ERRORS = [
     "Downloading the full bad domains file",
     /\[GatewaySocket\].{0,110}Cannot access '/,
     "search for 'name' in undefined",
-    "Attempting to set fast connect zstd when unsupported"
+    "Attempting to set fast connect zstd when unsupported",
+    "Webpack Find Fail: waitForStore(\"PermissionStore\")"
 ] as Array<string | RegExp>;
 
 function toCodeBlock(s: string, indentation = 0, isDiscord = false) {
diff --git a/src/equicordplugins/messageLoggerEnhanced/index.tsx b/src/equicordplugins/messageLoggerEnhanced/index.tsx
index a35db3c4e..8c058200d 100644
--- a/src/equicordplugins/messageLoggerEnhanced/index.tsx
+++ b/src/equicordplugins/messageLoggerEnhanced/index.tsx
@@ -251,12 +251,6 @@ export const settings = definePluginSettings({
         description: "Usually message logger only logs from whitelisted ids and dms, enabling this would mean it would log messages from all servers as well. Note that this may cause the cache to exceed its limit, resulting in some messages being missed. If you are in a lot of servers, this may significantly increase the chances of messages being logged, which can result in a large message record and the inclusion of irrelevant messages.",
     },
 
-    autoCheckForUpdates: {
-        default: true,
-        type: OptionType.BOOLEAN,
-        description: "Automatically check for updates on startup.",
-    },
-
     ignoreBots: {
         type: OptionType.BOOLEAN,
         description: "Whether to ignore messages by bots",
@@ -309,7 +303,7 @@ export const settings = definePluginSettings({
     permanentlyRemoveLogByDefault: {
         default: false,
         type: OptionType.BOOLEAN,
-        description: "Vencord's base MessageLogger remove log button wiil delete logs permanently",
+        description: "Equicord's base MessageLogger remove log button wiil delete logs permanently",
     },
 
     hideMessageFromMessageLoggers: {
diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index 35a6aec7b..b0aed7a36 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -5,7 +5,6 @@
  */
 
 import ErrorBoundary from "@components/ErrorBoundary";
-import { onceDefined } from "@shared/onceDefined";
 import { Devs } from "@utils/constants";
 import { getCurrentChannel } from "@utils/discord";
 import { Logger } from "@utils/Logger";
@@ -19,15 +18,7 @@ const getCreatedAtDate = findByCodeLazy('month:"short",day:"numeric"');
 const locale = findByPropsLazy("getLocale");
 const lastSection = findByPropsLazy("lastSection");
 
-let section;
-
-onceDefined(window, "GLOBAL_ENV", v => {
-    if (v.RELEASE_CHANNEL === "stable") {
-        section = findLazy((m: any) => m.section !== void 0 && Object.values(m).length === 1);
-    } else {
-        section = findLazy((m: any) => m.section !== void 0 && m.heading !== void 0 && Object.values(m).length === 2);
-    }
-});
+const section = findLazy((m: any) => m.section !== void 0 && m.heading !== void 0 && Object.values(m).length === 2);
 
 export default definePlugin({
     name: "FriendsSince",
diff --git a/src/plugins/moreUserTags/index.tsx b/src/plugins/moreUserTags/index.tsx
index 0884791c8..45538fb66 100644
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@@ -263,11 +263,10 @@ export default definePlugin({
                     // it's either this or extremely long lookbehind
                     match: /user:\i,nick:\i,/,
                     replace: "$&moreTags_channelId,"
-                },
-                ...[/,botType:(\i\((\i)\)),/g, /,botType:(\i),(?<=user:(\i).+?)/g].map(match => ({
-                    match,
+                }, {
+                    match: /,botType:(\i),(?<=user:(\i).+?)/g,
                     replace: ",botType:$self.getTag({user:$2,channelId:moreTags_channelId,origType:$1,location:'not-chat'}),"
-                })),
+                }
             ]
         },
     ],