Skip to content

Commit

Permalink
Update Xpui track watcher and root selector, fix getArtist return val…
Browse files Browse the repository at this point in the history
…ue (#16)

* fix: return `data.data.artistUnion`

* fix: `data.data`, not `data.artist`

* fix: use `data.item` for track data
  • Loading branch information
rxri authored Mar 25, 2024
1 parent 938e035 commit 6a8c9dd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/core/api/ApiUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class ApiUtils {
persistCache: true,
}
)
return data.artistUnion as ApiPartnerArtist
return data.data.artistUnion as ApiPartnerArtist
}

const vars = {
Expand Down
8 changes: 5 additions & 3 deletions src/ui/apps/NowPlayingApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@ export class NowPlayingApp extends React.Component<
render() {
const data = this.state.data
if (!data) return null
// @ts-expect-error: 'item' is not in types
const trackData = data.track ?? data.item
const track: TrackBase = {
uri: URI.from(data.track.uri),
title: data.track.metadata.title,
artists: [data.track.metadata.artist_name],
uri: URI.from(trackData.uri),
title: trackData.metadata.title,
artists: [trackData.metadata.artist_name],
}
if (BeatSaber.IsZlink) {
return <StyledApp trackBase={track} />
Expand Down
7 changes: 6 additions & 1 deletion src/ui/watchers/xpui/AppWatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import { TracklistWatcher } from "./TracklistWatcher"

export class AppWatcher extends BaseWatcher<HTMLBodyElement> {
connect(): void {
this.observe(".Root__main-view .os-content main", {
const selector = document.querySelector(
".Root__main-view .os-content main"
)
? ".Root__main-view .os-content main"
: ".Root__main-view .main-view-container__scroll-node"
this.observe(selector, {
subtree: true,
childList: true,
})
Expand Down

0 comments on commit 6a8c9dd

Please sign in to comment.