MessageLinkEmbeds: Use api

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.3.2",
+    "version": "1.2.9",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

scripts/generatePluginList.ts

@@ -151,6 +151,7 @@ async function parseFile(fileName: string) {
                 case "required":
                 case "enabledByDefault":
                     data[key] = value.kind === SyntaxKind.TrueKeyword;
+                    if (!data[key] && value.kind !== SyntaxKind.FalseKeyword) throw fail(`${key} is not a boolean literal`);
                     break;
             }
         }

src/VencordNative.ts

@@ -58,10 +58,4 @@ export default {
         getVersions: () => process.versions as Partial<NodeJS.ProcessVersions>,
         openExternal: (url: string) => invoke<void>(IpcEvents.OPEN_EXTERNAL, url)
     },
-
-    pluginHelpers: {
-        OpenInApp: {
-            resolveRedirect: (url: string) => invoke<string>(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, url),
-        },
-    }
 };

src/api/ComponentUpdater.ts

@@ -0,0 +1,29 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * 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 { proxyLazy } from "@utils/lazy";
+
+const p = proxyLazy<typeof import("plugins/_api/componentUpdater").default>(() => Vencord.Plugins.plugins.ComponentUpdaterAPI as any);
+
+/**
+ * Rerender a specific message
+ * @param messageId The id of the message to rerender
+ */
+export function updateMessageComponent(messageId: string) {
+    p.forceUpdaters.get(messageId)?.();
+}

src/api/index.ts

@@ -18,6 +18,7 @@
 
 import * as $Badges from "./Badges";
 import * as $Commands from "./Commands";
+import * as $ComponentUpdater from "./ComponentUpdater";
 import * as $ContextMenu from "./ContextMenu";
 import * as $DataStore from "./DataStore";
 import * as $MemberListDecorators from "./MemberListDecorators";
@@ -109,3 +110,8 @@ export const Notifications = $Notifications;
  * An api allowing you to patch and add/remove items to/from context menus
  */
 export const ContextMenu = $ContextMenu;
+
+/**
+ * An api allowing you to update/rerender components
+ */
+export const ComponentUpdater = $ComponentUpdater;

src/main/ipcMain.ts

@@ -17,7 +17,6 @@
 */
 
 import "./updater";
-import "./ipcPlugins";
 
 import { debounce } from "@utils/debounce";
 import { IpcEvents } from "@utils/IpcEvents";

src/main/ipcPlugins.ts

@@ -1,46 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * 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 { IpcEvents } from "@utils/IpcEvents";
-import { ipcMain } from "electron";
-import { request } from "https";
-
-// #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.handle(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, async (_, url: string) => {
-    if (!validRedirectUrls.test(url)) return url;
-
-    return getRedirect(url);
-});
-// #endregion

src/main/utils/constants.ts

@@ -31,8 +31,7 @@ export const ALLOWED_PROTOCOLS = [
     "https:",
     "http:",
     "steam:",
-    "spotify:",
+    "spotify:"
-    "com.epicgames.launcher:",
 ];
 
 export const IS_VANILLA = /* @__PURE__ */ process.argv.includes("--vanilla");

src/plugins/_api/badges.tsx

