[skip ci] add react linting

2023-10-31 23:43:28 +01:00
67 changed files with 1013 additions and 491 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -9,6 +9,7 @@
        "unused-imports",
        "path-alias"
    ],
+    "extends": ["plugin:react/recommended", "plugin:react/jsx-runtime"],
    "settings": {
        "import/resolver": {
            "alias": {
@ -20,6 +21,9 @@
                    ["@components", "./src/components"]
                ]
            }
+        },
+        "react": {
+            "version": "18.2"
        }
    },
    "rules": {
@ -93,6 +97,12 @@

        "unused-imports/no-unused-imports": "error",

-        "path-alias/no-relative": "error"
+        "path-alias/no-relative": "error",
+
+        "react/no-unescaped-entities": "off",
+        "react/prop-types": "off",
+
+        /* we dont target ancient browsers */
+        "react/jsx-no-target-blank": "off"
    }
 }
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -14,8 +14,7 @@ body:
        DO NOT USE THIS FORM, unless
        - you are a vencord contributor
        - you were given explicit permission to use this form by a moderator in our support server
-        
-        DO NOT USE THIS FORM FOR SECURITY RELATED ISSUES. [CREATE A SECURITY ADVISORY INSTEAD.](https://github.com/Vendicated/Vencord/security/advisories/new)
+        - you are filing a security related report
  
  - type: input
    id: discord
--- a/README.md
+++ b/README.md
@ -28,14 +28,6 @@ Visit https://vencord.dev/download

 https://discord.gg/D9uwnFnqmd

-## Sponsors
-
-| **Thanks a lot to all Vencord [sponsors](https://github.com/sponsors/Vendicated)!!** |
-|:--:| 
-| [![](https://meow.vendicated.dev/sponsors.png)](https://github.com/sponsors/Vendicated) |
-| *generated using [github-sponsor-graph](https://github.com/Vendicated/github-sponsor-graph)* |
-
-
 ## Star History

 <a href="https://star-history.com/#Vendicated/Vencord&Timeline">
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
    "name": "vencord",
    "private": "true",
-    "version": "1.6.3",
+    "version": "1.6.1",
    "description": "The cutest Discord client mod",
    "homepage": "https://github.com/Vendicated/Vencord#readme",
    "bugs": {
@ -57,6 +57,7 @@
        "eslint": "^8.46.0",
        "eslint-import-resolver-alias": "^1.1.2",
        "eslint-plugin-path-alias": "^1.0.0",
+        "eslint-plugin-react": "^7.33.2",
        "eslint-plugin-simple-import-sort": "^10.0.0",
        "eslint-plugin-unused-imports": "^2.0.0",
        "highlight.js": "10.6.0",
@ -70,7 +71,7 @@
        "typescript": "^5.0.4",
        "zip-local": "^0.3.5"
    },
-    "packageManager": "pnpm@8.10.2",
+    "packageManager": "pnpm@8.1.1",
    "pnpm": {
        "patchedDependencies": {
            "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@ -18,10 +18,8 @@
 */

 import esbuild from "esbuild";
-import { readdir } from "fs/promises";
-import { join } from "path";

-import { BUILD_TIMESTAMP, commonOpts, existsAsync, globPlugins, isStandalone, updaterDisabled, VERSION, watch } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, globPlugins, isStandalone, updaterDisabled, VERSION, watch } from "./common.mjs";

 const defines = {
    IS_STANDALONE: isStandalone,
@ -45,59 +43,13 @@ const nodeCommonOpts = {
    format: "cjs",
    platform: "node",
    target: ["esnext"],
-    external: ["electron", "original-fs", "~pluginNatives", ...commonOpts.external],
+    external: ["electron", "original-fs", ...commonOpts.external],
    define: defines,
 };

 const sourceMapFooter = s => watch ? "" : `//# sourceMappingURL=vencord://${s}.js.map`;
 const sourcemap = watch ? "inline" : "external";

-/**
- * @type {import("esbuild").Plugin}
- */
-const globNativesPlugin = {
-    name: "glob-natives-plugin",
-    setup: build => {
-        const filter = /^~pluginNatives$/;
-        build.onResolve({ filter }, args => {
-            return {
-                namespace: "import-natives",
-                path: args.path
-            };
-        });
-
-        build.onLoad({ filter, namespace: "import-natives" }, async () => {
-            const pluginDirs = ["plugins", "userplugins"];
-            let code = "";
-            let natives = "\n";
-            let i = 0;
-            for (const dir of pluginDirs) {
-                const dirPath = join("src", dir);
-                if (!await existsAsync(dirPath)) continue;
-                const plugins = await readdir(dirPath);
-                for (const p of plugins) {
-                    if (!await existsAsync(join(dirPath, p, "native.ts"))) continue;
-
-                    const nameParts = p.split(".");
-                    const namePartsWithoutTarget = nameParts.length === 1 ? nameParts : nameParts.slice(0, -1);
-                    // pluginName.thing.desktop -> PluginName.thing
-                    const cleanPluginName = p[0].toUpperCase() + namePartsWithoutTarget.join(".").slice(1);
-
-                    const mod = `p${i}`;
-                    code += `import * as ${mod} from "./${dir}/${p}/native";\n`;
-                    natives += `${JSON.stringify(cleanPluginName)}:${mod},\n`;
-                    i++;
-                }
-            }
-            code += `export default {${natives}};`;
-            return {
-                contents: code,
-                resolveDir: "./src"
-            };
-        });
-    }
-};
-
 await Promise.all([
    // Discord Desktop main & renderer & preload
    esbuild.build({
@ -110,11 +62,7 @@ await Promise.all([
            ...defines,
            IS_DISCORD_DESKTOP: true,
            IS_VESKTOP: false
-        },
-        plugins: [
-            ...nodeCommonOpts.plugins,
-            globNativesPlugin
-        ]
+        }
    }),
    esbuild.build({
        ...commonOpts,
@ -159,11 +107,7 @@ await Promise.all([
            ...defines,
            IS_DISCORD_DESKTOP: false,
            IS_VESKTOP: true
-        },
-        plugins: [
-            ...nodeCommonOpts.plugins,
-            globNativesPlugin
-        ]
+        }
    }),
    esbuild.build({
        ...commonOpts,
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@ -20,8 +20,8 @@ import "../suppressExperimentalWarnings.js";
 import "../checkNodeVersion.js";

 import { exec, execSync } from "child_process";
-import { constants as FsConstants, readFileSync } from "fs";
-import { access, readdir, readFile } from "fs/promises";
+import { existsSync, readFileSync } from "fs";
+import { readdir, readFile } from "fs/promises";
 import { join, relative } from "path";
 import { promisify } from "util";

@ -47,12 +47,6 @@ export const banner = {

 const isWeb = process.argv.slice(0, 2).some(f => f.endsWith("buildWeb.mjs"));

-export function existsAsync(path) {
-    return access(path, FsConstants.F_OK)
-        .then(() => true)
-        .catch(() => false);
-}
-
 // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
 /**
 * @type {import("esbuild").Plugin}
@ -85,7 +79,7 @@ export const globPlugins = kind => ({
            let plugins = "\n";
            let i = 0;
            for (const dir of pluginDirs) {
-                if (!await existsAsync(`./src/${dir}`)) continue;
+                if (!existsSync(`./src/${dir}`)) continue;
                const files = await readdir(`./src/${dir}`);
                for (const file of files) {
                    if (file.startsWith("_") || file.startsWith(".")) continue;
--- a/src/VencordNative.ts
+++ b/src/VencordNative.ts
@ -7,7 +7,6 @@
 import { IpcEvents } from "@utils/IpcEvents";
 import { IpcRes } from "@utils/types";
 import { ipcRenderer } from "electron";
-import { PluginIpcMappings } from "main/ipcPlugins";
 import type { UserThemeHeader } from "main/themes";

 function invoke<T = any>(event: IpcEvents, ...args: any[]) {
@ -18,16 +17,6 @@ export function sendSync<T = any>(event: IpcEvents, ...args: any[]) {
    return ipcRenderer.sendSync(event, ...args) as T;
 }

-const PluginHelpers = {} as Record<string, Record<string, (...args: any[]) => Promise<any>>>;
-const pluginIpcMap = sendSync<PluginIpcMappings>(IpcEvents.GET_PLUGIN_IPC_METHOD_MAP);
-
-for (const [plugin, methods] of Object.entries(pluginIpcMap)) {
-    const map = PluginHelpers[plugin] = {};
-    for (const [methodName, method] of Object.entries(methods)) {
-        map[methodName] = (...args: any[]) => invoke(method as IpcEvents, ...args);
-    }
-}
-
 export default {
    themes: {
        uploadTheme: (fileName: string, fileData: string) => invoke<void>(IpcEvents.UPLOAD_THEME, fileName, fileData),
@ -72,5 +61,12 @@ export default {
        openExternal: (url: string) => invoke<void>(IpcEvents.OPEN_EXTERNAL, url)
    },

-    pluginHelpers: PluginHelpers
+    pluginHelpers: {
+        OpenInApp: {
+            resolveRedirect: (url: string) => invoke<string>(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, url),
+        },
+        VoiceMessages: {
+            readRecording: (path: string) => invoke<Uint8Array | null>(IpcEvents.VOICE_MESSAGES_READ_RECORDING, path),
+        }
+    }
 };
--- a/src/api/Notifications/NotificationComponent.tsx
+++ b/src/api/Notifications/NotificationComponent.tsx
@ -21,7 +21,7 @@ import "./styles.css";
 import { useSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { classes } from "@utils/misc";
-import { React, useEffect, useMemo, useState, useStateFromStores, WindowStore } from "@webpack/common";
+import { useEffect, useMemo, useState, useStateFromStores, WindowStore } from "@webpack/common";

 import { NotificationData } from "./Notifications";

--- a/src/components/ErrorBoundary.tsx
+++ b/src/components/ErrorBoundary.tsx
@ -80,10 +80,7 @@ const ErrorBoundary = LazyComponent(() => {
            if (this.props.noop) return null;

            if (this.props.fallback)
-                return <this.props.fallback
-                    children={this.props.children}
-                    {...this.state}
-                />;
+                return <this.props.fallback {...this.state}>{this.props.children}</this.props.fallback>;

            const msg = this.props.message || "An error occurred while rendering this Component. More info can be found below and in your console.";

--- a/src/components/Heart.tsx
+++ b/src/components/Heart.tsx
@ -27,7 +27,7 @@ export function Heart() {
        >
            <path
                fill="#db61a2"
-                fill-rule="evenodd"
+                fillRule="evenodd"
                d="M4.25 2.5c-1.336 0-2.75 1.164-2.75 3 0 2.15 1.58 4.144 3.365 5.682A20.565 20.565 0 008 13.393a20.561 20.561 0 003.135-2.211C12.92 9.644 14.5 7.65 14.5 5.5c0-1.836-1.414-3-2.75-3-1.373 0-2.609.986-3.029 2.456a.75.75 0 01-1.442 0C6.859 3.486 5.623 2.5 4.25 2.5zM8 14.25l-.345.666-.002-.001-.006-.003-.018-.01a7.643 7.643 0 01-.31-.17 22.075 22.075 0 01-3.434-2.414C2.045 10.731 0 8.35 0 5.5 0 2.836 2.086 1 4.25 1 5.797 1 7.153 1.802 8 3.02 8.847 1.802 10.203 1 11.75 1 13.914 1 16 2.836 16 5.5c0 2.85-2.045 5.231-3.885 6.818a22.08 22.08 0 01-3.744 2.584l-.018.01-.006.003h-.002L8 14.25zm0 0l.345.666a.752.752 0 01-.69 0L8 14.25z"
            />
        </svg>
--- a/src/components/Icons.tsx
+++ b/src/components/Icons.tsx
@ -58,7 +58,7 @@ export function LinkIcon({ height = 24, width = 24, className }: IconProps) {
            className={classes(className, "vc-link-icon")}
            viewBox="0 0 24 24"
        >
-            <g fill="none" fill-rule="evenodd">
+            <g fill="none" fillRule="evenodd">
                <path fill="currentColor" d="M10.59 13.41c.41.39.41 1.03 0 1.42-.39.39-1.03.39-1.42 0a5.003 5.003 0 0 1 0-7.07l3.54-3.54a5.003 5.003 0 0 1 7.07 0 5.003 5.003 0 0 1 0 7.07l-1.49 1.49c.01-.82-.12-1.64-.4-2.42l.47-.48a2.982 2.982 0 0 0 0-4.24 2.982 2.982 0 0 0-4.24 0l-3.53 3.53a2.982 2.982 0 0 0 0 4.24zm2.82-4.24c.39-.39 1.03-.39 1.42 0a5.003 5.003 0 0 1 0 7.07l-3.54 3.54a5.003 5.003 0 0 1-7.07 0 5.003 5.003 0 0 1 0-7.07l1.49-1.49c-.01.82.12 1.64.4 2.43l-.47.47a2.982 2.982 0 0 0 0 4.24 2.982 2.982 0 0 0 4.24 0l3.53-3.53a2.982 2.982 0 0 0 0-4.24.973.973 0 0 1 0-1.42z" />
                <rect width={width} height={height} />
            </g>
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@ -30,7 +30,7 @@ import { ChangeList } from "@utils/ChangeList";
 import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
 import { classes, isObjectEmpty } from "@utils/misc";
-import { openModalLazy } from "@utils/modal";
+import { openModal } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import { Plugin } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@ -95,12 +95,14 @@ export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, on

    const isEnabled = () => settings.enabled ?? false;

-    function openModal() {
-        openModalLazy(async () => {
-            return modalProps => {
-                return <PluginModal {...modalProps} plugin={plugin} onRestartNeeded={() => onRestartNeeded(plugin.name)} />;
-            };
-        });
+    function openPluginModal() {
+        openModal(modalProps => (
+            <PluginModal
+                {...modalProps}
+                plugin={plugin}
+                onRestartNeeded={() => onRestartNeeded(plugin.name)}
+            />
+        ));
    }

    function toggleEnabled() {
@ -159,7 +161,7 @@ export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, on
            onMouseEnter={onMouseEnter}
            onMouseLeave={onMouseLeave}
            infoButton={
-                <button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
+                <button role="switch" onClick={() => openPluginModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
                    {plugin.options && !isObjectEmpty(plugin.options)
                        ? <CogWheel />
                        : <InfoIcon />}
@ -352,7 +354,7 @@ function makeDependencyList(deps: string[]) {
    return (
        <React.Fragment>
            <Forms.FormText>This plugin is required by:</Forms.FormText>
-            {deps.map((dep: string) => <Forms.FormText className={cl("dep-text")}>{dep}</Forms.FormText>)}
+            {deps.map((dep: string) => <Forms.FormText key={dep} className={cl("dep-text")}>{dep}</Forms.FormText>)}
        </React.Fragment>
    );
 }
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@ -106,9 +106,9 @@ function ReplacementComponent({ module, match, replacement, setReplacementError
    }

    function renderDiff() {
-        return diff?.map(p => {
+        return diff?.map((p, i) => {
            const color = p.added ? "lime" : p.removed ? "red" : "grey";
-            return <div style={{ color, userSelect: "text" }}>{p.value}</div>;
+            return <div key={i} style={{ color, userSelect: "text" }}>{p.value}</div>;
        });
    }

--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@ -26,7 +26,7 @@ import { classes } from "@utils/misc";
 import { showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
 import { findByPropsLazy, findLazy } from "@webpack";
-import { Button, Card, FluxDispatcher, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
+import { Button, Card, FluxDispatcher, Forms, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
 import { UserThemeHeader } from "main/themes";
 import type { ComponentType, Ref, SyntheticEvent } from "react";

--- a/src/components/VencordSettings/UpdaterTab.tsx
+++ b/src/components/VencordSettings/UpdaterTab.tsx
@ -57,7 +57,7 @@ function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>
                title: "Oops!",
                body: (
                    <ErrorCard>
-                        {err.split("\n").map(line => <div>{Parser.parse(line)}</div>)}
+                        {err.split("\n").map((line, i) => <div key={i}>{Parser.parse(line)}</div>)}
                    </ErrorCard>
                )
            });
@ -83,7 +83,7 @@ function Changes({ updates, repo, repoPending }: CommonProps & { updates: typeof
    return (
        <Card style={{ padding: ".5em" }}>
            {updates.map(({ hash, author, message }) => (
-                <div>
+                <div key={hash}>
                    <code><HashLink {...{ repo, hash }} disabled={repoPending} /></code>
                    <span style={{
                        marginLeft: "0.5em",
--- a/src/main/ipcPlugins.ts
+++ b/src/main/ipcPlugins.ts
@ -17,26 +17,73 @@
 */

 import { IpcEvents } from "@utils/IpcEvents";
-import { ipcMain } from "electron";
+import { app, ipcMain } from "electron";
+import { readFile } from "fs/promises";
+import { request } from "https";
+import { basename, normalize } from "path";

-import PluginNatives from "~pluginNatives";
+import { getSettings } from "./ipcMain";

-const PluginIpcMappings = {} as Record<string, Record<string, string>>;
-export type PluginIpcMappings = typeof PluginIpcMappings;
+// FixSpotifyEmbeds
+app.on("browser-window-created", (_, win) => {
+    win.webContents.on("frame-created", (_, { frame }) => {
+        frame.once("dom-ready", () => {
+            if (frame.url.startsWith("https://open.spotify.com/embed/")) {
+                const settings = getSettings().plugins?.FixSpotifyEmbeds;
+                if (!settings?.enabled) return;

-for (const [plugin, methods] of Object.entries(PluginNatives)) {
-    const entries = Object.entries(methods);
-    if (!entries.length) continue;
-
-    const mappings = PluginIpcMappings[plugin] = {};
-
-    for (const [methodName, method] of entries) {
-        const key = `VencordPluginNative_${plugin}_${methodName}`;
-        ipcMain.handle(key, method);
-        mappings[methodName] = key;
+                frame.executeJavaScript(`
+                    const original = Audio.prototype.play;
+                    Audio.prototype.play = function() {
+                        this.volume = ${(settings.volume / 100) || 0.1};
+                        return original.apply(this, arguments);
                    }
+                `);
+            }
+        });
+    });
+});
+
+// #region OpenInApp
+// These links don't support CORS, so this has to be native
+const validRedirectUrls = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
+
+function getRedirect(url: string) {
+    return new Promise<string>((resolve, reject) => {
+        const req = request(new URL(url), { method: "HEAD" }, res => {
+            resolve(
+                res.headers.location
+                    ? getRedirect(res.headers.location)
+                    : url
+            );
+        });
+        req.on("error", reject);
+        req.end();
+    });
 }

-ipcMain.on(IpcEvents.GET_PLUGIN_IPC_METHOD_MAP, e => {
-    e.returnValue = PluginIpcMappings;
+ipcMain.handle(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, async (_, url: string) => {
+    if (!validRedirectUrls.test(url)) return url;
+
+    return getRedirect(url);
 });
+// #endregion
+
+
+// #region VoiceMessages
+ipcMain.handle(IpcEvents.VOICE_MESSAGES_READ_RECORDING, async (_, filePath: string) => {
+    filePath = normalize(filePath);
+    const filename = basename(filePath);
+    const discordBaseDirWithTrailingSlash = normalize(app.getPath("userData") + "/");
+    console.log(filename, discordBaseDirWithTrailingSlash, filePath);
+    if (filename !== "recording.ogg" || !filePath.startsWith(discordBaseDirWithTrailingSlash)) return null;
+
+    try {
+        const buf = await readFile(filePath);
+        return new Uint8Array(buf.buffer);
+    } catch {
+        return null;
+    }
+});
+
+// #endregion
--- a/src/modules.d.ts
+++ b/src/modules.d.ts
@ -24,11 +24,6 @@ declare module "~plugins" {
    export default plugins;
 }

-declare module "~pluginNatives" {
-    const pluginNatives: Record<string, Record<string, (event: Electron.IpcMainInvokeEvent, ...args: unknown[]) => unknown>>;
-    export default pluginNatives;
-}
-
 declare module "~git-hash" {
    const hash: string;
    export default hash;
--- a/src/plugins/_api/messageDecorations.ts
+++ b/src/plugins/_api/messageDecorations.ts
@ -27,8 +27,8 @@ export default definePlugin({
        {
            find: '"Message Username"',
            replacement: {
-                match: /\.Messages\.GUILD_COMMUNICATION_DISABLED_BOTTOM_SHEET_TITLE.+?}\),\i(?=\])/,
-                replace: "$&,...Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0])"
+                match: /currentUserIsPremium:.{0,70}{children:\i(?=}\))/,
+                replace: "$&.concat(Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0]))"
            }
        }
    ],
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@ -18,19 +18,16 @@

 import ErrorBoundary from "@components/ErrorBoundary";
 import { LazyComponent } from "@utils/react";
-import { find, findByPropsLazy, findStoreLazy } from "@webpack";
+import { find, findByPropsLazy } from "@webpack";
 import { useStateFromStores } from "@webpack/common";
-import type { CSSProperties } from "react";

 import { ExpandedGuildFolderStore, settings } from ".";

-const ChannelRTCStore = findStoreLazy("ChannelRTCStore");
 const Animations = findByPropsLazy("a", "animated", "useTransition");
 const GuildsBar = LazyComponent(() => find(m => m.type?.toString().includes('("guildsnav")')));

 export default ErrorBoundary.wrap(guildsBarProps => {
    const expandedFolders = useStateFromStores([ExpandedGuildFolderStore], () => ExpandedGuildFolderStore.getExpandedFolders());
-    const isFullscreen = useStateFromStores([ChannelRTCStore], () => ChannelRTCStore.isFullscreenInContext());

    const Sidebar = (
        <GuildsBar
@ -43,15 +40,9 @@ export default ErrorBoundary.wrap(guildsBarProps => {
    const visible = !!expandedFolders.size;
    const guilds = document.querySelector(guildsBarProps.className.split(" ").map(c => `.${c}`).join(""));

-    // We need to display none if we are in fullscreen. Yes this seems horrible doing with css, but it's literally how Discord does it.
-    // Also display flex otherwise to fix scrolling
-    const barStyle = {
-        display: isFullscreen ? "none" : "flex",
-    } as CSSProperties;
-
    if (!guilds || !settings.store.sidebarAnim) {
        return visible
-            ? <div style={barStyle}>{Sidebar}</div>
+            ? <div style={{ display: "flex " }}>{Sidebar}</div>
            : null;
    }

@ -63,9 +54,9 @@ export default ErrorBoundary.wrap(guildsBarProps => {
            leave={{ width: 0 }}
            config={{ duration: 200 }}
        >
-            {(animationStyle, show) =>
+            {(style, show) =>
                show && (
-                    <Animations.animated.div style={{ ...animationStyle, ...barStyle }}>
+                    <Animations.animated.div style={{ ...style, display: "flex" }}>
                        {Sidebar}
                    </Animations.animated.div>
                )
--- a/src/plugins/callTimer/index.tsx
+++ b/src/plugins/callTimer/index.tsx
@ -21,7 +21,6 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { useTimer } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { React } from "@webpack/common";

 function formatDuration(ms: number) {
    // here be dragons (moment fucking sucks)
--- a/src/plugins/consoleShortcuts/index.ts
+++ b/src/plugins/consoleShortcuts/index.ts
@ -92,6 +92,7 @@ export default definePlugin({
                fakeRenderWin = new WeakRef(win);
                win.focus();

+                // eslint-disable-next-line react/no-deprecated
                ReactDOM.render(React.createElement(component, props), win.document.body);
            }
        };
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@ -23,14 +23,13 @@ import { isTruthy } from "@utils/guards";
 import { useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
+import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";

 const ActivityComponent = findByCodeLazy("onOpenGameProfile");
 const ActivityClassName = findByPropsLazy("activity", "buttonColor");
 const Colors = findByPropsLazy("profileColors");

 async function getApplicationAsset(key: string): Promise<string> {
-    if (/https?:\/\/(cdn|media)\.discordapp\.(com|net)\/attachments\//.test(key)) return "mp:" + key.replace(/https?:\/\/(cdn|media)\.discordapp\.(com|net)\//, "");
    return (await ApplicationAssetUtils.fetchAssetIds(settings.store.appID!, [key]))[0];
 }

--- a/src/plugins/dearrow/index.tsx
+++ b/src/plugins/dearrow/index.tsx
@ -63,7 +63,7 @@ async function embedDidMount(this: Component<Props>) {
            embed.rawTitle = titles[0].title;
        }

-        if (thumbnails[0]?.votes >= 0 && thumbnails[0].timestamp) {
+        if (thumbnails[0]?.votes >= 0) {
            embed.dearrow.oldThumb = embed.thumbnail.proxyURL;
            embed.thumbnail.proxyURL = `https://dearrow-thumb.ajay.app/api/v1/getThumbnail?videoID=${videoId}&time=${thumbnails[0].timestamp}`;
        }
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@ -155,15 +155,10 @@ async function doClone(guildId: string, data: Sticker | Emoji) {
            type: Toasts.Type.SUCCESS,
            id: Toasts.genId()
        });
-    } catch (e: any) {
-        let message = "Something went wrong (check console!)";
-        try {
-            message = JSON.parse(e.text).message;
-        } catch { }
-
+    } catch (e) {
        new Logger("EmoteCloner").error("Failed to clone", data.name, "to", guildId, e);
        Toasts.show({
-            message: "Failed to clone: " + message,
+            message: "Oopsie something went wrong :( Check console!!!",
            type: Toasts.Type.FAILURE,
            id: Toasts.genId()
        });
@ -210,7 +205,7 @@ function CloneModal({ data }: { data: Sticker | Emoji; }) {
                alignItems: "center"
            }}>
                {guilds.map(g => (
-                    <Tooltip text={g.name}>
+                    <Tooltip key={g.id} text={g.name}>
                        {({ onMouseLeave, onMouseEnter }) => (
                            <div
                                onMouseLeave={onMouseLeave}
@ -283,7 +278,8 @@ function buildMenuItem(type: "Emoji" | "Sticker", fetchData: () => Promisable<Om
                    const data = { t: type, ...res } as Sticker | Emoji;
                    const url = getUrl(data);

-                    return modalProps => (
+                    return function EmoteClonerModal(modalProps) {
+                        return (
                            <ModalRoot {...modalProps}>
                                <ModalHeader>
                                    <img
@ -302,6 +298,7 @@ function buildMenuItem(type: "Emoji" | "Sticker", fetchData: () => Promisable<Om
                                </ModalContent>
                            </ModalRoot>
                        );
+                    };
                })
            }
        />
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@ -201,15 +201,15 @@ export default definePlugin({
            predicate: () => settings.store.enableEmojiBypass,
            replacement: {
                match: /((?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\(\i)\){(.+?\))(?=})/g,
-                replace: (_, rest, premiumCheck) => `${rest},fakeNitroIntention){${premiumCheck}||fakeNitroIntention==null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
+                replace: (_, rest, premiumCheck) => `${rest},fakeNitroIntention){${premiumCheck}||fakeNitroIntention!=null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
            }
        },
        // Allow stickers to be sent everywhere
        {
-            find: "canUseCustomStickersEverywhere:function",
+            find: "canUseStickersEverywhere:function",
            predicate: () => settings.store.enableStickerBypass,
            replacement: {
-                match: /canUseCustomStickersEverywhere:function\(\i\){/,
+                match: /canUseStickersEverywhere:function\(\i\){/,
                replace: "$&return true;"
            },
        },
--- a/src/plugins/favGifSearch/index.tsx
+++ b/src/plugins/favGifSearch/index.tsx
@ -60,7 +60,7 @@ interface Instance {
 }


-const containerClasses: { searchBar: string; } = findByPropsLazy("searchBar", "searchBarFullRow");
+const containerClasses: { searchBar: string; } = findByPropsLazy("searchBar", "searchHeader", "searchInput");

 export const settings = definePluginSettings({
    searchOption: {
@ -182,7 +182,7 @@ function SearchBar({ instance, SearchBarComponent }: { instance: Instance; Searc
            ref={ref}
            autoFocus={true}
            className={containerClasses.searchBar}
-            size={SearchBarComponent.Sizes.MEDIUM}
+            size={SearchBarComponent.Sizes.SMALL}
            onChange={onChange}
            onClear={() => {
                setQuery("");
--- a/src/plugins/fixSpotifyEmbeds.desktop/native.ts
+++ b/src/plugins/fixSpotifyEmbeds.desktop/native.ts
@ -1,27 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { app } from "electron";
-import { getSettings } from "main/ipcMain";
-
-app.on("browser-window-created", (_, win) => {
-    win.webContents.on("frame-created", (_, { frame }) => {
-        frame.once("dom-ready", () => {
-            if (frame.url.startsWith("https://open.spotify.com/embed/")) {
-                const settings = getSettings().plugins?.FixSpotifyEmbeds;
-                if (!settings?.enabled) return;
-
-                frame.executeJavaScript(`
-                    const original = Audio.prototype.play;
-                    Audio.prototype.play = function() {
-                        this.volume = ${(settings.volume / 100) || 0.1};
-                        return original.apply(this, arguments);
-                    }
-                `);
-            }
-        });
-    });
-});
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@ -28,7 +28,7 @@ import style from "./style.css?managed";
 const Button = findByCodeLazy("Button.Sizes.NONE,disabled:");

 function makeIcon(showCurrentGame?: boolean) {
-    return function () {
+    return function GameActivityToggle() {
        return (
            <svg
                width="20"
--- a/src/plugins/gifPaste/index.ts
+++ b/src/plugins/gifPaste/index.ts
@ -33,8 +33,8 @@ export default definePlugin({
    patches: [{
        find: ".handleSelectGIF=",
        replacement: {
-            match: /\.handleSelectGIF=(\i)=>\{/,
-            replace: ".handleSelectGIF=$1=>{if (!this.props.className) return $self.handleSelect($1);"
+            match: /\.handleSelectGIF=\i=>\{/,
+            replace: ".handleSelectGIF=function(gif){return $self.handleSelect(gif);"
        }
    }],

--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@ -186,13 +186,6 @@ export default definePlugin({
                }
            ]
        },
-        {
-            find: ".carouselModal",
-            replacement: {
-                match: /(?<=\.carouselModal.{0,100}onClick:)\i,/,
-                replace: "()=>{},"
-            }
-        }
    ],

    settings,
--- a/src/plugins/imageZoom/styles.css
+++ b/src/plugins/imageZoom/styles.css
@ -15,17 +15,19 @@
    border-radius: 0;
 }

-.vc-imgzoom-nearest-neighbor>img {
-    image-rendering: pixelated;
-
-    /* https://googlechrome.github.io/samples/image-rendering-pixelated/index.html */
+.vc-imgzoom-nearest-neighbor > img {
+    image-rendering: pixelated; /* https://googlechrome.github.io/samples/image-rendering-pixelated/index.html */
 }

 /* make the carousel take up less space so we can click the backdrop and exit out of it */
-[class*="modalCarouselWrapper_"] {
-    top: 0 !important;
+[class|="carouselModal"] {
+    height: fit-content;
+    box-shadow: none;
 }

-[class*="carouselModal_"] {
-    height: 0 !important;
+[class|="wrapper"]:has(> #vc-imgzoom-magnify-modal) {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
 }
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@ -343,10 +343,10 @@ function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
                    ? parse(message.content)
                    : [noContent(message.attachments.length, message.embeds.length)]
                }
-                {images.map(a => {
+                {images.map((a, i) => {
                    const { width, height } = computeWidthAndHeight(a.width, a.height);
                    return (
-                        <div>
+                        <div key={i}>
                            <img src={a.url} width={width} height={height} />
                        </div>
                    );
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@ -111,7 +111,7 @@ function SettingsComponent(props: { setValue(v: any): void; }) {
    return (
        <Flex flexDirection="column">
            {tags.map(t => (
-                <Card style={{ padding: "1em 1em 0" }}>
+                <Card key={t.name} style={{ padding: "1em 1em 0" }}>
                    <Forms.FormTitle style={{ width: "fit-content" }}>
                        <Tooltip text={t.description}>
                            {({ onMouseEnter, onMouseLeave }) => (
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@ -64,6 +64,7 @@ export default definePlugin({
    renderMutualGDMs(user: User, onClose: () => void) {
        const entries = ChannelStore.getSortedPrivateChannels().filter(c => c.isGroupDM() && c.recipients.includes(user.id)).map(c => (
            <Clickable
+                key={c.id}
                className={ProfileListClasses.listRow}
                onClick={() => {
                    onClose();
--- a/src/plugins/noMosaic/index.ts
+++ b/src/plugins/noMosaic/index.ts
@ -4,58 +4,28 @@
 * SPDX-License-Identifier: GPL-3.0-or-later
 */

-import { definePluginSettings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
+import definePlugin from "@utils/types";

 import style from "./styles.css?managed";

-const settings = definePluginSettings({
-    inlineVideo: {
-        description: "Play videos without carousel modal",
-        type: OptionType.BOOLEAN,
-        default: true,
-        restartNeeded: true
-    },
-    mediaLayoutType: {
-        description: "Choose media layout type",
-        type: OptionType.SELECT,
-        restartNeeded: true,
-        options: [
-            { label: "STATIC, render loading image but image isn't resposive, no problem unless discord window width is too small", value: "STATIC", default: true },
-            { label: "RESPONSIVE, image is responsive but not render loading image, cause messages shift when loaded", value: "RESPONSIVE" },
-        ]
-    }
-});
-
 export default definePlugin({
    name: "NoMosaic",
    authors: [Devs.AutumnVN],
    description: "Removes Discord new image mosaic",
    tags: ["image", "mosaic", "media"],
-
-    settings,
-
    patches: [
        {
            find: ".oneByTwoLayoutThreeGrid",
            replacement: [{
                match: /mediaLayoutType:\i\.\i\.MOSAIC/,
-                replace: "mediaLayoutType:$self.mediaLayoutType()",
+                replace: 'mediaLayoutType:"RESPONSIVE"'
            },
            {
                match: /null!==\(\i=\i\.get\(\i\)\)&&void 0!==\i\?\i:"INVALID"/,
                replace: '"INVALID"',
-            }]
-        },
-        {
-            find: "renderAttachments(",
-            predicate: () => settings.store.inlineVideo,
-            replacement: {
-                match: /url:(\i)\.url\}\);return /,
-                replace: "$&$1.content_type?.startsWith('image/')&&"
-            }
+            },]
        },
        {
            find: "Messages.REMOVE_ATTACHMENT_TOOLTIP_TEXT",
@ -63,17 +33,10 @@ export default definePlugin({
                match: /\i===\i\.\i\.MOSAIC/,
                replace: "true"
            }
-        }
-    ],
-
-    mediaLayoutType() {
-        return settings.store.mediaLayoutType;
-    },
-
+        }],
    start() {
        enableStyle(style);
    },
-
    stop() {
        disableStyle(style);
    }
--- a/src/plugins/onePingPerDM/index.ts
+++ b/src/plugins/onePingPerDM/index.ts
@ -55,8 +55,10 @@ export default definePlugin({
    }],
    isPrivateChannelRead(message: MessageJSON) {
        const channelType = ChannelStore.getChannel(message.channel_id)?.type;
+        if (channelType !== ChannelType.DM && channelType !== ChannelType.GROUP_DM) {
+            return false;
+        }
        if (
-            (channelType !== ChannelType.DM && channelType !== ChannelType.GROUP_DM) ||
            (channelType === ChannelType.DM && settings.store.channelToAffect === "group_dm") ||
            (channelType === ChannelType.GROUP_DM && settings.store.channelToAffect === "user_dm") ||
            (settings.store.allowMentions && message.mentions.some(m => m.id === UserStore.getCurrentUser().id)) ||
--- a/src/plugins/openInApp/index.ts
+++ b/src/plugins/openInApp/index.ts
@ -18,12 +18,12 @@

 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin, { OptionType, PluginNative } from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { showToast, Toasts } from "@webpack/common";
 import type { MouseEvent } from "react";

 const ShortUrlMatcher = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
-const SpotifyMatcher = /^https:\/\/open\.spotify\.com\/(track|album|artist|playlist|user|episode)\/(.+)(?:\?.+?)?$/;
+const SpotifyMatcher = /^https:\/\/open\.spotify\.com\/(track|album|artist|playlist|user)\/(.+)(?:\?.+?)?$/;
 const SteamMatcher = /^https:\/\/(steamcommunity\.com|(?:help|store)\.steampowered\.com)\/.+$/;
 const EpicMatcher = /^https:\/\/store\.epicgames\.com\/(.+)$/;

@ -45,8 +45,6 @@ const settings = definePluginSettings({
    }
 });

-const Native = VencordNative.pluginHelpers.OpenInApp as PluginNative<typeof import("./native")>;
-
 export default definePlugin({
    name: "OpenInApp",
    description: "Open Spotify, Steam and Epic Games URLs in their respective apps instead of your browser",
@ -57,8 +55,8 @@ export default definePlugin({
        {
            find: "trackAnnouncementMessageLinkClicked({",
            replacement: {
-                match: /(?<=handleClick:function\(\)\{return (\i)\}.+?)function \1\(.+?\)\{/,
-                replace: "async $& if(await $self.handleLink(...arguments)) return;"
+                match: /(?<=handleClick:function\(\)\{return (\i)\}.+?)async function \1\(.+?\)\{/,
+                replace: "$& if(await $self.handleLink(...arguments)) return;"
            }
        },
        // Make Spotify profile activity links open in app on web
@ -86,7 +84,7 @@ export default definePlugin({
        if (!IS_WEB && ShortUrlMatcher.test(url)) {
            event?.preventDefault();
            // CORS jumpscare
-            url = await Native.resolveRedirect(url);
+            url = await VencordNative.pluginHelpers.OpenInApp.resolveRedirect(url);
        }

        spotify: {
--- a/src/plugins/openInApp/native.ts
+++ b/src/plugins/openInApp/native.ts
@ -1,31 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { IpcMainInvokeEvent } from "electron";
-import { request } from "https";
-
-// These links don't support CORS, so this has to be native
-const validRedirectUrls = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
-
-function getRedirect(url: string) {
-    return new Promise<string>((resolve, reject) => {
-        const req = request(new URL(url), { method: "HEAD" }, res => {
-            resolve(
-                res.headers.location
-                    ? getRedirect(res.headers.location)
-                    : url
-            );
-        });
-        req.on("error", reject);
-        req.end();
-    });
-}
-
-export async function resolveRedirect(_: IpcMainInvokeEvent, url: string) {
-    if (!validRedirectUrls.test(url)) return url;
-
-    return getRedirect(url);
-}
--- a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
@ -104,6 +104,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea

                                return (
                                    <button
+                                        key={permission.id}
                                        className={cl("perms-list-item-btn")}
                                        onClick={() => selectItem(index)}
                                    >
@ -157,7 +158,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
                        </div>
                        <div className={cl("perms-perms")}>
                            {Object.entries(PermissionsBits).map(([permissionName, bit]) => (
-                                <div className={cl("perms-perms-item")}>
+                                <div key={permissionName} className={cl("perms-perms-item")}>
                                    <div className={cl("perms-perms-item-icon")}>
                                        {(() => {
                                            const { permissions, overwriteAllow, overwriteDeny } = selectedItem;
--- a/src/plugins/permissionsViewer/components/UserPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/UserPermissions.tsx
@ -109,7 +109,7 @@ function UserPermissionsComponent({ guild, guildMember }: { guild: Guild; guildM
            }
            defaultState={settings.store.defaultPermissionsDropdownState}
            buttons={[
-                (<Tooltip text={`Sorting by ${stns.permissionsSortOrder === PermissionsSortOrder.HighestRole ? "Highest Role" : "Lowest Role"}`}>
+                (<Tooltip key="sort" text={`Sorting by ${stns.permissionsSortOrder === PermissionsSortOrder.HighestRole ? "Highest Role" : "Lowest Role"}`}>
                    {tooltipProps => (
                        <button
                            {...tooltipProps}
@ -133,7 +133,7 @@ function UserPermissionsComponent({ guild, guildMember }: { guild: Guild; guildM
            {userPermissions.length > 0 && (
                <div className={classes(root, roles)}>
                    {userPermissions.map(({ permission, roleColor }) => (
-                        <div className={classes(role, rolePill, rolePillBorder)}>
+                        <div key={permission} className={classes(role, rolePill, rolePillBorder)}>
                            <div className={roleRemoveButton}>
                                <span
                                    className={roleCircle}
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@ -4,13 +4,11 @@
 * SPDX-License-Identifier: GPL-3.0-or-later
 */

-import "./styles.css";
-
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { React, Tooltip } from "@webpack/common";
+import { Tooltip } from "@webpack/common";

 const settings = definePluginSettings({
    loop: {
@ -30,8 +28,8 @@ export default definePlugin({
        {
            find: ".nonMediaAttachment]",
            replacement: {
-                match: /\.nonMediaAttachment\]:!(\i).{0,10}children:\[(\S)/,
-                replace: "$&,$1&&$2&&$self.renderPiPButton(),"
+                match: /\.nonMediaAttachment\].{0,10}children:\[(\S)/,
+                replace: "$&,$1&&$self.renderPiPButton(),"
            },
        },
    ],
@ -42,7 +40,6 @@ export default definePlugin({
                {tooltipProps => (
                    <div
                        {...tooltipProps}
-                        className="vc-pip-button"
                        role="button"
                        style={{
                            cursor: "pointer",
@ -73,7 +70,7 @@ export default definePlugin({
                    >
                        <svg width="24px" height="24px" viewBox="0 0 24 24">
                            <path
-                                fill="currentColor"
+                                fill="var(--interactive-normal)"
                                d="M21 3a1 1 0 0 1 1 1v7h-2V5H4v14h6v2H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h18zm0 10a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1h8zm-1 2h-6v4h6v-4z"
                            />
                        </svg>
--- a/src/plugins/platformIndicators/index.tsx
+++ b/src/plugins/platformIndicators/index.tsx
@ -30,7 +30,8 @@ import { User } from "discord-types/general";
 const SessionsStore = findStoreLazy("SessionsStore");

 function Icon(path: string, opts?: { viewBox?: string; width?: number; height?: number; }) {
-    return ({ color, tooltip, small }: { color: string; tooltip: string; small: boolean; }) => (
+    return function PlatformIndicator({ color, tooltip, small }: { color: string; tooltip: string; small: boolean; }) {
+        return (
            <Tooltip text={tooltip} >
                {(tooltipProps: any) => (
                    <svg
@ -45,6 +46,7 @@ function Icon(path: string, opts?: { viewBox?: string; width?: number; height?:
                )}
            </Tooltip>
        );
+    };
 }

 const Icons = {
--- a/src/plugins/previewMessage/index.tsx
+++ b/src/plugins/previewMessage/index.tsx
@ -137,5 +137,5 @@ export default definePlugin({
        },
    ],

-    chatBarIcon: ErrorBoundary.wrap(PreviewButton, { noop: true }),
+    previewIcon: ErrorBoundary.wrap(PreviewButton, { noop: true }),
 });
--- a/src/plugins/readAllNotificationsButton/index.tsx
+++ b/src/plugins/readAllNotificationsButton/index.tsx
@ -19,7 +19,7 @@
 import { addServerListElement, removeServerListElement, ServerListRenderPosition } from "@api/ServerList";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { Button, FluxDispatcher, GuildChannelStore, GuildStore, React, ReadStateStore } from "@webpack/common";
+import { Button, FluxDispatcher, GuildChannelStore, GuildStore, ReadStateStore } from "@webpack/common";

 function onClick() {
    const channels: Array<any> = [];
--- a/src/plugins/searchReply/index.tsx
+++ b/src/plugins/searchReply/index.tsx
@ -20,12 +20,12 @@ import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCal
 import { ReplyIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByCodeLazy } from "@webpack";
 import { ChannelStore, i18n, Menu, PermissionsBits, PermissionStore, SelectedChannelStore } from "@webpack/common";
 import { Message } from "discord-types/general";


-const messageUtils = findByPropsLazy("replyToMessage");
+const replyFn = findByCodeLazy("showMentionToggle", "TEXTAREA_FOCUS", "shiftKey");

 const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { message }: { message: Message; }) => () => {
    // make sure the message is in the selected channel
@ -43,7 +43,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { messag
                id="reply"
                label={i18n.Messages.MESSAGE_ACTION_REPLY}
                icon={ReplyIcon}
-                action={(e: React.MouseEvent) => messageUtils.replyToMessage(channel, message, e)}
+                action={(e: React.MouseEvent) => replyFn(channel, message, e)}
            />
        ));
    }
@ -56,7 +56,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { messag
                id="reply"
                label={i18n.Messages.MESSAGE_ACTION_REPLY}
                icon={ReplyIcon}
-                action={(e: React.MouseEvent) => messageUtils.replyToMessage(channel, message, e)}
+                action={(e: React.MouseEvent) => replyFn(channel, message, e)}
            />
        ));
    }
--- a/src/plugins/sendTimestamps/index.tsx
+++ b/src/plugins/sendTimestamps/index.tsx
@ -172,7 +172,7 @@ export default definePlugin({
                                    height="24"
                                    viewBox="0 0 24 24"
                                >
-                                    <g fill="none" fill-rule="evenodd">
+                                    <g fill="none" fillRule="evenodd">
                                        <path fill="currentColor" d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7v-5z" />
                                        <rect width="24" height="24" />
                                    </g>
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@ -236,6 +236,7 @@ function UserList(type: "friends" | "blocked", guild: Guild, ids: string[], setC
        <ScrollerThin fade className={cl("scroller")}>
            {members.map(id =>
                <FriendRow
+                    key={id}
                    user={UserStore.getUser(id)}
                    status={PresenceStore.getStatus(id) || "offline"}
                    onSelect={() => openUserProfile(id)}
--- a/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
+++ b/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
@ -46,7 +46,7 @@ export const Code = ({
                .split("\n")
                .map((line, i) => <span key={i} dangerouslySetInnerHTML={{ __html: line }} />);
        } catch {
-            lines = content.split("\n").map(line => <span>{line}</span>);
+            lines = content.split("\n").map((line, i) => <span key={i}>{line}</span>);
        }
    } else {
        const renderTokens =
@ -55,11 +55,11 @@ export const Code = ({
                .split("\n")
                .map(line => [{ color: theme.plainColor, content: line } as IThemedToken]);

-        lines = renderTokens.map(line => {
+        lines = renderTokens.map((line, i) => {
            // [Cynthia] this makes it so when you highlight the codeblock
            // empty lines are also selected and copied when you Ctrl+C.
            if (line.length === 0) {
-                return <span>{"\n"}</span>;
+                return <span key={i}>{"\n"}</span>;
            }

            return (
--- a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
+++ b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
@ -18,7 +18,7 @@

 import ErrorBoundary from "@components/ErrorBoundary";
 import { useAwaiter, useIntersection } from "@utils/react";
-import { hljs, React } from "@webpack/common";
+import { hljs } from "@webpack/common";

 import { resolveLang } from "../api/languages";
 import { shiki } from "../api/shiki";
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@ -105,7 +105,7 @@ function ConnectionsComponent({ id, theme }: { id: string, theme: string; }) {
                gap: getSpacingPx(settings.store.iconSpacing),
                flexWrap: "wrap"
            }}>
-                {connections.map(connection => <CompactConnectionComponent connection={connection} theme={theme} />)}
+                {connections.map(connection => <CompactConnectionComponent connection={connection} theme={theme} key={connection.id} />)}
            </Flex>
        </Section>
    );
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@ -275,7 +275,7 @@ function HiddenChannelLockScreen({ channel }: { channel: ExtendedChannel; }) {
                    <div className="shc-lock-screen-tags-container">
                        <Text variant="text-lg/bold">Available tags:</Text>
                        <div className="shc-lock-screen-tags">
-                            {availableTags.map(tag => <TagComponent tag={tag} />)}
+                            {availableTags.map(tag => <TagComponent tag={tag} key={tag.id} />)}
                        </div>
                    </div>
                }
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@ -47,7 +47,7 @@ export default definePlugin({
    authors: [Devs.Rini, Devs.TheKodeToad],
    patches: [
        {
-            find: ".useCanSeeRemixBadge)",
+            find: '"Message Username"',
            replacement: {
                match: /(?<=onContextMenu:\i,children:).*?\}/,
                replace: "$self.renderUsername(arguments[0])}"
--- a/src/plugins/silentMessageToggle/index.tsx
+++ b/src/plugins/silentMessageToggle/index.tsx
@ -88,7 +88,7 @@ function SilentMessageToggle(chatBoxProps: {
                                <g fill="currentColor">
                                    <path d="M18 10.7101C15.1085 9.84957 13 7.17102 13 4C13 3.69264 13.0198 3.3899 13.0582 3.093C12.7147 3.03189 12.3611 3 12 3C8.686 3 6 5.686 6 9V14C6 15.657 4.656 17 3 17V18H21V17C19.344 17 18 15.657 18 14V10.7101ZM8.55493 19C9.24793 20.19 10.5239 21 11.9999 21C13.4759 21 14.7519 20.19 15.4449 19H8.55493Z" />
                                    <path d="M18.2624 5.50209L21 2.5V1H16.0349V2.49791H18.476L16 5.61088V7H21V5.50209H18.2624Z" />
-                                    {!enabled && <line x1="22" y1="2" x2="2" y2="22" stroke="var(--red-500)" stroke-width="2.5" />}
+                                    {!enabled && <line x1="22" y1="2" x2="2" y2="22" stroke="var(--red-500)" strokeWidth="2.5" />}
                                </g>
                            </svg>
                        </div>
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@ -21,7 +21,7 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ButtonLooks, ButtonWrapperClasses, FluxDispatcher, React, Tooltip } from "@webpack/common";
+import { Button, ButtonLooks, ButtonWrapperClasses, FluxDispatcher, Tooltip } from "@webpack/common";

 const settings = definePluginSettings({
    showIcon: {
@ -62,7 +62,7 @@ function SilentTypingToggle(chatBoxProps: {
                        <div className={ButtonWrapperClasses.buttonWrapper}>
                            <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
                                <path fill="currentColor" d="M528 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM128 180v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm288 0v-40c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h232c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12z" />
-                                {isEnabled && <path d="M13 432L590 48" stroke="var(--red-500)" stroke-width="72" stroke-linecap="round" />}
+                                {isEnabled && <path d="M13 432L590 48" stroke="var(--red-500)" strokeWidth="72" strokeLinecap="round" />}
                            </svg>
                        </div>
                    </Button>
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@ -38,7 +38,8 @@ function msToHuman(ms: number) {
 }

 function Svg(path: string, label: string) {
-    return () => (
+    return function Icon() {
+        return (
            <svg
                className={classes(cl("button-icon"), cl(label))}
                height="24"
@ -51,6 +52,7 @@ function Svg(path: string, label: string) {
                <path d={path} />
            </svg>
        );
+    };
 }

 // KraXen's icons :yesyes:
--- a/src/plugins/startupTimings/StartupTimingPage.tsx
+++ b/src/plugins/startupTimings/StartupTimingPage.tsx
@ -120,8 +120,8 @@ function ServerTrace({ trace }: ServerTraceProps) {
        <Forms.FormSection title="Server Trace" tag="h2">
            <code>
                <Flex flexDirection="column" style={{ color: "var(--header-primary)", gap: 5, userSelect: "text" }}>
-                    {lines.map(line => (
-                        <span>{line}</span>
+                    {lines.map((line, i) => (
+                        <span key={i}>{line}</span>
                    ))}
                </Flex>
            </code>
--- a/src/plugins/superReactionTweaks/README.md
+++ b/src/plugins/superReactionTweaks/README.md
@ -1,11 +0,0 @@
-# Super Reaction Tweaks
-
-This plugin applies configurable various tweaks to super reactions.
-
-![Screenshot](https://user-images.githubusercontent.com/22851444/281598795-58f07116-9f95-4f64-940b-23a5499f2302.png)
-
-## Features:
-
-**Super React By Default** -  The reaction picker will default to super reactions instead of normal reactions.
-
-**Super Reaction Play Limit** - Allows you to decide how many super reaction animations can play at once, including removing the limit entirely.
--- a/src/plugins/superReactionTweaks/index.ts
+++ b/src/plugins/superReactionTweaks/index.ts
@ -1,63 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated, ant0n, FieryFlames and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-
-export const settings = definePluginSettings({
-    superReactByDefault: {
-        type: OptionType.BOOLEAN,
-        description: "Reaction picker will default to Super Reactions",
-        default: true,
-    },
-    unlimitedSuperReactionPlaying: {
-        type: OptionType.BOOLEAN,
-        description: "Remove the limit on Super Reactions playing at once",
-        default: false,
-    },
-
-    superReactionPlayingLimit: {
-        description: "Max Super Reactions to play at once",
-        type: OptionType.SLIDER,
-        default: 20,
-        markers: [5, 10, 20, 40, 60, 80, 100],
-        stickToMarkers: true,
-    },
-}, {
-    superReactionPlayingLimit: {
-        disabled() { return this.store.unlimitedSuperReactionPlaying; },
-    }
-});
-
-export default definePlugin({
-    name: "SuperReactionTweaks",
-    description: "Customize the limit of Super Reactions playing at once, and super react by default",
-    authors: [Devs.FieryFlames, Devs.ant0n],
-    patches: [
-        {
-            find: ",BURST_REACTION_EFFECT_PLAY",
-            replacement: {
-                match: /(?<=BURST_REACTION_EFFECT_PLAY:\i=>{.{50,100})(\i\(\i,\i\))>=\d+/,
-                replace: "!$self.shouldPlayBurstReaction($1)"
-            }
-        },
-        {
-            find: ".hasAvailableBurstCurrency)",
-            replacement: {
-                match: /(?<=\.useBurstReactionsExperiment.{0,20})useState\(!1\)(?=.+?(\i===\i\.EmojiIntention.REACTION))/,
-                replace: "useState($self.settings.store.superReactByDefault && $1)"
-            }
-        }
-    ],
-    settings,
-
-    shouldPlayBurstReaction(playingCount: number) {
-        if (settings.store.unlimitedSuperReactionPlaying) return true;
-        if (playingCount <= settings.store.superReactionPlayingLimit) return true;
-        return false;
-    }
-});
--- a/src/plugins/typingTweaks/index.tsx
+++ b/src/plugins/typingTweaks/index.tsx
@ -21,7 +21,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { openUserProfile } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { Avatar, GuildMemberStore, React, RelationshipStore } from "@webpack/common";
+import { Avatar, GuildMemberStore, RelationshipStore } from "@webpack/common";
 import { User } from "discord-types/general";

 const settings = definePluginSettings({
@ -112,7 +112,7 @@ export default definePlugin({
        {
            find: "getCooldownTextStyle",
            replacement: {
-                match: /(?<=(\i)\.length\?\i.\i\.Messages.THREE_USERS_TYPING\.format\({\i:(\i),(?:\i:)?(\i),\i:\i}\):)\i\.\i\.Messages\.SEVERAL_USERS_TYPING/,
+                match: /(?<=(\i)\.length\?\i.\i\.Messages.THREE_USERS_TYPING\.format\({\i:(\i),\i:(\i),\i:\i}\):)\i\.\i\.Messages\.SEVERAL_USERS_TYPING/,
                replace: (_, users, a, b) => `$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`
            },
            predicate: () => settings.store.alternativeFormatting
@ -135,7 +135,7 @@ export default definePlugin({

        return children.map(c =>
            c.type === "strong"
-                ? <TypingUser {...props} user={users[element++]} />
+                ? <TypingUser {...props} user={users[element++]} key={users[element].id} />
                : c
        );
    }
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@ -173,7 +173,7 @@ export default definePlugin({
    patches: [
        // Make pfps clickable
        {
-            find: "User Profile Modal - Context Menu",
+            find: "onAddFriend:function",
            replacement: {
                match: /\{src:(\i)(?=,avatarDecoration)/,
                replace: "{src:$1,onClick:()=>$self.openImage($1)"
--- a/src/plugins/voiceMessages/DesktopRecorder.tsx
+++ b/src/plugins/voiceMessages/DesktopRecorder.tsx
@ -16,14 +16,11 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { PluginNative } from "@utils/types";
 import { Button, showToast, Toasts, useState } from "@webpack/common";

 import type { VoiceRecorder } from ".";
 import { settings } from "./settings";

-const Native = VencordNative.pluginHelpers.VoiceMessages as PluginNative<typeof import("./native")>;
-
 export const VoiceRecorderDesktop: VoiceRecorder = ({ setAudioBlob, onRecordingChange }) => {
    const [recording, setRecording] = useState(false);

@ -52,7 +49,7 @@ export const VoiceRecorderDesktop: VoiceRecorder = ({ setAudioBlob, onRecordingC
        } else {
            discordVoice.stopLocalAudioRecording(async (filePath: string) => {
                if (filePath) {
-                    const buf = await Native.readRecording(filePath);
+                    const buf = await VencordNative.pluginHelpers.VoiceMessages.readRecording(filePath);
                    if (buf)
                        setAudioBlob(new Blob([buf], { type: "audio/ogg; codecs=opus" }));
                    else
--- a/src/plugins/voiceMessages/native.ts
+++ b/src/plugins/voiceMessages/native.ts
@ -1,24 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { app } from "electron";
-import { readFile } from "fs/promises";
-import { basename, normalize } from "path";
-
-export async function readRecording(_, filePath: string) {
-    filePath = normalize(filePath);
-    const filename = basename(filePath);
-    const discordBaseDirWithTrailingSlash = normalize(app.getPath("userData") + "/");
-    console.log(filename, discordBaseDirWithTrailingSlash, filePath);
-    if (filename !== "recording.ogg" || !filePath.startsWith(discordBaseDirWithTrailingSlash)) return null;
-
-    try {
-        const buf = await readFile(filePath);
-        return new Uint8Array(buf.buffer);
-    } catch {
-        return null;
-    }
-}
--- a/src/utils/IpcEvents.ts
+++ b/src/utils/IpcEvents.ts
@ -38,8 +38,6 @@ export const enum IpcEvents {
    BUILD = "VencordBuild",
    OPEN_MONACO_EDITOR = "VencordOpenMonacoEditor",

-    GET_PLUGIN_IPC_METHOD_MAP = "VencordGetPluginIpcMethodMap",
-
    OPEN_IN_APP__RESOLVE_REDIRECT = "VencordOIAResolveRedirect",
    VOICE_MESSAGES_READ_RECORDING = "VencordVMReadRecording",
 }
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@ -379,10 +379,6 @@ export const Devs = /* #__PURE__*/ Object.freeze({
        name: "ProffDea",
        id: 609329952180928513n
    },
-    ant0n: {
-        name: "ant0n",
-        id: 145224646868860928n
-    },
 } satisfies Record<string, Dev>);

 // iife so #__PURE__ works correctly
--- a/src/utils/react.tsx
+++ b/src/utils/react.tsx
@ -133,7 +133,7 @@ export function useForceUpdater(withDep?: true) {

 export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>, attempts = 5) {
    const get = makeLazy(factory, attempts);
-    return (props: T) => {
+    return function Lazy(props: T) {
        const Component = get() ?? NoopComponent;
        return <Component {...props} />;
    };
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@ -307,10 +307,3 @@ export type PluginOptionBoolean = PluginSettingBooleanDef & PluginSettingCommon
 export type PluginOptionSelect = PluginSettingSelectDef & PluginSettingCommon & IsDisabled & IsValid<PluginSettingSelectOption>;
 export type PluginOptionSlider = PluginSettingSliderDef & PluginSettingCommon & IsDisabled & IsValid<number>;
 export type PluginOptionComponent = PluginSettingComponentDef & PluginSettingCommon;
-
-export type PluginNative<PluginExports extends Record<string, (event: Electron.IpcMainInvokeEvent, ...args: any[]) => any>> = {
-    [key in keyof PluginExports]:
-    PluginExports[key] extends (event: Electron.IpcMainInvokeEvent, ...args: infer Args) => infer Return
-    ? (...args: Args) => Return extends Promise<any> ? Return : Promise<Return>
-    : never;
-};