From 348261b1e858a6badd8632999d77b77dad159849 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Tue, 12 Aug 2025 20:02:25 -0400 Subject: [PATCH] MusicControls: Migrate Settings --- src/equicordplugins/musicControls/index.tsx | 10 ++++++- .../musicControls/settings.tsx | 26 ++----------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/equicordplugins/musicControls/index.tsx b/src/equicordplugins/musicControls/index.tsx index 09c299c44..0031aeb0d 100644 --- a/src/equicordplugins/musicControls/index.tsx +++ b/src/equicordplugins/musicControls/index.tsx @@ -102,7 +102,15 @@ export default definePlugin({ }, async start() { + if (Settings.plugins?.SpotifyControls?.enabled) { + settings.store.showSpotifyControls = true; + Settings.plugins.SpotifyControls.enabled = false; + } + if (Settings.plugins?.SpotifyLyrics?.enabled) { + settings.store.showSpotifyLyrics = true; + Settings.plugins.SpotifyLyrics.enabled = false; + } await migrateOldLyrics(); - toggleHoverControls(Settings.plugins.MusicControls.hoverControls); + toggleHoverControls(settings.store.hoverControls); }, }); diff --git a/src/equicordplugins/musicControls/settings.tsx b/src/equicordplugins/musicControls/settings.tsx index 5d62d84f3..8e9c4eac0 100644 --- a/src/equicordplugins/musicControls/settings.tsx +++ b/src/equicordplugins/musicControls/settings.tsx @@ -6,13 +6,11 @@ import { definePluginSettings } from "@api/Settings"; import { disableStyle, enableStyle } from "@api/Styles"; -import { useAwaiter } from "@utils/react"; import { makeRange, OptionType } from "@utils/types"; -import { Button, Forms, MaskedLink, showToast, Text, Toasts, useMemo } from "@webpack/common"; +import { Button, Forms, MaskedLink, showToast, Toasts } from "@webpack/common"; import hoverOnlyStyle from "./hoverOnly.css?managed"; -import { clearLyricsCache, getLyricsCount } from "./spotify/lyrics/api"; -import { useLyrics } from "./spotify/lyrics/components/util"; +import { clearLyricsCache } from "./spotify/lyrics/api"; import { Provider } from "./spotify/lyrics/providers/types"; const sliderOptions = { @@ -24,26 +22,6 @@ export function toggleHoverControls(value: boolean) { (value ? enableStyle : disableStyle)(hoverOnlyStyle); } -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}} - - ); -} - - function InstallInstructions() { return (