Merge branch 'main' of https://www.coastalcommits.com/CoastalCommitsArchival/github.com-Vendicated-Vencord

package.json

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

src/plugins/customRPC/index.tsx

@@ -27,7 +27,6 @@ import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, React, Select
 
 const ActivityComponent = findComponentByCodeLazy("onOpenGameProfile");
 const ActivityClassName = findByPropsLazy("activity", "buttonColor");
-const Colors = findByPropsLazy("profileColors");
 
 async function getApplicationAsset(key: string): Promise<string> {
     if (/https?:\/\/(cdn|media)\.discordapp\.(com|net)\/attachments\//.test(key)) return "mp:" + key.replace(/https?:\/\/(cdn|media)\.discordapp\.(com|net)\//, "");
@@ -406,7 +405,7 @@ export default definePlugin({
                     If you want to use image link, download your image and reupload the image to <Link href="https://imgur.com">Imgur</Link> and get the image link by right-clicking the image and select "Copy image address".
                 </Forms.FormText>
                 <Forms.FormDivider />
-                <div style={{ width: "284px" }} className={Colors.profileColors}>
+                <div style={{ width: "284px" }}>
                     {activity[0] && <ActivityComponent activity={activity[0]} className={ActivityClassName.activity} channelId={SelectedChannelStore.getChannelId()}
                         guild={GuildStore.getGuild(SelectedGuildStore.getLastSelectedGuildId())}
                         application={{ id: settings.store.appID }}

src/plugins/favEmojiFirst/index.ts

@@ -83,6 +83,6 @@ export default definePlugin({
             if (!aIsFavorite && bIsFavorite) return 1;
 
             return 0;
-        }).slice(0, query.results.emojis.sliceTo ?? 10);
+        }).slice(0, query.results.emojis.sliceTo ?? Infinity);
     }
 });

src/plugins/messageLogger/index.tsx

