Merge remote-tracking branch 'upstream/main'

Co-authored-by: v <vendicated@riseup.net>

browser/userscript.meta.js

@@ -5,6 +5,7 @@
 // @author          Vendicated (https://github.com/Vendicated)
 // @namespace       https://github.com/Vendicated/Vencord
 // @supportURL      https://github.com/Vendicated/Vencord
+// @icon            https://raw.githubusercontent.com/Vendicated/Vencord/refs/heads/main/browser/icon.png
 // @license         GPL-3.0
 // @match           *://*.discord.com/*
 // @grant           GM_xmlhttpRequest

package.json

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

src/main/patcher.ts

@@ -17,7 +17,7 @@
 */
 
 import { onceDefined } from "@shared/onceDefined";
-import electron, { app, BrowserWindowConstructorOptions, Menu } from "electron";
+import electron, { app, BrowserWindowConstructorOptions, Menu, nativeTheme } from "electron";
 import { dirname, join } from "path";
 
 import { initIpc } from "./ipcMain";
@@ -100,6 +100,19 @@ if (!IS_VANILLA) {
 
                 super(options);
                 initIpc(this);
+
+                // Workaround for https://github.com/electron/electron/issues/43367. Vesktop also has its own workaround
+                // @TODO: Remove this when the issue is fixed
+                if (IS_DISCORD_DESKTOP) {
+                    this.webContents.on("devtools-opened", () => {
+                        if (!nativeTheme.shouldUseDarkColors) return;
+
+                        nativeTheme.themeSource = "light";
+                        setTimeout(() => {
+                            nativeTheme.themeSource = "dark";
+                        }, 100);
+                    });
+                }
             } else super(options);
         }
     }

src/plugins/_api/dynamicImageModalApi.ts

@@ -0,0 +1,24 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+
+export default definePlugin({
+    name: "DynamicImageModalAPI",
+    authors: [Devs.sadan, Devs.Nuckyz],
+    description: "Allows you to omit either width or height when opening an image modal",
+    patches: [
+        {
+            find: "SCALE_DOWN:",
+            replacement: {
+                match: /!\(null==(\i)\|\|0===\i\|\|null==(\i)\|\|0===\i\)/,
+                replace: (_, width, height) => `!((null == ${width} || 0 === ${width}) && (null == ${height} || 0 === ${height}))`
+            }
+        }
+    ]
+});

src/plugins/_core/settings.tsx