@@ -80,8 +80,8 @@ export default definePlugin({
             find: "Messages.PROFILE_USER_BADGES,role:",
             replacement: [
                 {
-                    match: /&&(\i)\.push\(\{id:"premium".+?\}\);/,
+                    match: /(?<=(\i)\.isTryItOutFlow,)(.{0,300})null==\i\?void 0:(\i)\.getBadges\(\)/,
-                    replace: "$&$1.unshift(...Vencord.Api.Badges._getBadges(arguments[0]));",
+                    replace: (_, props, restCode, badgesMod) => `vencordProps=${props},${restCode}Vencord.Api.Badges._getBadges(vencordProps).concat(${badgesMod}?.getBadges()??[])`,
                 },
                 {
                     // alt: "", aria-hidden: false, src: originalSrc

src/plugins/_api/componentUpdater.ts

@@ -0,0 +1,51 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * 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 { useForceUpdater } from "@utils/react";
+import definePlugin from "@utils/types";
+import { useEffect } from "@webpack/common";
+import { Channel, Message } from "discord-types/general";
+
+const forceUpdaters = new Map<string, () => void>();
+
+function useUpdater(data: { channel: Channel; message: Message; }) {
+    const forceUpdater = useForceUpdater();
+
+    useEffect(() => {
+        forceUpdaters.set(data.message.id, forceUpdater);
+        return () => void forceUpdaters.delete(data.message.id);
+    }, [data.message.id]);
+}
+
+export default definePlugin({
+    name: "ComponentUpdaterAPI",
+    description: "API to update / force rerender several components, such as messages",
+    authors: [Devs.Ven],
+
+    patches: [{
+        find: ".renderContentOnly;",
+        replacement: {
+            match: /=(\i)\.renderContentOnly;/,
+            replace: "$&$self.useUpdater($1);"
+        }
+    }],
+
+    useUpdater,
+    forceUpdaters
+});

src/plugins/ignoreActivities.tsx

@@ -45,7 +45,7 @@ function ToggleIconOff() {
             className={RegisteredGamesClasses.overlayToggleIconOff}
             height="24"
             width="24"
-            viewBox="0 2.2 32 26"
+            viewBox="0 0 32 26"
             aria-hidden={true}
             role="img"
         >
@@ -77,7 +77,7 @@ function ToggleIconOn({ forceWhite }: { forceWhite?: boolean; }) {
             className={RegisteredGamesClasses.overlayToggleIconOn}
             height="24"
             width="24"
-            viewBox="0 2.2 32 26"
+            viewBox="0 0 32 26"
         >
             <path
                 className={forceWhite ? "" : RegisteredGamesClasses.fill}
@@ -119,7 +119,7 @@ function ToggleActivityComponentWithBackground({ activity }: { activity: Ignored
     return (
         <div
             className={`${TryItOutClasses.tryItOutBadge} ${BaseShapeRoundClasses.baseShapeRound}`}
-            style={{ padding: "0px 2px", height: 28 }}
+            style={{ padding: "0px 2px" }}
         >
             <ToggleActivityComponent activity={activity} forceWhite={true} />
         </div>
@@ -157,16 +157,10 @@ export default definePlugin({
         },
         {
             find: ".overlayBadge",
-            replacement: [
+            replacement: {
-                {
+                match: /(?<=\(\)\.badgeContainer.+?(\i)\.name}\):null)/,
-                    match: /(?<=\(\)\.badgeContainer,children:).{0,50}?name:(\i)\.name.+?null/,
+                replace: (_, props) => `,$self.renderToggleActivityButton(${props})`
-                    replace: (m, props) => `[${m},$self.renderToggleActivityButton(${props})]`
-                },
-                {
-                    match: /(?<=\(\)\.badgeContainer,children:).{0,50}?name:(\i\.application)\.name.+?null/,
-                    replace: (m, props) => `${m},$self.renderToggleActivityButton(${props})`
             }
-            ]
         },
         {
             find: '.displayName="LocalActivityStore"',

src/plugins/imageZoom/components/Magnifier.tsx

@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { classNameFactory } from "@api/Styles";
 import { FluxDispatcher, React, useRef, useState } from "@webpack/common";
 
 import { ELEMENT_ID } from "../constants";
@@ -34,8 +33,6 @@ export interface MagnifierProps {
     instance: any;
 }
 
-const cl = classNameFactory("vc-imgzoom-");
-
 export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSize, zoom: initalZoom }) => {
     const [ready, setReady] = useState(false);
 
@@ -159,7 +156,7 @@ export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSiz
 
     return (
         <div
-            className={cl("lens", { "nearest-neighbor": settings.store.nearestNeighbour, square: settings.store.square })}
+            className="vc-imgzoom-lens"
             style={{
                 opacity,
                 width: size.current + "px",

src/plugins/imageZoom/index.tsx

@@ -23,7 +23,7 @@ import { makeRange } from "@components/PluginSettings/components";
 import { Devs } from "@utils/constants";
 import { debounce } from "@utils/debounce";
 import definePlugin, { OptionType } from "@utils/types";
-import { ContextMenu, Menu, React, ReactDOM } from "@webpack/common";
+import { Menu, React, ReactDOM } from "@webpack/common";
 import type { Root } from "react-dom/client";
 
 import { Magnifier, MagnifierProps } from "./components/Magnifier";
@@ -50,18 +50,6 @@ export const settings = definePluginSettings({
         default: true,
     },
 
-    nearestNeighbour: {
-        type: OptionType.BOOLEAN,
-        description: "Use Nearest Neighbour Interpolation when scaling images",
-        default: false,
-    },
-
-    square: {
-        type: OptionType.BOOLEAN,
-        description: "Make the lens square",
-        default: false,
-    },
-
     zoom: {
         description: "Zoom of the lens",
         type: OptionType.SLIDER,
@@ -90,17 +78,9 @@ export const settings = definePluginSettings({
 const imageContextMenuPatch: NavContextMenuPatchCallback = children => () => {
     children.push(
         <Menu.MenuGroup id="image-zoom">
-            <Menu.MenuCheckboxItem
+            {/* thanks SpotifyControls */}
-                id="vc-square"
-                label="Square Lens"
-                checked={settings.store.square}
-                action={() => {
-                    settings.store.square = !settings.store.square;
-                    ContextMenu.close();
-                }}
-            />
             <Menu.MenuControlItem
-                id="vc-zoom"
+                id="zoom"
                 label="Zoom"
                 control={(props, ref) => (
                     <Menu.MenuSliderControl
@@ -114,7 +94,7 @@ const imageContextMenuPatch: NavContextMenuPatchCallback = children => () => {
                 )}
             />
             <Menu.MenuControlItem
-                id="vc-size"
+                id="size"
                 label="Lens Size"
                 control={(props, ref) => (
                     <Menu.MenuSliderControl
@@ -128,7 +108,7 @@ const imageContextMenuPatch: NavContextMenuPatchCallback = children => () => {
                 )}
             />
             <Menu.MenuControlItem
-                id="vc-zoom-speed"
+                id="zoom-speed"
                 label="Zoom Speed"
                 control={(props, ref) => (
                     <Menu.MenuSliderControl

src/plugins/imageZoom/styles.css

@@ -11,14 +11,6 @@
     pointer-events: none;
 }
 
-.vc-imgzoom-square {
-    border-radius: 0;
-}
-
-.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|="carouselModal"] {
     height: fit-content;

src/plugins/invisibleChat/index.tsx

@@ -132,7 +132,7 @@ export default definePlugin({
             find: ".Messages.MESSAGE_EDITED,",
             replacement: {
                 match: /var .,.,.=(.)\.className,.=.\.message,.=.\.children,.=.\.content,.=.\.onUpdate/gm,
-                replace: "try {$1 && $self.INV_REGEX.test($1.message.content) ? $1.content.push($self.indicator()) : null } catch {};$&"
+                replace: "try {$1 && $self.INV_REGEX.test($1.content[0]) ? $1.content.push($self.indicator()) : null } catch {};$&"
             }
         },
         {
@@ -200,11 +200,8 @@ export default definePlugin({
             },
         });
 
-        if (urlCheck?.length) {
+        if (urlCheck?.length)
-            const embed = await this.getEmbed(new URL(urlCheck[0]));
+            message.embeds.push(await this.getEmbed(new URL(urlCheck[0])));
-            if (embed)
-                message.embeds.push(embed);
-        }
 
         this.updateMessage(message);
     },

src/plugins/messageLinkEmbeds.tsx

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { updateMessageComponent } from "@api/ComponentUpdater";
 import { addAccessory } from "@api/MessageAccessories";
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
@@ -28,7 +29,6 @@ import { find, findByCode, findByPropsLazy } from "@webpack";
 import {
     Button,
     ChannelStore,
-    FluxDispatcher,
     GuildStore,
     MessageStore,
     Parser,
@@ -228,10 +228,7 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
                 delete msg.interaction;
 
                 messageFetchQueue.push(() => fetchMessage(channelID, messageID)
-                    .then(m => m && FluxDispatcher.dispatch({
+                    .then(m => m && updateMessageComponent(message.id))
-                        type: "MESSAGE_UPDATE",
-                        message: msg
-                    }))
                 );
                 continue;
             }

src/plugins/moyai.ts

@@ -21,7 +21,7 @@ import { makeRange } from "@components/PluginSettings/components/SettingSliderCo
 import { Devs } from "@utils/constants";
 import { sleep } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
-import { RelationshipStore, SelectedChannelStore, UserStore } from "@webpack/common";
+import { SelectedChannelStore, UserStore } from "@webpack/common";
 import { Message, ReactionEmoji } from "discord-types/general";
 
 interface IMessageCreate {
@@ -37,7 +37,6 @@ interface IReactionAdd {
     optimistic: boolean;
     channelId: string;
     messageId: string;
-    messageAuthorId: string;
     userId: "195136840355807232";
     emoji: ReactionEmoji;
 }
@@ -72,11 +71,6 @@ const settings = definePluginSettings({
         description: "Ignore bots",
         type: OptionType.BOOLEAN,
         default: true
-    },
-    ignoreBlocked: {
-        description: "Ignore blocked users",
-        type: OptionType.BOOLEAN,
-        default: true
     }
 });
 
@@ -91,7 +85,6 @@ export default definePlugin({
             if (optimistic || type !== "MESSAGE_CREATE") return;
             if (message.state === "SENDING") return;
             if (settings.store.ignoreBots && message.author?.bot) return;
-            if (settings.store.ignoreBlocked && RelationshipStore.isBlocked(message.author?.id)) return;
             if (!message.content) return;
             if (channelId !== SelectedChannelStore.getChannelId()) return;
 
@@ -103,10 +96,9 @@ export default definePlugin({
             }
         },
 
-        MESSAGE_REACTION_ADD({ optimistic, type, channelId, userId, messageAuthorId, emoji }: IReactionAdd) {
+        MESSAGE_REACTION_ADD({ optimistic, type, channelId, userId, emoji }: IReactionAdd) {
             if (optimistic || type !== "MESSAGE_REACTION_ADD") return;
             if (settings.store.ignoreBots && UserStore.getUser(userId)?.bot) return;
-            if (settings.store.ignoreBlocked && RelationshipStore.isBlocked(messageAuthorId)) return;
             if (channelId !== SelectedChannelStore.getChannelId()) return;
 
             const name = emoji.name.toLowerCase();

src/plugins/openInApp.ts

@@ -1,147 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * 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 { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { showToast, Toasts } from "@webpack/common";
-import { MouseEvent } from "react";
-
-const ShortUrlMatcher = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
-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\/(.+)$/;
-
-const settings = definePluginSettings({
-    spotify: {
-        type: OptionType.BOOLEAN,
-        description: "Open Spotify links in the Spotify app",
-        default: true,
-    },
-    steam: {
-        type: OptionType.BOOLEAN,
-        description: "Open Steam links in the Steam app",
-        default: true,
-    },
-    epic: {
-        type: OptionType.BOOLEAN,
-        description: "Open Epic Games links in the Epic Games Launcher",
-        default: true,
-    }
-});
-
-export default definePlugin({
-    name: "OpenInApp",
-    description: "Open Spotify, Steam and Epic Games URLs in their respective apps instead of your browser",
-    authors: [Devs.Ven],
-    settings,
-
-    patches: [
-        {
-            find: '"MaskedLinkStore"',
-            replacement: {
-                match: /return ((\i)\.apply\(this,arguments\))(?=\}function \i.{0,200}\.trusted)/,
-                replace: "return $self.handleLink(...arguments).then(handled => handled || $1)"
-            }
-        },
-        // Make Spotify profile activity links open in app on web
-        {
-            find: "WEB_OPEN(",
-            predicate: () => !IS_DISCORD_DESKTOP && settings.store.spotify,
-            replacement: {
-                match: /\i\.\i\.isProtocolRegistered\(\)(.{0,100})window.open/g,
-                replace: "true$1VencordNative.native.openExternal"
-            }
-        },
-        {
-            find: ".CONNECTED_ACCOUNT_VIEWED,",
-            replacement: {
-                match: /(?<=href:\i,onClick:function\(\)\{)(?=return \i=(\i)\.type,.{0,50}CONNECTED_ACCOUNT_VIEWED)/,
-                replace: "$self.handleAccountView(arguments[0],$1.type,$1.id);"
-            }
-        }
-    ],
-
-    async handleLink(data: { href: string; }, event: MouseEvent) {
-        if (!data) return false;
-
-        let url = data.href;
-        if (!IS_WEB && ShortUrlMatcher.test(url)) {
-            event.preventDefault();
-            // CORS jumpscare
-            url = await VencordNative.pluginHelpers.OpenInApp.resolveRedirect(url);
-        }
-
-        spotify: {
-            if (!settings.store.spotify) break spotify;
-
-            const match = SpotifyMatcher.exec(url);
-            if (!match) break spotify;
-
-            const [, type, id] = match;
-            VencordNative.native.openExternal(`spotify:${type}:${id}`);
-
-            event.preventDefault();
-            return true;
-        }
-
-        steam: {
-            if (!settings.store.steam) break steam;
-
-            if (!SteamMatcher.test(url)) break steam;
-
-            VencordNative.native.openExternal(`steam://openurl/${url}`);
-            event.preventDefault();
-
-            // Steam does not focus itself so show a toast so it's slightly less confusing
-            showToast("Opened link in Steam", Toasts.Type.SUCCESS);
-            return true;
-        }
-
-        epic: {
-            if (!settings.store.epic) break epic;
-
-            const match = EpicMatcher.exec(url);
-            if (!match) break epic;
-
-            VencordNative.native.openExternal(`com.epicgames.launcher://store/${match[1]}`);
-            event.preventDefault();
-
-            return true;
-        }
-
-        // in case short url didn't end up being something we can handle
-        if (event.defaultPrevented) {
-            window.open(url, "_blank");
-            return true;
-        }
-
-        return false;
-    },
-
-    handleAccountView(event: { preventDefault(): void; }, platformType: string, userId: string) {
-        if (platformType === "spotify" && settings.store.spotify) {
-            VencordNative.native.openExternal(`spotify:user:${userId}`);
-            event.preventDefault();
-        } else if (platformType === "steam" && settings.store.steam) {
-            VencordNative.native.openExternal(`steam://openurl/https://steamcommunity.com/profiles/${userId}`);
-            showToast("Opened link in Steam", Toasts.Type.SUCCESS);
-            event.preventDefault();
-        }
-    }
-});

src/plugins/pronoundb/components/PronounsChatComponent.tsx

@@ -52,7 +52,7 @@ export function CompactPronounsChatComponentWrapper({ message }: { message: Mess
 }
 
 function PronounsChatComponent({ message }: { message: Message; }) {
-    const [result] = useFormattedPronouns(message.author.id);
+    const result = useFormattedPronouns(message.author.id);
 
     return result
         ? (
@@ -64,7 +64,7 @@ function PronounsChatComponent({ message }: { message: Message; }) {
 }
 
 export function CompactPronounsChatComponent({ message }: { message: Message; }) {
-    const [result] = useFormattedPronouns(message.author.id);
+    const result = useFormattedPronouns(message.author.id);
 
     return result
         ? (

src/plugins/pronoundb/index.ts

@@ -26,11 +26,6 @@ import { CompactPronounsChatComponentWrapper, PronounsChatComponentWrapper } fro
 import { useProfilePronouns } from "./pronoundbUtils";
 import { settings } from "./settings";
 
-const PRONOUN_TOOLTIP_PATCH = {
-    match: /text:(.{0,10}.Messages\.USER_PROFILE_PRONOUNS)(?=,)/,
-    replace: '$& + (typeof vcPronounSource !== "undefined" ? ` (${vcPronounSource})` : "")'
-};
-
 export default definePlugin({
     name: "PronounDB",
     authors: [Devs.Tyman, Devs.TheKodeToad, Devs.Ven],
@@ -55,24 +50,18 @@ export default definePlugin({
         // Patch the profile popout username header to use our pronoun hook instead of Discord's pronouns
         {
             find: ".userTagNoNickname",
-            replacement: [
+            replacement: {
-                {
+                match: /=(\i)\.pronouns/,
-                    match: /,(\i)=(\i)\.pronouns/,
+                replace: "=$self.useProfilePronouns($1.user.id,$1.pronouns)"
-                    replace: ",[$1,vcPronounSource]=$self.useProfilePronouns($2.user.id)"
+            }
-                },
-                PRONOUN_TOOLTIP_PATCH
-            ]
         },
         // Patch the profile modal username header to use our pronoun hook instead of Discord's pronouns
         {
             find: ".USER_PROFILE_ACTIVITY",
-            replacement: [
+            replacement: {
-                {
+                match: /\).showPronouns/,
-                    match: /getGlobalName\(\i\);(?<=displayProfile.{0,200})/,
+                replace: ").showPronouns||true;const vcPronounce=$self.useProfilePronouns(arguments[0].user.id,arguments[0].displayProfile?.pronouns);if(arguments[0].displayProfile&&vcPronounce)arguments[0].displayProfile.pronouns=vcPronounce"
-                    replace: "$&const [vcPronounce,vcPronounSource]=$self.useProfilePronouns(arguments[0].user.id);if(arguments[0].displayProfile&&vcPronounce)arguments[0].displayProfile.pronouns=vcPronounce;"
+            }
-                },
-                PRONOUN_TOOLTIP_PATCH
-            ]
         }
     ],
 

src/plugins/pronoundb/pronoundbUtils.ts

@@ -29,9 +29,6 @@ import { PronounCode, PronounMapping, PronounsResponse } from "./types";
 
 const UserProfileStore = findStoreLazy("UserProfileStore");
 
-type PronounsWithSource = [string | null, string];
-const EmptyPronouns: PronounsWithSource = [null, ""];
-
 export const enum PronounsFormat {
     Lowercase = "LOWERCASE",
     Capitalized = "CAPITALIZED"
@@ -65,48 +62,45 @@ function getDiscordPronouns(id: string) {
     );
 }
 
-export function useFormattedPronouns(id: string): PronounsWithSource {
+export function useFormattedPronouns(id: string, discordPronouns: string = getDiscordPronouns(id)): string | null {
-    // Discord is so stupid you can put tons of newlines in pronouns
+    const [result] = useAwaiter(() => fetchPronouns(id, discordPronouns), {
-    const discordPronouns = getDiscordPronouns(id)?.trim().replace(NewLineRe, " ");
+        fallbackValue: getCachedPronouns(id, discordPronouns),
-
-    const [result] = useAwaiter(() => fetchPronouns(id), {
-        fallbackValue: getCachedPronouns(id),
         onError: e => console.error("Fetching pronouns failed: ", e)
     });
 
-    if (settings.store.pronounSource === PronounSource.PreferDiscord && discordPronouns)
-        return [discordPronouns, "Discord"];
-
     if (result && result !== "unspecified")
-        return [formatPronouns(result), "PronounDB"];
+        return Object.hasOwn(PronounMapping, result)
+            ? formatPronouns(result) // PronounDB
+            : result; // Discord
 
-    return [discordPronouns, "Discord"];
+    return null;
 }
 
-export function useProfilePronouns(id: string): PronounsWithSource {
+export function useProfilePronouns(id: string, discordPronouns: string) {
-    const pronouns = useFormattedPronouns(id);
+    const pronouns = useFormattedPronouns(id, discordPronouns);
 
-    if (!settings.store.showInProfile) return EmptyPronouns;
+    if (!settings.store.showInProfile) return null;
-    if (!settings.store.showSelf && id === UserStore.getCurrentUser().id) return EmptyPronouns;
+    if (!settings.store.showSelf && id === UserStore.getCurrentUser().id) return null;
 
     return pronouns;
 }
 
 
-const NewLineRe = /\n+/g;
-
 // Gets the cached pronouns, if you're too impatient for a promise!
-export function getCachedPronouns(id: string): string | null {
+export function getCachedPronouns(id: string, discordPronouns: string): string | null {
+    if (settings.store.pronounSource === PronounSource.PreferDiscord && discordPronouns)
+        return discordPronouns;
+
     const cached = cache[id];
     if (cached && cached !== "unspecified") return cached;
 
-    return cached || null;
+    return discordPronouns || cached || null;
 }
 
 // Fetches the pronouns for one id, returning a promise that resolves if it was cached, or once the request is completed
-export function fetchPronouns(id: string): Promise<string> {
+export function fetchPronouns(id: string, discordPronouns: string): Promise<string> {
     return new Promise(res => {
-        const cached = getCachedPronouns(id);
+        const cached = getCachedPronouns(id, discordPronouns);
         if (cached) return res(cached);
 
         // If there is already a request added, then just add this callback to it

src/plugins/showConnections/index.tsx

@@ -147,13 +147,6 @@ function CompactConnectionComponent({ connection, theme }: { connection: Connect
                         className="vc-user-connection"
                         href={url}
                         target="_blank"
-                        onClick={e => {
-                            if (Vencord.Plugins.isPluginEnabled("OpenInApp")) {
-                                const OpenInApp = Vencord.Plugins.plugins.OpenInApp as any as typeof import("../openInApp").default;
-                                // handleLink will .preventDefault() if applicable
-                                OpenInApp.handleLink(e.currentTarget, e);
-                            }
-                        }}
                     >
                         {img}
                     </a>

src/plugins/showHiddenChannels/index.tsx

@@ -342,27 +342,32 @@ export default definePlugin({
             ]
         },
         {
-            find: "useNotificationSettingsItem: channel cannot be undefined",
+            find: "Guild voice channel without guild id.",
             replacement: [
                 {
                     // Render our HiddenChannelLockScreen component instead of the main stage channel component
-                    match: /"124px".+?children:(?<=var (\i)=\i\.channel.+?)(?=.{0,20}?}\)}function)/,
+                    match: /Guild voice channel without guild id.+?children:(?<=(\i)\.getGuildId\(\).+?)(?=.{0,20}?}\)}function)/,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?$self.HiddenChannelLockScreen(${channel}):`
                 },
                 {
                     // Disable useless components for the HiddenChannelLockScreen of stage channels
-                    match: /render(?:BottomLeft|BottomCenter|BottomRight|ChatToasts):(?<=var (\i)=\i\.channel.+?)/g,
+                    match: /render(?!Header).{0,30}?:(?<=(\i)\.getGuildId\(\).+?Guild voice channel without guild id.+?)/g,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?null:`
                 },
+                // Prevent Discord from replacing our route if we aren't connected to the stage channel
+                {
+                    match: /(?=!\i&&!\i&&!\i.{0,80}?(\i)\.getGuildId\(\).{0,50}?Guild voice channel without guild id)(?<=if\()/,
+                    replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
+                },
                 {
                     // Disable gradients for the HiddenChannelLockScreen of stage channels
-                    match: /"124px".+?disableGradients:(?<=(\i)\.getGuildId\(\).+?)/,
+                    match: /Guild voice channel without guild id.+?disableGradients:(?<=(\i)\.getGuildId\(\).+?)/,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})||`
                 },
                 {
                     // Disable strange styles applied to the header for the HiddenChannelLockScreen of stage channels
-                    match: /"124px".+?style:(?<=(\i)\.getGuildId\(\).+?)/,
+                    match: /Guild voice channel without guild id.+?style:(?<=(\i)\.getGuildId\(\).+?)/,
-                    replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?void 0:`
+                    replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?undefined:`
                 },
                 {
                     // Remove the divider and amount of users in stage channel components for the HiddenChannelLockScreen
@@ -371,7 +376,7 @@ export default definePlugin({
                 },
                 {
                     // Remove the open chat button for the HiddenChannelLockScreen
-                    match: /"recents".+?&&(?=\(.+?channelId:(\i)\.id,showRequestToSpeakSidebar)/,
+                    match: /"recents".+?null,(?=.+?channelId:(\i)\.id,showRequestToSpeakSidebar)/,
                     replace: (m, channel) => `${m}!$self.isHiddenChannel(${channel})&&`
                 }
             ],

src/plugins/spotifyControls/PlayerComponent.tsx

@@ -23,7 +23,6 @@ import { Flex } from "@components/Flex";
 import { ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
 import { Link } from "@components/Link";
 import { debounce } from "@utils/debounce";
-import { openImageModal } from "@utils/discord";
 import { classes, copyWithToast } from "@utils/misc";
 import { ContextMenu, FluxDispatcher, Forms, Menu, React, useEffect, useState, useStateFromStores } from "@webpack/common";
 
@@ -232,7 +231,7 @@ function AlbumContextMenu({ track }: { track: Track; }) {
                 id="view-cover"
                 label="View Album Cover"
                 // trolley
-                action={() => openImageModal(track.album.image.url)}
+                action={() => (Vencord.Plugins.plugins.ViewIcons as any).openImage(track.album.image.url)}
                 icon={ImageIcon}
             />
             <Menu.MenuControlItem

src/plugins/spotifyControls/SpotifyStore.ts

@@ -89,7 +89,7 @@ export const SpotifyStore = proxyLazy(() => {
         public isSettingPosition = false;
 
         public openExternal(path: string) {
-            const url = Settings.plugins.SpotifyControls.useSpotifyUris || Vencord.Plugins.isPluginEnabled("OpenInApp")
+            const url = Settings.plugins.SpotifyControls.useSpotifyUris
                 ? "spotify:" + path.replaceAll("/", (_, idx) => idx === 0 ? "" : ":")
                 : "https://open.spotify.com" + path;
 

src/plugins/validUser.tsx

@@ -75,7 +75,7 @@ function MentionWrapper({ data, UserMention, RoleMention, parse, props }: Mentio
                     const mention = children?.[0]?.props?.children;
                     if (typeof mention !== "string") return;
 
-                    const id = mention.match(/<@!?(\d+)>/)?.[1];
+                    const id = mention.match(/<@(\d+)>/)?.[1];
                     if (!id) return;
 
                     if (fetching.has(id))

src/plugins/vcNarrator.tsx

@@ -156,8 +156,6 @@ export default definePlugin({
             const myChanId = SelectedChannelStore.getVoiceChannelId();
             const myId = UserStore.getCurrentUser().id;
 
-            if (ChannelStore.getChannel(myChanId!)?.type === 13 /* Stage Channel */) return;
-
             for (const state of voiceStates) {
                 const { userId, channelId, oldChannelId } = state;
                 const isMe = userId === myId;

src/plugins/viewIcons.tsx

@@ -35,7 +35,7 @@ interface UserContextProps {
 }
 
 interface GuildContextProps {
-    guild?: Guild;
+    guild: Guild;
 }
 
 const settings = definePluginSettings({
@@ -100,8 +100,7 @@ const UserContext: NavContextMenuPatchCallback = (children, { user, guildId }: U
                     action={() => openImage(BannerStore.getGuildMemberAvatarURLSimple({
                         userId: user.id,
                         avatar: memberAvatar,
-                        guildId,
+                        guildId
-                        canAnimate: true
                     }, true))}
                     icon={ImageIcon}
                 />
@@ -110,10 +109,7 @@ const UserContext: NavContextMenuPatchCallback = (children, { user, guildId }: U
     ));
 };
 
-const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildContextProps) => () => {
+const GuildContext: NavContextMenuPatchCallback = (children, { guild: { id, icon, banner } }: GuildContextProps) => () => {
-    if(!guild) return;
-
-    const { id, icon, banner } = guild;
     if (!banner && !icon) return;
 
     children.splice(-1, 0, (
@@ -185,8 +181,8 @@ export default definePlugin({
                 // style: { backgroundImage: shouldShowBanner ? "url(".concat(bannerUrl,
                 match: /style:\{(?=backgroundImage:(\i&&\i)\?"url\("\.concat\((\i),)/,
                 replace:
-                    // onClick: () => shouldShowBanner && ev.target.style.backgroundImage && openImage(bannerUrl), style: { cursor: shouldShowBanner ? "pointer" : void 0,
+                    // onClick: () => shouldShowBanner && openImage(bannerUrl), style: { cursor: shouldShowBanner ? "pointer" : void 0,
-                    'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'
+                    'onClick:()=>$1&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'
             }
         },
         {

src/plugins/webContextMenus.web.ts

@@ -47,10 +47,9 @@ const settings = definePluginSettings({
 
 export default definePlugin({
     name: "WebContextMenus",
-    description: "Re-adds context menus missing in the web version of Discord: Links & Images (Copy/Open Link/Image), Text Area (Copy, Cut, Paste, SpellCheck)",
+    description: "Re-adds context menus missing in the web version of Discord: Images, ChatInputBar, Links, 'Copy Link', 'Open Link', 'Copy Image', 'Save Image'",
     authors: [Devs.Ven],
     enabledByDefault: true,
-    required: IS_VENCORD_DESKTOP,
 
     settings,
 
@@ -147,30 +146,36 @@ export default definePlugin({
             }
         },
         {
-            find: 'navId:"textarea-context"',
+            find: ':"command-suggestions"',
-            all: true,
             predicate: () => settings.store.addBack,
             replacement: [
+                {
+                    // desktopOnlyEntries = makeEntries(), spellcheckChildren = desktopOnlyEntries[0], languageChildren = desktopOnlyEntries[1]
+                    match: /\i=.{0,30}text:\i,target:\i,onHeightUpdate:\i\}\),2\),(\i)=\i\[0\],(\i)=\i\[1\]/,
+                    // set spellcheckChildren & languageChildren to empty arrays, so just in case patch 3 fails, we don't
+                    // reference undefined variables
+                    replace: "$1=[],$2=[]",
+                },
                 {
                     // if (!IS_DESKTOP) return null;
                     match: /if\(!\i\.\i\)return null;/,
                     replace: ""
                 },
+                {
+                    // do not add menu items for entries removed in patch 1. Using a lookbehind for group 1 is slow,
+                    // so just capture and add back
+                    match: /("submit-button".+?)(\(0,\i\.jsx\)\(\i\.MenuGroup,\{children:\i\}\),){2}/,
+                    replace: "$1"
+                },
                 {
                     // Change calls to DiscordNative.clipboard to us instead
                     match: /\b\i\.default\.(copy|cut|paste)/g,
                     replace: "$self.$1"
                 }
             ]
-        },
-        {
-            find: '"add-to-dictionary"',
-            predicate: () => settings.store.addBack,
-            replacement: {
-                match: /var \i=\i\.text,/,
-                replace: "return [null,null];$&"
-            }
         }
+
+        // TODO: Maybe add spellcheck for VencordDesktop
     ],
 
     async copyImage(url: string) {

src/plugins/webKeybinds.vencordDesktop.ts

@@ -1,79 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * 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 from "@utils/types";
-import { findLazy, mapMangledModuleLazy } from "@webpack";
-import { ComponentDispatch, FluxDispatcher, NavigationRouter, SelectedGuildStore, SettingsRouter } from "@webpack/common";
-
-const GuildNavBinds = mapMangledModuleLazy("mod+alt+down", {
-    CtrlTab: m => m.binds?.at(-1) === "ctrl+tab",
-    CtrlShiftTab: m => m.binds?.at(-1) === "ctrl+shift+tab",
-});
-
-const DigitBinds = findLazy(m => m.binds?.[0] === "mod+1");
-
-export default definePlugin({
-    name: "WebKeybinds",
-    description: "Re-adds keybinds missing in the web version of Discord: ctrl+t, ctrl+shift+t, ctrl+tab, ctrl+shift+tab, ctrl+1-9, ctrl+,",
-    authors: [Devs.Ven],
-    enabledByDefault: true,
-
-    onKey(e: KeyboardEvent) {
-        const hasCtrl = e.ctrlKey || (e.metaKey && navigator.platform.includes("Mac"));
-
-        if (hasCtrl) switch (e.key) {
-            case "t":
-            case "T":
-                e.preventDefault();
-                if (e.shiftKey) {
-                    if (SelectedGuildStore.getGuildId()) NavigationRouter.transitionToGuild("@me");
-                    ComponentDispatch.safeDispatch("TOGGLE_DM_CREATE");
-                } else {
-                    FluxDispatcher.dispatch({
-                        type: "QUICKSWITCHER_SHOW",
-                        query: "",
-                        queryMode: null
-                    });
-                }
-                break;
-            case ",":
-                e.preventDefault();
-                SettingsRouter.open("My Account");
-                break;
-            case "Tab":
-                const handler = e.shiftKey ? GuildNavBinds.CtrlShiftTab : GuildNavBinds.CtrlTab;
-                handler.action(e);
-                break;
-            default:
-                if (e.key >= "1" && e.key <= "9") {
-                    e.preventDefault();
-                    DigitBinds.action(e, `mod+${e.key}`);
-                }
-                break;
-        }
-    },
-
-    start() {
-        document.addEventListener("keydown", this.onKey);
-    },
-
-    stop() {
-        document.removeEventListener("keydown", this.onKey);
-    }
-});

src/utils/IpcEvents.ts

@@ -30,6 +30,4 @@ export const enum IpcEvents {
     UPDATE = "VencordUpdate",
     BUILD = "VencordBuild",
     OPEN_MONACO_EDITOR = "VencordOpenMonacoEditor",
-
-    OPEN_IN_APP__RESOLVE_REDIRECT = "VencordOIAResolveRedirect",
 }

src/webpack/common/utils.ts

@@ -77,17 +77,6 @@ export const Toasts = {
     }
 };
 
-/**
- * Show a simple toast. If you need more options, use Toasts.show manually
- */
-export function showToast(message: string, type = ToastType.MESSAGE) {
-    Toasts.show({
-        id: Toasts.genId(),
-        message,
-        type
-    });
-}
-
 export const UserUtils = {
     fetchUser: findByCodeLazy(".USER(", "getUser") as (id: string) => Promise<User>,
 };