From 864ee7c7ad833508c18eb888f730fc341df5f722 Mon Sep 17 00:00:00 2001 From: sadan4 <117494111+sadan4@users.noreply.github.com> Date: Fri, 27 Jun 2025 12:45:22 -0400 Subject: [PATCH 1/5] Fix BlurNSFW and ShowMeYourName for latest version (#3517) --- src/plugins/blurNsfw/index.ts | 2 +- src/plugins/showMeYourName/index.tsx | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/blurNsfw/index.ts b/src/plugins/blurNsfw/index.ts index c4023f098..c1670fe85 100644 --- a/src/plugins/blurNsfw/index.ts +++ b/src/plugins/blurNsfw/index.ts @@ -43,7 +43,7 @@ export default definePlugin({ patches: [ { - find: ".embedWrapper,embed", + find: "}renderEmbeds(", replacement: [{ match: /\.container/, replace: "$&+(this.props.channel.nsfw? ' vc-nsfw-img': '')" diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx index ac727f69d..ba92e82a3 100644 --- a/src/plugins/showMeYourName/index.tsx +++ b/src/plugins/showMeYourName/index.tsx @@ -48,10 +48,9 @@ export default definePlugin({ authors: [Devs.Rini, Devs.TheKodeToad], patches: [ { - find: '"BaseUsername"', + find: '="SYSTEM_TAG"', replacement: { - /* TODO: remove \i+\i once change makes it to stable */ - match: /(?<=onContextMenu:\i,children:)(?:\i\+\i|\i)/, + match: /(?<=onContextMenu:\i,children:)\i/, replace: "$self.renderUsername(arguments[0])" } }, From 65f41cb7bd8335059126783f27f6d7cb4c1e8a3f Mon Sep 17 00:00:00 2001 From: Vendicated Date: Fri, 27 Jun 2025 21:36:31 +0200 Subject: [PATCH 2/5] Update GuildStore -> GuildRoleStore --- src/plugins/betterRoleContext/index.tsx | 4 ++-- src/plugins/mentionAvatars/index.tsx | 4 ++-- .../components/RolesAndUsersPermissions.tsx | 6 +++--- src/plugins/permissionsViewer/index.tsx | 4 ++-- src/plugins/permissionsViewer/utils.ts | 6 +++--- src/plugins/roleColorEverywhere/index.tsx | 4 ++-- src/plugins/serverInfo/GuildInfoModal.tsx | 4 ++-- src/plugins/viewRaw/index.tsx | 4 ++-- src/plugins/xsOverlay/index.tsx | 4 ++-- src/webpack/common/stores.ts | 9 +++++++-- src/webpack/common/types/stores.d.ts | 3 +++ 11 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/plugins/betterRoleContext/index.tsx b/src/plugins/betterRoleContext/index.tsx index a9bab1a79..f9eae586d 100644 --- a/src/plugins/betterRoleContext/index.tsx +++ b/src/plugins/betterRoleContext/index.tsx @@ -12,7 +12,7 @@ import { Devs } from "@utils/constants"; import { getCurrentGuild, openImageModal } from "@utils/discord"; import definePlugin, { OptionType } from "@utils/types"; import { findByPropsLazy } from "@webpack"; -import { GuildStore, Menu, PermissionStore } from "@webpack/common"; +import { GuildRoleStore, Menu, PermissionStore } from "@webpack/common"; const GuildSettingsActions = findByPropsLazy("open", "selectRole", "updateGuild"); @@ -80,7 +80,7 @@ export default definePlugin({ const guild = getCurrentGuild(); if (!guild) return; - const role = GuildStore.getRole(guild.id, id); + const role = GuildRoleStore.getRole(guild.id, id); if (!role) return; if (role.colorString) { diff --git a/src/plugins/mentionAvatars/index.tsx b/src/plugins/mentionAvatars/index.tsx index 5466a9e26..8f18567ed 100644 --- a/src/plugins/mentionAvatars/index.tsx +++ b/src/plugins/mentionAvatars/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 { GuildStore, SelectedGuildStore, useState } from "@webpack/common"; +import { GuildRoleStore, SelectedGuildStore, useState } from "@webpack/common"; import { User } from "discord-types/general"; const settings = definePluginSettings({ @@ -89,7 +89,7 @@ export default definePlugin({ // Discord uses Role Mentions for uncached users because .... idk if (!roleId) return null; - const role = GuildStore.getRole(guildId, roleId); + const role = GuildRoleStore.getRole(guildId, roleId); if (!role?.icon) return ; diff --git a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx index ed620d7f3..46ddb1469 100644 --- a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx +++ b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx @@ -23,7 +23,7 @@ import { copyToClipboard } from "@utils/clipboard"; import { getIntlMessage, getUniqueUsername } from "@utils/discord"; import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal"; import { findByCodeLazy } from "@webpack"; -import { ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildStore, i18n, Menu, PermissionsBits, ScrollerThin, Text, Tooltip, useEffect, useMemo, UserStore, useState, useStateFromStores } from "@webpack/common"; +import { ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildRoleStore, i18n, Menu, PermissionsBits, ScrollerThin, Text, Tooltip, useEffect, useMemo, UserStore, useState, useStateFromStores } from "@webpack/common"; import { UnicodeEmoji } from "@webpack/types"; import type { Guild, Role, User } from "discord-types/general"; @@ -85,7 +85,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea const [selectedItemIndex, selectItem] = useState(0); const selectedItem = permissions[selectedItemIndex]; - const roles = GuildStore.getRoles(guild.id); + const roles = GuildRoleStore.getRoles(guild.id); return ( { - const role = GuildStore.getRole(guild.id, roleId); + const role = GuildRoleStore.getRole(guild.id, roleId); if (!role) return; onClose(); diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx index 3fd4428cd..cc942f092 100644 --- a/src/plugins/permissionsViewer/index.tsx +++ b/src/plugins/permissionsViewer/index.tsx @@ -26,7 +26,7 @@ import { Devs } from "@utils/constants"; import { classes } from "@utils/misc"; import definePlugin, { OptionType } from "@utils/types"; import { findByPropsLazy } from "@webpack"; -import { Button, ChannelStore, Dialog, GuildMemberStore, GuildStore, match, Menu, PermissionsBits, Popout, TooltipContainer, useRef, UserStore } from "@webpack/common"; +import { Button, ChannelStore, Dialog, GuildMemberStore, GuildRoleStore, GuildStore, match, Menu, PermissionsBits, Popout, TooltipContainer, useRef, UserStore } from "@webpack/common"; import type { Guild, GuildMember } from "discord-types/general"; import openRolesAndUsersPermissionsModal, { PermissionType, RoleOrUserPermission } from "./components/RolesAndUsersPermissions"; @@ -107,7 +107,7 @@ function MenuItem(guildId: string, id?: string, type?: MenuItemParentType) { }; }) .otherwise(() => { - const permissions = Object.values(GuildStore.getRoles(guild.id)).map(role => ({ + const permissions = Object.values(GuildRoleStore.getRoles(guild.id)).map(role => ({ type: PermissionType.Role, ...role })); diff --git a/src/plugins/permissionsViewer/utils.ts b/src/plugins/permissionsViewer/utils.ts index dfa81e731..409c08963 100644 --- a/src/plugins/permissionsViewer/utils.ts +++ b/src/plugins/permissionsViewer/utils.ts @@ -18,7 +18,7 @@ import { classNameFactory } from "@api/Styles"; import { findByPropsLazy } from "@webpack"; -import { GuildStore } from "@webpack/common"; +import { GuildRoleStore } from "@webpack/common"; import { Guild, GuildMember, Role } from "discord-types/general"; import { PermissionsSortOrder, settings } from "."; @@ -29,7 +29,7 @@ export const { getGuildPermissionSpecMap } = findByPropsLazy("getGuildPermission export const cl = classNameFactory("vc-permviewer-"); export function getSortedRoles({ id }: Guild, member: GuildMember) { - const roles = GuildStore.getRoles(id); + const roles = GuildRoleStore.getRoles(id); return [...member.roles, id] .map(id => roles[id]) @@ -48,7 +48,7 @@ export function sortUserRoles(roles: Role[]) { } export function sortPermissionOverwrites(overwrites: T[], guildId: string) { - const roles = GuildStore.getRoles(guildId); + const roles = GuildRoleStore.getRoles(guildId); return overwrites.sort((a, b) => { if (a.type !== PermissionType.Role || b.type !== PermissionType.Role) return 0; diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx index 61ea7868c..65da676c6 100644 --- a/src/plugins/roleColorEverywhere/index.tsx +++ b/src/plugins/roleColorEverywhere/index.tsx @@ -23,7 +23,7 @@ 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"; +import { ChannelStore, GuildMemberStore, GuildRoleStore, GuildStore } from "@webpack/common"; const useMessageAuthor = findByCodeLazy('"Result cannot be null because the message is not null"'); @@ -210,7 +210,7 @@ export default definePlugin({ }, RoleGroupColor: ErrorBoundary.wrap(({ id, count, title, guildId, label }: { id: string; count: number; title: string; guildId: string; label: string; }) => { - const role = GuildStore.getRole(guildId, id); + const role = GuildRoleStore.getRole(guildId, id); return ( m.ANNOUNCEMENT_THREAD === 10); @@ -267,7 +267,7 @@ export default definePlugin({ // color role mentions (unity styling btw lol) if (message.mention_roles.length > 0) { for (const roleId of message.mention_roles) { - const role = GuildStore.getRole(channel.guild_id, roleId); + const role = GuildRoleStore.getRole(channel.guild_id, roleId); if (!role) continue; const roleColor = role.colorString ?? `#${pingColor}`; finalMsg = finalMsg.replace(`<@&${roleId}>`, `@${role.name}`); diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts index e0c00f6de..712f5bdce 100644 --- a/src/webpack/common/stores.ts +++ b/src/webpack/common/stores.ts @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import { findByCodeLazy, findByPropsLazy } from "@webpack"; +import { findByCodeLazy, findByPropsLazy, waitFor } from "@webpack"; import type * as Stores from "discord-types/stores"; import { waitForStore } from "./internal"; @@ -40,12 +40,13 @@ export let ReadStateStore: GenericStore; export let PresenceStore: GenericStore; export let GuildStore: t.GuildStore; +export let GuildRoleStore: t.GuildRoleStore; +export let GuildMemberStore: Stores.GuildMemberStore & t.FluxStore; export let UserStore: Stores.UserStore & t.FluxStore; export let UserProfileStore: GenericStore; export let SelectedChannelStore: Stores.SelectedChannelStore & t.FluxStore; export let SelectedGuildStore: t.FluxStore & Record; export let ChannelStore: Stores.ChannelStore & t.FluxStore; -export let GuildMemberStore: Stores.GuildMemberStore & t.FluxStore; export let RelationshipStore: t.RelationshipStore; export let EmojiStore: t.EmojiStore; @@ -86,3 +87,7 @@ waitForStore("ThemeStore", m => { // Importing this directly can easily cause circular imports. For this reason, use a non import access here. Vencord.QuickCss.initQuickCssThemeStore(); }); + +// GuildRoleStore is new, this code is for stable + canary compatibility +// TODO: Change to waitForStore once GuildRoleStore is on stable +waitFor(["getRole", "getRoles"], m => GuildRoleStore = m); diff --git a/src/webpack/common/types/stores.d.ts b/src/webpack/common/types/stores.d.ts index cb06ca4b3..9a2dd1323 100644 --- a/src/webpack/common/types/stores.d.ts +++ b/src/webpack/common/types/stores.d.ts @@ -214,6 +214,9 @@ export class GuildStore extends FluxStore { getGuildCount(): number; getGuilds(): Record; getGuildIds(): string[]; +} + +export class GuildRoleStore extends FluxStore { getRole(guildId: string, roleId: string): Role; getRoles(guildId: string): Record; getAllGuildRoles(): Record>; From a25d26e9211ad9a1c920faee1564614e810bd768 Mon Sep 17 00:00:00 2001 From: Vendicated Date: Sat, 28 Jun 2025 03:42:31 +0200 Subject: [PATCH 3/5] Update to new Discord css variable names Co-Authored-By: sadan <117494111+sadan4@users.noreply.github.com> Co-Authored-By: Nuckyz <61953774+Nuckyz@users.noreply.github.com> --- src/api/Notifications/styles.css | 4 ++-- src/components/ErrorCard.css | 2 +- src/components/VencordSettings/UpdaterTab.tsx | 2 +- src/components/VencordSettings/addonCard.css | 2 +- src/components/VencordSettings/quickActions.css | 6 +++--- .../VencordSettings/settingsStyles.css | 2 +- src/components/VencordSettings/themesStyles.css | 2 +- src/plugins/betterSessions/index.tsx | 2 +- src/plugins/customRPC/index.tsx | 2 +- src/plugins/expressionCloner/index.tsx | 2 +- src/plugins/messageLinkEmbeds/index.tsx | 2 +- src/plugins/messageLogger/deleteStyleText.css | 2 +- .../components/UserPermissions.tsx | 4 ++-- .../permissionsViewer/components/icons.tsx | 2 +- src/plugins/permissionsViewer/styles.css | 10 ++++------ src/plugins/reviewDB/style.css | 2 +- src/plugins/roleColorEverywhere/index.tsx | 2 +- src/plugins/sendTimestamps/styles.css | 2 +- src/plugins/serverInfo/styles.css | 2 +- .../components/Highlighter.tsx | 4 ++-- src/plugins/shikiCodeblocks.desktop/shiki.css | 2 +- src/plugins/showHiddenChannels/style.css | 16 ++++++++-------- src/plugins/spotifyControls/spotifyStyles.css | 8 ++++---- .../visualRefreshSpotifyStyles.css | 4 ++-- src/plugins/voiceMessages/styles.css | 4 ++-- 25 files changed, 45 insertions(+), 47 deletions(-) diff --git a/src/api/Notifications/styles.css b/src/api/Notifications/styles.css index ba8a246af..10d3c0cfa 100644 --- a/src/api/Notifications/styles.css +++ b/src/api/Notifications/styles.css @@ -3,8 +3,8 @@ all: unset; display: flex; flex-direction: column; - color: var(--text-normal); - background-color: var(--background-secondary-alt); + color: var(--text-default); + background-color: var(--background-base-lower-alt); border-radius: 6px; overflow: hidden; cursor: pointer; diff --git a/src/components/ErrorCard.css b/src/components/ErrorCard.css index 6401c59c6..2eea2f06d 100644 --- a/src/components/ErrorCard.css +++ b/src/components/ErrorCard.css @@ -3,7 +3,7 @@ background-color: #e7828430; border: 1px solid #e78284; border-radius: 5px; - color: var(--text-normal, white); + color: var(--text-default, white); & a:hover { text-decoration: underline; diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx index e29d7dfd7..9871bfcc8 100644 --- a/src/components/VencordSettings/UpdaterTab.tsx +++ b/src/components/VencordSettings/UpdaterTab.tsx @@ -94,7 +94,7 @@ function Changes({ updates, repo, repoPending }: CommonProps & { updates: typeof {message} - {author} ))} diff --git a/src/components/VencordSettings/addonCard.css b/src/components/VencordSettings/addonCard.css index 67bdece57..c8a2a81e2 100644 --- a/src/components/VencordSettings/addonCard.css +++ b/src/components/VencordSettings/addonCard.css @@ -1,5 +1,5 @@ .vc-addon-card { - background-color: var(--background-secondary-alt); + background-color: var(--background-base-lower-alt); color: var(--interactive-active); border-radius: 8px; display: block; diff --git a/src/components/VencordSettings/quickActions.css b/src/components/VencordSettings/quickActions.css index 391378189..f65fba21e 100644 --- a/src/components/VencordSettings/quickActions.css +++ b/src/components/VencordSettings/quickActions.css @@ -14,7 +14,7 @@ .vc-settings-quickActions-pill { all: unset; - background: var(--background-secondary); + background: var(--background-base-lower); color: var(--header-secondary); display: flex; align-items: center; @@ -26,7 +26,7 @@ } .vc-settings-quickActions-pill:hover { - background: var(--background-secondary-alt); + background: var(--background-base-lower-alt); transform: translateY(-1px); box-shadow: var(--elevation-high); } @@ -47,4 +47,4 @@ .vc-settings-quickActions-img { width: 24px; height: 24px; -} \ No newline at end of file +} diff --git a/src/components/VencordSettings/settingsStyles.css b/src/components/VencordSettings/settingsStyles.css index 5349993d7..ccf01cfd2 100644 --- a/src/components/VencordSettings/settingsStyles.css +++ b/src/components/VencordSettings/settingsStyles.css @@ -29,7 +29,7 @@ .vc-settings-theme-links { /* Needed to fix bad themes that hide certain textarea elements for whatever eldritch reason */ display: inline-block !important; - color: var(--text-normal) !important; + color: var(--text-default) !important; padding: 0.5em; border: 1px solid var(--background-modifier-accent); max-height: unset; diff --git a/src/components/VencordSettings/themesStyles.css b/src/components/VencordSettings/themesStyles.css index b10daff31..b47174063 100644 --- a/src/components/VencordSettings/themesStyles.css +++ b/src/components/VencordSettings/themesStyles.css @@ -7,7 +7,7 @@ .vc-settings-theme-card { display: flex; flex-direction: column; - background-color: var(--background-secondary-alt); + background-color: var(--background-base-lower-alt); color: var(--interactive-active); border-radius: 8px; padding: 1em; diff --git a/src/plugins/betterSessions/index.tsx b/src/plugins/betterSessions/index.tsx index 8f8ef141f..b40c3c1e9 100644 --- a/src/plugins/betterSessions/index.tsx +++ b/src/plugins/betterSessions/index.tsx @@ -138,7 +138,7 @@ export default definePlugin({ borderRadius: "50%", backgroundColor: "var(--interactive-normal)", - color: "var(--background-secondary)", + color: "var(--background-base-lower)", }} > diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx index 6f7719332..d35dad135 100644 --- a/src/plugins/customRPC/index.tsx +++ b/src/plugins/customRPC/index.tsx @@ -456,7 +456,7 @@ export default definePlugin({ -
+
{activity[0] && {channelLabel} - diff --git a/src/plugins/messageLogger/deleteStyleText.css b/src/plugins/messageLogger/deleteStyleText.css index a114b7de8..655294c1c 100644 --- a/src/plugins/messageLogger/deleteStyleText.css +++ b/src/plugins/messageLogger/deleteStyleText.css @@ -1,5 +1,5 @@ .messagelogger-deleted { - --text-normal: var(--status-danger, #f04747); + --text-default: var(--status-danger, #f04747); --interactive-normal: var(--status-danger, #f04747); --text-muted: var(--status-danger, #f04747); --embed-title: var(--red-460, #be3535); diff --git a/src/plugins/permissionsViewer/components/UserPermissions.tsx b/src/plugins/permissionsViewer/components/UserPermissions.tsx index d0c0ed507..85b1d418a 100644 --- a/src/plugins/permissionsViewer/components/UserPermissions.tsx +++ b/src/plugins/permissionsViewer/components/UserPermissions.tsx @@ -159,7 +159,7 @@ function UserPermissionsComponent({ guild, guildMember, closePopout }: { guild: viewBox="0 96 960 960" transform={permissionsSortOrder === PermissionsSortOrder.HighestRole ? "scale(1 1)" : "scale(1 -1)"} > - +
)} @@ -181,7 +181,7 @@ function UserPermissionsComponent({ guild, guildMember, closePopout }: { guild: height="24" viewBox="0 0 24 24" > - +
)} diff --git a/src/plugins/permissionsViewer/components/icons.tsx b/src/plugins/permissionsViewer/components/icons.tsx index 8b58a440f..fb5b03419 100644 --- a/src/plugins/permissionsViewer/components/icons.tsx +++ b/src/plugins/permissionsViewer/components/icons.tsx @@ -51,7 +51,7 @@ export function PermissionDefaultIcon() { > Not overwritten - + ); diff --git a/src/plugins/permissionsViewer/styles.css b/src/plugins/permissionsViewer/styles.css index 2ca61025d..c149933f2 100644 --- a/src/plugins/permissionsViewer/styles.css +++ b/src/plugins/permissionsViewer/styles.css @@ -140,10 +140,9 @@ /* copy pasted from discord cause impossible to webpack find */ .vc-permviewer-role-button { - border-radius: var(--radius-xs); - background: var(--bg-mod-faint); + border-radius: var(--radius-sm); color: var(--interactive-normal); - border: 1px solid var(--border-faint); + border: 1px solid var(--user-profile-border); /* stylelint-disable-next-line value-no-vendor-prefix */ width: -moz-fit-content; width: fit-content; @@ -151,9 +150,8 @@ padding: 4px } -.custom-profile-theme .vc-permviewer-role-button { - background: rgb(var(--bg-overlay-color)/var(--bg-overlay-opacity-6)); - border-color: var(--profile-body-border-color) +.vc-permviewer-role-button:hover { + background-color: var(--user-profile-background-hover); } .vc-permviewer-granted-by-container { diff --git a/src/plugins/reviewDB/style.css b/src/plugins/reviewDB/style.css index c62c300e9..50499b294 100644 --- a/src/plugins/reviewDB/style.css +++ b/src/plugins/reviewDB/style.css @@ -72,7 +72,7 @@ overflow-y: hidden; margin-top: 1px; margin-bottom: 8px; - color: var(--text-normal); + color: var(--text-default); font-size: 15px; } diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx index 65da676c6..84b581991 100644 --- a/src/plugins/roleColorEverywhere/index.tsx +++ b/src/plugins/roleColorEverywhere/index.tsx @@ -197,7 +197,7 @@ export default definePlugin({ const value = `color-mix(in oklab, ${author.colorString} ${messageSaturation}%, var({DEFAULT}))`; return { - color: value.replace("{DEFAULT}", "--text-normal"), + color: value.replace("{DEFAULT}", "--text-default"), "--header-primary": value.replace("{DEFAULT}", "--header-primary"), "--text-muted": value.replace("{DEFAULT}", "--text-muted") }; diff --git a/src/plugins/sendTimestamps/styles.css b/src/plugins/sendTimestamps/styles.css index e7efbe59e..d96e886a7 100644 --- a/src/plugins/sendTimestamps/styles.css +++ b/src/plugins/sendTimestamps/styles.css @@ -1,6 +1,6 @@ .vc-st-date-picker { background-color: var(--input-background); - color: var(--text-normal); + color: var(--text-default); width: 95%; padding: 8px 8px 8px 12px; margin: 1em 0; diff --git a/src/plugins/serverInfo/styles.css b/src/plugins/serverInfo/styles.css index 42a7899cb..0fc44e022 100644 --- a/src/plugins/serverInfo/styles.css +++ b/src/plugins/serverInfo/styles.css @@ -68,7 +68,7 @@ } .vc-gp-server-info-pair { - color: var(--text-normal); + color: var(--text-default); } .vc-gp-server-info-pair [class^="timestamp"] { diff --git a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx index 2d62af6e1..926a6caea 100644 --- a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx +++ b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx @@ -78,12 +78,12 @@ export const Highlighter = ({ }); const themeBase: ThemeBase = { - plainColor: currentTheme?.fg || "var(--text-normal)", + plainColor: currentTheme?.fg || "var(--text-default)", accentBgColor: currentTheme?.colors?.["statusBar.background"] || (useHljs ? "#7289da" : "#007BC8"), accentFgColor: currentTheme?.colors?.["statusBar.foreground"] || "#FFF", backgroundColor: - currentTheme?.colors?.["editor.background"] || "var(--background-secondary)", + currentTheme?.colors?.["editor.background"] || "var(--background-base-lower)", }; let langName; diff --git a/src/plugins/shikiCodeblocks.desktop/shiki.css b/src/plugins/shikiCodeblocks.desktop/shiki.css index 9d3a52c6f..9ca34484b 100644 --- a/src/plugins/shikiCodeblocks.desktop/shiki.css +++ b/src/plugins/shikiCodeblocks.desktop/shiki.css @@ -1,6 +1,6 @@ .vc-shiki-container { border: 4px; - background-color: var(--background-secondary); + background-color: var(--background-base-lower); } .vc-shiki-root { diff --git a/src/plugins/showHiddenChannels/style.css b/src/plugins/showHiddenChannels/style.css index 56e50a2fd..7104f0471 100644 --- a/src/plugins/showHiddenChannels/style.css +++ b/src/plugins/showHiddenChannels/style.css @@ -22,12 +22,12 @@ } .vc-shc-heading-nsfw-icon { - color: var(--text-normal); + color: var(--text-default); } .vc-shc-topic-container { - color: var(--text-normal); - background: var(--bg-overlay-3, var(--background-secondary)); + color: var(--text-default); + background: var(--bg-overlay-5, var(--background-base-lower)); border-radius: 5px; padding: 10px; max-width: 70vw; @@ -37,7 +37,7 @@ display: flex; flex-direction: row; align-items: center; - background: var(--bg-overlay-3, var(--background-secondary)); + background: var(--bg-overlay-5, var(--background-base-lower)); border-radius: 8px; padding: 0.75em; margin-left: 0.75em; @@ -46,7 +46,7 @@ .vc-shc-tags-container { display: flex; flex-direction: column; - background: var(--bg-overlay-3, var(--background-secondary)); + background: var(--bg-overlay-5, var(--background-base-lower)); border-radius: 5px; padding: 0.75em; gap: 0.75em; @@ -65,7 +65,7 @@ display: flex; flex-direction: column; align-items: center; - background: var(--bg-overlay-3, var(--background-secondary)); + background: var(--bg-overlay-5, var(--background-base-lower)); border-radius: 5px; padding: 0.75em; max-width: 70vw; @@ -83,7 +83,7 @@ cursor: pointer; display: flex; align-items: center; - color: var(--text-normal); + color: var(--text-default); } .vc-shc-allowed-users-and-roles-container-permdetails-btn { @@ -91,7 +91,7 @@ cursor: pointer; display: flex; align-items: center; - color: var(--text-normal); + color: var(--text-default); } .vc-shc-allowed-users-and-roles-container > [class^="members"] { diff --git a/src/plugins/spotifyControls/spotifyStyles.css b/src/plugins/spotifyControls/spotifyStyles.css index 0b760377a..58d745044 100644 --- a/src/plugins/spotifyControls/spotifyStyles.css +++ b/src/plugins/spotifyControls/spotifyStyles.css @@ -8,11 +8,11 @@ } .theme-light #vc-spotify-player { - background: var(--bg-overlay-3, var(--background-secondary-alt)); + background: var(--bg-overlay-3, var(--background-base-lower-alt)); } .theme-dark #vc-spotify-player { - background: var(--bg-overlay-1, var(--background-secondary-alt)); + background: var(--bg-overlay-1, var(--background-base-lower-alt)); } .vc-spotify-button { @@ -143,7 +143,7 @@ #vc-spotify-progress-bar { position: relative; - color: var(--text-normal); + color: var(--text-default); width: 100%; margin: 0.5em 0; margin-bottom: 5px; @@ -195,5 +195,5 @@ .vc-spotify-fallback { padding: 0.5em; - color: var(--text-normal); + color: var(--text-default); } diff --git a/src/plugins/spotifyControls/visualRefreshSpotifyStyles.css b/src/plugins/spotifyControls/visualRefreshSpotifyStyles.css index 3a140a17f..0d6d30ba2 100644 --- a/src/plugins/spotifyControls/visualRefreshSpotifyStyles.css +++ b/src/plugins/spotifyControls/visualRefreshSpotifyStyles.css @@ -2,7 +2,7 @@ .visual-refresh { #vc-spotify-player { padding: 12px; - background: var(--bg-overlay-floating, var(--background-base-low, var(--background-secondary-alt))); + background: var(--bg-overlay-floating, var(--background-base-low, var(--background-base-lower-alt))); margin: 0; border-top-left-radius: 10px; border-top-right-radius: 10px; @@ -22,7 +22,7 @@ #vc-spotify-progress-bar { position: relative; - color: var(--text-normal); + color: var(--text-default); width: 100%; } diff --git a/src/plugins/voiceMessages/styles.css b/src/plugins/voiceMessages/styles.css index 4f2e1d57e..4f1f2c622 100644 --- a/src/plugins/voiceMessages/styles.css +++ b/src/plugins/voiceMessages/styles.css @@ -10,9 +10,9 @@ } .vc-vmsg-preview { - color: var(--text-normal); + color: var(--text-default); border-radius: 24px; - background-color: var(--background-secondary); + background-color: var(--background-base-lower); position: relative; display: flex; align-items: center; From f6d92e5024d2b1aaa9731406bf0405420a446436 Mon Sep 17 00:00:00 2001 From: Vendicated Date: Sat, 28 Jun 2025 03:56:49 +0200 Subject: [PATCH 4/5] Update more Discord css variables --- src/components/PluginSettings/styles.css | 2 +- src/components/VencordSettings/PatchHelperTab.tsx | 2 +- src/components/VencordSettings/ThemesTab.tsx | 2 +- src/components/VencordSettings/settingsStyles.css | 2 +- src/components/iconStyles.css | 2 +- src/plugins/permissionsViewer/components/icons.tsx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/PluginSettings/styles.css b/src/components/PluginSettings/styles.css index a4f9aeee1..ed5e9aa13 100644 --- a/src/components/PluginSettings/styles.css +++ b/src/components/PluginSettings/styles.css @@ -70,7 +70,7 @@ padding: 1em; background: var(--info-warning-background); border: 1px solid var(--info-warning-foreground); - color: var(--info-warning-text); + color: var(--info-warning-foreground); } .vc-plugins-restart-button { diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx index 558220697..accccd494 100644 --- a/src/components/VencordSettings/PatchHelperTab.tsx +++ b/src/components/VencordSettings/PatchHelperTab.tsx @@ -148,7 +148,7 @@ function ReplacementComponent({ module, match, replacement, setReplacementError )} {compileResult && - + {compileResult[1]} } diff --git a/src/components/VencordSettings/ThemesTab.tsx b/src/components/VencordSettings/ThemesTab.tsx index 128b6817d..692e20bf3 100644 --- a/src/components/VencordSettings/ThemesTab.tsx +++ b/src/components/VencordSettings/ThemesTab.tsx @@ -69,7 +69,7 @@ function Validator({ link }: { link: string; }) { : "Valid!"; return {text}; } diff --git a/src/components/VencordSettings/settingsStyles.css b/src/components/VencordSettings/settingsStyles.css index ccf01cfd2..35c121975 100644 --- a/src/components/VencordSettings/settingsStyles.css +++ b/src/components/VencordSettings/settingsStyles.css @@ -23,7 +23,7 @@ .vc-backup-restore-card { background-color: var(--info-warning-background); border-color: var(--info-warning-foreground); - color: var(--info-warning-text); + color: var(--info-warning-foreground); } .vc-settings-theme-links { diff --git a/src/components/iconStyles.css b/src/components/iconStyles.css index e6d49a263..9b139b325 100644 --- a/src/components/iconStyles.css +++ b/src/components/iconStyles.css @@ -3,7 +3,7 @@ } .vc-owner-crown-icon { - color: var(--text-warning); + color: var(--status-warning); } .vc-heart-icon { diff --git a/src/plugins/permissionsViewer/components/icons.tsx b/src/plugins/permissionsViewer/components/icons.tsx index fb5b03419..18b4ad0bb 100644 --- a/src/plugins/permissionsViewer/components/icons.tsx +++ b/src/plugins/permissionsViewer/components/icons.tsx @@ -37,7 +37,7 @@ export function PermissionAllowedIcon() { viewBox="0 0 24 24" > Allowed - + ); } From 468b290d28771da571b63d4b3ebd20afb266e3a8 Mon Sep 17 00:00:00 2001 From: Damian <43420467+DAMcraft@users.noreply.github.com> Date: Sun, 29 Jun 2025 20:56:20 +0200 Subject: [PATCH 5/5] FakeNitro: add 96 to available emoji sizes (#3526) --- src/plugins/fakeNitro/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx index f362a3557..b39095957 100644 --- a/src/plugins/fakeNitro/index.tsx +++ b/src/plugins/fakeNitro/index.tsx @@ -127,7 +127,7 @@ const settings = definePluginSettings({ description: "Size of the emojis when sending", type: OptionType.SLIDER, default: 48, - markers: [32, 48, 64, 128, 160, 256, 512] + markers: [32, 48, 64, 96, 128, 160, 256, 512] }, transformEmojis: { description: "Whether to transform fake emojis into real ones",