diff --git a/src/equicordplugins/exitSounds/index.tsx b/src/equicordplugins/exitSounds/index.tsx
index 3f161fbb6..db67fe6ed 100644
--- a/src/equicordplugins/exitSounds/index.tsx
+++ b/src/equicordplugins/exitSounds/index.tsx
@@ -30,7 +30,7 @@ function GuildSelector() {
return (
o.value === soundGuildId)}
+ value={options.find(o => o.value === soundGuildId)?.value}
placeholder="Select a server..."
maxVisibleItems={6}
closeOnSelect={true}
diff --git a/src/equicordplugins/instantScreenshare/utils.tsx b/src/equicordplugins/instantScreenshare/utils.tsx
index b6dbbece8..22ac85cea 100644
--- a/src/equicordplugins/instantScreenshare/utils.tsx
+++ b/src/equicordplugins/instantScreenshare/utils.tsx
@@ -105,7 +105,7 @@ function StreamSimplePicker({ streamMediaSelection, streamMedia }: PickerProps)
placeholder="Select a media source to stream "
maxVisibleItems={5}
options={options}
- value={options.find(o => o.value === streamMedia)}
+ value={options.find(o => o.value === streamMedia)?.value}
onChange={v => settings.store.streamMedia = v}
closeOnSelect
/>
diff --git a/src/equicordplugins/timezones/TimezoneModal.tsx b/src/equicordplugins/timezones/TimezoneModal.tsx
index 8d599fd1f..e6c7116ff 100644
--- a/src/equicordplugins/timezones/TimezoneModal.tsx
+++ b/src/equicordplugins/timezones/TimezoneModal.tsx
@@ -56,7 +56,7 @@ export function SetTimezoneModal({ userId, modalProps, database }: { userId: str
o.value === currentValue)}
+ value={options.find(o => o.value === currentValue)?.value}
placeholder={"Select a Timezone"}
maxVisibleItems={5}
closeOnSelect={true}
diff --git a/src/equicordplugins/vcNarratorCustom/index.tsx b/src/equicordplugins/vcNarratorCustom/index.tsx
index e1a340bf3..f4711d878 100644
--- a/src/equicordplugins/vcNarratorCustom/index.tsx
+++ b/src/equicordplugins/vcNarratorCustom/index.tsx
@@ -794,7 +794,7 @@ function VoiceSelectModal({ modalProps, user }: { modalProps: ModalProps; user:
Select voice for {user.username}
o.value === currentValue)}
+ value={options.find(o => o.value === currentValue)?.value}
placeholder="Select a voice"
maxVisibleItems={6}
closeOnSelect={true}
diff --git a/src/equicordplugins/voiceMessageTranscriber.desktop/index.tsx b/src/equicordplugins/voiceMessageTranscriber.desktop/index.tsx
index 608d08f50..f60724321 100644
--- a/src/equicordplugins/voiceMessageTranscriber.desktop/index.tsx
+++ b/src/equicordplugins/voiceMessageTranscriber.desktop/index.tsx
@@ -132,7 +132,7 @@ function LanguageSelectionModal(props: { modalProps: ModalProps, src: string; })
o.value === language)}
+ value={languageOptions.find(o => o.value === language)?.value}
onChange={setLanguage}
/>
From b6e779822ada5c1fe844dc8784cde92c11a7d86b Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 3 Mar 2026 19:34:20 -0500
Subject: [PATCH 13/41] mainWindowFrameless: no idea if this works
---
src/api/Settings.ts | 2 ++
src/components/settings/tabs/vencord/index.tsx | 12 ++++++++++--
src/equicordplugins/messagePeek/index.tsx | 2 +-
src/main/patcher.ts | 5 ++++-
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/api/Settings.ts b/src/api/Settings.ts
index 208c37698..f0db98933 100644
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@@ -49,6 +49,7 @@ export interface Settings {
themeNames: Record;
enableReactDevtools: boolean;
themeLinks: string[];
+ mainWindowFrameless: boolean;
frameless: boolean;
transparent: boolean;
winCtrlQ: boolean;
@@ -116,6 +117,7 @@ const DefaultSettings: Settings = {
pinnedThemes: [],
themeNames: {},
enableReactDevtools: false,
+ mainWindowFrameless: false,
frameless: false,
transparent: false,
winCtrlQ: false,
diff --git a/src/components/settings/tabs/vencord/index.tsx b/src/components/settings/tabs/vencord/index.tsx
index ee1d5eadf..37901be6d 100644
--- a/src/components/settings/tabs/vencord/index.tsx
+++ b/src/components/settings/tabs/vencord/index.tsx
@@ -81,11 +81,18 @@ function EquicordSettings() {
restartRequired: true,
warning: { enabled: false },
},
+ (!IS_WEB && !IS_DISCORD_DESKTOP || !IS_WINDOWS) && {
+ key: "mainWindowFrameless",
+ title: "Disable the Main Window Frame",
+ description: "Remove the native window frame for a cleaner look. You can still move the window by dragging the title bar area.",
+ restartRequired: true,
+ warning: { enabled: false },
+ },
!IS_WEB &&
(!IS_DISCORD_DESKTOP || !IS_WINDOWS
? {
key: "frameless",
- title: "Disable the Window Frame",
+ title: "Disable All Window Frames",
description: "Remove the native window frame for a cleaner look. You can still move the window by dragging the title bar area.",
restartRequired: true,
warning: { enabled: false },
@@ -96,7 +103,8 @@ function EquicordSettings() {
description: "Replace Discord's custom title bar with the standard Windows title bar. This may improve compatibility with some window management tools.",
restartRequired: true,
warning: { enabled: false },
- }),
+ }
+ ),
!IS_WEB && {
key: "transparent",
title: "Enable Window Transparency",
diff --git a/src/equicordplugins/messagePeek/index.tsx b/src/equicordplugins/messagePeek/index.tsx
index 8d07c8492..866e704e9 100644
--- a/src/equicordplugins/messagePeek/index.tsx
+++ b/src/equicordplugins/messagePeek/index.tsx
@@ -224,7 +224,7 @@ function Timestamp({ channel }: { channel: Channel; }) {
if (!lastMessage) return null;
const timestamp = SnowflakeUtils.extractTimestamp(lastMessage.id);
- const className = ExperimentStore.getUserExperimentBucket("2026-01-favorites-server") >= 1 ? cl("timestamp-favorites") : cl("timestamp");
+ const className = ExperimentStore.getUserExperimentBucket("2026-01-favorites-server") > 0 ? cl("timestamp-favorites") : cl("timestamp");
return {formatRelativeTime(timestamp)};
}
diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index 60cc515f4..c5584f300 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -72,12 +72,15 @@ if (!IS_VANILLA) {
constructor(options: BrowserWindowConstructorOptions) {
if (options?.webPreferences?.preload && options.title) {
const original = options.webPreferences.preload;
+ const isMainWindow = options.title === "Discord";
options.webPreferences.preload = join(__dirname, "preload.js");
options.webPreferences.sandbox = false;
// work around discord unloading when in background
options.webPreferences.backgroundThrottling = false;
- if (settings.frameless) {
+ if (settings.mainWindowFrameless && isMainWindow) {
+ options.frame = false;
+ } else if (settings.frameless) {
options.frame = false;
} else if (process.platform === "win32" && settings.winNativeTitleBar) {
delete options.frame;
From d613793dc4446f34ee1e9be4a844f9ea0db32add Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 3 Mar 2026 19:36:05 -0500
Subject: [PATCH 14/41] do frameless first
---
src/main/patcher.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index c5584f300..911a40473 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -78,9 +78,9 @@ if (!IS_VANILLA) {
// work around discord unloading when in background
options.webPreferences.backgroundThrottling = false;
- if (settings.mainWindowFrameless && isMainWindow) {
+ if (settings.frameless) {
options.frame = false;
- } else if (settings.frameless) {
+ } else if (settings.mainWindowFrameless && isMainWindow) {
options.frame = false;
} else if (process.platform === "win32" && settings.winNativeTitleBar) {
delete options.frame;
From 2ae503d9305ad7bb211ae7b79dc988552f5842be Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 3 Mar 2026 20:38:40 -0500
Subject: [PATCH 15/41] BetterSettings: Fix For New Menu
---
src/plugins/_core/settings.tsx | 8 ---
src/plugins/betterSettings/index.tsx | 91 ++++++++--------------------
2 files changed, 24 insertions(+), 75 deletions(-)
diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index d5a57d933..eb87cb137 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -152,14 +152,6 @@ export default definePlugin({
}
]
},
- {
- find: "#{intl::USER_SETTINGS_ACTIONS_MENU_LABEL}",
- replacement: {
- // Skip the check Discord performs to make sure the section being selected in the user settings context menu is valid
- match: /null!=\(\i=Object.values\(\i\.\i\).{0,50}?&&(?=\(0,\i\.openUserSettings\)\(\i,\{section:\i)/,
- replace: ""
- }
- },
{
find: ".buildLayout().map",
replacement: {
diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
index 7b0b3517e..1f2578b94 100644
--- a/src/plugins/betterSettings/index.tsx
+++ b/src/plugins/betterSettings/index.tsx
@@ -7,14 +7,13 @@
import { definePluginSettings } from "@api/Settings";
import { disableStyle, enableStyle } from "@api/Styles";
import { buildPluginMenuEntries, buildThemeMenuEntries } from "@equicordplugins/equicordToolbox/menu";
-import SettingsPlugin from "@plugins/_core/settings";
import { Devs } from "@utils/constants";
import { classNameFactory } from "@utils/css";
import { Logger } from "@utils/Logger";
import definePlugin, { OptionType } from "@utils/types";
import { findCssClassesLazy } from "@webpack";
import { ComponentDispatch, FocusLock, Menu, useEffect, useRef } from "@webpack/common";
-import type { HTMLAttributes, ReactElement } from "react";
+import type { HTMLAttributes } from "react";
import fullHeightStyle from "./fullHeightContext.css?managed";
@@ -171,13 +170,9 @@ export default definePlugin({
find: "#{intl::USER_SETTINGS_ACTIONS_MENU_LABEL}",
replacement: [
{
- match: /=\[\];(\i)(?=\.forEach.{0,200}?"logout"===\i.{0,100}?(\i)\.get\(\i\))/,
- replace: "=$self.wrapMap([]);$self.transformSettingsEntries($1,$2)",
+ match: /(\i)=(.{0,20}openUserSettings\)\(\i\)\));/,
+ replace: "$1=$self.transformSettingsElements($2);",
},
- {
- match: /case \i\.\i\.DEVELOPER_OPTIONS:return \i;/,
- replace: "$&case 'EquicordPlugins':return $self.buildPluginMenuEntries(true);case 'EquicordThemes':return $self.buildThemeMenuEntries();"
- }
]
},
],
@@ -200,72 +195,34 @@ export default definePlugin({
return ;
},
- transformSettingsEntries(list: SettingsEntry[], keyMap: Map) {
+ transformSettingsElements(list) {
const items: any[] = [];
- const equicordItems: SettingsEntry[] = [
- { section: "EquicordSettings", label: "Settings" },
- { section: "EquicordPlugins", label: "Plugins" },
- { section: "EquicordThemes", label: "Themes" },
- { section: "EquicordUpdater", label: "Updater" },
- { section: "EquicordChangelog", label: "Changelog" },
- { section: "EquicordCloud", label: "Cloud" },
- { section: "EquicordBackupAndRestore", label: "Backup & Restore" },
- { section: "EquicordPatchHelper", label: "Patch Helper" },
- ];
- for (const [section, key] of SettingsPlugin.settingsSectionMap) {
- const entry = SettingsPlugin.customEntries.find(e => key.endsWith(e.key));
- if (entry) equicordItems.push({ section, label: entry.title });
- }
+ for (const item of list) {
+ const { key, props } = item;
+ if (!props) continue;
- if (settings.store.organizeMenu) {
- for (const item of list) {
- if (!item.label || item.predicate != null && !item.predicate()) continue;
+ if (key === "equicord_plugins" || key === "equicord_themes") {
+ const children = key === "equicord_plugins"
+ ? buildPluginMenuEntries()
+ : buildThemeMenuEntries();
- if (item.section === "HEADER") {
- keyMap.set(item.label, item.label);
- items.push({ section: item.label, items: [] });
- } else if (item.section !== "DIVIDER" && keyMap.has(item.section)) {
- items.at(-1)?.items.push(item);
- }
+ items.push(
+
+ {children}
+
+ );
+ } else if (key.endsWith("_section") && props.label) {
+ items.push(
+
+ {this.transformSettingsElements(props.children)}
+
+ );
+ } else {
+ items.push(item);
}
-
- keyMap.set("Equicord", "Equicord");
- items.push({
- section: "Equicord",
- items: equicordItems
- });
- } else {
- items.push(...list, ...equicordItems);
}
return items;
- },
-
- wrapMap(toWrap: TransformedSettingsEntry[]) {
- if (!settings.store.organizeMenu) return toWrap;
- // @ts-expect-error
- toWrap.map = function (render: (item: SettingsEntry) => ReactElement) {
- return this
- .filter(a => a.items.length > 0)
- .map(({ section, items }) => {
- const children = items.map(render);
- if (section) {
- return (
-
- {children}
-
- );
- } else {
- return children;
- }
- });
- };
-
- return toWrap;
}
});
From 1c63caa0c5f0d3c5ebf47caa11393003b33661e2 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 3 Mar 2026 21:27:19 -0500
Subject: [PATCH 16/41] MoreCommands: Make Freaky Default
---
src/equicordplugins/moreCommands/utils.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/equicordplugins/moreCommands/utils.ts b/src/equicordplugins/moreCommands/utils.ts
index 38a53a517..a5a0f7815 100644
--- a/src/equicordplugins/moreCommands/utils.ts
+++ b/src/equicordplugins/moreCommands/utils.ts
@@ -11,7 +11,7 @@ export const settings = definePluginSettings({
addFreakyEnding: {
type: OptionType.BOOLEAN,
description: "Add ๐
or โค๏ธ at the end",
- default: true
+ default: false
},
uwuEveryMessage: {
description: "Make every single message uwuified",
From 753c29e61f3ddf13923c631f42829559c12a03aa Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 3 Mar 2026 21:42:13 -0500
Subject: [PATCH 17/41] Fix NicknamesIconsAPI
---
src/plugins/_api/nicknameIcons.ts | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/plugins/_api/nicknameIcons.ts b/src/plugins/_api/nicknameIcons.ts
index 81423e450..6d0c220b6 100644
--- a/src/plugins/_api/nicknameIcons.ts
+++ b/src/plugins/_api/nicknameIcons.ts
@@ -14,10 +14,16 @@ export default definePlugin({
patches: [
{
find: "#{intl::USER_PROFILE_PRONOUNS}",
- replacement: {
- match: /(?<=shouldUnderlineOnHover:null.{0,200})children:(\i)/,
- replace: "children:[...Vencord.Api.NicknameIcons._renderIcons({userId:arguments[0].user?.id}),$1]"
- }
+ replacement: [
+ {
+ match: /(?<=,\i\]\}\)\),)null!=\i/,
+ replace: "($&||Vencord.Api.NicknameIcons._renderIcons({userId:arguments[0].user?.id})?.length)"
+ },
+ {
+ match: /(?<=shouldUnderlineOnHover:null.{0,300})children:(\i)/,
+ replace: "children:[...Vencord.Api.NicknameIcons._renderIcons({userId:arguments[0].user?.id}),$1]"
+ }
+ ]
}
]
});
From 1058bb12e97f22acc4126c19ca48d6fe4a711c67 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 3 Mar 2026 21:52:19 -0500
Subject: [PATCH 18/41] AlwaysAnimate: Hopefully speed up nameplate patch
---
src/plugins/alwaysAnimate/index.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/alwaysAnimate/index.ts b/src/plugins/alwaysAnimate/index.ts
index 2052998ad..3c26219de 100644
--- a/src/plugins/alwaysAnimate/index.ts
+++ b/src/plugins/alwaysAnimate/index.ts
@@ -92,7 +92,7 @@ export default definePlugin({
find: ".MINI_PREVIEW,[",
predicate: () => settings.store.nameplates,
replacement: {
- match: /animate:\i,loop:.{0,15}===\i/,
+ match: /animate:\i,loop:(?:!0===\i(?:&&)?){2}/,
replace: "animate:true,loop:true"
},
},
From 00d797b77c4d43847858cbdf202e8c8e4e06e6d3 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Wed, 4 Mar 2026 10:02:19 -0500
Subject: [PATCH 19/41] AlwaysAnimate: Update Nameplate Patch
---
src/plugins/alwaysAnimate/index.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/alwaysAnimate/index.ts b/src/plugins/alwaysAnimate/index.ts
index 3c26219de..48d1335aa 100644
--- a/src/plugins/alwaysAnimate/index.ts
+++ b/src/plugins/alwaysAnimate/index.ts
@@ -92,7 +92,7 @@ export default definePlugin({
find: ".MINI_PREVIEW,[",
predicate: () => settings.store.nameplates,
replacement: {
- match: /animate:\i,loop:(?:!0===\i(?:&&)?){2}/,
+ match: /animate:\i,loop:!0===\i&&!0===\i/,
replace: "animate:true,loop:true"
},
},
From a1a12eee41889e152eba1f023dfc43ad1328abcf Mon Sep 17 00:00:00 2001
From: nexpid
Date: Wed, 4 Mar 2026 16:04:23 +0100
Subject: [PATCH 20/41] feat(SongSpotlight): support refresh tokens (#870)
---
.../songSpotlight.desktop/lib/api.ts | 66 +++++++++++--------
.../songSpotlight.desktop/lib/oauth2.tsx | 14 +++-
.../lib/stores/AuthorizationStore.ts | 39 ++++++++---
.../songSpotlight.desktop/settings.tsx | 5 +-
.../ui/settings/index.tsx | 6 +-
.../ui/songs/CollapsedProfileSongs.tsx | 7 +-
6 files changed, 91 insertions(+), 46 deletions(-)
diff --git a/src/equicordplugins/songSpotlight.desktop/lib/api.ts b/src/equicordplugins/songSpotlight.desktop/lib/api.ts
index 868f79132..9bad09bca 100644
--- a/src/equicordplugins/songSpotlight.desktop/lib/api.ts
+++ b/src/equicordplugins/songSpotlight.desktop/lib/api.ts
@@ -9,7 +9,6 @@ import { showToast, Toasts, UserStore } from "@webpack/common";
import { useAuthorizationStore } from "./stores/AuthorizationStore";
import { useSongStore } from "./stores/SongStore";
-import { logger } from "./utils";
export const apiConstants = {
api: "https://dc.songspotlight.nexpid.xyz/",
@@ -20,16 +19,36 @@ export const apiConstants = {
songLimit: 6,
};
-export async function authFetch(_url: string | URL, options?: RequestInit) {
- const url = new URL(_url);
+let refreshPromise: Promise | undefined;
+async function refreshAccessToken() {
+ const token = useAuthorizationStore.getState().getToken();
+ if (!token) return false;
+ return refreshPromise ??= fetch(new URL("api/auth/refresh", apiConstants.api), {
+ method: "POST",
+ headers: {
+ "X-Refresh-Token": token.refresh,
+ },
+ body: token.access,
+ }).then(async res => {
+ if (!res.ok) return false;
+
+ const access = await res.text();
+ useAuthorizationStore.getState().setToken(access, token.refresh);
+ return true;
+ }).finally(() => refreshPromise = undefined);
+}
+
+export async function authFetch(url: string | URL, options?: RequestInit, retried = false) {
+ url = new URL(url);
try {
+ const token = useAuthorizationStore.getState().getToken();
const res = await fetch(url, {
...options,
headers: {
...options?.headers,
- Authorization: useAuthorizationStore.getState().getToken()!,
- },
+ Authorization: token?.access,
+ } as HeadersInit,
});
if (res.ok) return res;
@@ -37,36 +56,29 @@ export async function authFetch(_url: string | URL, options?: RequestInit) {
// not modified
if (res.status === 304) return null;
+ const text = await res.text();
+
// unauthorized
if (res.status === 401) {
- useAuthorizationStore.getState().deleteToken();
+ const retry = !retried && await refreshAccessToken();
+ if (retry) return await authFetch(url, options, true);
+ else {
+ useAuthorizationStore.getState().deleteTokens();
+ showToast("You have been signed out from Song Spotlight. Please sign in again.", Toasts.Type.FAILURE);
+ }
+ } else {
+ showToast(
+ !text.includes("") && res.status >= 400 && res.status <= 599
+ ? `Song Spotlight: ${text}`
+ : `Song Spotlight fetch error at ${url.pathname}`,
+ Toasts.Type.FAILURE,
+ );
}
- const text = await res.text();
- showToast(
- !text.includes("") && res.status >= 400 && res.status <= 599
- ? `Song Spotlight: ${text}`
- : `Song Spotlight fetch error at ${url.pathname}`,
- Toasts.Type.FAILURE,
- );
-
- logger.error(
- "Got an authFetch response error",
- options?.method ?? "GET",
- url.toString(),
- res.status,
- text,
- );
throw new Error(text);
} catch (error) {
showToast(`Song Spotlight: ${error}`, Toasts.Type.FAILURE);
- logger.error(
- "Got an authFetch request error",
- options?.method ?? "GET",
- url.toString(),
- error,
- );
throw error;
}
}
diff --git a/src/equicordplugins/songSpotlight.desktop/lib/oauth2.tsx b/src/equicordplugins/songSpotlight.desktop/lib/oauth2.tsx
index 3ff3bcdf9..8780a8df0 100644
--- a/src/equicordplugins/songSpotlight.desktop/lib/oauth2.tsx
+++ b/src/equicordplugins/songSpotlight.desktop/lib/oauth2.tsx
@@ -30,15 +30,23 @@ export function presentOAuth2Modal() {
const url = new URL(location);
url.searchParams.append("whois", "equicord");
- const token = await (await authFetch(url))?.text();
- if (!token) return;
+ const res = await authFetch(url);
+ if (!res) throw "Response wasn't ok";
- useAuthorizationStore.getState().setToken(token);
+ const access = await res.text();
+ if (!access) throw "Access token is missing";
+
+ const refresh = res.headers.get("X-Refresh-Token");
+ // STUB uncomment this once API is fully rolled out
+ // if (!refresh) throw "Refresh token is missing";
+
+ useAuthorizationStore.getState().setToken(access, refresh || "");
getData();
showToast("Successfully authorized!", Toasts.Type.SUCCESS);
} catch (error) {
logger.error("Got an error during OAuth2", error);
+ if (typeof error === "string") showToast(error, Toasts.Type.FAILURE);
}
}}
/>
diff --git a/src/equicordplugins/songSpotlight.desktop/lib/stores/AuthorizationStore.ts b/src/equicordplugins/songSpotlight.desktop/lib/stores/AuthorizationStore.ts
index 48e1469d5..368166764 100644
--- a/src/equicordplugins/songSpotlight.desktop/lib/stores/AuthorizationStore.ts
+++ b/src/equicordplugins/songSpotlight.desktop/lib/stores/AuthorizationStore.ts
@@ -10,11 +10,16 @@ import { UserStore, zustandCreate, zustandPersist } from "@webpack/common";
import { PersistedZustandStore, ZustandDefinition } from "./zustand";
+export interface Token {
+ access: string;
+ refresh: string;
+}
+
interface AuthorizationState {
- tokens: Record;
- getToken(): string | undefined;
- setToken(token: string): void;
- deleteToken(): void;
+ tokens: Record;
+ getToken(): Token | undefined;
+ setToken(access: string, refresh: string): void;
+ deleteTokens(): void;
isAuthorized(): boolean;
}
@@ -26,17 +31,18 @@ export const useAuthorizationStore: PersistedZustandStore =
getToken() {
return get().tokens[UserStore.getCurrentUser()?.id];
},
- setToken(token) {
+ setToken(access, refresh) {
const userId = UserStore.getCurrentUser()?.id;
if (userId) {
set({
- tokens: Object.assign(get().tokens, {
- [userId]: token,
- }),
+ tokens: {
+ ...get().tokens,
+ [userId]: { access, refresh },
+ },
});
}
},
- deleteToken() {
+ deleteTokens() {
set({ tokens: {} });
},
isAuthorized() {
@@ -45,11 +51,24 @@ export const useAuthorizationStore: PersistedZustandStore =
})) as ZustandDefinition,
{
name: "songspotlight-auth",
+ version: 1,
+ migrate(persisted: any, version: number) {
+ if (version === 0) {
+ persisted.tokens = Object.fromEntries(
+ Object.entries(persisted.tokens).map(([userId, access]) => [userId, {
+ access,
+ refresh: "",
+ }]),
+ );
+ }
+
+ return persisted;
+ },
storage: {
async getItem(name: string) {
return (await DataStore.get(name)) ?? null;
},
- async setItem(name: string, value: string) {
+ async setItem(name: string, value: unknown) {
return await DataStore.set(name, value);
},
async removeItem(name: string) {
diff --git a/src/equicordplugins/songSpotlight.desktop/settings.tsx b/src/equicordplugins/songSpotlight.desktop/settings.tsx
index 2819a7adb..97af8cc3f 100644
--- a/src/equicordplugins/songSpotlight.desktop/settings.tsx
+++ b/src/equicordplugins/songSpotlight.desktop/settings.tsx
@@ -7,6 +7,7 @@
import { definePluginSettings } from "@api/Settings";
import { makeRange, OptionType } from "@utils/types";
+import { apiConstants } from "./lib/api";
import Settings from "./ui/settings";
export default definePluginSettings({
@@ -18,8 +19,8 @@ export default definePluginSettings({
profileSongsLimit: {
type: OptionType.SLIDER,
description: "How many songs are shown when initially clicking on a user",
- default: 6,
- markers: makeRange(1, 6),
+ default: apiConstants.songLimit,
+ markers: makeRange(1, apiConstants.songLimit),
},
manager: {
type: OptionType.COMPONENT,
diff --git a/src/equicordplugins/songSpotlight.desktop/ui/settings/index.tsx b/src/equicordplugins/songSpotlight.desktop/ui/settings/index.tsx
index ef42841de..7a36d6f73 100644
--- a/src/equicordplugins/songSpotlight.desktop/ui/settings/index.tsx
+++ b/src/equicordplugins/songSpotlight.desktop/ui/settings/index.tsx
@@ -85,7 +85,7 @@ interface SettingsProps {
}
export default function Settings({ templateData }: SettingsProps) {
- const { isAuthorized, deleteToken } = useAuthorizationStore();
+ const { isAuthorized, deleteTokens } = useAuthorizationStore();
const { self } = useSongStore();
const ticked = useRef(false);
@@ -172,7 +172,7 @@ export default function Settings({ templateData }: SettingsProps) {
);
}
+
+export function TranslateButton({
+ className,
+ ...props
+}: Partial) {
+ const link = "https://weblate.equicord.org/projects/equicord/";
+ return (
+
+ );
+}
diff --git a/src/components/settings/SpecialCard.css b/src/components/settings/SpecialCard.css
index f037aadbd..97a9b5030 100644
--- a/src/components/settings/SpecialCard.css
+++ b/src/components/settings/SpecialCard.css
@@ -26,6 +26,18 @@
background-color: color-mix(in srgb, #c3a3ce 50%, rgb(240 178 240));
}
+.vc-translate-button {
+ overflow: visible !important;
+ color: black;
+ background-color: color-mix(in srgb, #575757 50%, rgb(255, 255, 255));
+}
+
+.vc-translate-button:hover {
+ overflow: visible !important;
+ color: black;
+ background-color: color-mix(in srgb, #575757 50%, rgb(201, 201, 201));
+}
+
.vc-invite-link {
width: 16px;
height: 16px;
@@ -142,4 +154,14 @@
.vc-special-image {
width: 65%;
+}
+
+.vc-translate-modal-icon {
+ margin: auto;
+ width: 60px;
+}
+
+.vc-translate-modal-paragraph {
+ padding: 12px;
+ text-align: center;
}
\ No newline at end of file
diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx
index 6125e7667..cd366010c 100644
--- a/src/plugins/_api/badges/index.tsx
+++ b/src/plugins/_api/badges/index.tsx
@@ -30,7 +30,7 @@ import { ContextMenuApi, Menu, Toasts, UserStore } from "@webpack/common";
import Plugins, { PluginMeta } from "~plugins";
-import { EquicordDonorModal, VencordDonorModal } from "./modals";
+import { EquicordDonorModal, EquicordTranslatorModal, VencordDonorModal } from "./modals";
const CONTRIBUTOR_BADGE = "https://cdn.discordapp.com/emojis/1092089799109775453.png?size=64";
const EQUICORD_CONTRIBUTOR_BADGE = "https://equicord.org/assets/favicon.png";
@@ -253,7 +253,7 @@ export default definePlugin({
ContextMenuApi.openContextMenu(event, () => );
},
onClick() {
- return EquicordDonorModal();
+ return badge.tooltip === "Equicord Translator" ? EquicordTranslatorModal() : EquicordDonorModal();
},
} satisfies ProfileBadge));
}
diff --git a/src/plugins/_api/badges/modals.tsx b/src/plugins/_api/badges/modals.tsx
index 275023666..f66ffe060 100644
--- a/src/plugins/_api/badges/modals.tsx
+++ b/src/plugins/_api/badges/modals.tsx
@@ -9,7 +9,7 @@ import { Flex } from "@components/Flex";
import { HeadingPrimary } from "@components/Heading";
import { Heart } from "@components/Heart";
import { Paragraph } from "@components/Paragraph";
-import { DonateButton } from "@components/settings";
+import { DonateButton, TranslateButton } from "@components/settings";
import { Margins } from "@utils/margins";
import { closeModal, ModalContent, ModalFooter, ModalHeader, ModalRoot, openModal } from "@utils/modal";
@@ -72,7 +72,6 @@ export function EquicordDonorModal() {
const modalKey = openModal(props => (
{
closeModal(modalKey);
- // Will get my own in the future
VencordNative.native.openExternal("https://github.com/sponsors/thororen1234");
}}>
@@ -123,3 +122,47 @@ export function EquicordDonorModal() {
));
}
+
+export function EquicordTranslatorModal() {
+ const modalKey = openModal(props => (
+ {
+ closeModal(modalKey);
+ }}>
+
+
+
+
+ Equicord Translator
+
+
+
+
+
+ 
+
+
+
+ Awarded to contributors who expand Equicordโs language support by translating content for the community.
+
+
})
+ {user.globalName ?? user.username}
+ 
+ )}
+ {extra && (
+