diff --git a/src/api/Notifications/styles.css b/src/api/Notifications/styles.css index e72656e8d..10d3c0cfa 100644 --- a/src/api/Notifications/styles.css +++ b/src/api/Notifications/styles.css @@ -4,7 +4,7 @@ display: flex; flex-direction: column; color: var(--text-default); - background-color: var(--background-secondary-alt); + background-color: var(--background-base-lower-alt); border-radius: 6px; overflow: hidden; cursor: pointer; @@ -123,4 +123,4 @@ .vc-notification-log-danger-btn { color: var(--white-500); background-color: var(--button-danger-background); -} \ No newline at end of file +} diff --git a/src/components/PluginSettings/styles.css b/src/components/PluginSettings/styles.css index d1657097a..12bab72e3 100644 --- a/src/components/PluginSettings/styles.css +++ b/src/components/PluginSettings/styles.css @@ -71,9 +71,9 @@ .vc-plugins-restart-card { padding: 1em; - background: var(--background-feedback-warning); - border: inherit !important; - color: var(--text-feedback-warning); + background: var(--info-warning-background); + border: 1px solid var(--info-warning-foreground); + color: var(--info-warning-foreground); } .vc-plugins-info-icon:not(:hover, :focus) { diff --git a/src/components/ThemeSettings/ThemesTab.tsx b/src/components/ThemeSettings/ThemesTab.tsx index e711ab2fe..f6f85fc55 100644 --- a/src/components/ThemeSettings/ThemesTab.tsx +++ b/src/components/ThemeSettings/ThemesTab.tsx @@ -78,7 +78,7 @@ function Validator({ link, onValidate }: { link: string; onValidate: (valid: boo : "Valid!"; return {text}; } diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx index 1b1e965de..976ae54eb 100644 --- a/src/components/VencordSettings/PatchHelperTab.tsx +++ b/src/components/VencordSettings/PatchHelperTab.tsx @@ -145,7 +145,7 @@ function ReplacementComponent({ module, match, replacement, setReplacementError )} {compileResult && - + {compileResult[1]} } 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 2b97368ba..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); } diff --git a/src/components/VencordSettings/settingsStyles.css b/src/components/VencordSettings/settingsStyles.css index bf4e82881..d34602da0 100644 --- a/src/components/VencordSettings/settingsStyles.css +++ b/src/components/VencordSettings/settingsStyles.css @@ -32,9 +32,9 @@ } .vc-backup-restore-card { - background-color: var(--background-feedback-warning) !important; - border-color: var(--info-warning-foreground) !important; - color: var(--text-feedback-warning) !important; + background-color: var(--info-warning-background); + border-color: var(--info-warning-foreground); + color: var(--info-warning-foreground); } .vc-settings-theme-links { 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/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/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/blurNsfw/index.ts b/src/plugins/blurNsfw/index.ts index b1f8e0469..c1670fe85 100644 --- a/src/plugins/blurNsfw/index.ts +++ b/src/plugins/blurNsfw/index.ts @@ -43,7 +43,7 @@ export default definePlugin({ patches: [ { - find: ".renderEmbedDescription,message", + find: "}renderEmbeds(", replacement: [{ match: /\.container/, replace: "$&+(this.props.channel.nsfw? ' vc-nsfw-img': '')" 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/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 - + ); } 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 82d63b29b..5517dcaa3 100644 --- a/src/plugins/reviewDB/style.css +++ b/src/plugins/reviewDB/style.css @@ -72,7 +72,7 @@ .vc-rdb-review-comment { overflow-y: hidden; margin-top: 1px; - margin-bottom: var(--vc-rdb-spacing-size); + margin-bottom: 8px; color: var(--text-default); font-size: 15px; } @@ -175,4 +175,4 @@ .vc-rdb-review:hover>.vc-rdb-buttons { opacity: 1; -} \ No newline at end of file +} diff --git a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx index 9962c8455..926a6caea 100644 --- a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx +++ b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx @@ -83,7 +83,7 @@ export const Highlighter = ({ 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 cdc708c1d..1e79b2cbf 100644 --- a/src/plugins/showHiddenChannels/style.css +++ b/src/plugins/showHiddenChannels/style.css @@ -27,7 +27,7 @@ .vc-shc-topic-container { color: var(--text-default); - background: var(--bg-overlay-3, var(--background-secondary)); + 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; @@ -104,4 +104,4 @@ cursor: not-allowed; margin-left: 6px; z-index: 0; -} \ No newline at end of file +} diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx index 5023e7f39..0fb225ddd 100644 --- a/src/plugins/showMeYourName/index.tsx +++ b/src/plugins/showMeYourName/index.tsx @@ -89,11 +89,10 @@ export default definePlugin({ authors: [Devs.Rini, Devs.TheKodeToad, Devs.nyx], patches: [ { - find: ".SYSTEM_TAG=0", + find: '="SYSTEM_TAG"', replacement: { - /* TODO: remove \i+\i once change makes it to stable */ - match: /(?<=onContextMenu:\i,children:)(?:\i\+\i|\i)(?=.*?contextGuildId:(\i))/, - replace: "$self.renderUsername({ ...arguments[0], guildId: $1 })", + match: /(?<=onContextMenu:\i,children:)\i/, + replace: "$self.renderUsername(arguments[0])" } }, { diff --git a/src/plugins/spotifyControls/spotifyStyles.css b/src/plugins/spotifyControls/spotifyStyles.css index d4fe14ee7..b7df52d70 100644 --- a/src/plugins/spotifyControls/spotifyStyles.css +++ b/src/plugins/spotifyControls/spotifyStyles.css @@ -10,11 +10,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 { @@ -198,4 +198,4 @@ .vc-spotify-fallback { padding: 0.5em; color: var(--text-default); -} \ No newline at end of file +} diff --git a/src/plugins/spotifyControls/visualRefreshSpotifyStyles.css b/src/plugins/spotifyControls/visualRefreshSpotifyStyles.css index ef7169e89..94bcd0ae8 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; diff --git a/src/plugins/voiceMessages/styles.css b/src/plugins/voiceMessages/styles.css index d63897596..14a178f97 100644 --- a/src/plugins/voiceMessages/styles.css +++ b/src/plugins/voiceMessages/styles.css @@ -12,7 +12,7 @@ .vc-vmsg-preview { 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; diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts index efc4fcb22..ce3a7f2f2 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"; @@ -42,14 +42,14 @@ export let VoiceStateStore: 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 TypingStore: GenericStore; -export let GuildMemberStore: Stores.GuildMemberStore & t.FluxStore; export let RelationshipStore: t.RelationshipStore; +export let TypingStore: GenericStore; export let EmojiStore: t.EmojiStore; export let StickerStore: t.StickerStore; @@ -94,3 +94,7 @@ waitForStore("ThemeStore", m => { Vencord.QuickCss.initQuickCssThemeStore(); }); waitForStore("VoiceStateStore", m => VoiceStateStore = m); + +// 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);