ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

Fix SpotifyControls

Browse source
This commit is contained in:
Vendicated 2024-04-14 01:35:04 +02:00
parent 89dc74d5d7
commit e5bd5534db
No known key found for this signature in database
GPG key ID: D66986BAF75ECF18
2 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/plugins/spotifyControls/PlayerComponent.tsx
View file

@ -18,7 +18,6 @@
import "./spotifyStyles.css"; import "./spotifyStyles.css";
import ErrorBoundary from "@components/ErrorBoundary";
import { Flex } from "@components/Flex"; import { Flex } from "@components/Flex";
import { ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons"; import { ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
import { debounce } from "@shared/debounce"; import { debounce } from "@shared/debounce";
@ -376,17 +375,10 @@ export function Player() {
} as React.CSSProperties; } as React.CSSProperties;
return ( return (
<ErrorBoundary fallback={() => ( <div id={cl("player")} style={exportTrackImageStyle}>
<div className="vc-spotify-fallback"> <Info track={track} />
<p>Failed to render Spotify Modal :(</p> <SeekBar />
<p >Check the console for errors</p> <Controls />
</div> </div>
)}>
<div id={cl("player")} style={exportTrackImageStyle}>
<Info track={track} />
<SeekBar />
<Controls />
</div>
</ErrorBoundary>
); );
} }

30
src/plugins/spotifyControls/index.tsx
View file

@ -18,6 +18,7 @@
import { Settings } from "@api/Settings"; import { Settings } from "@api/Settings";
import { disableStyle, enableStyle } from "@api/Styles"; import { disableStyle, enableStyle } from "@api/Styles";
import ErrorBoundary from "@components/ErrorBoundary";
import { Devs } from "@utils/constants"; import { Devs } from "@utils/constants";
import definePlugin, { OptionType } from "@utils/types"; import definePlugin, { OptionType } from "@utils/types";
@ -49,10 +50,10 @@ export default definePlugin({
{ {
find: "showTaglessAccountPanel:", find: "showTaglessAccountPanel:",
replacement: { replacement: {
// return React.createElement(AccountPanel, { ..., showTaglessAccountPanel: blah }) // react.jsx)(AccountPanel, { ..., showTaglessAccountPanel: blah })
match: /return ?(.{0,30}\(.{1,3},\{[^}]+?,showTaglessAccountPanel:.+?\}\))/, match: /(?<=\i\.jsxs?\)\()(\i),{(?=[^}]*?showTaglessAccountPanel:)/,
// return [Player, Panel] // react.jsx(WrapperComponent, { VencordOriginal: AccountPanel, ...
replace: "return [$self.renderPlayer(),$1]" replace: "$self.PanelWrapper,{VencordOriginal:$1,"
} }
}, },
{ {
@ -78,6 +79,25 @@ export default definePlugin({
} }
} }
], ],
start: () => toggleHoverControls(Settings.plugins.SpotifyControls.hoverControls), start: () => toggleHoverControls(Settings.plugins.SpotifyControls.hoverControls),
renderPlayer: () => <Player />
PanelWrapper({ VencordOriginal, ...props }) {
return (
<>
<ErrorBoundary
fallback={() => (
<div className="vc-spotify-fallback">
<p>Failed to render Spotify Modal :(</p>
<p >Check the console for errors</p>
</div>
)}
>
<Player />
</ErrorBoundary>
<VencordOriginal {...props} />
</>
);
}
}); });