mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-06-16 18:07:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "BetterFolder Fixes"

Browse source 
This reverts commit ccb029b839.
This commit is contained in:
thororen1234 2025-04-04 12:55:32 -04:00
parent 4d20ef0d64
commit c32799cf8c
No known key found for this signature in database
1 changed files with 15 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/utils/quickCss.ts
View file

@ -44,80 +44,27 @@ export async function toggle(isEnabled: boolean) {
if (!style) { if (!style) {
if (isEnabled) { if (isEnabled) {
style = createStyle("vencord-custom-css"); style = createStyle("vencord-custom-css");
VencordNative.quickCss.addChangeListener(css => { VencordNative.quickCss.addChangeListener(css => {
css = patchSidebar(css);
style.textContent = css; style.textContent = css;
// At the time of writing this, changing textContent resets the disabled state
style.disabled = !Settings.useQuickCss; style.disabled = !Settings.useQuickCss;
}); });
style.textContent = await VencordNative.quickCss.get();
const css = await VencordNative.quickCss.get();
style.textContent = patchSidebar(css);
} }
} else { } else
style.disabled = !isEnabled; style.disabled = !isEnabled;
}
}
function patchSidebar(css: string): string {
if (
css.includes("grid-template-columns") && Settings.plugins.BetterFolders.enabled ||
css.includes("grid-template-areas") && Settings.plugins.BetterFolders.enabled
) {
css = css.replace(
/\btitleBar\b/,
"titleBar titleBar"
);
css = css.replace(
/\buserPanel\b/,
"userPanel userPanel"
);
css = css.replace(
/guildsList/g,
"guildsList sidebar"
);
css = css.replace(
/guildsEnd\]/g,
"guildsEnd] min-content [sidebarEnd]"
);
}
return css;
}
async function fetchAndPatchCSS(url: string): Promise<string> {
try {
const res = await fetch(url);
const css = await res.text();
const importLinks = extractImportLinks(css);
const patchedCSS = await Promise.all(importLinks.map(fetchAndPatchCSS));
const combinedCSS = patchedCSS.join("\n") + "\n" + patchSidebar(css);
return combinedCSS;
} catch (e) {
console.warn(`Failed to fetch and patch CSS from ${url}`, e);
return "";
}
}
function extractImportLinks(css: string): string[] {
const importRegex = /@import url\(([^)]+)\)/g;
const links: string[] = [];
let match;
while ((match = importRegex.exec(css)) !== null) {
links.push(match[1].trim().replace(/['"]/g, ""));
}
return links;
} }
async function initThemes() { async function initThemes() {
themesStyle ??= createStyle("vencord-themes"); themesStyle ??= createStyle("vencord-themes");
const { enabledThemeLinks, enabledThemes } = Settings; const { enabledThemeLinks, enabledThemes } = Settings;
const enabledlinks: string[] = [...enabledThemeLinks]; const enabledlinks: string[] = [...enabledThemeLinks];
// "darker" and "midnight" both count as dark
const activeTheme = ThemeStore.theme === "light" ? "light" : "dark"; const activeTheme = ThemeStore.theme === "light" ? "light" : "dark";
const rawLinks = enabledlinks const links = enabledlinks
.map(rawLink => { .map(rawLink => {
const match = /^@(light|dark) (.*)/.exec(rawLink); const match = /^@(light|dark) (.*)/.exec(rawLink);
if (!match) return rawLink; if (!match) return rawLink;
@ -125,27 +72,20 @@ async function initThemes() {
const [, mode, link] = match; const [, mode, link] = match;
return mode === activeTheme ? link : null; return mode === activeTheme ? link : null;
}) })
.filter((link): link is string => link !== null); .filter(link => link !== null);
const links: string[] = []; if (IS_WEB) {
for (const theme of enabledThemes) {
for (const url of rawLinks) { const themeData = await VencordNative.themes.getThemeData(theme);
const css = await fetchAndPatchCSS(url); if (!themeData) continue;
if (css) { const blob = new Blob([themeData], { type: "text/css" });
const blob = new Blob([css], { type: "text/css" });
links.push(URL.createObjectURL(blob)); links.push(URL.createObjectURL(blob));
} catch (e) { } catch (e) {
console.warn(`Failed to fetch theme from ${url}`, e); console.warn(`Failed to fetch theme from ${url}`, e);
} }
} } else {
const localThemes = enabledThemes.map(theme => `vencord:///themes/${theme}?v=${Date.now()}`);
for (const theme of enabledThemes) { links.push(...localThemes);
const themeData = await VencordNative.themes.getThemeData(theme);
if (!themeData) continue;
const patchedTheme = patchSidebar(themeData);
const blob = new Blob([patchedTheme], { type: "text/css" });
links.push(URL.createObjectURL(blob));
} }
themesStyle.textContent = links.map(link => `@import url("${link.trim()}");`).join("\n"); themesStyle.textContent = links.map(link => `@import url("${link.trim()}");`).join("\n");