@@ -197,7 +197,7 @@ export default definePlugin({
     },
 
     get electronVersion() {
-        return VencordNative.native.getVersions().electron || window.armcord?.electron || null;
+        return VencordNative.native.getVersions().electron || window.legcord?.electron || null;
     },
 
     get chromiumVersion() {

src/plugins/_core/supportHelper.tsx

@@ -77,7 +77,7 @@ async function generateDebugInfoMessage() {
     const client = (() => {
         if (IS_DISCORD_DESKTOP) return `Discord Desktop v${DiscordNative.app.getVersion()}`;
         if (IS_VESKTOP) return `Vesktop v${VesktopNative.app.getVersion()}`;
-        if ("armcord" in window) return `ArmCord v${window.armcord.version}`;
+        if ("legcord" in window) return `Legcord v${window.legcord.version}`;
 
         // @ts-expect-error
         const name = typeof unsafeWindow !== "undefined" ? "UserScript" : "Web";
@@ -149,8 +149,8 @@ export default definePlugin({
     patches: [{
         find: ".BEGINNING_DM.format",
         replacement: {
-            match: /BEGINNING_DM\.format\(\{.+?\}\),(?=.{0,100}userId:(\i\.getRecipientId\(\)))/,
+            match: /BEGINNING_DM\.format\(\{.+?\}\),(?=.{0,300}(\i)\.isMultiUserDM)/,
-            replace: "$& $self.ContributorDmWarningCard({ userId: $1 }),"
+            replace: "$& $self.renderContributorDmWarningCard({ channel: $1 }),"
         }
     }],
 
@@ -235,7 +235,8 @@ export default definePlugin({
         }
     },
 
-    ContributorDmWarningCard: ErrorBoundary.wrap(({ userId }) => {
+    renderContributorDmWarningCard: ErrorBoundary.wrap(({ channel }) => {
+        const userId = channel.getRecipientId();
         if (!isPluginDev(userId)) return null;
         if (RelationshipStore.isFriend(userId) || isPluginDev(UserStore.getCurrentUser()?.id)) return null;
 

src/plugins/arRPC.web/index.tsx

@@ -73,8 +73,8 @@ export default definePlugin({
     },
 
     async start() {
-        // ArmCord comes with its own arRPC implementation, so this plugin just confuses users
+        // Legcord comes with its own arRPC implementation, so this plugin just confuses users
-        if ("armcord" in window) return;
+        if ("legcord" in window) return;
 
         if (ws) ws.close();
         ws = new WebSocket("ws://127.0.0.1:1337"); // try to open WebSocket

src/plugins/betterRoleContext/index.tsx

@@ -99,7 +99,11 @@ export default definePlugin({
                         id="vc-view-role-icon"
                         label="View Role Icon"
                         action={() => {
-                            openImageModal(`${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/role-icons/${role.id}/${role.icon}.${settings.store.roleIconFileFormat}`);
+                            openImageModal({
+                                url: `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/role-icons/${role.id}/${role.icon}.${settings.store.roleIconFileFormat}`,
+                                height: 128,
+                                width: 128
+                            });
                         }}
                         icon={ImageIcon}
                     />

src/plugins/biggerStreamPreview/index.tsx

@@ -57,7 +57,11 @@ export const handleViewPreview = async ({ guildId, channelId, ownerId }: Applica
     const previewUrl = await ApplicationStreamPreviewStore.getPreviewURL(guildId, channelId, ownerId);
     if (!previewUrl) return;
 
-    openImageModal(previewUrl);
+    openImageModal({
+        url: previewUrl,
+        height: 720,
+        width: 1280
+    });
 };
 
 export const addViewStreamContext: NavContextMenuPatchCallback = (children, { userId }: { userId: string | bigint; }) => {

src/plugins/fakeNitro/index.tsx

@@ -350,7 +350,7 @@ export default definePlugin({
                 {
                     // Filter attachments to remove fake nitro stickers or emojis
                     predicate: () => settings.store.transformStickers,
-                    match: /renderAttachments\(\i\){let{attachments:(\i).+?;/,
+                    match: /renderAttachments\(\i\){.+?{attachments:(\i).+?;/,
                     replace: (m, attachments) => `${m}${attachments}=$self.filterAttachments(${attachments});`
                 }
             ]

src/plugins/fixImagesQuality/README.md

@@ -0,0 +1,3 @@
+# Fix Images Quality
+
+Prevents images from being loaded as webp, which can cause quality loss

src/plugins/fixImagesQuality/index.ts

@@ -0,0 +1,23 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "FixImagesQuality",
+    description: "Prevents images from being loaded as webp, which can cause quality loss",
+    authors: [Devs.Nuckyz],
+    patches: [
+        {
+            find: "getFormatQuality(){",
+            replacement: {
+                match: /(?<=null;return )\i\.\i&&\(\i\|\|!\i\.isAnimated.+?:(?=\i&&\(\i="png"\))/,
+                replace: ""
+            }
+        }
+    ]
+});

src/plugins/imageZoom/index.tsx

@@ -156,14 +156,10 @@ export default definePlugin({
 
     patches: [
         {
-            find: "Messages.OPEN_IN_BROWSER",
+            find: ".contain,SCALE_DOWN:",
             replacement: {
-                // there are 2 image thingies. one for carosuel and one for the single image.
+                match: /\.slide,\i\),/g,
-                // so thats why i added global flag.
+                replace: `$&id:"${ELEMENT_ID}",`
-                // also idk if this patch is good, should it be more specific?
-                // https://regex101.com/r/xfvNvV/1
-                match: /return.{1,200}\.wrapper.{1,200}src:\i,/g,
-                replace: `$&id: '${ELEMENT_ID}',`
             }
         },
 
@@ -185,13 +181,6 @@ export default definePlugin({
                     replace: "$&$self.unMountMagnifier();"
                 }
             ]
-        },
-        {
-            find: ".carouselModal",
-            replacement: {
-                match: /(?<=\.carouselModal.{0,100}onClick:)\i,/,
-                replace: "()=>{},"
-            }
         }
     ],
 

src/plugins/imageZoom/styles.css

@@ -23,12 +23,3 @@
 
     /* 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: 0 !important;
-}

src/plugins/messageClickActions/index.ts

@@ -74,7 +74,7 @@ export default definePlugin({
                 if (msg.deleted === true) return;
 
                 if (isMe) {
-                    if (!settings.store.enableDoubleClickToEdit || EditStore.isEditing(channel.id, msg.id)) return;
+                    if (!settings.store.enableDoubleClickToEdit || EditStore.isEditing(channel.id, msg.id) || msg.state !== "SENT") return;
 
                     MessageActions.startEditMessage(channel.id, msg.id, msg.content);
                     event.preventDefault();

src/plugins/mutualGroupDMs/index.tsx

@@ -28,7 +28,7 @@ const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel");
 const UserUtils = findByPropsLazy("getGlobalName");
 
 const ProfileListClasses = findByPropsLazy("emptyIconFriends", "emptyIconGuilds");
-const ExpandableList = findComponentByCodeLazy(".mutualFriendItem]");
+const ExpandableList = findComponentByCodeLazy('"PRESS_SECTION"');
 const GuildLabelClasses = findByPropsLazy("guildNick", "guildAvatarWithoutIcon");
 
 function getGroupDMName(channel: Channel) {
@@ -142,16 +142,15 @@ export default definePlugin({
         const mutualGDms = getMutualGroupDms(user.id);
         if (mutualGDms.length === 0) return null;
 
-        const header = getMutualGDMCountText(user);
 
         return (
             <>
                 {Divider}
                 <ExpandableList
-                    className={listStyle}
+                    listClassName={listStyle}
-                    header={header}
+                    header={"Mutual Groups"}
-                    isLoadingHeader={false}
+                    isLoading={false}
-                    children={renderClickableGDMs(mutualGDms, () => { })}
+                    items={renderClickableGDMs(mutualGDms, () => { })}
                 />
             </>
         );

src/plugins/openInApp/index.ts

@@ -91,15 +91,6 @@ export default definePlugin({
                 replace: "async function $1 if(await $self.handleLink(...arguments)) return;"
             }
         },
-        // Make Spotify profile activity links open in app on web
-        {
-            find: "WEB_OPEN(",
-            predicate: () => !IS_DISCORD_DESKTOP && pluginSettings.store.spotify,
-            replacement: {
-                match: /\i\.\i\.isProtocolRegistered\(\)(.{0,100})window.open/g,
-                replace: "true$1VencordNative.native.openExternal"
-            }
-        },
         {
             find: "no artist ids in metadata",
             predicate: () => !IS_DISCORD_DESKTOP && pluginSettings.store.spotify,

src/plugins/pronoundb/api.ts

@@ -1,172 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 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 { getCurrentChannel } from "@utils/discord";
-import { useAwaiter } from "@utils/react";
-import { findStoreLazy } from "@webpack";
-import { UserProfileStore, UserStore } from "@webpack/common";
-
-import { settings } from "./settings";
-import { PronounMapping, Pronouns, PronounsCache, PronounSets, PronounsFormat, PronounSource, PronounsResponse } from "./types";
-
-const UserSettingsAccountStore = findStoreLazy("UserSettingsAccountStore");
-
-const EmptyPronouns = { pronouns: undefined, source: "", hasPendingPronouns: false } as const satisfies Pronouns;
-
-type RequestCallback = (pronounSets?: PronounSets) => void;
-
-const pronounCache: Record<string, PronounsCache> = {};
-const requestQueue: Record<string, RequestCallback[]> = {};
-let isProcessing = false;
-
-async function processQueue() {
-    if (isProcessing) return;
-    isProcessing = true;
-
-    let ids = Object.keys(requestQueue);
-    while (ids.length > 0) {
-        const idsChunk = ids.splice(0, 50);
-        const pronouns = await bulkFetchPronouns(idsChunk);
-
-        for (const id of idsChunk) {
-            const callbacks = requestQueue[id];
-            for (const callback of callbacks) {
-                callback(pronouns[id]?.sets);
-            }
-
-            delete requestQueue[id];
-        }
-
-        ids = Object.keys(requestQueue);
-        await new Promise(r => setTimeout(r, 2000));
-    }
-
-    isProcessing = false;
-}
-
-function fetchPronouns(id: string): Promise<string | undefined> {
-    return new Promise(resolve => {
-        if (pronounCache[id] != null) {
-            resolve(extractPronouns(pronounCache[id].sets));
-            return;
-        }
-
-        function handlePronouns(pronounSets?: PronounSets) {
-            const pronouns = extractPronouns(pronounSets);
-            resolve(pronouns);
-        }
-
-        if (requestQueue[id] != null) {
-            requestQueue[id].push(handlePronouns);
-            return;
-        }
-
-        requestQueue[id] = [handlePronouns];
-        processQueue();
-    });
-}
-
-async function bulkFetchPronouns(ids: string[]): Promise<PronounsResponse> {
-    const params = new URLSearchParams();
-    params.append("platform", "discord");
-    params.append("ids", ids.join(","));
-
-    try {
-        const req = await fetch("https://pronoundb.org/api/v2/lookup?" + String(params), {
-            method: "GET",
-            headers: {
-                "Accept": "application/json",
-                "X-PronounDB-Source": "WebExtension/0.14.5"
-            }
-        });
-
-        if (!req.ok) throw new Error(`Status ${req.status}`);
-        const res: PronounsResponse = await req.json();
-
-        Object.assign(pronounCache, res);
-        return res;
-
-    } catch (e) {
-        console.error("PronounDB request failed:", e);
-        const dummyPronouns: PronounsResponse = Object.fromEntries(ids.map(id => [id, { sets: {} }]));
-
-        Object.assign(pronounCache, dummyPronouns);
-        return dummyPronouns;
-    }
-}
-
-function extractPronouns(pronounSets?: PronounSets): string | undefined {
-    if (pronounSets == null) return undefined;
-    if (pronounSets.en == null) return PronounMapping.unspecified;
-
-    const pronouns = pronounSets.en;
-    if (pronouns.length === 0) return PronounMapping.unspecified;
-
-    const { pronounsFormat } = settings.store;
-
-    if (pronouns.length > 1) {
-        const pronounString = pronouns.map(p => p[0].toUpperCase() + p.slice(1)).join("/");
-        return pronounsFormat === PronounsFormat.Capitalized ? pronounString : pronounString.toLowerCase();
-    }
-
-    const pronoun = pronouns[0];
-    // For capitalized pronouns or special codes (any, ask, avoid), we always return the normal (capitalized) string
-    if (pronounsFormat === PronounsFormat.Capitalized || ["any", "ask", "avoid", "other", "unspecified"].includes(pronoun)) {
-        return PronounMapping[pronoun];
-    } else {
-        return PronounMapping[pronoun].toLowerCase();
-    }
-}
-
-function getDiscordPronouns(id: string, useGlobalProfile: boolean = false): string | undefined {
-    const globalPronouns = UserProfileStore.getUserProfile(id)?.pronouns;
-    if (useGlobalProfile) return globalPronouns;
-
-    return UserProfileStore.getGuildMemberProfile(id, getCurrentChannel()?.guild_id)?.pronouns || globalPronouns;
-}
-
-export function useFormattedPronouns(id: string, useGlobalProfile: boolean = false): Pronouns {
-    const discordPronouns = getDiscordPronouns(id, useGlobalProfile)?.trim().replace(/\n+/g, "");
-    const hasPendingPronouns = UserSettingsAccountStore.getPendingPronouns() != null;
-
-    const [pronouns] = useAwaiter(() => fetchPronouns(id));
-
-    if (settings.store.pronounSource === PronounSource.PreferDiscord && discordPronouns) {
-        return { pronouns: discordPronouns, source: "Discord", hasPendingPronouns };
-    }
-
-    if (pronouns != null && pronouns !== PronounMapping.unspecified) {
-        return { pronouns, source: "PronounDB", hasPendingPronouns };
-    }
-
-    return { pronouns: discordPronouns, source: "Discord", hasPendingPronouns };
-}
-
-export function useProfilePronouns(id: string, useGlobalProfile: boolean = false): Pronouns {
-    try {
-        const pronouns = useFormattedPronouns(id, useGlobalProfile);
-
-        if (!settings.store.showInProfile) return EmptyPronouns;
-        if (!settings.store.showSelf && id === UserStore.getCurrentUser()?.id) return EmptyPronouns;
-
-        return pronouns;
-    } catch (e) {
-        console.error(e);
-        return EmptyPronouns;
-    }
-}

src/plugins/pronoundb/components/PronounsAboutComponent.tsx

@@ -1,41 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 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 { Link } from "@components/Link";
-import { Forms, React } from "@webpack/common";
-
-export default function PronounsAboutComponent() {
-    return (
-        <React.Fragment>
-            <Forms.FormTitle tag="h3">More Information</Forms.FormTitle>
-            <Forms.FormText>To add your own pronouns, visit{" "}
-                <Link href="https://pronoundb.org">pronoundb.org</Link>
-            </Forms.FormText>
-            <Forms.FormDivider />
-            <Forms.FormText>
-                The two pronoun formats are lowercase and capitalized. Example:
-                <ul>
-                    <li>Lowercase: they/them</li>
-                    <li>Capitalized: They/Them</li>
-                </ul>
-                Text like "Ask me my pronouns" or "Any pronouns" will always be capitalized. <br /><br />
-                You can also configure whether or not to display pronouns for the current user (since you probably already know them)
-            </Forms.FormText>
-        </React.Fragment>
-    );
-}

src/plugins/pronoundb/index.ts

@@ -1,78 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 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 "./styles.css";
-
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-
-import { useProfilePronouns } from "./api";
-import PronounsAboutComponent from "./components/PronounsAboutComponent";
-import { CompactPronounsChatComponentWrapper, PronounsChatComponentWrapper } from "./components/PronounsChatComponent";
-import { settings } from "./settings";
-
-export default definePlugin({
-    name: "PronounDB",
-    authors: [Devs.Tyman, Devs.TheKodeToad, Devs.Ven, Devs.Elvyra],
-    description: "Adds pronouns to user messages using pronoundb",
-    patches: [
-        {
-            find: "showCommunicationDisabledStyles",
-            replacement: [
-                // Add next to username (compact mode)
-                {
-                    match: /("span",{id:\i,className:\i,children:\i}\))/,
-                    replace: "$1, $self.CompactPronounsChatComponentWrapper(arguments[0])"
-                },
-                // Patch the chat timestamp element (normal mode)
-                {
-                    match: /(?<=return\s*\(0,\i\.jsxs?\)\(.+!\i&&)(\(0,\i.jsxs?\)\(.+?\{.+?\}\))/,
-                    replace: "[$1, $self.PronounsChatComponentWrapper(arguments[0])]"
-                }
-            ]
-        },
-
-        {
-            find: ".Messages.USER_PROFILE_PRONOUNS",
-            group: true,
-            replacement: [
-                {
-                    match: /\.PANEL},/,
-                    replace: "$&{pronouns:vcPronoun,source:vcPronounSource,hasPendingPronouns:vcHasPendingPronouns}=$self.useProfilePronouns(arguments[0].user?.id),"
-                },
-                {
-                    match: /text:\i\.\i.Messages.USER_PROFILE_PRONOUNS/,
-                    replace: '$&+(vcPronoun==null||vcHasPendingPronouns?"":` (${vcPronounSource})`)'
-                },
-                {
-                    match: /(\.pronounsText.+?children:)(\i)/,
-                    replace: "$1(vcPronoun==null||vcHasPendingPronouns)?$2:vcPronoun"
-                }
-            ]
-        }
-    ],
-
-    settings,
-
-    settingsAboutComponent: PronounsAboutComponent,
-
-    // Re-export the components on the plugin object so it is easily accessible in patches
-    PronounsChatComponentWrapper,
-    CompactPronounsChatComponentWrapper,
-    useProfilePronouns
-});

src/plugins/pronoundb/styles.css

@@ -1,9 +0,0 @@
-.vc-pronoundb-compact {
-    display: none;
-}
-
-[class*="compact"] .vc-pronoundb-compact {
-    display: inline-block;
-    margin-left: -2px;
-    margin-right: 0.25rem;
-}

src/plugins/pronoundb/types.ts

@@ -1,63 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 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/>.
-*/
-
-export interface UserProfileProps {
-    userId: string;
-}
-
-export interface UserProfilePronounsProps {
-    currentPronouns: string | null;
-    hidePersonalInformation: boolean;
-}
-
-export type PronounSets = Record<string, PronounCode[]>;
-export type PronounsResponse = Record<string, { sets?: PronounSets; }>;
-
-export interface PronounsCache {
-    sets?: PronounSets;
-}
-
-export const PronounMapping = {
-    he: "He/Him",
-    it: "It/Its",
-    she: "She/Her",
-    they: "They/Them",
-    any: "Any pronouns",
-    other: "Other pronouns",
-    ask: "Ask me my pronouns",
-    avoid: "Avoid pronouns, use my name",
-    unspecified: "No pronouns specified.",
-} as const satisfies Record<string, string>;
-
-export type PronounCode = keyof typeof PronounMapping;
-
-export interface Pronouns {
-    pronouns?: string;
-    source: string;
-    hasPendingPronouns: boolean;
-}
-
-export const enum PronounsFormat {
-    Lowercase = "LOWERCASE",
-    Capitalized = "CAPITALIZED"
-}
-
-export const enum PronounSource {
-    PreferPDB,
-    PreferDiscord
-}

src/plugins/serverInfo/GuildInfoModal.tsx

@@ -80,7 +80,10 @@ function GuildInfoModal({ guild }: GuildProps) {
                     className={cl("banner")}
                     src={bannerUrl}
                     alt=""
-                    onClick={() => openImageModal(bannerUrl)}
+                    onClick={() => openImageModal({
+                        url: bannerUrl,
+                        width: 1024
+                    })}
                 />
             )}
 
@@ -89,7 +92,11 @@ function GuildInfoModal({ guild }: GuildProps) {
                     ? <img
                         src={iconUrl}
                         alt=""
-                        onClick={() => openImageModal(iconUrl)}
+                        onClick={() => openImageModal({
+                            url: iconUrl,
+                            height: 512,
+                            width: 512,
+                        })}
                     />
                     : <div aria-hidden className={classes(IconClasses.childWrapper, IconClasses.acronym)}>{guild.acronym}</div>
                 }
@@ -151,7 +158,15 @@ function Owner(guildId: string, owner: User) {
 
     return (
         <div className={cl("owner")}>
-            <img src={ownerAvatarUrl} alt="" onClick={() => openImageModal(ownerAvatarUrl)} />
+            <img
+                src={ownerAvatarUrl}
+                alt=""
+                onClick={() => openImageModal({
+                    url: ownerAvatarUrl,
+                    height: 512,
+                    width: 512
+                })}
+            />
             {Parser.parse(`<@${owner.id}>`)}
         </div>
     );

src/plugins/serverInfo/index.tsx

@@ -30,7 +30,9 @@ export default definePlugin({
     name: "ServerInfo",
     description: "Allows you to view info about a server",
     authors: [Devs.Ven, Devs.Nuckyz],
+    dependencies: ["DynamicImageModalAPI"],
     tags: ["guild", "info", "ServerProfile"],
+
     contextMenus: {
         "guild-context": Patch,
         "guild-header-popout": Patch

src/plugins/showHiddenChannels/index.tsx

@@ -61,6 +61,10 @@ export const settings = definePluginSettings({
     }
 });
 
+function isUncategorized(objChannel: { channel: Channel; comparator: number; }) {
+    return objChannel.channel.id === "null" && objChannel.channel.name === "Uncategorized" && objChannel.comparator === -1;
+}
+
 export default definePlugin({
     name: "ShowHiddenChannels",
     description: "Show channels that you do not have access to view.",
@@ -99,7 +103,7 @@ export default definePlugin({
             replacement: [
                 {
                     // Do not show confirmation to join a voice channel when already connected to another if clicking on a hidden voice channel
-                    match: /(?<=getCurrentClientVoiceChannelId\((\i)\.guild_id\);return)/,
+                    match: /(?<=getBlockedUsersForVoiceChannel\((\i)\.id\);return)/,
                     replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
                 },
                 {
@@ -503,7 +507,7 @@ export default definePlugin({
             res[key] ??= [];
 
             for (const objChannel of maybeObjChannels) {
-                if (objChannel.channel.id === null || !this.isHiddenChannel(objChannel.channel)) res[key].push(objChannel);
+                if (isUncategorized(objChannel) || objChannel.channel.id === null || !this.isHiddenChannel(objChannel.channel)) res[key].push(objChannel);
             }
         }
 

src/plugins/spotifyControls/PlayerComponent.tsx

@@ -229,7 +229,7 @@ function AlbumContextMenu({ track }: { track: Track; }) {
                 id="view-cover"
                 label="View Album Cover"
                 // trolley
-                action={() => openImageModal(track.album.image.url)}
+                action={() => openImageModal(track.album.image)}
                 icon={ImageIcon}
             />
             <Menu.MenuControlItem

src/plugins/userMessagesPronouns/PronounsChatComponent.tsx

@@ -16,22 +16,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { getUserSettingLazy } from "@api/UserSettings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { classes } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
-import { UserStore } from "@webpack/common";
+import { i18n, Tooltip, UserStore } from "@webpack/common";
 import { Message } from "discord-types/general";
 
-import { useFormattedPronouns } from "../api";
+import { settings } from "./settings";
-import { settings } from "../settings";
+import { useFormattedPronouns } from "./utils";
 
 const styles: Record<string, string> = findByPropsLazy("timestampInline");
+const MessageDisplayCompact = getUserSettingLazy("textAndImages", "messageDisplayCompact")!;
 
 const AUTO_MODERATION_ACTION = 24;
 
 function shouldShow(message: Message): boolean {
-    if (!settings.store.showInMessages)
-        return false;
     if (message.author.bot || message.author.system || message.type === AUTO_MODERATION_ACTION)
         return false;
     if (!settings.store.showSelf && message.author.id === UserStore.getCurrentUser().id)
@@ -40,6 +40,21 @@ function shouldShow(message: Message): boolean {
     return true;
 }
 
+function PronounsChatComponent({ message }: { message: Message; }) {
+    const pronouns = useFormattedPronouns(message.author.id);
+
+    return pronouns && (
+        <Tooltip text={i18n.Messages.USER_PROFILE_PRONOUNS}>
+            {tooltipProps => (
+                <span
+                    {...tooltipProps}
+                    className={classes(styles.timestampInline, styles.timestamp)}
+                >• {pronouns}</span>
+            )}
+        </Tooltip>
+    );
+}
+
 export const PronounsChatComponentWrapper = ErrorBoundary.wrap(({ message }: { message: Message; }) => {
     return shouldShow(message)
         ? <PronounsChatComponent message={message} />
@@ -47,27 +62,11 @@ export const PronounsChatComponentWrapper = ErrorBoundary.wrap(({ message }: { m
 }, { noop: true });
 
 export const CompactPronounsChatComponentWrapper = ErrorBoundary.wrap(({ message }: { message: Message; }) => {
-    return shouldShow(message)
+    const compact = MessageDisplayCompact.useSetting();
-        ? <CompactPronounsChatComponent message={message} />
+
-        : null;
+    if (!compact || !shouldShow(message)) {
-}, { noop: true });
+        return null;
-
+    }
-function PronounsChatComponent({ message }: { message: Message; }) {
+
-    const { pronouns } = useFormattedPronouns(message.author.id);
+    return <PronounsChatComponent message={message} />;
-
-    return pronouns && (
-        <span
-            className={classes(styles.timestampInline, styles.timestamp)}
-        >• {pronouns}</span>
-    );
-}
-
-export const CompactPronounsChatComponent = ErrorBoundary.wrap(({ message }: { message: Message; }) => {
-    const { pronouns } = useFormattedPronouns(message.author.id);
-
-    return pronouns && (
-        <span
-            className={classes(styles.timestampInline, styles.timestamp, "vc-pronoundb-compact")}
-        >• {pronouns}</span>
-    );
 }, { noop: true });

src/plugins/userMessagesPronouns/README.md

@@ -0,0 +1,5 @@
+User Messages Pronouns
+
+Adds pronouns to chat user messages
+
+![](https://github.com/user-attachments/assets/34dc373d-faf4-4420-b49b-08b2647baa3b)

src/plugins/userMessagesPronouns/index.ts

@@ -0,0 +1,54 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 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 { migratePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+import { CompactPronounsChatComponentWrapper, PronounsChatComponentWrapper } from "./PronounsChatComponent";
+import { settings } from "./settings";
+
+migratePluginSettings("UserMessagesPronouns", "PronounDB");
+export default definePlugin({
+    name: "UserMessagesPronouns",
+    authors: [Devs.Tyman, Devs.TheKodeToad, Devs.Ven, Devs.Elvyra],
+    description: "Adds pronouns to chat user messages",
+    settings,
+
+    patches: [
+        {
+            find: "showCommunicationDisabledStyles",
+            replacement: {
+                // Add next to timestamp (normal mode)
+                match: /(?<=return\s*\(0,\i\.jsxs?\)\(.+!\i&&)(\(0,\i.jsxs?\)\(.+?\{.+?\}\))/,
+                replace: "[$1, $self.PronounsChatComponentWrapper(arguments[0])]"
+            }
+        },
+        {
+            find: '="SYSTEM_TAG"',
+            replacement: {
+                // Add next to username (compact mode)
+                match: /className:\i\(\)\(\i\.className(?:,\i\.clickable)?,\i\)}\),(?=\i)/g,
+                replace: "$&$self.CompactPronounsChatComponentWrapper(arguments[0]),"
+            }
+        }
+    ],
+
+    PronounsChatComponentWrapper,
+    CompactPronounsChatComponentWrapper,
+});

src/plugins/userMessagesPronouns/settings.ts

@@ -19,7 +19,10 @@
 import { definePluginSettings } from "@api/Settings";
 import { OptionType } from "@utils/types";
 
-import { PronounsFormat, PronounSource } from "./types";
+export const enum PronounsFormat {
+    Lowercase = "LOWERCASE",
+    Capitalized = "CAPITALIZED"
+}
 
 export const settings = definePluginSettings({
     pronounsFormat: {
@@ -37,34 +40,9 @@ export const settings = definePluginSettings({
             }
         ]
     },
-    pronounSource: {
-        type: OptionType.SELECT,
-        description: "Where to source pronouns from",
-        options: [
-            {
-                label: "Prefer PronounDB, fall back to Discord",
-                value: PronounSource.PreferPDB,
-                default: true
-            },
-            {
-                label: "Prefer Discord, fall back to PronounDB (might lead to inconsistency between pronouns in chat and profile)",
-                value: PronounSource.PreferDiscord
-            }
-        ]
-    },
     showSelf: {
         type: OptionType.BOOLEAN,
-        description: "Enable or disable showing pronouns for the current user",
+        description: "Enable or disable showing pronouns for yourself",
-        default: true
-    },
-    showInMessages: {
-        type: OptionType.BOOLEAN,
-        description: "Show in messages",
-        default: true
-    },
-    showInProfile: {
-        type: OptionType.BOOLEAN,
-        description: "Show in profile",
         default: true
     }
 });

src/plugins/userMessagesPronouns/utils.ts

@@ -0,0 +1,35 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 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 { getCurrentChannel } from "@utils/discord";
+import { UserProfileStore, useStateFromStores } from "@webpack/common";
+
+import { PronounsFormat, settings } from "./settings";
+
+function useDiscordPronouns(id: string, useGlobalProfile: boolean = false): string | undefined {
+    const globalPronouns: string | undefined = useStateFromStores([UserProfileStore], () => UserProfileStore.getUserProfile(id)?.pronouns);
+    const guildPronouns: string | undefined = useStateFromStores([UserProfileStore], () => UserProfileStore.getGuildMemberProfile(id, getCurrentChannel()?.getGuildId())?.pronouns);
+
+    if (useGlobalProfile) return globalPronouns;
+    return guildPronouns || globalPronouns;
+}
+
+export function useFormattedPronouns(id: string, useGlobalProfile: boolean = false) {
+    const pronouns = useDiscordPronouns(id, useGlobalProfile)?.trim().replace(/\n+/g, "");
+    return settings.store.pronounsFormat === PronounsFormat.Lowercase ? pronouns?.toLowerCase() : pronouns;
+}

src/plugins/viewIcons/index.tsx

@@ -67,7 +67,10 @@ const settings = definePluginSettings({
     }
 });
 
-function openImage(url: string) {
+const openAvatar = (url: string) => openImage(url, 512, 512);
+const openBanner = (url: string) => openImage(url, 1024);
+
+function openImage(url: string, width: number, height?: number) {
     const format = url.startsWith("/") ? "png" : settings.store.format;
 
     const u = new URL(url, window.location.href);
@@ -76,11 +79,13 @@ function openImage(url: string) {
     url = u.toString();
 
     u.searchParams.set("size", "4096");
-    const originalUrl = u.toString();
+    const original = u.toString();
 
-    openImageModal(url, {
+    openImageModal({
-        original: originalUrl,
+        url,
-        height: 256
+        original,
+        width,
+        height
     });
 }
 
@@ -93,14 +98,14 @@ const UserContext: NavContextMenuPatchCallback = (children, { user, guildId }: U
             <Menu.MenuItem
                 id="view-avatar"
                 label="View Avatar"
-                action={() => openImage(IconUtils.getUserAvatarURL(user, true))}
+                action={() => openAvatar(IconUtils.getUserAvatarURL(user, true))}
                 icon={ImageIcon}
             />
             {memberAvatar && (
                 <Menu.MenuItem
                     id="view-server-avatar"
                     label="View Server Avatar"
-                    action={() => openImage(IconUtils.getGuildMemberAvatarURLSimple({
+                    action={() => openAvatar(IconUtils.getGuildMemberAvatarURLSimple({
                         userId: user.id,
                         avatar: memberAvatar,
                         guildId: guildId!,
@@ -126,7 +131,7 @@ const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildCon
                     id="view-icon"
                     label="View Icon"
                     action={() =>
-                        openImage(IconUtils.getGuildIconURL({
+                        openAvatar(IconUtils.getGuildIconURL({
                             id,
                             icon,
                             canAnimate: true
@@ -140,7 +145,7 @@ const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildCon
                     id="view-banner"
                     label="View Banner"
                     action={() =>
-                        openImage(IconUtils.getGuildBannerURL(guild, true)!)
+                        openBanner(IconUtils.getGuildBannerURL(guild, true)!)
                     }
                     icon={ImageIcon}
                 />
@@ -158,7 +163,7 @@ const GroupDMContext: NavContextMenuPatchCallback = (children, { channel }: Grou
                 id="view-group-channel-icon"
                 label="View Icon"
                 action={() =>
-                    openImage(IconUtils.getChannelIconURL(channel)!)
+                    openAvatar(IconUtils.getChannelIconURL(channel)!)
                 }
                 icon={ImageIcon}
             />
@@ -171,10 +176,12 @@ export default definePlugin({
     authors: [Devs.Ven, Devs.TheKodeToad, Devs.Nuckyz, Devs.nyx],
     description: "Makes avatars and banners in user profiles clickable, adds View Icon/Banner entries in the user, server and group channel context menu.",
     tags: ["ImageUtilities"],
+    dependencies: ["DynamicImageModalAPI"],
 
     settings,
 
-    openImage,
+    openAvatar,
+    openBanner,
 
     contextMenus: {
         "user-context": UserContext,
@@ -188,7 +195,7 @@ export default definePlugin({
             find: ".overlay:void 0,status:",
             replacement: {
                 match: /avatarSrc:(\i),eventHandlers:(\i).+?"div",{...\2,/,
-                replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openImage($1)},"
+                replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openAvatar($1)},"
             },
             all: true
         },
@@ -197,7 +204,7 @@ export default definePlugin({
             find: 'backgroundColor:"COMPLETE"',
             replacement: {
                 match: /(\.banner,.+?),style:{(?=.+?backgroundImage:null!=(\i)\?"url\("\.concat\(\2,)/,
-                replace: (_, rest, bannerSrc) => `${rest},onClick:()=>${bannerSrc}!=null&&$self.openImage(${bannerSrc}),style:{cursor:${bannerSrc}!=null?"pointer":void 0,`
+                replace: (_, rest, bannerSrc) => `${rest},onClick:()=>${bannerSrc}!=null&&$self.openBanner(${bannerSrc}),style:{cursor:${bannerSrc}!=null?"pointer":void 0,`
             }
         },
         // Group DMs top small & large icon
@@ -205,7 +212,7 @@ export default definePlugin({
             find: /\.recipients\.length>=2(?!<isMultiUserDM.{0,50})/,
             replacement: {
                 match: /null==\i\.icon\?.+?src:(\(0,\i\.\i\).+?\))(?=[,}])/,
-                replace: (m, iconUrl) => `${m},onClick:()=>$self.openImage(${iconUrl})`
+                replace: (m, iconUrl) => `${m},onClick:()=>$self.openAvatar(${iconUrl})`
             }
         },
         // User DMs top small icon
@@ -213,7 +220,7 @@ export default definePlugin({
             find: ".cursorPointer:null,children",
             replacement: {
                 match: /.Avatar,.+?src:(.+?\))(?=[,}])/,
-                replace: (m, avatarUrl) => `${m},onClick:()=>$self.openImage(${avatarUrl})`
+                replace: (m, avatarUrl) => `${m},onClick:()=>$self.openAvatar(${avatarUrl})`
             }
         },
         // User Dms top large icon
@@ -221,7 +228,7 @@ export default definePlugin({
             find: 'experimentLocation:"empty_messages"',
             replacement: {
                 match: /.Avatar,.+?src:(.+?\))(?=[,}])/,
-                replace: (m, avatarUrl) => `${m},onClick:()=>$self.openImage(${avatarUrl})`
+                replace: (m, avatarUrl) => `${m},onClick:()=>$self.openAvatar(${avatarUrl})`
             }
         }
     ]

src/plugins/webKeybinds.web/index.ts

@@ -25,7 +25,7 @@ const KeyBinds = findByPropsLazy("JUMP_TO_GUILD", "SERVER_NEXT");
 
 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+,. Only works fully on Vesktop/ArmCord, not inside your browser",
+    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+,. Only works fully on Vesktop/Legcord, not inside your browser",
     authors: [Devs.Ven],
     enabledByDefault: true,
 

src/utils/constants.ts

@@ -575,6 +575,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "RamziAH",
         id: 1279957227612147747n,
     },
+        SomeAspy: {
+        name: "SomeAspy",
+        id: 516750892372852754n,
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

src/utils/discord.css

@@ -0,0 +1,24 @@
+.vc-position-inherit {
+    position: inherit;
+}
+
+/**
+ * copy pasted from discord css. not really webpack-findable since it's the only class in the module
+**/
+
+.vc-image-modal {
+    background: transparent!important;
+    box-shadow: none!important;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 0
+}
+
+@media(width <= 485px) {
+    .vc-image-modal {
+        display:relative;
+        overflow: visible;
+        overflow: initial
+    }
+}

src/utils/discord.tsx

@@ -16,11 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import "./discord.css";
+
 import { MessageObject } from "@api/MessageEvents";
-import { ChannelStore, ComponentDispatch, Constants, FluxDispatcher, GuildStore, InviteActions, MaskedLink, MessageActions, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
+import { ChannelStore, ComponentDispatch, Constants, FluxDispatcher, GuildStore, InviteActions, MessageActions, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
 import { Channel, Guild, Message, User } from "discord-types/general";
 
-import { ImageModal, ModalRoot, ModalSize, openModal } from "./modal";
+import { ImageModal, ImageModalItem, openModal } from "./modal";
 
 /**
  * Open the invite modal
@@ -108,25 +110,24 @@ export function sendMessage(
     return MessageActions.sendMessage(channelId, messageData, waitForChannelReady, extra);
 }
 
-export function openImageModal(url: string, props?: Partial<React.ComponentProps<ImageModal>>): string {
+/**
+ * You must specify either height or width
+ */
+export function openImageModal(props: Omit<ImageModalItem, "type">): string {
     return openModal(modalProps => (
-        <ModalRoot
+        <ImageModal
             {...modalProps}
-            className={ModalImageClasses.modal}
+            className="vc-image-modal"
-            size={ModalSize.DYNAMIC}>
+            fit="vc-position-inherit"
-            <ImageModal
+            items={[{
-                className={ModalImageClasses.image}
+                type: "IMAGE",
-                original={url}
+                original: props.url,
-                placeholder={url}
+                ...props,
-                src={url}
+            }]}
-                renderLinkComponent={props => <MaskedLink {...props} />}
+            onClose={modalProps.onClose}
-                // Don't render forward message button
+            shouldHideMediaOptions={false}
-                renderForwardComponent={() => null}
+            shouldAnimate
-                shouldHideMediaOptions={false}
+        />
-                shouldAnimate
-                {...props}
-            />
-        </ModalRoot>
     ));
 }
 

src/utils/modal.tsx

@@ -101,25 +101,24 @@ export const Modals = findByPropsLazy("ModalRoot", "ModalCloseButton") as {
     }>;
 };
 
-export type ImageModal = ComponentType<{
+export interface ImageModalItem {
-    className?: string;
+    type: "IMAGE" | "VIDEO";
-    src: string;
+    url: string;
-    placeholder: string;
-    original: string;
     width?: number;
     height?: number;
-    animated?: boolean;
+    original?: string;
-    responsive?: boolean;
+}
-    renderLinkComponent(props: any): ReactNode;
+
-    renderForwardComponent(props: any): ReactNode;
+export type ImageModal = ComponentType<{
-    maxWidth?: number;
+    className?: string;
-    maxHeight?: number;
+    fit?: string;
-    shouldAnimate?: boolean;
     onClose?(): void;
     shouldHideMediaOptions?: boolean;
+    shouldAnimate?: boolean;
+    items: ImageModalItem[];
 }>;
 
-export const ImageModal = findComponentByCodeLazy(".MEDIA_MODAL_CLOSE", "responsive") as ImageModal;
+export const ImageModal = findComponentByCodeLazy(".MEDIA_MODAL_CLOSE") as ImageModal;
 
 export const ModalRoot = LazyComponent(() => Modals.ModalRoot);
 export const ModalHeader = LazyComponent(() => Modals.ModalHeader);