SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
thororen1234 2025-07-01 16:38:36 -04:00
commit fc6bafbae0
No known key found for this signature in database
26 changed files with 50 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api/Notifications/styles.css
View file

@ -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);
}
}

6
src/components/PluginSettings/styles.css
View file

@ -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) {

2
src/components/ThemeSettings/ThemesTab.tsx
View file

@ -78,7 +78,7 @@ function Validator({ link, onValidate }: { link: string; onValidate: (valid: boo
: "Valid!";
return <Forms.FormText style={{
color: pending ? "var(--text-muted)" : err ? "var(--text-danger)" : "var(--text-positive)"
color: pending ? "var(--text-muted)" : err ? "var(--text-danger)" : "var(--status-positive)"
}}>{text}</Forms.FormText>;
}

2
src/components/VencordSettings/PatchHelperTab.tsx
View file

@ -145,7 +145,7 @@ function ReplacementComponent({ module, match, replacement, setReplacementError
)}
{compileResult &&
<Forms.FormText style={{ color: compileResult[0] ? "var(--text-positive)" : "var(--text-danger)" }}>
<Forms.FormText style={{ color: compileResult[0] ? "var(--status-positive)" : "var(--text-danger)" }}>
{compileResult[1]}
</Forms.FormText>
}

2
src/components/VencordSettings/addonCard.css
View file

@ -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;

4
src/components/VencordSettings/quickActions.css
View file

@ -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);
}

6
src/components/VencordSettings/settingsStyles.css
View file

@ -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 {

2
src/components/VencordSettings/themesStyles.css
View file

@ -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;

2
src/components/iconStyles.css
View file

@ -3,7 +3,7 @@
}
.vc-owner-crown-icon {
color: var(--text-warning);
color: var(--status-warning);
}
.vc-heart-icon {

2
src/plugins/betterSessions/index.tsx
View file

@ -138,7 +138,7 @@ export default definePlugin({
borderRadius: "50%",
backgroundColor: "var(--interactive-normal)",
color: "var(--background-secondary)",
color: "var(--background-base-lower)",
}}
>
<PlatformIcon width={14} height={14} />

2
src/plugins/blurNsfw/index.ts
View file

@ -43,7 +43,7 @@ export default definePlugin({
patches: [
{
find: ".renderEmbedDescription,message",
find: "}renderEmbeds(",
replacement: [{
match: /\.container/,
replace: "$&+(this.props.channel.nsfw? ' vc-nsfw-img': '')"

2
src/plugins/customRPC/index.tsx
View file

@ -456,7 +456,7 @@ export default definePlugin({
<Forms.FormDivider className={Margins.top8} />
<div style={{ width: "284px", ...profileThemeStyle, marginTop: 8, borderRadius: 8, background: "var(--bg-mod-faint)" }}>
<div style={{ width: "284px", ...profileThemeStyle, marginTop: 8, borderRadius: 8, background: "var(--background-mod-faint)" }}>
{activity[0] && <ActivityView
activity={activity[0]}
user={UserStore.getCurrentUser()}

2
src/plugins/expressionCloner/index.tsx
View file

@ -224,7 +224,7 @@ function CloneModal({ data }: { data: Sticker | Emoji; }) {
aria-disabled={isCloning}
style={{
borderRadius: "50%",
backgroundColor: "var(--background-secondary)",
backgroundColor: "var(--background-base-lower)",
display: "inline-flex",
justifyContent: "center",
alignItems: "center",

2
src/plugins/fakeNitro/index.tsx
View file

@ -124,7 +124,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",

2
src/plugins/messageLinkEmbeds/index.tsx
View file

@ -294,7 +294,7 @@ function ChannelMessageEmbedAccessory({ message, channel }: MessageEmbedProps):
<Embed
embed={{
rawDescription: "",
color: "var(--background-secondary)",
color: "var(--background-base-lower)",
author: {
name: <Text variant="text-xs/medium" tag="span">
<span>{channelLabel} - </span>

2
src/plugins/permissionsViewer/components/icons.tsx
View file

@ -37,7 +37,7 @@ export function PermissionAllowedIcon() {
viewBox="0 0 24 24"
>
<title>Allowed</title>
<path fill="var(--text-positive)" d="M8.99991 16.17L4.82991 12L3.40991 13.41L8.99991 19L20.9999 7.00003L19.5899 5.59003L8.99991 16.17ZZ" />
<path fill="var(--status-positive)" d="M8.99991 16.17L4.82991 12L3.40991 13.41L8.99991 19L20.9999 7.00003L19.5899 5.59003L8.99991 16.17ZZ" />
</svg>
);
}

10
src/plugins/permissionsViewer/styles.css
View file

@ -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 {

4
src/plugins/reviewDB/style.css
View file

@ -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;
}
}

2
src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
View file

@ -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;

2
src/plugins/shikiCodeblocks.desktop/shiki.css
View file

@ -1,6 +1,6 @@
.vc-shiki-container {
border: 4px;
background-color: var(--background-secondary);
background-color: var(--background-base-lower);
}
.vc-shiki-root {

10
src/plugins/showHiddenChannels/style.css
View file

@ -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;
}
}

7
src/plugins/showMeYourName/index.tsx
View file

@ -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])"
}
},
{

6
src/plugins/spotifyControls/spotifyStyles.css
View file

@ -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);
}
}

2
src/plugins/spotifyControls/visualRefreshSpotifyStyles.css
View file

@ -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;

2
src/plugins/voiceMessages/styles.css
View file

@ -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;

10
src/webpack/common/stores.ts
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
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<string, any>;
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);