From 4c8a7342336aa599507fbe4dda2166e1ae9b9efa Mon Sep 17 00:00:00 2001
From: Sophie <56909681+sophiethefox@users.noreply.github.com>
Date: Fri, 12 Dec 2025 02:22:04 +1100
Subject: [PATCH 1/3] FakeNitro: fix animated webp emojis not animating (#3830)

---
 src/plugins/fakeNitro/index.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 25b36e5b6..8f9127f59 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -493,10 +493,11 @@ export default definePlugin({
                     } catch { }
 
                     const emojiName = EmojiStore.getCustomEmojiById(fakeNitroMatch[1])?.name ?? url?.searchParams.get("name") ?? "FakeNitroEmoji";
+                    const isAnimated = fakeNitroMatch[2] === "gif" || url?.searchParams.get("animated") === "true";
 
                     return Parser.defaultRules.customEmoji.react({
                         jumboable: !inline && content.length === 1 && typeof content[0].type !== "string",
-                        animated: fakeNitroMatch[2] === "gif",
+                        animated: isAnimated,
                         emojiId: fakeNitroMatch[1],
                         name: emojiName,
                         fake: true

From 6662647472f627f1d2e5fdeb1d8ec51408fd1da6 Mon Sep 17 00:00:00 2001
From: sadan4 <117494111+sadan4@users.noreply.github.com>
Date: Thu, 11 Dec 2025 10:25:55 -0500
Subject: [PATCH 2/3] ConsoleShortcuts: Add functions to switch branch on
 vesktop (#3204)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/consoleShortcuts/index.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/plugins/consoleShortcuts/index.ts b/src/plugins/consoleShortcuts/index.ts
index 884d3d5c5..188ebe619 100644
--- a/src/plugins/consoleShortcuts/index.ts
+++ b/src/plugins/consoleShortcuts/index.ts
@@ -35,6 +35,14 @@ const DESKTOP_ONLY = (f: string) => () => {
     throw new Error(`'${f}' is Discord Desktop only.`);
 };
 
+const makeVesktopSwitcher = (branch: string) => () => {
+    if (Vesktop.Settings.store.discordBranch === branch)
+        throw new Error(`Already on ${branch}`);
+
+    Vesktop.Settings.store.discordBranch = branch;
+    VesktopNative.app.relaunch();
+};
+
 const define: typeof Object.defineProperty =
     (obj, prop, desc) => {
         if (Object.hasOwn(desc, "value"))
@@ -180,6 +188,11 @@ function makeShortcuts() {
                 experimentBucket: bucket,
             });
         },
+        ...IS_VESKTOP ? {
+            vesktopStable: makeVesktopSwitcher("stable"),
+            vesktopCanary: makeVesktopSwitcher("canary"),
+            vesktopPtb: makeVesktopSwitcher("ptb"),
+        } : {},
     };
 }
 

From c36c75010606c2c1e2edae51a7970b7c437ca4a0 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 12 Dec 2025 02:24:03 +0100
Subject: [PATCH 3/3] fix PermissionViewer & css variables again

---
 src/api/Notifications/styles.css                     |  2 +-
 src/components/Heading.css                           |  6 +++---
 .../settings/tabs/plugins/components/styles.css      |  2 +-
 .../decor/ui/components/DecorationGridCreate.tsx     |  2 +-
 .../decor/ui/components/DecorationGridNone.tsx       |  2 +-
 .../decor/ui/modals/ChangeDecorationModal.tsx        |  4 ++--
 .../decor/ui/modals/CreateDecorationModal.tsx        |  2 +-
 src/plugins/decor/ui/modals/GuidelinesModal.tsx      |  2 +-
 src/plugins/messageLogger/deleteStyleText.css        |  2 +-
 src/plugins/permissionsViewer/index.tsx              | 12 ++++++------
 src/plugins/roleColorEverywhere/index.tsx            |  2 +-
 src/plugins/spotifyControls/spotifyStyles.css        |  4 ++--
 src/plugins/startupTimings/StartupTimingPage.tsx     |  6 +++---
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/api/Notifications/styles.css b/src/api/Notifications/styles.css
index e36f1934f..136ef7ea8 100644
--- a/src/api/Notifications/styles.css
+++ b/src/api/Notifications/styles.css
@@ -37,7 +37,7 @@
 }
 
 .vc-notification-title {
-    color: var(--header-primary);
+    color: var(--text-strong);
     font-size: 1rem;
     font-weight: 600;
     line-height: 1.25rem;
diff --git a/src/components/Heading.css b/src/components/Heading.css
index 3eddc40e7..c15fee0d6 100644
--- a/src/components/Heading.css
+++ b/src/components/Heading.css
@@ -1,13 +1,13 @@
 .vc-h1,
 .vc-h2 {
-    color: var(--header-primary);
+    color: var(--text-strong);
     font-weight: 600;
 }
 
 .vc-h3,
 .vc-h4,
 .vc-h5 {
-    color: var(--header-primary);
+    color: var(--text-strong);
 }
 
 .vc-h1 {
@@ -41,7 +41,7 @@
 }
 
 .vc-h5 {
-    color: var(--header-primary);
+    color: var(--text-strong);
     font-size: 16px;
     font-weight: 500;
     margin-bottom: 8px;
diff --git a/src/components/settings/tabs/plugins/components/styles.css b/src/components/settings/tabs/plugins/components/styles.css
index f4cafd061..a28b80c5b 100644
--- a/src/components/settings/tabs/plugins/components/styles.css
+++ b/src/components/settings/tabs/plugins/components/styles.css
@@ -23,7 +23,7 @@
 }
 
 .vc-plugins-setting-title {
-    color: var(--header-primary);
+    color: var(--text-strong);
 }
 
 .vc-plugins-setting-description {
diff --git a/src/plugins/decor/ui/components/DecorationGridCreate.tsx b/src/plugins/decor/ui/components/DecorationGridCreate.tsx
index 09572041a..28e035637 100644
--- a/src/plugins/decor/ui/components/DecorationGridCreate.tsx
+++ b/src/plugins/decor/ui/components/DecorationGridCreate.tsx
@@ -23,7 +23,7 @@ export default function DecorationGridCreate(props: DecorationGridCreateProps) {
         <PlusIcon />
         <Text
             variant="text-xs/normal"
-            color="header-primary"
+            color="text-strong"
         >
             {getIntlMessage("CREATE")}
         </Text>
diff --git a/src/plugins/decor/ui/components/DecorationGridNone.tsx b/src/plugins/decor/ui/components/DecorationGridNone.tsx
index 81ebde0bd..b15f471bd 100644
--- a/src/plugins/decor/ui/components/DecorationGridNone.tsx
+++ b/src/plugins/decor/ui/components/DecorationGridNone.tsx
@@ -23,7 +23,7 @@ export default function DecorationGridNone(props: DecorationGridNoneProps) {
         <NoEntrySignIcon />
         <Text
             variant="text-xs/normal"
-            color="header-primary"
+            color="text-strong"
         >
             {getIntlMessage("NONE")}
         </Text>
diff --git a/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx b/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
index 704648979..f784849e3 100644
--- a/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
+++ b/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
@@ -143,7 +143,7 @@ function ChangeDecorationModal(props: ModalProps) {
     >
         <ModalHeader separator={false} className={cl("modal-header")}>
             <Text
-                color="header-primary"
+                color="text-strong"
                 variant="heading-lg/semibold"
                 tag="h1"
                 style={{ flexGrow: 1 }}
@@ -204,7 +204,7 @@ function ChangeDecorationModal(props: ModalProps) {
                     {typeof activeSelectedDecoration === "object" &&
                         <Text
                             variant="text-sm/semibold"
-                            color="header-primary"
+                            color="text-strong"
                         >
                             {activeSelectedDecoration?.alt}
                         </Text>
diff --git a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
index 3c699de4f..f79c60e0e 100644
--- a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
+++ b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
@@ -64,7 +64,7 @@ function CreateDecorationModal(props: ModalProps) {
     >
         <ModalHeader separator={false} className={cl("modal-header")}>
             <Text
-                color="header-primary"
+                color="text-strong"
                 variant="heading-lg/semibold"
                 tag="h1"
                 style={{ flexGrow: 1 }}
diff --git a/src/plugins/decor/ui/modals/GuidelinesModal.tsx b/src/plugins/decor/ui/modals/GuidelinesModal.tsx
index 604ed83eb..6ff681d85 100644
--- a/src/plugins/decor/ui/modals/GuidelinesModal.tsx
+++ b/src/plugins/decor/ui/modals/GuidelinesModal.tsx
@@ -21,7 +21,7 @@ function GuidelinesModal(props: ModalProps) {
     >
         <ModalHeader separator={false} className={cl("modal-header")}>
             <Text
-                color="header-primary"
+                color="text-strong"
                 variant="heading-lg/semibold"
                 tag="h1"
                 style={{ flexGrow: 1 }}
diff --git a/src/plugins/messageLogger/deleteStyleText.css b/src/plugins/messageLogger/deleteStyleText.css
index 9d798d1d7..82cf6ae94 100644
--- a/src/plugins/messageLogger/deleteStyleText.css
+++ b/src/plugins/messageLogger/deleteStyleText.css
@@ -4,5 +4,5 @@
     --text-muted: var(--status-danger, #f04747);
     --embed-title: var(--red-460, #be3535);
     --text-link: var(--red-460, #be3535);
-    --header-primary: var(--red-460, #be3535);
+    --text-strong: var(--red-460, #be3535);
 }
\ No newline at end of file
diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index 101f7ac02..5a0ca71f1 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -34,7 +34,7 @@ import UserPermissions from "./components/UserPermissions";
 import { getSortedRolesForMember, sortPermissionOverwrites } from "./utils";
 
 const PopoutClasses = findByPropsLazy("container", "scroller", "list");
-const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "banner");
+const RoleButtonClasses = findByPropsLazy("button", "icon");
 
 export const enum PermissionsSortOrder {
     HighestRole,
@@ -165,15 +165,15 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::VIEW_ALL_ROLES}",
+            find: "#{intl::COLLAPSE_ROLES}",
             replacement: {
-                match: /\.expandButton,.+?null,/,
-                replace: "$&$self.ViewPermissionsButton(arguments[0]),"
+                match: /className:(\i\.expandButton),.+?null,/,
+                replace: "$&$self.ViewPermissionsButton({className:$1,props:arguments[0]}),"
             }
         }
     ],
 
-    ViewPermissionsButton: ErrorBoundary.wrap(({ guild, guildMember }: { guild: Guild; guildMember: GuildMember; }) => {
+    ViewPermissionsButton: ErrorBoundary.wrap(({ className, props: { guild, guildMember } }: { className: string, props: { guild: Guild; guildMember: GuildMember; }; }) => {
         const buttonRef = useRef(null);
 
         return (
@@ -195,7 +195,7 @@ export default definePlugin({
                             color={Button.Colors.CUSTOM}
                             look={Button.Looks.FILLED}
                             size={Button.Sizes.NONE}
-                            className={classes(RoleButtonClasses.button, RoleButtonClasses.icon, "vc-permviewer-role-button")}
+                            className={classes(className, "vc-permviewer-role-button")}
                         >
                             <SafetyIcon height="16" width="16" />
                         </Button>
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index e7bf30399..77f4579bf 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -197,7 +197,7 @@ export default definePlugin({
 
                 return {
                     color: value.replace("{DEFAULT}", "--text-default"),
-                    "--header-primary": value.replace("{DEFAULT}", "--header-primary"),
+                    "--text-strong": value.replace("{DEFAULT}", "--text-strong"),
                     "--text-muted": value.replace("{DEFAULT}", "--text-muted")
                 };
             }
diff --git a/src/plugins/spotifyControls/spotifyStyles.css b/src/plugins/spotifyControls/spotifyStyles.css
index e57ab59da..4470ec201 100644
--- a/src/plugins/spotifyControls/spotifyStyles.css
+++ b/src/plugins/spotifyControls/spotifyStyles.css
@@ -121,7 +121,7 @@
 }
 
 #vc-spotify-song-title {
-    color: var(--header-primary);
+    color: var(--text-strong);
     font-size: 14px;
     font-weight: 600;
 }
@@ -137,7 +137,7 @@
 .vc-spotify-album {
     font-size: 12px;
     text-decoration: none;
-    color: var(--header-primary);
+    color: var(--text-strong);
 }
 
 .vc-spotify-comma {
diff --git a/src/plugins/startupTimings/StartupTimingPage.tsx b/src/plugins/startupTimings/StartupTimingPage.tsx
index 09f99a374..6b4cc3ebc 100644
--- a/src/plugins/startupTimings/StartupTimingPage.tsx
+++ b/src/plugins/startupTimings/StartupTimingPage.tsx
@@ -92,11 +92,11 @@ function TimingSection({ title, logs, traceEnd }: TimingSectionProps) {
             <Forms.FormTitle tag="h2">{title}</Forms.FormTitle>
             <code>
                 {traceEnd && (
-                    <div style={{ color: "var(--header-primary)", marginBottom: 5, userSelect: "text" }}>
+                    <div style={{ color: "var(--text-strong)", marginBottom: 5, userSelect: "text" }}>
                         Trace ended at: {(new Date(traceEnd)).toTimeString()}
                     </div>
                 )}
-                <div style={{ color: "var(--header-primary)", display: "grid", gridTemplateColumns: "repeat(3, auto) 1fr", gap: "2px 10px", userSelect: "text" }}>
+                <div style={{ color: "var(--text-strong)", display: "grid", gridTemplateColumns: "repeat(3, auto) 1fr", gap: "2px 10px", userSelect: "text" }}>
                     <span>Start</span>
                     <span>Interval</span>
                     <span>Delta</span>
@@ -121,7 +121,7 @@ function ServerTrace({ trace }: ServerTraceProps) {
         <section>
             <Forms.FormTitle tag="h3">Server Trace</Forms.FormTitle>
             <code>
-                <Flex flexDirection="column" gap="5px" style={{ color: "var(--header-primary)", userSelect: "text" }}>
+                <Flex flexDirection="column" gap="5px" style={{ color: "var(--text-strong)", userSelect: "text" }}>
                     {lines.map((line, idx) => (
                         <span key={idx}>{line}</span>
                     ))}