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

Merge branch 'dev'

Browse source
This commit is contained in:
thororen1234 2026-02-20 13:07:46 -05:00
commit 8f01941939
No known key found for this signature in database
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/_api/badges/index.tsx
View file

@ -91,7 +91,7 @@ async function loadBadges(url: string, noCache = false) {
async function loadAllBadges(noCache = false) { async function loadAllBadges(noCache = false) {
const vencordBadges = await loadBadges("https://badges.vencord.dev/badges.json", noCache); const vencordBadges = await loadBadges("https://badges.vencord.dev/badges.json", noCache);
const equicordBadges = await loadBadges("https://equicord.org/badges.json", noCache); const equicordBadges = await loadBadges("https://badge.equicord.org/badges.json", noCache);
DonorBadges = vencordBadges; DonorBadges = vencordBadges;
EquicordDonorBadges = equicordBadges; EquicordDonorBadges = equicordBadges;

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

@ -123,12 +123,13 @@ function resolveColor(
let primaryAdjusted: any = null; let primaryAdjusted: any = null;
let secondaryAdjusted: any = null; let secondaryAdjusted: any = null;
let tertiaryAdjusted: any = null; let tertiaryAdjusted: any = null;
const defaultColor = toCSS("var(--text-strong)");
if (savedColor.toLowerCase().includes("role")) { if (savedColor.toLowerCase().includes("role")) {
const percentage = roleColorPattern.exec(savedColor)?.[1] || ""; const percentage = roleColorPattern.exec(savedColor)?.[1] || "";
if (percentage && isNaN(parseInt(percentage))) return null; if (percentage && isNaN(parseInt(percentage))) return null;
primaryColor = forceDefault ? toCSS("var(--text-strong)") : (toCSS(colorStrings?.primaryColor) || (!inGuild && toCSS(displayNameStyles?.colors?.[0])) || toCSS("var(--text-strong)")); primaryColor = forceDefault ? defaultColor : (toCSS(colorStrings?.primaryColor) || (!inGuild && toCSS(displayNameStyles?.colors?.[0])) || defaultColor);
secondaryColor = forceDefault ? null : (toCSS(colorStrings?.secondaryColor) || (!inGuild && toCSS(displayNameStyles?.colors?.[1])) || null); secondaryColor = forceDefault ? null : (toCSS(colorStrings?.secondaryColor) || (!inGuild && toCSS(displayNameStyles?.colors?.[1])) || null);
tertiaryColor = forceDefault ? null : (toCSS(colorStrings?.tertiaryColor) || (!inGuild && toCSS(displayNameStyles?.colors?.[2])) || null); tertiaryColor = forceDefault ? null : (toCSS(colorStrings?.tertiaryColor) || (!inGuild && toCSS(displayNameStyles?.colors?.[2])) || null);
@ -136,7 +137,8 @@ function resolveColor(
secondaryAdjusted = secondaryColor && percentage ? adjustBrightness(secondaryColor, parseInt(percentage)) : secondaryColor; secondaryAdjusted = secondaryColor && percentage ? adjustBrightness(secondaryColor, parseInt(percentage)) : secondaryColor;
tertiaryAdjusted = tertiaryColor && percentage ? adjustBrightness(tertiaryColor, parseInt(percentage)) : tertiaryColor; tertiaryAdjusted = tertiaryColor && percentage ? adjustBrightness(tertiaryColor, parseInt(percentage)) : tertiaryColor;
} else { } else {
primaryColor = savedColor; primaryColor = forceDefault ? defaultColor : toCSS(savedColor);
primaryAdjusted = primaryColor;
} }
gradient = !canUseGradient || !secondaryColor || forceDefault gradient = !canUseGradient || !secondaryColor || forceDefault