@@ -337,12 +337,12 @@ export default definePlugin({
         {
             // Attachment renderer
             // Module 96063
-            find: ".removeAttachmentHoverButton",
+            find: ".removeMosaicItemHoverButton",
             group: true,
             replacement: [
                 {
-                    match: /(className:\i,attachment:\i),/,
+                    match: /(className:\i,item:\i),/,
-                    replace: "$1,attachment: {deleted},"
+                    replace: "$1,item: deleted,"
                 },
                 {
                     match: /\[\i\.obscured\]:.+?,/,

src/plugins/noMosaic/index.ts

@@ -5,15 +5,9 @@
  */
 
 import { definePluginSettings } from "@api/Settings";
-import { disableStyle, enableStyle } from "@api/Styles";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 
-import style from "./styles.css?managed";
-
-const MAX_WIDTH = 550;
-const MAX_HEIGHT = 350;
-
 const settings = definePluginSettings({
     inlineVideo: {
         description: "Play videos without carousel modal",
@@ -33,15 +27,11 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".oneByTwoLayoutThreeGrid",
+            find: "isGroupableMedia:function()",
-            replacement: [{
+            replacement: {
-                match: /mediaLayoutType:\i\.\i\.MOSAIC/,
+                match: /=>"IMAGE"===\i\|\|"VIDEO"===\i;/,
-                replace: "mediaLayoutType:'RESPONSIVE'",
+                replace: "=>false;"
-            },
+            }
-            {
-                match: /null!==\(\i=\i\.get\(\i\)\)&&void 0!==\i\?\i:"INVALID"/,
-                replace: '"INVALID"',
-            }]
         },
         {
             find: "renderAttachments(",
@@ -51,52 +41,5 @@ export default definePlugin({
                 replace: "$&$1.content_type?.startsWith('image/')&&"
             }
         },
-        {
+    ]
-            find: "Messages.REMOVE_ATTACHMENT_TOOLTIP_TEXT",
-            replacement: [{
-                match: /\i===\i\.\i\.MOSAIC/,
-                replace: "true"
-            },
-            {
-                match: /\i!==\i\.\i\.MOSAIC/,
-                replace: "false"
-            }]
-        },
-        {
-            find: ".messageAttachment,",
-            replacement: {
-                match: /\{width:\i,height:\i\}=(\i).*?(?=className:\i\(\)\(\i\.messageAttachment,)/,
-                replace: "$&style:$self.style($1),"
-            }
-        }
-    ],
-
-    style({ width, height }) {
-        if (!width || !height) return {};
-
-        if (width > MAX_WIDTH || height > MAX_HEIGHT) {
-            if (width / height > MAX_WIDTH / MAX_HEIGHT) {
-                height = Math.ceil(MAX_WIDTH / (width / height));
-                width = MAX_WIDTH;
-            } else {
-                width = Math.ceil(MAX_HEIGHT * (width / height));
-                height = MAX_HEIGHT;
-            }
-        }
-
-        return {
-            maxWidth: width,
-            width: "100%",
-            aspectRatio: `${width} / ${height}`
-        };
-
-    },
-
-    start() {
-        enableStyle(style);
-    },
-
-    stop() {
-        disableStyle(style);
-    }
 });

src/plugins/noMosaic/styles.css

@@ -1,8 +0,0 @@
-[class^="nonMediaAttachmentsContainer_"] [class*="messageAttachment_"] {
-    position: relative;
-}
-
-[class^="nonMediaAttachmentsContainer_"],
-[class^="nonMediaAttachmentItem_"]:has([class^="messageAttachment_"][style^="max-width"]) {
-    width: 100%;
-}

src/plugins/pictureInPicture/index.tsx

@@ -10,7 +10,7 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { React, Tooltip } from "@webpack/common";
+import { Tooltip } from "@webpack/common";
 
 const settings = definePluginSettings({
     loop: {
@@ -28,9 +28,9 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: ".nonMediaAttachment]",
+            find: ".nonMediaMosaicItem]",
             replacement: {
-                match: /\.nonMediaAttachment\]:!(\i).{0,10}children:\[(\S)/,
+                match: /\.nonMediaMosaicItem\]:!(\i).{0,10}children:\[(\S)/,
                 replace: "$&,$1&&$2&&$self.renderPiPButton(),"
             },
         },

src/plugins/pronoundb/index.ts

@@ -36,25 +36,24 @@ export default definePlugin({
     authors: [Devs.Tyman, Devs.TheKodeToad, Devs.Ven],
     description: "Adds pronouns to user messages using pronoundb",
     patches: [
-        // Add next to username (compact mode)
         {
             find: "showCommunicationDisabledStyles",
-            replacement: {
+            replacement: [
-                match: /("span",{id:\i,className:\i,children:\i}\))/,
+                // Add next to username (compact mode)
-                replace: "$1, $self.CompactPronounsChatComponentWrapper(arguments[0])"
+                {
-            }
+                    match: /("span",{id:\i,className:\i,children:\i}\))/,
-        },
+                    replace: "$1, $self.CompactPronounsChatComponentWrapper(arguments[0])"
-        // Patch the chat timestamp element (normal mode)
+                },
-        {
+                // Patch the chat timestamp element (normal mode)
-            find: "showCommunicationDisabledStyles",
+                {
-            replacement: {
+                    match: /(?<=return\s*\(0,\i\.jsxs?\)\(.+!\i&&)(\(0,\i.jsxs?\)\(.+?\{.+?\}\))/,
-                match: /(?<=return\s*\(0,\i\.jsxs?\)\(.+!\i&&)(\(0,\i.jsxs?\)\(.+?\{.+?\}\))/,
+                    replace: "[$1, $self.PronounsChatComponentWrapper(arguments[0])]"
-                replace: "[$1, $self.PronounsChatComponentWrapper(arguments[0])]"
+                }
-            }
+            ]
         },
         // Patch the profile popout username header to use our pronoun hook instead of Discord's pronouns
         {
-            find: ".userTagNoNickname",
+            find: ".pronouns,children",
             replacement: [
                 {
                     match: /{user:(\i),[^}]*,pronouns:(\i),[^}]*}=\i;/,

src/plugins/resurrectHome/index.tsx

@@ -18,9 +18,68 @@
 
 import { findGroupChildrenByChildId } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Menu } from "@webpack/common";
+import { findByPropsLazy } from "@webpack";
+import { Button, Menu, Tooltip, useEffect, useState } from "@webpack/common";
+
+const ChannelRowClasses = findByPropsLazy("modeConnected", "modeLocked", "icon");
+
+let currentShouldViewServerHome = false;
+const shouldViewServerHomeStates = new Set<React.Dispatch<React.SetStateAction<boolean>>>();
+
+function ViewServerHomeButton() {
+    return (
+        <Tooltip text="View Server Home">
+            {tooltipProps => (
+                <Button
+                    {...tooltipProps}
+                    look={Button.Looks.BLANK}
+                    size={Button.Sizes.NONE}
+                    innerClassName={ChannelRowClasses.icon}
+                    onClick={e => {
+                        e.preventDefault();
+
+                        currentShouldViewServerHome = true;
+                        for (const setState of shouldViewServerHomeStates) {
+                            setState(true);
+                        }
+                    }}
+
+                >
+                    <svg width="20" height="20" viewBox="0 0 24 24">
+                        <path fill="currentColor" d="m2.4 8.4 8.38-6.46a2 2 0 0 1 2.44 0l8.39 6.45a2 2 0 0 1-.79 3.54l-.32.07-.82 8.2a2 2 0 0 1-1.99 1.8H16a1 1 0 0 1-1-1v-5a3 3 0 0 0-6 0v5a1 1 0 0 1-1 1H6.31a2 2 0 0 1-1.99-1.8L3.5 12l-.32-.07a2 2 0 0 1-.79-3.54Z" />
+                    </svg>
+                </Button>
+            )}
+        </Tooltip>
+    );
+}
+
+function useForceServerHome() {
+    const { forceServerHome } = settings.use(["forceServerHome"]);
+    const [shouldViewServerHome, setShouldViewServerHome] = useState(currentShouldViewServerHome);
+
+    useEffect(() => {
+        shouldViewServerHomeStates.add(setShouldViewServerHome);
+
+        return () => {
+            shouldViewServerHomeStates.delete(setShouldViewServerHome);
+        };
+    }, []);
+
+    return shouldViewServerHome || forceServerHome;
+}
+
+function useDisableViewServerHome() {
+    useEffect(() => () => {
+        currentShouldViewServerHome = false;
+        for (const setState of shouldViewServerHomeStates) {
+            setState(false);
+        }
+    }, []);
+}
 
 const settings = definePluginSettings({
     forceServerHome: {
@@ -30,12 +89,6 @@ const settings = definePluginSettings({
     }
 });
 
-function useForceServerHome() {
-    const { forceServerHome } = settings.use(["forceServerHome"]);
-
-    return forceServerHome;
-}
-
 export default definePlugin({
     name: "ResurrectHome",
     description: "Re-enables the Server Home tab when there isn't a Server Guide. Also has an option to force the Server Home over the Server Guide, which is accessible through right-clicking the Server Guide.",
@@ -92,14 +145,37 @@ export default definePlugin({
                 match: /getMutableGuildChannelsForGuild\(\i\);return\(0,\i\.useStateFromStores\).+?\]\)(?=}function)/,
                 replace: m => `${m}&&!$self.useForceServerHome()`
             }
+        },
+        // Add View Server Home Button to Server Guide
+        {
+            find: "487e85_1",
+            replacement: {
+                match: /(?<=text:(\i)\?\i\.\i\.Messages\.SERVER_GUIDE:\i\.\i\.Messages\.GUILD_HOME,)/,
+                replace: "badge:$self.ViewServerHomeButton({serverGuide:$1}),"
+            }
+        },
+        // Disable view Server Home override when the Server Home is unmouted
+        {
+            find: "69386d_5",
+            replacement: {
+                match: /location:"69386d_5".+?;/,
+                replace: "$&$self.useDisableViewServerHome();"
+            }
         }
     ],
 
+    ViewServerHomeButton: ErrorBoundary.wrap(({ serverGuide }: { serverGuide?: boolean; }) => {
+        if (serverGuide !== true) return null;
+
+        return <ViewServerHomeButton />;
+    }),
+
     useForceServerHome,
+    useDisableViewServerHome,
 
     contextMenus: {
         "guild-context"(children, props) {
-            const forceServerHome = useForceServerHome();
+            const { forceServerHome } = settings.use(["forceServerHome"]);
 
             if (!props?.guild) return;
 

src/plugins/roleColorEverywhere/index.tsx

@@ -94,7 +94,7 @@ export default definePlugin({
             find: "renderPrioritySpeaker",
             replacement: [
                 {
-                    match: /renderName\(\).{0,100}speaking:.{50,100}jsx.{5,10}{/,
+                    match: /renderName\(\).{0,100}speaking:.{50,150}"div",{/,
                     replace: "$&...$self.getVoiceProps(this.props),"
                 }
             ],

src/plugins/showConnections/index.tsx

@@ -35,7 +35,7 @@ const Section = findComponentByCodeLazy(".lastSection", "children:");
 const ThemeStore = findStoreLazy("ThemeStore");
 const platformHooks: { useLegacyPlatformType(platform: string): string; } = findByPropsLazy("useLegacyPlatformType");
 const platforms: { get(type: string): ConnectionPlatform; } = findByPropsLazy("isSupported", "getByUrl");
-const getTheme: (user: User, displayProfile: any) => any = findByCodeLazy(',"--profile-gradient-primary-color"');
+const getTheme: (user: User, displayProfile: any) => any = findByCodeLazy('--profile-gradient-primary-color":');
 
 const enum Spacing {
     COMPACT,

src/plugins/showMeYourName/index.tsx

@@ -49,7 +49,7 @@ export default definePlugin({
         {
             find: ".useCanSeeRemixBadge)",
             replacement: {
-                match: /(?<=onContextMenu:\i,children:).*?\}/,
+                match: /(?<=onContextMenu:\i,children:).*?\)}/,
                 replace: "$self.renderUsername(arguments[0])}"
             }
         },

src/plugins/spotifyControls/PlayerComponent.tsx

@@ -18,7 +18,6 @@
 
 import "./spotifyStyles.css";
 
-import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
 import { debounce } from "@shared/debounce";
@@ -376,17 +375,10 @@ export function Player() {
     } as React.CSSProperties;
 
     return (
-        <ErrorBoundary fallback={() => (
+        <div id={cl("player")} style={exportTrackImageStyle}>
-            <div className="vc-spotify-fallback">
+            <Info track={track} />
-                <p>Failed to render Spotify Modal :(</p>
+            <SeekBar />
-                <p >Check the console for errors</p>
+            <Controls />
-            </div>
+        </div>
-        )}>
-            <div id={cl("player")} style={exportTrackImageStyle}>
-                <Info track={track} />
-                <SeekBar />
-                <Controls />
-            </div>
-        </ErrorBoundary>
     );
 }

src/plugins/spotifyControls/index.tsx

@@ -18,6 +18,7 @@
 
 import { Settings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 
@@ -49,10 +50,10 @@ export default definePlugin({
         {
             find: "showTaglessAccountPanel:",
             replacement: {
-                // return React.createElement(AccountPanel, { ..., showTaglessAccountPanel: blah })
+                // react.jsx)(AccountPanel, { ..., showTaglessAccountPanel: blah })
-                match: /return ?(.{0,30}\(.{1,3},\{[^}]+?,showTaglessAccountPanel:.+?\}\))/,
+                match: /(?<=\i\.jsxs?\)\()(\i),{(?=[^}]*?showTaglessAccountPanel:)/,
-                // return [Player, Panel]
+                // react.jsx(WrapperComponent, { VencordOriginal: AccountPanel, ...
-                replace: "return [$self.renderPlayer(),$1]"
+                replace: "$self.PanelWrapper,{VencordOriginal:$1,"
             }
         },
         {
@@ -78,6 +79,25 @@ export default definePlugin({
             }
         }
     ],
+
     start: () => toggleHoverControls(Settings.plugins.SpotifyControls.hoverControls),
-    renderPlayer: () => <Player />
+
+    PanelWrapper({ VencordOriginal, ...props }) {
+        return (
+            <>
+                <ErrorBoundary
+                    fallback={() => (
+                        <div className="vc-spotify-fallback">
+                            <p>Failed to render Spotify Modal :(</p>
+                            <p >Check the console for errors</p>
+                        </div>
+                    )}
+                >
+                    <Player />
+                </ErrorBoundary>
+
+                <VencordOriginal {...props} />
+            </>
+        );
+    }
 });

src/plugins/viewIcons/index.tsx

@@ -174,7 +174,7 @@ export default definePlugin({
             find: ".NITRO_BANNER,",
             replacement: {
                 // style: { backgroundImage: shouldShowBanner ? "url(".concat(bannerUrl,
-                match: /style:\{(?=backgroundImage:(\i)\?"url\("\.concat\((\i),)/,
+                match: /style:\{(?=backgroundImage:(null!=\i)\?"url\("\.concat\((\i),)/,
                 replace:
                     // onClick: () => shouldShowBanner && ev.target.style.backgroundImage && openImage(bannerUrl), style: { cursor: shouldShowBanner ? "pointer" : void 0,
                     'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'

src/webpack/webpack.ts

@@ -406,13 +406,15 @@ export function findExportedComponentLazy<T extends object = any>(...props: stri
     });
 }
 
+const DefaultExtractAndLoadChunksRegex = /(?:Promise\.all\((\[\i\.\i\(".+?"\).+?\])\)|Promise\.resolve\(\)).then\(\i\.bind\(\i,"(.+?)"\)\)/;
+
 /**
  * Extract and load chunks using their entry point
  * @param code An array of all the code the module factory containing the lazy chunk loading must include
  * @param matcher A RegExp that returns the chunk ids array as the first capture group and the entry point id as the second. Defaults to a matcher that captures the lazy chunk loading found in the module factory
  * @returns A promise that resolves when the chunks were loaded
  */
-export async function extractAndLoadChunks(code: string[], matcher: RegExp = /Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/) {
+export async function extractAndLoadChunks(code: string[], matcher: RegExp = DefaultExtractAndLoadChunksRegex) {
     const module = findModuleFactory(...code);
     if (!module) {
         const err = new Error("extractAndLoadChunks: Couldn't find module factory");
@@ -434,7 +436,7 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = /Pr
     }
 
     const [, rawChunkIds, entryPointId] = match;
-    if (!rawChunkIds || Number.isNaN(entryPointId)) {
+    if (Number.isNaN(entryPointId)) {
         const err = new Error("extractAndLoadChunks: Matcher didn't return a capturing group with the chunk ids array, or the entry point id returned as the second group wasn't a number");
         logger.warn(err, "Code:", code, "Matcher:", matcher);
 
@@ -445,9 +447,11 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = /Pr
         return;
     }
 
-    const chunkIds = Array.from(rawChunkIds.matchAll(/\("(.+?)"\)/g)).map((m: any) => m[1]);
+    if (rawChunkIds) {
+        const chunkIds = Array.from(rawChunkIds.matchAll(/\("(.+?)"\)/g)).map((m: any) => m[1]);
+        await Promise.all(chunkIds.map(id => wreq.e(id)));
+    }
 
-    await Promise.all(chunkIds.map(id => wreq.e(id)));
     wreq(entryPointId);
 }
 
@@ -459,7 +463,7 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = /Pr
  * @param matcher A RegExp that returns the chunk ids array as the first capture group and the entry point id as the second. Defaults to a matcher that captures the lazy chunk loading found in the module factory
  * @returns A function that returns a promise that resolves when the chunks were loaded, on first call
  */
-export function extractAndLoadChunksLazy(code: string[], matcher: RegExp = /Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/) {
+export function extractAndLoadChunksLazy(code: string[], matcher = DefaultExtractAndLoadChunksRegex) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["extractAndLoadChunks", [code, matcher]]);
 
     return () => extractAndLoadChunks(code, matcher);