Merge remote-tracking branch 'upstream/main'

src/debug/loadLazyChunks.ts

@@ -27,11 +27,11 @@ export async function loadLazyChunks() {
 
         const LazyChunkRegex = canonicalizeMatch(/(?:(?:Promise\.all\(\[)?(\i\.e\("?[^)]+?"?\)[^\]]*?)(?:\]\))?)\.then\(\i\.bind\(\i,"?([^)]+?)"?\)\)/g);
 
-        const foundCssDebuggingLoad = false;
+        let foundCssDebuggingLoad = false;
 
         async function searchAndLoadLazyChunks(factoryCode: string) {
             // Workaround to avoid loading the CSS debugging chunk which turns the app pink
-            const hasCssDebuggingLoad = foundCssDebuggingLoad ? false : factoryCode.includes(".cssDebuggingEnabled&&");
+            const hasCssDebuggingLoad = foundCssDebuggingLoad ? false : (foundCssDebuggingLoad = factoryCode.includes(".cssDebuggingEnabled&&"));
 
             const lazyChunks = factoryCode.matchAll(LazyChunkRegex);
             const validChunkGroups = new Set<[chunkIds: number[], entryPoint: number]>();

src/plugins/decor/ui/modals/CreateDecorationModal.tsx

@@ -20,7 +20,7 @@ import { AvatarDecorationModalPreview } from "../components";
 const FileUpload = findComponentByCodeLazy("fileUploadInput,");
 
 const { HelpMessage, HelpMessageTypes } = mapMangledModuleLazy('POSITIVE=3]="POSITIVE', {
-    HelpMessageTypes: filters.byProps("POSITIVE", "WARNING"),
+    HelpMessageTypes: filters.byProps("POSITIVE", "WARNING", "INFO"),
     HelpMessage: filters.byCode(".iconDiv")
 });
 
@@ -119,8 +119,8 @@ function CreateDecorationModal(props: ModalProps) {
                         />
                     </div>
                 </div>
-                <Forms.FormText type="description" className={Margins.bottom16}>
+                <HelpMessage messageType={HelpMessageTypes.INFO}>
-                    <br />You can receive updates on your decoration's review by joining <Link
+                    To receive updates on your decoration's review, join <Link
                         href={`https://discord.gg/${INVITE_KEY}`}
                         onClick={async e => {
                             e.preventDefault();
@@ -138,8 +138,8 @@ function CreateDecorationModal(props: ModalProps) {
                         }}
                     >
                         Decor's Discord server
-                    </Link>.
+                    </Link> and allow direct messages.
-                </Forms.FormText>
+                </HelpMessage>
             </ErrorBoundary>
         </ModalContent>
         <ModalFooter className={cl("modal-footer")}>

src/plugins/pictureInPicture/index.tsx

@@ -30,10 +30,10 @@ export default definePlugin({
         {
             find: ".removeMosaicItemHoverButton),",
             replacement: {
-                match: /\.nonMediaMosaicItem\]:!(\i).{0,50}?children:\[\S,(\S)/,
+                match: /\.nonMediaMosaicItem\]:.{0,40}children:\[(?<=showDownload:(\i).+?isVisualMediaType:(\i).+?)/,
-                replace: "$&,$1&&$2&&$self.renderPiPButton(),"
+                replace: "$&$1&&$2&&$self.renderPiPButton(),"
-            },
+            }
-        },
+        }
     ],
 
     renderPiPButton: ErrorBoundary.wrap(() => {

src/plugins/roleColorEverywhere/index.tsx

@@ -20,6 +20,7 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { makeRange } from "@components/PluginSettings/components";
 import { Devs } from "@utils/constants";
+import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy } from "@webpack";
 import { ChannelStore, GuildMemberStore, GuildStore } from "@webpack/common";
@@ -51,6 +52,12 @@ const settings = definePluginSettings({
         description: "Show role colors in the reactors list",
         restartNeeded: true
     },
+    pollResults: {
+        type: OptionType.BOOLEAN,
+        default: true,
+        description: "Show role colors in the poll results",
+        restartNeeded: true
+    },
     colorChatMessages: {
         type: OptionType.BOOLEAN,
         default: false,
@@ -62,14 +69,15 @@ const settings = definePluginSettings({
         description: "Intensity of message coloring.",
         markers: makeRange(0, 100, 10),
         default: 30
-    },
+    }
 });
 
-
 export default definePlugin({
     name: "RoleColorEverywhere",
-    authors: [Devs.KingFish, Devs.lewisakura, Devs.AutumnVN, Devs.Kyuuhachi],
+    authors: [Devs.KingFish, Devs.lewisakura, Devs.AutumnVN, Devs.Kyuuhachi, Devs.jamesbt365],
     description: "Adds the top role color anywhere possible",
+    settings,
+
     patches: [
         // Chat Mentions
         {
@@ -77,82 +85,133 @@ export default definePlugin({
             replacement: [
                 {
                     match: /onContextMenu:\i,color:\i,\.\.\.\i(?=,children:)(?<=user:(\i),channel:(\i).{0,500}?)/,
-                    replace: "$&,color:$self.getUserColor($1?.id,{channelId:$2?.id})"
+                    replace: "$&,color:$self.getColorInt($1?.id,$2?.id)"
                 }
             ],
-            predicate: () => settings.store.chatMentions,
+            predicate: () => settings.store.chatMentions
         },
         // Slate
         {
             find: ".userTooltip,children",
             replacement: [
                 {
-                    match: /let\{id:(\i),guildId:(\i)[^}]*\}.*?\.\i,{(?=children)/,
+                    match: /let\{id:(\i),guildId:\i,channelId:(\i)[^}]*\}.*?\.\i,{(?=children)/,
-                    replace: "$&color:$self.getUserColor($1,{guildId:$2}),"
+                    replace: "$&color:$self.getColorInt($1,$2),"
                 }
             ],
-            predicate: () => settings.store.chatMentions,
+            predicate: () => settings.store.chatMentions
         },
+        // Member List Role Headers
         {
             find: 'tutorialId:"whos-online',
             replacement: [
                 {
                     match: /null,\i," — ",\i\]/,
-                    replace: "null,$self.roleGroupColor(arguments[0])]"
+                    replace: "null,$self.RoleGroupColor(arguments[0])]"
                 },
             ],
-            predicate: () => settings.store.memberList,
+            predicate: () => settings.store.memberList
         },
         {
             find: "#{intl::THREAD_BROWSER_PRIVATE}",
             replacement: [
                 {
                     match: /children:\[\i," — ",\i\]/,
-                    replace: "children:[$self.roleGroupColor(arguments[0])]"
+                    replace: "children:[$self.RoleGroupColor(arguments[0])]"
                 },
             ],
-            predicate: () => settings.store.memberList,
+            predicate: () => settings.store.memberList
         },
+        // Voice Users
         {
-            find: "renderPrioritySpeaker",
+            find: "renderPrioritySpeaker(){",
             replacement: [
                 {
                     match: /renderName\(\){.+?usernameSpeaking\]:.+?(?=children)/,
-                    replace: "$&...$self.getVoiceProps(this.props),"
+                    replace: "$&style:$self.getColorStyle(this?.props?.user?.id,this?.props?.guildId),"
                 }
             ],
-            predicate: () => settings.store.voiceUsers,
+            predicate: () => settings.store.voiceUsers
         },
+        // Reaction List
         {
             find: ".reactorDefault",
             replacement: {
-                match: /,onContextMenu:e=>.{0,15}\((\i),(\i),(\i)\).{0,250}tag:"strong"/,
+                match: /,onContextMenu:\i=>.{0,15}\((\i),(\i),(\i)\).{0,250}tag:"strong"/,
-                replace: "$&,style:{color:$self.getColor($2?.id,$1)}"
+                replace: "$&,style:$self.getColorStyle($2?.id,$1?.channel?.id)"
             },
             predicate: () => settings.store.reactorsList,
         },
+        // Poll Results
+        {
+            find: ",reactionVoteCounts",
+            replacement: {
+                match: /\.nickname,(?=children:)/,
+                replace: "$&style:$self.getColorStyle(arguments[0]?.user?.id,arguments[0]?.channel?.id),"
+            },
+            predicate: () => settings.store.pollResults
+        },
+        // Messages
         {
             find: "#{intl::MESSAGE_EDITED}",
             replacement: {
                 match: /(?<=isUnsupported\]:(\i)\.isUnsupported\}\),)(?=children:\[)/,
-                replace: "style:{color:$self.useMessageColor($1)},"
+                replace: "style:$self.useMessageColorStyle($1),"
-            },
-            predicate: () => settings.store.colorChatMessages,
             },
+            predicate: () => settings.store.colorChatMessages
+        }
     ],
-    settings,
 
-    getColor(userId: string, { channelId, guildId }: { channelId?: string; guildId?: string; }) {
+    getColorString(userId: string, channelOrGuildId: string) {
-        if (!(guildId ??= ChannelStore.getChannel(channelId!)?.guild_id)) return null;
+        try {
+            const guildId = ChannelStore.getChannel(channelOrGuildId)?.guild_id ?? GuildStore.getGuild(channelOrGuildId)?.id;
+            if (guildId == null) return null;
+
             return GuildMemberStore.getMember(guildId, userId)?.colorString ?? null;
+        } catch (e) {
+            new Logger("RoleColorEverywhere").error("Failed to get color string", e);
+        }
+
+        return null;
     },
 
-    getUserColor(userId: string, ids: { channelId?: string; guildId?: string; }) {
+    getColorInt(userId: string, channelOrGuildId: string) {
-        const colorString = this.getColor(userId, ids);
+        const colorString = this.getColorString(userId, channelOrGuildId);
         return colorString && parseInt(colorString.slice(1), 16);
     },
 
-    roleGroupColor: ErrorBoundary.wrap(({ id, count, title, guildId, label }: { id: string; count: number; title: string; guildId: string; label: string; }) => {
+    getColorStyle(userId: string, channelOrGuildId: string) {
+        const colorString = this.getColorString(userId, channelOrGuildId);
+
+        return colorString && {
+            color: colorString
+        };
+    },
+
+    useMessageColor(message: any) {
+        try {
+            const { messageSaturation } = settings.use(["messageSaturation"]);
+            const author = useMessageAuthor(message);
+
+            if (author.colorString != null && messageSaturation !== 0) {
+                return `color-mix(in oklab, ${author.colorString} ${messageSaturation}%, var(--text-normal))`;
+            }
+        } catch (e) {
+            new Logger("RoleColorEverywhere").error("Failed to get message color", e);
+        }
+
+        return null;
+    },
+
+    useMessageColorStyle(message: any) {
+        const color = this.useMessageColor(message);
+
+        return color && {
+            color
+        };
+    },
+
+    RoleGroupColor: ErrorBoundary.wrap(({ id, count, title, guildId, label }: { id: string; count: number; title: string; guildId: string; label: string; }) => {
         const role = GuildStore.getRole(guildId, id);
 
         return (
@@ -164,25 +223,5 @@ export default definePlugin({
                 {title ?? label} &mdash; {count}
             </span>
         );
-    }, { noop: true }),
+    }, { noop: true })
-
-    getVoiceProps({ user: { id: userId }, guildId }: { user: { id: string; }; guildId: string; }) {
-        return {
-            style: {
-                color: this.getColor(userId, { guildId })
-            }
-        };
-    },
-
-    useMessageColor(message: any) {
-        try {
-            const { messageSaturation } = settings.use(["messageSaturation"]);
-            const author = useMessageAuthor(message);
-            if (author.colorString !== undefined && messageSaturation !== 0)
-                return `color-mix(in oklab, ${author.colorString} ${messageSaturation}%, var(--text-normal))`;
-        } catch (e) {
-            console.error("[RCE] failed to get message color", e);
-        }
-        return undefined;
-    },
 });

src/plugins/shikiCodeblocks.desktop/api/themes.ts

@@ -1,6 +1,6 @@
 /*
  * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
+ * Copyright (c) 2024 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
@@ -18,9 +18,9 @@
 
 import { IShikiTheme } from "@vap/shiki";
 
-export const SHIKI_REPO = "shikijs/shiki";
+export const SHIKI_REPO = "shikijs/textmate-grammars-themes";
-export const SHIKI_REPO_COMMIT = "0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043";
+export const SHIKI_REPO_COMMIT = "2d87559c7601a928b9f7e0f0dda243d2fb6d4499";
-export const shikiRepoTheme = (name: string) => `https://raw.githubusercontent.com/${SHIKI_REPO}/${SHIKI_REPO_COMMIT}/packages/shiki/themes/${name}.json`;
+export const shikiRepoTheme = (name: string) => `https://raw.githubusercontent.com/${SHIKI_REPO}/${SHIKI_REPO_COMMIT}/packages/tm-themes/themes/${name}.json`;
 
 export const themes = {
     // Default
@@ -30,33 +30,59 @@ export const themes = {
     MaterialCandy: "https://raw.githubusercontent.com/millsp/material-candy/master/material-candy.json",
 
     // More from Shiki repo
+    Andromeeda: shikiRepoTheme("andromeeda"),
+    AuroraX: shikiRepoTheme("aurora-x"),
+    AyuDark: shikiRepoTheme("ayu-dark"),
+    CatppuccinLatte: shikiRepoTheme("catppuccin-latte"),
+    CatppuccinFrappe: shikiRepoTheme("catppuccin-frappe"),
+    CatppuccinMacchiato: shikiRepoTheme("catppuccin-macchiato"),
+    CatppuccinMocha: shikiRepoTheme("catppuccin-mocha"),
     DraculaSoft: shikiRepoTheme("dracula-soft"),
     Dracula: shikiRepoTheme("dracula"),
+    EverforestDark: shikiRepoTheme("everforest-dark"),
+    EverforestLight: shikiRepoTheme("everforest-light"),
+    GithubDarkDefault: shikiRepoTheme("github-dark-default"),
     GithubDarkDimmed: shikiRepoTheme("github-dark-dimmed"),
+    GithubDarkHighContrast: shikiRepoTheme("github-dark-high-contrast"),
     GithubDark: shikiRepoTheme("github-dark"),
+    GithubLightDefault: shikiRepoTheme("github-light-default"),
+    GithubLightHighContrast: shikiRepoTheme("github-light-high-contrast"),
     GithubLight: shikiRepoTheme("github-light"),
+    Houston: shikiRepoTheme("houston"),
+    KanagawaDragon: shikiRepoTheme("kanagawa-dragon"),
+    KanagawaLotus: shikiRepoTheme("kanagawa-lotus"),
+    KanagawaWave: shikiRepoTheme("kanagawa-wave"),
+    LaserWave: shikiRepoTheme("laserwave"),
     LightPlus: shikiRepoTheme("light-plus"),
-    MaterialDarker: shikiRepoTheme("material-darker"),
+    MaterialDarker: shikiRepoTheme("material-theme-darker"),
-    MaterialDefault: shikiRepoTheme("material-default"),
+    MaterialDefault: shikiRepoTheme("material-theme"),
-    MaterialLighter: shikiRepoTheme("material-lighter"),
+    MaterialLighter: shikiRepoTheme("material-theme-lighter"),
-    MaterialOcean: shikiRepoTheme("material-ocean"),
+    MaterialOcean: shikiRepoTheme("material-theme-ocean"),
-    MaterialPalenight: shikiRepoTheme("material-palenight"),
+    MaterialPalenight: shikiRepoTheme("material-theme-palenight"),
     MinDark: shikiRepoTheme("min-dark"),
     MinLight: shikiRepoTheme("min-light"),
     Monokai: shikiRepoTheme("monokai"),
+    NightOwl: shikiRepoTheme("night-owl"),
     Nord: shikiRepoTheme("nord"),
     OneDarkPro: shikiRepoTheme("one-dark-pro"),
+    OneLight: shikiRepoTheme("one-light"),
+    Plastic: shikiRepoTheme("plastic"),
     Poimandres: shikiRepoTheme("poimandres"),
+    Red: shikiRepoTheme("red"),
     RosePineDawn: shikiRepoTheme("rose-pine-dawn"),
     RosePineMoon: shikiRepoTheme("rose-pine-moon"),
     RosePine: shikiRepoTheme("rose-pine"),
     SlackDark: shikiRepoTheme("slack-dark"),
     SlackOchin: shikiRepoTheme("slack-ochin"),
+    SnazzyLight: shikiRepoTheme("snazzy-light"),
     SolarizedDark: shikiRepoTheme("solarized-dark"),
     SolarizedLight: shikiRepoTheme("solarized-light"),
+    Synthwave84: shikiRepoTheme("synthwave-84"),
+    TokyoNight: shikiRepoTheme("tokyo-night"),
+    Vesper: shikiRepoTheme("vesper"),
+    VitesseBlack: shikiRepoTheme("vitesse-black"),
     VitesseDark: shikiRepoTheme("vitesse-dark"),
     VitesseLight: shikiRepoTheme("vitesse-light"),
-    CssVariables: shikiRepoTheme("css-variables"),
 };
 
 export const themeCache = new Map<string, IShikiTheme>();

src/plugins/viewRaw/index.tsx

@@ -155,6 +155,7 @@ export default definePlugin({
         "guild-context": MakeContextCallback("Guild"),
         "channel-context": MakeContextCallback("Channel"),
         "thread-context": MakeContextCallback("Channel"),
+        "gdm-context": MakeContextCallback("Channel"),
         "user-context": MakeContextCallback("User")
     },
 

src/utils/constants.ts

@@ -520,8 +520,8 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         id: 721717126523781240n,
     },
     nyx: {
-        name: "verticalsync",
+        name: "verticalsync.",
-        id: 328165170536775680n
+        id: 1207087393929171095n
     },
     nekohaxx: {
         name: "nekohaxx",
@@ -579,6 +579,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "SomeAspy",
         id: 516750892372852754n,
     },
+    jamesbt365: {
+        name: "jamesbt365",
+        id: 158567567487795200n,
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly