diff --git a/src/equicordplugins/tidalLyrics/components/util.tsx b/src/equicordplugins/musicControls/tidal/lyrics/components/util.tsx
similarity index 96%
rename from src/equicordplugins/tidalLyrics/components/util.tsx
rename to src/equicordplugins/musicControls/tidal/lyrics/components/util.tsx
index 8fce9f6ab..74881e693 100644
--- a/src/equicordplugins/tidalLyrics/components/util.tsx
+++ b/src/equicordplugins/musicControls/tidal/lyrics/components/util.tsx
@@ -5,12 +5,12 @@
*/
import { classNameFactory } from "@api/Styles";
-import { TidalStore } from "@equicordplugins/tidalControls/TidalStore";
import { findByPropsLazy } from "@webpack";
import { React, useEffect, useState, useStateFromStores } from "@webpack/common";
+import { settings } from "../../../settings";
+import { TidalStore } from "../../TidalStore";
import { TidalLrcStore } from "../providers/store";
-import settings from "../settings";
import { EnhancedLyric } from "../types";
export const scrollClasses = findByPropsLazy("auto", "customTheme");
diff --git a/src/equicordplugins/tidalLyrics/providers/store.ts b/src/equicordplugins/musicControls/tidal/lyrics/providers/store.ts
similarity index 93%
rename from src/equicordplugins/tidalLyrics/providers/store.ts
rename to src/equicordplugins/musicControls/tidal/lyrics/providers/store.ts
index 2eb327dfd..9b260fba4 100644
--- a/src/equicordplugins/tidalLyrics/providers/store.ts
+++ b/src/equicordplugins/musicControls/tidal/lyrics/providers/store.ts
@@ -5,12 +5,12 @@
*/
import { showNotification } from "@api/Notifications";
-import { TidalStore } from "@equicordplugins/tidalControls/TidalStore";
import { proxyLazyWebpack } from "@webpack";
import { Flux, FluxDispatcher } from "@webpack/common";
+import { settings } from "../../../settings";
+import { TidalStore } from "../../TidalStore";
import { getLyrics } from "../api";
-import settings from "../settings";
import { EnhancedLyric } from "../types";
function showNotif(title: string, body: string) {
diff --git a/src/equicordplugins/tidalLyrics/types.ts b/src/equicordplugins/musicControls/tidal/lyrics/types.ts
similarity index 100%
rename from src/equicordplugins/tidalLyrics/types.ts
rename to src/equicordplugins/musicControls/tidal/lyrics/types.ts
diff --git a/src/equicordplugins/tidalControls/tidalStyles.css b/src/equicordplugins/musicControls/tidal/tidalStyles.css
similarity index 100%
rename from src/equicordplugins/tidalControls/tidalStyles.css
rename to src/equicordplugins/musicControls/tidal/tidalStyles.css
diff --git a/src/equicordplugins/spotifyLyrics/index.tsx b/src/equicordplugins/spotifyLyrics/index.tsx
deleted file mode 100644
index 0f802fd0c..000000000
--- a/src/equicordplugins/spotifyLyrics/index.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import "./styles.css";
-
-import { Settings } from "@api/Settings";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { Player } from "plugins/spotifyControls/PlayerComponent";
-
-import { migrateOldLyrics } from "./api";
-import { Lyrics } from "./components/lyrics";
-import settings from "./settings";
-
-
-export default definePlugin({
- name: "SpotifyLyrics",
- authors: [Devs.Joona],
- description: "Adds lyrics to SpotifyControls",
- dependencies: ["SpotifyControls"],
- patches: [
- {
- find: "this.isCopiedStreakGodlike",
- replacement: {
- match: /Vencord\.Plugins\.plugins\["SpotifyControls"\]\.PanelWrapper/,
- replace: "$self.FakePanelWrapper",
- },
- predicate: () => Settings.plugins.SpotifyControls.enabled,
- noWarn: true,
- },
- ],
- FakePanelWrapper({ VencordOriginal, ...props }) {
- const { LyricsPosition } = settings.use(["LyricsPosition"]);
- return (
- <>
-
(
-
-
Failed to render Spotify Lyrics Modal :(
-
Check the console for errors
-
-
-
-
- );
- },
- settings,
- async start() {
- await migrateOldLyrics();
- },
-});
diff --git a/src/equicordplugins/spotifyLyrics/settings.tsx b/src/equicordplugins/spotifyLyrics/settings.tsx
deleted file mode 100644
index 4348ac477..000000000
--- a/src/equicordplugins/spotifyLyrics/settings.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { definePluginSettings } from "@api/Settings";
-import { SliderSetting } from "@components/settings/tabs/plugins/components/SliderSetting";
-import { useAwaiter } from "@utils/react";
-import { makeRange, OptionType } from "@utils/types";
-import { Button, showToast, Text, Toasts, useMemo } from "@webpack/common";
-
-import { clearLyricsCache, getLyricsCount, removeTranslations } from "./api";
-import { Lyrics } from "./components/lyrics";
-import { useLyrics } from "./components/util";
-import languages from "./providers/translator/languages";
-import { Provider } from "./providers/types";
-
-const sliderOptions = {
- markers: makeRange(-2500, 2500, 250),
- stickToMarkers: true,
-};
-
-function Details() {
- const { lyricsInfo } = useLyrics();
-
- const [count, error, loading] = useAwaiter(
- useMemo(() => getLyricsCount, []),
- {
- onError: () => console.error("Failed to get lyrics count"),
- fallbackValue: null,
- }
- );
-
- return (
- <>
-
Current lyrics provider: {lyricsInfo?.useLyric || "None"}
- {loading ?
Loading lyrics count... : error ?
Failed to get lyrics count :
Lyrics count: {count}}
-
- );
-}
-
-const settings = definePluginSettings({
- ShowMusicNoteOnNoLyrics: {
- description: "Show a music note icon when no lyrics are found",
- type: OptionType.BOOLEAN,
- default: true,
- },
- LyricsPosition: {
- description: "Position of the lyrics",
- type: OptionType.SELECT,
- options: [
- { value: "above", label: "Above SpotifyControls" },
- { value: "below", label: "Below SpotifyControls", default: true },
- ],
- },
- LyricsProvider: {
- description: "Where lyrics are fetched from",
- type: OptionType.SELECT,
- options: [
- { value: Provider.Spotify, label: "Spotify (Musixmatch)", default: true },
- { value: Provider.Lrclib, label: "LRCLIB" },
- ],
- },
- FallbackProvider: {
- description: "When a lyrics provider fails, try other providers",
- type: OptionType.BOOLEAN,
- default: true,
- },
- TranslateTo: {
- description: "Translate lyrics to - Changing this will clear existing translations",
- type: OptionType.SELECT,
- options: languages,
- onChange: async () => {
- await removeTranslations();
- showToast("Translations cleared", Toasts.Type.SUCCESS);
- }
- },
- LyricsConversion: {
- description: "Automatically translate or romanize lyrics",
- type: OptionType.SELECT,
- options: [
- { value: Provider.None, label: "None", default: true },
- { value: Provider.Translated, label: "Translate" },
- { value: Provider.Romanized, label: "Romanize" },
- ]
- },
- ShowFailedToasts: {
- description: "Hide toasts when lyrics fail to fetch",
- type: OptionType.BOOLEAN,
- default: true,
- },
- LyricDelay: {
- description: "",
- type: OptionType.SLIDER,
- default: 0,
- hidden: true,
- ...sliderOptions
- },
- Display: {
- description: "",
- type: OptionType.COMPONENT,
- component: () => (
- <>
-
{
- settings.store.LyricDelay = v;
- }}
- pluginSettings={Vencord.Settings.plugins.SpotifyLyrics}
- id={"LyricDelay"}
- />
-
-
- )
- },
- Details: {
- description: "",
- type: OptionType.COMPONENT,
- component: () => @vmohammad/api
-
-
- );
-}
-
-const settings = definePluginSettings({
- installYtmWithWebsocket: {
- type: OptionType.COMPONENT,
- component: () =>
- },
- hoverControls: {
- description: "Show controls on hover",
- type: OptionType.BOOLEAN,
- default: false,
- onChange: v => toggleHoverControls(v)
- },
- // SOON™️™️™️
- // lyricsProvider: {
- // description: "Which provider should be used for lyrics",
- // type: OptionType.SELECT,
- // options: [
- // { label: "Tidal", value: "tidal", default: true },
- // { label: "vMohammad's Synced API", value: "synced" }
- // ]
- // }
-});
-
-export default definePlugin({
- name: "TidalControls",
- description: "Adds a TIDAL player above the account panel",
- authors: [EquicordDevs.vmohammad],
- settings,
- patches: [
- {
- find: "this.isCopiedStreakGodlike",
- replacement: [
- {
- match: /(?<=\i\.jsxs?\)\()(\i),{(?=[^}]*?userTag:\i,hidePrivateData:)/,
- replace: "$self.PanelWrapper,{VencordOriginal:$1,",
- predicate: () => !Settings.plugins.SpotifyControls.enabled,
- noWarn: true,
- },
- {
- match: /Vencord\.Plugins\.plugins\["SpotifyLyrics"\]\.FakePanelWrapper/,
- replace: "$self.PanelWrapper",
- predicate: () => Settings.plugins.SpotifyLyrics.enabled,
- noWarn: true,
- },
- {
- match: /Vencord\.Plugins\.plugins\["SpotifyControls"\]\.PanelWrapper/,
- replace: "$self.PanelWrapper",
- predicate: () => Settings.plugins.SpotifyControls.enabled && !Settings.plugins.SpotifyLyrics.enabled,
- noWarn: true,
- },
- {
- match: /Vencord\.Plugins\.plugins\["YouTubeMusicControls"\]\.FakePanelWrapper/,
- replace: "$self.PanelWrapper",
- predicate: () => Settings.plugins.YouTubeMusicControls.enabled,
- noWarn: true,
- },
- ],
- },
- ],
-
- start: () => toggleHoverControls(Settings.plugins.YouTubeMusicControls.hoverControls),
-
- PanelWrapper({ VencordOriginal, ...props }) {
- const showYTMPlayer = Settings.plugins.YouTubeMusicControls.enabled;
- const showSpotifyControls = Settings.plugins.SpotifyControls.enabled;
- const showSpotifyLyrics = Settings.plugins.SpotifyLyrics.enabled;
- const LyricsPosition = showSpotifyLyrics ? Settings.plugins.SpotifyLyrics.LyricsPosition : null;
- return (
- <>
- (
-
-
Failed to render YouTube Music Modal :(
-
Check the console for errors
-
-
Failed to render Tidal Lyrics Modal :(
-
Check the console for errors
-
- git clone https://github.com/th-ch/youtube-music
- cd .\youtube-music\
- git remote add johannes https://github.com/Johannes7k75/youtube-music.git
- git fetch johannes
- git merge johannes/feat/api-websocket
- pnpm install --frozen-lockfile
- pnpm dist:win
-
-
-
- );
-}
-*/
-
-function InstallInstructions() {
- return (
-
- How to install
- Instructions on how to install YouTube music with websocket plugin
-
-
-
- Software needed: git,node.js >= 22.12.0,pnpm
-
-
- git clone https://github.com/thororen1234/youtube-music.git
- cd .\youtube-music\
- pnpm install --frozen-lockfile
- pnpm dist:win
-
-
-
- );
-}
-
-const settings = definePluginSettings({
- installYtmWithWebsocket: {
- type: OptionType.COMPONENT,
- component: () =>
- },
- hoverControls: {
- description: "Show controls on hover",
- type: OptionType.BOOLEAN,
- default: false,
- onChange: v => toggleHoverControls(v)
- },
- websocketUrl: {
- description: "The websocket url",
- type: OptionType.STRING,
- placeholder: "ws://localhost:26539",
- default: "ws://localhost:26539",
- isValid: isUrlValid,
- }
-});
-
-export default definePlugin({
- name: "YouTubeMusicControls",
- description: "Adds a YouTube Music player above the account panel, requires `https://github.com/th-ch/youtube-music` with an custom websocket plugin. See Readme of ths Plugin for instructions",
- authors: [EquicordDevs.Johannes7k75],
- settings,
- patches: [
- {
- find: "this.isCopiedStreakGodlike",
- replacement: [
- {
- match: /(?<=\i\.jsxs?\)\()(\i),{(?=[^}]*?userTag:\i,hidePrivateData:)/,
- replace: "$self.PanelWrapper,{VencordOriginal:$1,",
- predicate: () => !Settings.plugins.SpotifyControls.enabled,
- noWarn: true,
- },
- {
- match: /Vencord\.Plugins\.plugins\["SpotifyLyrics"\]\.FakePanelWrapper/,
- replace: "$self.PanelWrapper",
- predicate: () => Settings.plugins.SpotifyLyrics.enabled,
- noWarn: true,
- },
- {
- match: /Vencord\.Plugins\.plugins\["SpotifyControls"\]\.PanelWrapper/,
- replace: "$self.PanelWrapper",
- predicate: () => Settings.plugins.SpotifyControls.enabled && !Settings.plugins.SpotifyLyrics.enabled,
- noWarn: true,
- }
- ],
- },
- ],
-
- start: () => toggleHoverControls(Settings.plugins.YouTubeMusicControls.hoverControls),
-
- PanelWrapper({ VencordOriginal, ...props }) {
- const showSpotifyControls = Settings.plugins.SpotifyControls.enabled;
- const showSpotifyLyrics = Settings.plugins.SpotifyLyrics.enabled;
- const LyricsPosition = showSpotifyLyrics ? Settings.plugins.SpotifyLyrics.LyricsPosition : null;
-
- return (
- <>
- (
-
-
Failed to render YouTube Music Modal :(
-
Check the console for errors
-
-
- {msToHuman(position)}
-
-
-
- {msToHuman(duration)}
-
-
- );
-}
-
-
-function AlbumContextMenu({ track }: { track: Track; }) {
- const volume = useStateFromStores([SpotifyStore], () => SpotifyStore.volume);
-
- return (
- FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" })}
- aria-label="Spotify Album Menu"
- >
- SpotifyStore.openExternal(`/album/${track.album.id}`)}
- icon={OpenExternalIcon}
- />
- openImageModal(track.album.image)}
- icon={ImageIcon}
- />
- (
- SpotifyStore.setVolume(v))}
- />
- )}
- />
-
- );
-}
-
-function makeLinkProps(name: string, condition: unknown, path: string) {
- if (!condition) return {};
-
- return {
- role: "link",
- onClick: () => SpotifyStore.openExternal(path),
- onContextMenu: makeContextMenu(name, path)
- } satisfies React.HTMLAttributes;
-}
-
-function Info({ track }: { track: Track; }) {
- const img = track?.album?.image;
-
- const [coverExpanded, setCoverExpanded] = useState(false);
-
- const i = (
- <>
- {img && (
- 
setCoverExpanded(!coverExpanded)}
- onContextMenu={e => {
- ContextMenuApi.openContextMenu(e, () => );
- }}
- />
- )}
-
- );
-
- if (coverExpanded && img)
- return (
-
- {i}
-
- );
-
- return (
-
- {i}
-
-
- {track.name}
-
- {track.artists.some(a => a.name) && (
-
- by
- {track.artists.map((a, i) => (
-
-
- {a.name}
-
- {i !== track.artists.length - 1 && {", "}}
-
- ))}
-
- )}
- {track.album.name && (
-
- on
-
- {track.album.name}
-
-
- )}
-
-
-
-
-
-
- );
-}
diff --git a/src/plugins/spotifyControls/SeekBar.ts b/src/plugins/spotifyControls/SeekBar.ts
deleted file mode 100644
index 8d6c8a30c..000000000
--- a/src/plugins/spotifyControls/SeekBar.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { LazyComponent } from "@utils/lazyReact";
-import { Slider } from "@webpack/common";
-
-export const SeekBar = LazyComponent(() => {
- const SliderClass = Slider.$$vencordGetWrappedComponent();
-
- // Discord's Slider does not update `state.value` when `props.initialValue` changes if state.value is not nullish.
- // We extend their class and override their `getDerivedStateFromProps` to update the value
- return class SeekBar extends SliderClass {
- static getDerivedStateFromProps(props: any, state: any) {
- const newState = super.getDerivedStateFromProps!(props, state);
- if (newState) {
- newState.value = props.initialValue;
- }
-
- return newState;
- }
- };
-});
diff --git a/src/plugins/spotifyControls/SpotifyStore.ts b/src/plugins/spotifyControls/SpotifyStore.ts
deleted file mode 100644
index 65ee2c154..000000000
--- a/src/plugins/spotifyControls/SpotifyStore.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
-*/
-
-import { Settings } from "@api/Settings";
-import { findByProps, findByPropsLazy, proxyLazyWebpack } from "@webpack";
-import { Flux, FluxDispatcher } from "@webpack/common";
-
-export interface Track {
- id: string;
- name: string;
- duration: number;
- isLocal: boolean;
- album: {
- id: string;
- name: string;
- image: {
- height: number;
- width: number;
- url: string;
- };
- };
- artists: {
- id: string;
- href: string;
- name: string;
- type: string;
- uri: string;
- }[];
-}
-
-interface PlayerState {
- accountId: string;
- track: Track | null;
- volumePercent: number,
- isPlaying: boolean,
- repeat: boolean,
- position: number,
- context?: any;
- device?: Device;
-
- // added by patch
- actual_repeat: Repeat;
- shuffle: boolean;
-}
-
-interface Device {
- id: string;
- is_active: boolean;
-}
-
-type Repeat = "off" | "track" | "context";
-
-// Don't wanna run before Flux and Dispatcher are ready!
-export const SpotifyStore = proxyLazyWebpack(() => {
- // For some reason ts hates extends Flux.Store
- const { Store } = Flux;
-
- const SpotifySocket = findByProps("getActiveSocketAndDevice");
- const SpotifyAPI = findByPropsLazy("vcSpotifyMarker");
-
- const API_BASE = "https://api.spotify.com/v1/me/player";
-
- class SpotifyStore extends Store {
- public mPosition = 0;
- public _start = 0;
-
- public track: Track | null = null;
- public device: Device | null = null;
- public isPlaying = false;
- public repeat: Repeat = "off";
- public shuffle = false;
- public volume = 0;
-
- public isSettingPosition = false;
-
- public openExternal(path: string) {
- const url = Settings.plugins.SpotifyControls.useSpotifyUris || Vencord.Plugins.isPluginEnabled("OpenInApp")
- ? "spotify:" + path.replaceAll("/", (_, idx) => idx === 0 ? "" : ":")
- : "https://open.spotify.com" + path;
-
- VencordNative.native.openExternal(url);
- }
-
- // Need to keep track of this manually
- public get position(): number {
- let pos = this.mPosition;
- if (this.isPlaying) {
- pos += Date.now() - this._start;
- }
- return pos;
- }
-
- public set position(p: number) {
- this.mPosition = p;
- this._start = Date.now();
- }
-
- prev() {
- this._req("post", "/previous");
- }
-
- next() {
- this._req("post", "/next");
- }
-
- setVolume(percent: number) {
- this._req("put", "/volume", {
- query: {
- volume_percent: Math.round(percent)
- }
-
- }).then(() => {
- this.volume = percent;
- this.emitChange();
- });
- }
-
- setPlaying(playing: boolean) {
- this._req("put", playing ? "/play" : "/pause");
- }
-
- setRepeat(state: Repeat) {
- this._req("put", "/repeat", {
- query: { state }
- });
- }
-
- setShuffle(state: boolean) {
- this._req("put", "/shuffle", {
- query: { state }
- }).then(() => {
- this.shuffle = state;
- this.emitChange();
- });
- }
-
- seek(ms: number) {
- if (this.isSettingPosition) return Promise.resolve();
-
- this.isSettingPosition = true;
-
- return this._req("put", "/seek", {
- query: {
- position_ms: Math.round(ms)
- }
- }).catch((e: any) => {
- console.error("[VencordSpotifyControls] Failed to seek", e);
- this.isSettingPosition = false;
- });
- }
-
- _req(method: "post" | "get" | "put", route: string, data: any = {}) {
- if (this.device?.is_active)
- (data.query ??= {}).device_id = this.device.id;
-
- const { socket } = SpotifySocket.getActiveSocketAndDevice();
- return SpotifyAPI[method](socket.accountId, socket.accessToken, {
- url: API_BASE + route,
- ...data
- });
- }
- }
-
- const store = new SpotifyStore(FluxDispatcher, {
- SPOTIFY_PLAYER_STATE(e: PlayerState) {
- store.track = e.track;
- store.device = e.device ?? null;
- store.isPlaying = e.isPlaying ?? false;
- store.volume = e.volumePercent ?? 0;
- store.repeat = e.actual_repeat || "off";
- store.shuffle = e.shuffle ?? false;
- store.position = e.position ?? 0;
- store.isSettingPosition = false;
- store.emitChange();
- },
- SPOTIFY_SET_DEVICES({ devices }: { devices: Device[]; }) {
- store.device = devices.find(d => d.is_active) ?? devices[0] ?? null;
- store.emitChange();
- }
- });
-
- return store;
-});
diff --git a/src/plugins/spotifyControls/hoverOnly.css b/src/plugins/spotifyControls/hoverOnly.css
deleted file mode 100644
index 8051cc42c..000000000
--- a/src/plugins/spotifyControls/hoverOnly.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.vc-spotify-button-row {
- height: 0;
- opacity: 0;
- pointer-events: none;
- transition: 0.2s;
- transition-property: height;
-}
-
-#vc-spotify-player:hover .vc-spotify-button-row {
- opacity: 1;
- height: 32px;
- pointer-events: auto;
-
- /* only transition opacity on show to prevent clipping */
- transition-property: height, opacity;
-}
diff --git a/src/plugins/spotifyControls/index.tsx b/src/plugins/spotifyControls/index.tsx
deleted file mode 100644
index add54025e..000000000
--- a/src/plugins/spotifyControls/index.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
-*/
-
-import { Settings } from "@api/Settings";
-import { disableStyle, enableStyle } from "@api/Styles";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-
-import hoverOnlyStyle from "./hoverOnly.css?managed";
-import { Player } from "./PlayerComponent";
-
-function toggleHoverControls(value: boolean) {
- (value ? enableStyle : disableStyle)(hoverOnlyStyle);
-}
-
-export default definePlugin({
- name: "SpotifyControls",
- description: "Adds a Spotify player above the account panel",
- authors: [Devs.Ven, Devs.afn, Devs.KraXen72, Devs.Av32000, Devs.nin0dev],
- options: {
- hoverControls: {
- description: "Show controls on hover",
- type: OptionType.BOOLEAN,
- default: false,
- onChange: v => toggleHoverControls(v)
- },
- useSpotifyUris: {
- type: OptionType.BOOLEAN,
- description: "Open Spotify URIs instead of Spotify URLs. Will only work if you have Spotify installed and might not work on all platforms",
- default: false
- },
- previousButtonRestartsTrack: {
- type: OptionType.BOOLEAN,
- description: "Restart currently playing track when pressing the previous button if playtime is >3s",
- default: true
- }
- },
- patches: [
- {
- // HEY THOR UPDATE YOUTUBE MUSIC CONTROLS IF THIS SHIT CHANGES TY :)
- find: "this.isCopiedStreakGodlike",
- replacement: {
- // react.jsx)(AccountPanel, { ..., showTaglessAccountPanel: blah })
- match: /(?<=\i\.jsxs?\)\()(\i),{(?=[^}]*?userTag:\i,hidePrivateData:)/,
- // react.jsx(WrapperComponent, { VencordOriginal: AccountPanel, ...
- replace: "$self.PanelWrapper,{VencordOriginal:$1,"
- }
- },
- {
- find: ".PLAYER_DEVICES",
- replacement: [{
- // Adds POST and a Marker to the SpotifyAPI (so we can easily find it)
- match: /get:(\i)\.bind\(null,(\i\.\i)\.get\)/,
- replace: "post:$1.bind(null,$2.post),vcSpotifyMarker:1,$&"
- },
- {
- // Spotify Connect API returns status 202 instead of 204 when skipping tracks.
- // Discord rejects 202 which causes the request to send twice. This patch prevents this.
- match: /202===\i\.status/,
- replace: "false",
- }]
- },
- {
- find: 'repeat:"off"!==',
- replacement: [
- {
- // Discord doesn't give you shuffle state and the repeat kind, only a boolean
- match: /repeat:"off"!==(\i),/,
- replace: "shuffle:arguments[2]?.shuffle_state??false,actual_repeat:$1,$&"
- },
- {
- match: /(?<=artists.filter\(\i=>).{0,10}\i\.id\)&&/,
- replace: ""
- }
- ]
- },
- ],
-
- start: () => toggleHoverControls(Settings.plugins.SpotifyControls.hoverControls),
-
- PanelWrapper({ VencordOriginal, ...props }) {
- return (
- <>
- (
-
-
Failed to render Spotify Modal :(
-
Check the console for errors
-
ContextMenuApi.openContextMenu(e, () => )}
- >
-
- {NoteElement}
-
-
- ) : null;
- }
-
return (
openModal(props =>
)}
+ onClick={() => openModal(props =>
)}
onContextMenu={e => ContextMenuApi.openContextMenu(e, () =>
)}
>
- {currentLyrics?.map((line, i) => (
+ {currentLyrics ? currentLyrics.map((line, i) => (
- {line.text || NoteElement}
+ {line.text || NoteSvg()}
- ))}
+ )) : ShowMusicNoteOnNoLyrics ? (
+
+
+
+ ) : null}
@@ -43,27 +50,30 @@ function ModalHeaderContent({ track }: { track: Track; }) {
);
}
-export function LyricsModal({ rootProps }: { rootProps: ModalProps; }) {
+const modalCurrentLine = cl("modal-line-current");
+const modalLine = cl("modal-line");
+
+export function LyricsModal({ props }: { props: ModalProps; }) {
const { track, lyricsInfo, currLrcIndex } = useLyrics({ scroll: false });
- const currentLyrics = lyricsInfo?.lyricsVersions[lyricsInfo.useLyric] || null;
+ const currentLyrics = lyricsInfo?.lyricsVersions[lyricsInfo.useLyric];
return (
-
-
+
+
-
+
{currentLyrics ? (
currentLyrics.map((line, i) => (
SpotifyStore.seek(line.time * 1000)}>
{formatTime(line.time)}
- {line.text || NoteSvg(cl("modal-note"))}
+ {line.text || NoteSvg()}
))
) : (
diff --git a/src/equicordplugins/musicControls/spotify/lyrics/components/util.tsx b/src/equicordplugins/musicControls/spotify/lyrics/components/util.tsx
index 176df03a7..5c63eb967 100644
--- a/src/equicordplugins/musicControls/spotify/lyrics/components/util.tsx
+++ b/src/equicordplugins/musicControls/spotify/lyrics/components/util.tsx
@@ -12,23 +12,51 @@ import { settings } from "../../../settings";
import { SpotifyStore } from "../../SpotifyStore";
import { SpotifyLrcStore } from "../providers/store";
import { SyncedLyric } from "../providers/types";
+
export const scrollClasses = findByPropsLazy("auto", "customTheme");
export const cl = classNameFactory("vc-spotify-lyrics-");
-export function NoteSvg(className: string) {
+export function NoteSvg() {
return (
-
,
@@ -107,7 +107,7 @@ function ResetCard() {
Loading your base profile will restore your actual profile settings
-
+
If you load, it will overwrite your current profile configuration.
Date: Fri, 15 Aug 2025 13:12:03 -0400
Subject: [PATCH 023/881] CustomSounds: Stuff
---
.../alwaysExpandProfiles/index.ts | 2 +-
.../customSounds/SoundOverrideComponent.tsx | 295 +++++++++++++
.../customSounds/audioStore.ts | 112 +++++
.../components/SoundOverrideComponent.tsx | 126 ------
src/equicordplugins/customSounds/index.tsx | 412 ++++++++++++++++--
src/equicordplugins/customSounds/styles.css | 61 ++-
src/equicordplugins/customSounds/types.ts | 121 +++--
src/equicordplugins/questify/index.tsx | 4 +-
8 files changed, 930 insertions(+), 203 deletions(-)
create mode 100644 src/equicordplugins/customSounds/SoundOverrideComponent.tsx
create mode 100644 src/equicordplugins/customSounds/audioStore.ts
delete mode 100644 src/equicordplugins/customSounds/components/SoundOverrideComponent.tsx
diff --git a/src/equicordplugins/alwaysExpandProfiles/index.ts b/src/equicordplugins/alwaysExpandProfiles/index.ts
index 9c9a1f911..b52b3296d 100644
--- a/src/equicordplugins/alwaysExpandProfiles/index.ts
+++ b/src/equicordplugins/alwaysExpandProfiles/index.ts
@@ -13,7 +13,7 @@ import { User } from "@vencord/discord-types";
migratePluginSettings("AlwaysExpandProfiles", "AlwaysExpandProfile");
export default definePlugin({
name: "AlwaysExpandProfiles",
- description: "Always display a user's full popout",
+ description: "Always expands profile popouts to the full modal",
authors: [EquicordDevs.thororen],
patches: [
{
diff --git a/src/equicordplugins/customSounds/SoundOverrideComponent.tsx b/src/equicordplugins/customSounds/SoundOverrideComponent.tsx
new file mode 100644
index 000000000..246cf691d
--- /dev/null
+++ b/src/equicordplugins/customSounds/SoundOverrideComponent.tsx
@@ -0,0 +1,295 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { classNameFactory } from "@api/Styles";
+import { Margins } from "@utils/margins";
+import { useForceUpdater } from "@utils/react";
+import { makeRange } from "@utils/types";
+import { findByCodeLazy, findLazy } from "@webpack";
+import { Button, Card, Forms, React, Select, showToast, Slider, Switch } from "@webpack/common";
+import { ComponentType, Ref, SyntheticEvent } from "react";
+
+import { deleteAudio, getAllAudio, saveAudio, StoredAudioFile } from "./audioStore";
+import { ensureDataURICached } from "./index";
+import { SoundOverride, SoundPlayer, SoundType } from "./types";
+
+type FileInput = ComponentType<{
+ ref: Ref
;
+ onChange: (e: SyntheticEvent) => void;
+ multiple?: boolean;
+ filters?: { name?: string; extensions: string[]; }[];
+}>;
+
+const AUDIO_EXTENSIONS = ["mp3", "wav", "ogg", "m4a", "aac", "flac", "webm", "wma", "mp4"];
+const cl = classNameFactory("vc-custom-sounds-");
+const playSound: (id: string) => SoundPlayer = findByCodeLazy(".playWithListener().then");
+const FileInput: FileInput = findLazy(m => m.prototype?.activateUploadDialogue && m.prototype.setRef);
+
+const capitalizeWords = (str: string) =>
+ str.replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase());
+
+export function SoundOverrideComponent({ type, override, onChange }: {
+ type: SoundType;
+ override: SoundOverride;
+ onChange: () => Promise;
+}) {
+ const fileInputRef = React.useRef(null);
+ const update = useForceUpdater();
+ const sound = React.useRef(null);
+ const [files, setFiles] = React.useState>({});
+
+ React.useEffect(() => {
+ getAllAudio().then(setFiles);
+ }, []);
+
+ const saveAndNotify = async () => {
+ await onChange();
+ update();
+ };
+
+ const previewSound = async () => {
+ sound.current?.stop();
+
+ if (!override.enabled) {
+ sound.current = playSound(type.id);
+ return;
+ }
+
+ const { selectedSound } = override;
+
+ if (selectedSound === "custom" && override.selectedFileId) {
+ try {
+ const dataUri = await ensureDataURICached(override.selectedFileId);
+
+ if (!dataUri || !dataUri.startsWith("data:audio/")) {
+ showToast("No custom sound file available for preview");
+ return;
+ }
+
+ const audio = new Audio(dataUri);
+ audio.volume = override.volume / 100;
+
+ audio.onerror = e => {
+ console.error("[CustomSounds] Error playing custom audio:", e);
+ showToast("Error playing custom sound. File may be corrupted.");
+ };
+
+ await audio.play();
+ sound.current = {
+ play: () => audio.play(),
+ pause: () => audio.pause(),
+ stop: () => {
+ audio.pause();
+ audio.currentTime = 0;
+ },
+ loop: () => { audio.loop = true; }
+ };
+ } catch (error) {
+ console.error("[CustomSounds] Error in previewSound:", error);
+ showToast("Error playing sound.");
+ }
+ } else if (selectedSound === "default") {
+ sound.current = playSound(type.id);
+ } else {
+ sound.current = playSound(selectedSound);
+ }
+ };
+
+ const uploadFile = async (event: React.ChangeEvent) => {
+ const file = event.target.files?.[0];
+ if (!file) return;
+
+ const fileExtension = file.name.split(".").pop()?.toLowerCase();
+ if (!fileExtension || !AUDIO_EXTENSIONS.includes(fileExtension)) {
+ showToast("Invalid file type. Please upload an audio file.");
+ event.target.value = "";
+ return;
+ }
+
+ try {
+ showToast("Uploading file...");
+ const id = await saveAudio(file);
+
+ const savedFiles = await getAllAudio();
+ setFiles(savedFiles);
+
+ override.selectedFileId = id;
+ override.selectedSound = "custom";
+
+ await ensureDataURICached(id);
+ await saveAndNotify();
+
+ showToast(`File uploaded successfully: ${file.name}`);
+ } catch (error) {
+ console.error("[CustomSounds] Error uploading file:", error);
+ showToast(`Error uploading file: ${error}`);
+ }
+
+ event.target.value = "";
+ };
+
+ const deleteFile = async (id: string) => {
+ try {
+ await deleteAudio(id);
+ const updated = await getAllAudio();
+ setFiles(updated);
+
+ if (override.selectedFileId === id) {
+ override.selectedFileId = undefined;
+ override.selectedSound = "default";
+ await saveAndNotify();
+ } else {
+ update();
+ }
+ showToast("File deleted successfully");
+ } catch (error) {
+ console.error("[CustomSounds] Error deleting file:", error);
+ showToast("Error deleting file.");
+ }
+ };
+
+ const customFileOptions = Object.entries(files)
+ .filter(([id, file]) => !!id && !!file?.name)
+ .map(([id, file]) => ({
+ value: id,
+ label: file.name
+ }));
+
+ return (
+
+ {
+ console.log(`[CustomSounds] Setting ${type.id} enabled to:`, val);
+
+ override.enabled = val;
+
+ if (val && override.selectedSound === "custom" && override.selectedFileId) {
+ try {
+ await ensureDataURICached(override.selectedFileId);
+ } catch (error) {
+ console.error(`[CustomSounds] Failed to cache data URI for ${type.id}:`, error);
+ showToast("Error loading custom sound file");
+ }
+ }
+
+ await saveAndNotify();
+ console.log("[CustomSounds] After setting enabled, override.enabled =", override.enabled);
+ }}
+ className={Margins.bottom16}
+ hideBorder
+ >
+ {type.name}
+
+
+ {override.enabled && (
+ <>
+
+
+
+
+
+ Volume
+ {
+ override.volume = val;
+ saveAndNotify();
+ }}
+ className={Margins.bottom16}
+ disabled={!override.enabled}
+ />
+
+ Sound Source
+
+ );
+}
diff --git a/src/equicordplugins/customSounds/audioStore.ts b/src/equicordplugins/customSounds/audioStore.ts
new file mode 100644
index 000000000..614942ff0
--- /dev/null
+++ b/src/equicordplugins/customSounds/audioStore.ts
@@ -0,0 +1,112 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { get, set } from "@api/DataStore";
+
+const STORAGE_KEY = "ScattrdCustomSounds";
+
+export interface StoredAudioFile {
+ id: string;
+ name: string;
+ buffer: ArrayBuffer;
+ type: string;
+ dataUri?: string;
+}
+
+export async function saveAudio(file: File): Promise {
+ const id = crypto.randomUUID();
+ const buffer = await file.arrayBuffer();
+
+ const dataUri = await generateDataURI(buffer, file.type, file.name);
+
+ const current = (await get(STORAGE_KEY)) ?? {};
+ current[id] = {
+ id,
+ name: file.name,
+ buffer,
+ type: file.type,
+ dataUri
+ };
+ await set(STORAGE_KEY, current);
+ return id;
+}
+
+export async function getAllAudio(): Promise> {
+ return (await get(STORAGE_KEY)) ?? {};
+}
+
+async function generateDataURI(buffer: ArrayBuffer, type: string, name: string): Promise {
+ try {
+ let mimeType = type || "audio/mpeg";
+
+ if (!mimeType || mimeType === "application/octet-stream") {
+ if (name) {
+ const extension = name.split(".").pop()?.toLowerCase();
+ switch (extension) {
+ case "ogg": mimeType = "audio/ogg"; break;
+ case "mp3": mimeType = "audio/mpeg"; break;
+ case "wav": mimeType = "audio/wav"; break;
+ case "m4a":
+ case "mp4": mimeType = "audio/mp4"; break;
+ case "flac": mimeType = "audio/flac"; break;
+ case "aac": mimeType = "audio/aac"; break;
+ case "webm": mimeType = "audio/webm"; break;
+ case "wma": mimeType = "audio/x-ms-wma"; break;
+ default: mimeType = "audio/mpeg";
+ }
+ }
+ }
+
+ const uint8Array = new Uint8Array(buffer);
+ const blob = new Blob([uint8Array], { type: mimeType });
+
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader();
+ reader.onloadend = () => resolve(reader.result as string);
+ reader.onerror = reject;
+ reader.readAsDataURL(blob);
+ });
+ } catch (error) {
+ console.error("[CustomSounds] Error generating data URI:", error);
+
+ const uint8Array = new Uint8Array(buffer);
+ let binary = "";
+ const chunkSize = 8192;
+
+ for (let i = 0; i < uint8Array.length; i += chunkSize) {
+ const chunk = uint8Array.slice(i, i + chunkSize);
+ binary += String.fromCharCode(...chunk);
+ }
+
+ const base64 = btoa(binary);
+ return `data:${type || "audio/mpeg"};base64,${base64}`;
+ }
+}
+
+export async function getAudioDataURI(id: string): Promise {
+ const all = await getAllAudio();
+ const entry = all[id];
+ if (!entry) return undefined;
+
+ if (entry.dataUri) {
+ return entry.dataUri;
+ }
+
+ console.log(`[CustomSounds] No cached data URI for ${id}, generating...`);
+ const dataUri = await generateDataURI(entry.buffer, entry.type, entry.name);
+
+ const current = await getAllAudio();
+ current[id].dataUri = dataUri;
+ await set(STORAGE_KEY, current);
+
+ return dataUri;
+}
+
+export async function deleteAudio(id: string): Promise {
+ const all = await getAllAudio();
+ delete all[id];
+ await set(STORAGE_KEY, all);
+}
diff --git a/src/equicordplugins/customSounds/components/SoundOverrideComponent.tsx b/src/equicordplugins/customSounds/components/SoundOverrideComponent.tsx
deleted file mode 100644
index 4519955ca..000000000
--- a/src/equicordplugins/customSounds/components/SoundOverrideComponent.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { classNameFactory } from "@api/Styles";
-import { Margins } from "@utils/margins";
-import { classes } from "@utils/misc";
-import { useForceUpdater } from "@utils/react";
-import { findByCodeLazy, findLazy } from "@webpack";
-import { Button, Card, Forms, Slider, Switch, Tooltip, useRef } from "@webpack/common";
-import { ComponentType, Ref, SyntheticEvent } from "react";
-
-import { SoundOverride, SoundPlayer, SoundType } from "../types";
-
-type FileInput = ComponentType<{
- ref: Ref;
- onChange: (event: SyntheticEvent) => void;
- multiple?: boolean;
- filters?: { name?: string; extensions: string[]; }[];
- disabled?: boolean;
-}>;
-
-const playSound: (id: string) => SoundPlayer = findByCodeLazy(".playWithListener().then");
-const FileInput: FileInput = findLazy(m => m.prototype?.activateUploadDialogue && m.prototype.setRef);
-const cl = classNameFactory("vc-custom-sounds-");
-
-export function SoundOverrideComponent({ type, override, onChange }: { type: SoundType; override: SoundOverride; onChange: () => Promise; }) {
- const fileInputRef = useRef(null);
- const sound = useRef(null);
- const update = useForceUpdater();
-
- return (
-
- {
- override.enabled = value;
- onChange();
- update();
- }}
- className={Margins.bottom16}
- hideBorder={true}
- >
-
- {tooltipProps => {type.name}}
-
-
- Sound File
-
- {override.url.length === 0 ? "Discord Default" : (override.fileName || "Custom Sound")}
-
-
-
- Volume
- {
- override.volume = value;
- onChange();
- update();
- }}
- className={Margins.bottom16}
- disabled={!override.enabled}
- />
-
-
- );
-}
diff --git a/src/equicordplugins/customSounds/index.tsx b/src/equicordplugins/customSounds/index.tsx
index c910cd10f..e810577c4 100644
--- a/src/equicordplugins/customSounds/index.tsx
+++ b/src/equicordplugins/customSounds/index.tsx
@@ -1,75 +1,398 @@
/*
* Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
+ * Copyright (c) 2025 Vendicated and contributors
* SPDX-License-Identifier: GPL-3.0-or-later
*/
import "./styles.css";
-import { DataStore } from "@api/index";
+import { get as getFromDataStore } from "@api/DataStore";
import { definePluginSettings } from "@api/Settings";
-import { Devs, EquicordDevs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { React } from "@webpack/common";
+import { classNameFactory } from "@api/Styles";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType, StartAt } from "@utils/types";
+import { Button, Forms, React, showToast, TextInput } from "@webpack/common";
-import { SoundOverrideComponent } from "./components/SoundOverrideComponent";
-import { makeEmptyOverride, SoundOverride, soundTypes } from "./types";
+import { getAllAudio, getAudioDataURI } from "./audioStore";
+import { SoundOverrideComponent } from "./SoundOverrideComponent";
+import { makeEmptyOverride, seasonalSounds, SoundOverride, soundTypes } from "./types";
-const OVERRIDES_KEY = "CustomSounds_overrides";
-let overrides: Record = soundTypes.reduce((result, sound) => ({ ...result, [sound.id]: makeEmptyOverride() }), {});
+const cl = classNameFactory("vc-custom-sounds-");
+
+const allSoundTypes = soundTypes || [];
+
+const AUDIO_STORE_KEY = "ScattrdCustomSounds";
+
+const dataUriCache = new Map();
+
+function getOverride(id: string): SoundOverride {
+ const stored = settings.store[id];
+ if (!stored) return makeEmptyOverride();
+
+ if (typeof stored === "object") return stored;
+
+ try {
+ return JSON.parse(stored);
+ } catch {
+ return makeEmptyOverride();
+ }
+}
+
+function setOverride(id: string, override: SoundOverride) {
+ settings.store[id] = JSON.stringify(override);
+}
+
+export function getCustomSoundURL(id: string): string | null {
+ const override = getOverride(id);
+
+ if (!override?.enabled) {
+ return null;
+ }
+
+ if (override.selectedSound === "custom" && override.selectedFileId) {
+ const dataUri = dataUriCache.get(override.selectedFileId);
+ if (dataUri) {
+ console.log(`[CustomSounds] Returning cached data URI for ${id}`);
+ return dataUri;
+ } else {
+ console.warn(`[CustomSounds] No cached data URI for ${id} with file ID ${override.selectedFileId}`);
+ return null;
+ }
+ }
+
+ if (override.selectedSound !== "default" && override.selectedSound !== "custom") {
+ if (override.selectedSound in seasonalSounds) {
+ return seasonalSounds[override.selectedSound];
+ }
+
+ const soundType = allSoundTypes.find(t => t.id === id);
+ if (soundType?.seasonal) {
+ const seasonalId = soundType.seasonal.find(seasonalId =>
+ seasonalId.startsWith(`${override.selectedSound}_`)
+ );
+ if (seasonalId && seasonalId in seasonalSounds) {
+ return seasonalSounds[seasonalId];
+ }
+ }
+ }
+
+ return null;
+}
+
+export async function ensureDataURICached(fileId: string): Promise {
+ if (dataUriCache.has(fileId)) {
+ return dataUriCache.get(fileId)!;
+ }
+
+ try {
+ const dataUri = await getAudioDataURI(fileId);
+ if (dataUri) {
+ dataUriCache.set(fileId, dataUri);
+ console.log(`[CustomSounds] Cached data URI for file ${fileId}`);
+ return dataUri;
+ }
+ } catch (error) {
+ console.error(`[CustomSounds] Error generating data URI for ${fileId}:`, error);
+ }
+
+ return null;
+}
+
+export async function refreshDataURI(id: string): Promise {
+ const override = getOverride(id);
+ if (!override?.selectedFileId) {
+ console.log(`[CustomSounds] refreshDataURI called for ${id} but no selectedFileId`);
+ return;
+ }
+
+ console.log(`[CustomSounds] Refreshing data URI for ${id} with file ID ${override.selectedFileId}`);
+
+ const dataUri = await ensureDataURICached(override.selectedFileId);
+ if (dataUri) {
+ console.log(`[CustomSounds] Successfully cached data URI for ${id} (length: ${dataUri.length})`);
+ } else {
+ console.error(`[CustomSounds] Failed to cache data URI for ${id}`);
+ }
+}
+
+async function preloadDataURIs() {
+ console.log("[CustomSounds] Preloading data URIs into memory cache...");
+
+ for (const soundType of allSoundTypes) {
+ const override = getOverride(soundType.id);
+ if (override?.enabled && override.selectedSound === "custom" && override.selectedFileId) {
+ try {
+ await ensureDataURICached(override.selectedFileId);
+ console.log(`[CustomSounds] Preloaded data URI for ${soundType.id}`);
+ } catch (error) {
+ console.error(`[CustomSounds] Failed to preload data URI for ${soundType.id}:`, error);
+ }
+ }
+ }
+
+ console.log(`[CustomSounds] Memory cache contains ${dataUriCache.size} data URIs`);
+}
+
+export async function debugCustomSounds() {
+ console.log("[CustomSounds] === DEBUG INFO ===");
+
+ const rawDataStore = await getFromDataStore(AUDIO_STORE_KEY);
+ console.log("[CustomSounds] Raw DataStore content:", rawDataStore);
+
+ const allFiles = await getAllAudio();
+ console.log(`[CustomSounds] Stored files: ${Object.keys(allFiles).length}`);
+
+ let totalBufferSize = 0;
+ let totalDataUriSize = 0;
+
+ for (const [id, file] of Object.entries(allFiles)) {
+ const bufferSize = file.buffer?.byteLength || 0;
+ const dataUriSize = file.dataUri?.length || 0;
+ totalBufferSize += bufferSize;
+ totalDataUriSize += dataUriSize;
+
+ console.log(`[CustomSounds] File ${id}:`, {
+ name: file.name,
+ type: file.type,
+ bufferSize: `${(bufferSize / 1024).toFixed(1)}KB`,
+ hasValidBuffer: file.buffer instanceof ArrayBuffer,
+ hasDataUri: !!file.dataUri,
+ dataUriSize: `${(dataUriSize / 1024).toFixed(1)}KB`
+ });
+ }
+
+ console.log(`[CustomSounds] Total storage - Buffers: ${(totalBufferSize / 1024).toFixed(1)}KB, DataURIs: ${(totalDataUriSize / 1024).toFixed(1)}KB`);
+
+ console.log(`[CustomSounds] Memory cache contains ${dataUriCache.size} data URIs`);
+
+ console.log("[CustomSounds] Settings store structure:", Object.keys(settings.store));
+
+ console.log("[CustomSounds] Sound override status:");
+ let enabledCount = 0;
+ let totalSettingsSize = 0;
+
+ for (const [soundId, storedValue] of Object.entries(settings.store)) {
+ if (soundId === "overrides") continue;
+
+ const override = getOverride(soundId);
+ const settingsSize = JSON.stringify(override).length;
+ totalSettingsSize += settingsSize;
+
+ console.log(`[CustomSounds] ${soundId}:`, {
+ enabled: override.enabled,
+ selectedSound: override.selectedSound,
+ selectedFileId: override.selectedFileId,
+ volume: override.volume,
+ settingsSize: `${settingsSize}B`
+ });
+
+ if (override.enabled) enabledCount++;
+ }
+
+ console.log(`[CustomSounds] Total enabled overrides: ${enabledCount}`);
+ console.log(`[CustomSounds] Estimated settings size: ${(totalSettingsSize / 1024).toFixed(1)}KB`);
+ console.log("[CustomSounds] === END DEBUG ===");
+}
+
+const soundSettings = Object.fromEntries(
+ allSoundTypes.map(type => [
+ type.id,
+ {
+ type: OptionType.STRING,
+ description: `Override for ${type.name}`,
+ default: JSON.stringify(makeEmptyOverride()),
+ hidden: true
+ }
+ ])
+);
const settings = definePluginSettings({
+ ...soundSettings,
overrides: {
type: OptionType.COMPONENT,
description: "",
- component: () =>
- <>
- {soundTypes.map(type =>
- DataStore.set(OVERRIDES_KEY, overrides)}
- />
- )}
-
+ component: () => {
+ const [resetTrigger, setResetTrigger] = React.useState(0);
+ const [searchQuery, setSearchQuery] = React.useState("");
+ const fileInputRef = React.useRef(null);
+
+ React.useEffect(() => {
+ allSoundTypes.forEach(type => {
+ if (!settings.store[type.id]) {
+ setOverride(type.id, makeEmptyOverride());
+ }
+ });
+ }, []);
+
+ const resetOverrides = () => {
+ allSoundTypes.forEach(type => {
+ setOverride(type.id, makeEmptyOverride());
+ });
+ dataUriCache.clear();
+ setResetTrigger(prev => prev + 1);
+ showToast("All overrides reset successfully!");
+ };
+
+ const triggerFileUpload = () => {
+ fileInputRef.current?.click();
+ };
+
+ const handleSettingsUpload = (event: React.ChangeEvent) => {
+ const file = event.target.files?.[0];
+ if (file) {
+ const reader = new FileReader();
+ reader.onload = async (e: ProgressEvent) => {
+ try {
+ resetOverrides();
+ const imported = JSON.parse(e.target?.result as string);
+
+ if (imported.overrides && Array.isArray(imported.overrides)) {
+ imported.overrides.forEach((setting: any) => {
+ if (setting.id) {
+ const override: SoundOverride = {
+ enabled: setting.enabled ?? false,
+ selectedSound: setting.selectedSound ?? "default",
+ selectedFileId: setting.selectedFileId ?? undefined,
+ volume: setting.volume ?? 100,
+ useFile: false
+ };
+ setOverride(setting.id, override);
+ }
+ });
+ }
+
+ setResetTrigger(prev => prev + 1);
+ showToast("Settings imported successfully!");
+ } catch (error) {
+ console.error("Error importing settings:", error);
+ showToast("Error importing settings. Check console for details.");
+ }
+ };
+
+ reader.readAsText(file);
+ event.target.value = "";
+ }
+ };
+
+ const downloadSettings = async () => {
+ const overrides = allSoundTypes.map(type => {
+ const override = getOverride(type.id);
+ return {
+ id: type.id,
+ enabled: override.enabled,
+ selectedSound: override.selectedSound,
+ selectedFileId: override.selectedFileId ?? undefined,
+ volume: override.volume
+ };
+ }).filter(o => o.enabled || o.selectedSound !== "default");
+
+ const exportPayload = {
+ overrides,
+ __note: "Audio files are not included in exports and will need to be re-uploaded after import"
+ };
+
+ const blob = new Blob([JSON.stringify(exportPayload, null, 2)], { type: "application/json" });
+ const url = URL.createObjectURL(blob);
+ const a = document.createElement("a");
+ a.href = url;
+ a.download = "customSounds-settings.json";
+ a.click();
+ URL.revokeObjectURL(url);
+
+ showToast(`Exported ${overrides.length} settings (audio files not included)`);
+ };
+
+ const filteredSoundTypes = allSoundTypes.filter(type =>
+ type.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
+ type.id.toLowerCase().includes(searchQuery.toLowerCase())
+ );
+
+ return (
+
+
+
+
+
+
+
+
+
+
+ Search Sounds
+ setSearchQuery(e)}
+ placeholder="Search by name or ID"
+ />
+
+
+
+ {filteredSoundTypes.map(type => {
+ const currentOverride = getOverride(type.id);
+
+ return (
+ {
+
+ setOverride(type.id, currentOverride);
+
+ if (currentOverride.enabled && currentOverride.selectedSound === "custom" && currentOverride.selectedFileId) {
+ try {
+ await ensureDataURICached(currentOverride.selectedFileId);
+ } catch (error) {
+ console.error(`[CustomSounds] Failed to cache data URI for ${type.id}:`, error);
+ showToast("Error loading custom sound file");
+ }
+ }
+
+ console.log(`[CustomSounds] Settings saved for ${type.id}:`, currentOverride);
+ }}
+ />
+ );
+ })}
+
+
-
-
- Ignored Quest Profile
-
-
-
{colorPickers.map(({ label, idx, defaultValue, value }) => (
{
@@ -1083,6 +1063,26 @@ function ReorderQuestsSetting(): JSX.Element {
/>
+
+
+ Ignored Quest Profile
+
+
+