diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx index 41955d33e..6125e7667 100644 --- a/src/plugins/_api/badges/index.tsx +++ b/src/plugins/_api/badges/index.tsx @@ -91,7 +91,7 @@ async function loadBadges(url: string, noCache = false) { async function loadAllBadges(noCache = false) { 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; EquicordDonorBadges = equicordBadges; diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx index 79fcf4d96..41b3a7181 100644 --- a/src/plugins/showMeYourName/index.tsx +++ b/src/plugins/showMeYourName/index.tsx @@ -123,12 +123,13 @@ function resolveColor( let primaryAdjusted: any = null; let secondaryAdjusted: any = null; let tertiaryAdjusted: any = null; + const defaultColor = toCSS("var(--text-strong)"); if (savedColor.toLowerCase().includes("role")) { const percentage = roleColorPattern.exec(savedColor)?.[1] || ""; 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); 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; tertiaryAdjusted = tertiaryColor && percentage ? adjustBrightness(tertiaryColor, parseInt(percentage)) : tertiaryColor; } else { - primaryColor = savedColor; + primaryColor = forceDefault ? defaultColor : toCSS(savedColor); + primaryAdjusted = primaryColor; } gradient = !canUseGradient || !secondaryColor || forceDefault