Some General Fixes

scripts/build/common.mjs

@@ -115,7 +115,7 @@ export const globPlugins = kind => ({
         });
 
         build.onLoad({ filter, namespace: "import-plugins" }, async () => {
-            const pluginDirs = ["plugins/_api", "plugins/_core", "plugins", "userplugins", "equicordplugins"];
+            const pluginDirs = ["plugins/_api", "plugins/_core", "plugins", "userplugins", "equicordplugins", "equicordplugins/_core"];
             let code = "";
             let pluginsCode = "\n";
             let metaCode = "\n";

scripts/generatePluginList.ts

@@ -257,7 +257,7 @@ function isPluginFile({ name }: { name: string; }) {
 
     const plugins = [] as PluginData[];
 
-    await Promise.all(["src/plugins", "src/plugins/_core", "src/equicordplugins"].flatMap(dir =>
+    await Promise.all(["src/plugins", "src/plugins/_core", "src/equicordplugins", "src/equicordplugins/_core"].flatMap(dir =>
         readdirSync(dir, { withFileTypes: true })
             .filter(isPluginFile)
             .map(async dirent => {

src/equicordplugins/_core/equicordHelper.ts

@@ -0,0 +1,50 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and Megumin
+ *
+ * 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 { EquicordDevs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "EquicordHelper",
+    description: "Fixes some misc issues with discord",
+    authors: [EquicordDevs.thororen, EquicordDevs.nyx],
+    required: true,
+    patches: [
+        {
+            find: "Unknown resolution:",
+            replacement: [
+                {
+                    match: /throw Error\("Unknown resolution: ".concat\((\i)\)\)/,
+                    replace: "return $1;"
+                },
+                {
+                    match: /throw Error\("Unknown frame rate: ".concat\((\i)\)\)/,
+                    replace: "return $1;"
+                }
+            ]
+        },
+        {
+            find: '"Slate: Unable to find syntax characters"',
+            replacement: {
+                match: /((let )(\i)=\i\.indexOf\(\i,(\i)\)),/,
+                replace: "$1;if ($3 === -1) {return $4;}$2"
+            },
+            all: true
+        }
+    ]
+});

src/equicordplugins/betterAudioPlayer/index.tsx

@@ -66,8 +66,7 @@ async function addListeners(audioElement: HTMLAudioElement, url: string, parentB
     const madeURL = new URL(url);
     madeURL.searchParams.set("t", Date.now().toString());
 
-    // thanks thororen :p
+    const corsProxyUrl = "https://corsproxy.io?" + encodeURIComponent(madeURL.href);
-    const corsProxyUrl = "https://cors.thororen.com/?url=" + encodeURIComponent(madeURL.href);
     const response = await fetch(corsProxyUrl);
     const blob = await response.blob();
     const blobUrl = URL.createObjectURL(blob);

src/plugins/_core/settings.tsx

@@ -75,19 +75,6 @@ export default definePlugin({
                 match: /(?<=function\((\i),\i\)\{)(?=let \i=Object.values\(\i.\i\).*?(\i\.\i)\.open\()/,
                 replace: "$2.open($1);return;"
             }
-        },
-        {
-            find: "Unknown resolution:",
-            replacement: [
-                {
-                    match: /throw Error\("Unknown resolution: ".concat\((\i)\)\)/,
-                    replace: "return $1;"
-                },
-                {
-                    match: /throw Error\("Unknown frame rate: ".concat\((\i)\)\)/,
-                    replace: "return $1;"
-                }
-            ]
         }
     ],
 

src/plugins/devCompanion/index.tsx

@@ -47,7 +47,7 @@ export const settings = definePluginSettings({
 });
 
 export default definePlugin({
-    name: "UserDevCompanion",
+    name: "DevCompanion",
     description: "Dev Companion Plugin",
     authors: [Devs.Ven, Devs.sadan, Devs.Samwich],
     reporterTestable: ReporterTestable.None,
@@ -63,7 +63,6 @@ export default definePlugin({
     start() {
         // if we're running the reporter, we need to initws in the reporter file to avoid a race condition
         if (!IS_DEV) throw new Error("This plugin requires dev mode to run, please build with pnpm build --dev");
-        if (Vencord.Settings.plugins.DevCompanion?.enabled) throw new Error("Disable DevCompanion");
         initWs();
     },