diff --git a/src/equicordplugins/youtubeMusicControls/index.tsx b/src/equicordplugins/youtubeMusicControls/index.tsx index 0dc22181e..ddac1140f 100644 --- a/src/equicordplugins/youtubeMusicControls/index.tsx +++ b/src/equicordplugins/youtubeMusicControls/index.tsx @@ -19,11 +19,13 @@ import { definePluginSettings, Settings } from "@api/Settings"; import { disableStyle, enableStyle } from "@api/Styles"; import ErrorBoundary from "@components/ErrorBoundary"; +import { Lyrics } from "@equicordplugins/spotifyLyrics/components/lyrics"; +import { EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Player as SpotifyPlayer } from "plugins/spotifyControls/PlayerComponent"; import hoverOnlyStyle from "./hoverOnly.css?managed"; import { Player } from "./PlayerComponent"; -import { EquicordDevs } from "@utils/constants"; function toggleHoverControls(value: boolean) { (value ? enableStyle : disableStyle)(hoverOnlyStyle); @@ -67,6 +69,22 @@ export default definePlugin({ authors: [EquicordDevs.Johannes7k75], settings, patches: [ + { + find: "this.isCopiedStreakGodlike", + replacement: { + match: /Vencord\.Plugins\.plugins\["SpotifyControls"\]\.PanelWrapper/, + replace: "$self.PanelWrapper" + }, + predicate: () => Settings.plugins.SpotifyControls.enabled, + }, + { + find: "this.isCopiedStreakGodlike", + replacement: { + match: /Vencord\.Plugins\.plugins\["SpotifyLyrics"\]\.FakePanelWrapper/, + replace: "$self.PanelWrapper" + }, + predicate: () => Settings.plugins.SpotifyLyrics.enabled, + }, { find: "this.isCopiedStreakGodlike", replacement: { @@ -74,24 +92,33 @@ export default definePlugin({ match: /(?<=\i\.jsxs?\)\()(\i),{(?=[^}]*?userTag:\i,hidePrivateData:)/, // react.jsx(WrapperComponent, { VencordOriginal: AccountPanel, ... replace: "$self.PanelWrapper,{VencordOriginal:$1," - } + }, + predicate: () => !Settings.plugins.SpotifyControls.enabled, }, ], 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

+

Check the console for errors

)} > + + {showSpotifyLyrics && LyricsPosition === "above" && } + {showSpotifyControls && } + {showSpotifyLyrics && LyricsPosition === "below" && }