secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Favouring current_track.name, fallback to stream_title; fixes #732

Browse Source
This commit is contained in:
James Barnsley
2022-07-31 13:05:16 +12:00
parent 09db7fba6c
commit 3a161a66d7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/views/Queue.js
View File

@ -151,6 +151,7 @@ const Queue = ({
current_track_image = current_track.images.large;
}
}
const current_track_name = current_track?.name || stream_title || '-'
const options = (
<>
@ -186,15 +187,14 @@ const Queue = ({
/>
<div className="current-track__details">
<div className="current-track__title">
{stream_title && (
<span>{stream_title}</span>
)}
{!stream_title && current_track && (
{current_track?.uri ? (
<URILink type="track" uri={current_track.uri}>
{current_track.name}
{current_track_name}
</URILink>
) : (
<span>{current_track_name}</span>
)}
{!stream_title && !current_track && (<span>-</span>)}
</div>
<LinksSentence
@ -282,8 +282,8 @@ const mapStateToProps = (state) => {
// Now merge in our queue metadata
if (queue_metadata[`tlid_${track.tlid}`] !== undefined) {
track = {
...track,
...queue_metadata[`tlid_${track.tlid}`],
...track,
};
}