rainbownapkin/canopy
1
0
Fork 0
Code Issues 20 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed multi-day livestream rendering.

Browse source
This commit is contained in:
rainbow napkin 2026-05-20 09:50:00 -04:00
parent dbc27aa874
commit 13e2b9fe11
1 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

32
www/js/channel/panels/queuePanel/queuePanel.js
View file

@ -1233,6 +1233,11 @@ class queuePanel extends panelObj{
//Convert start epoch to JS date object //Convert start epoch to JS date object
const started = new Date(nowPlaying.startTime); const started = new Date(nowPlaying.startTime);
//If the date the scheduler is set to isn't within the livestream
if(!utils.isSameDate(started, this.day) && !utils.dateWithinRange(started, new Date(), this.day)){
return;
}
//If this started today //If this started today
if(utils.isSameDate(this.day, started)){ if(utils.isSameDate(this.day, started)){
//Set entryDiv top-border location based on start time //Set entryDiv top-border location based on start time
@ -1246,15 +1251,29 @@ class queuePanel extends panelObj{
entryDiv.style.top = `${this.offsetByDate(dawn)}px`; entryDiv.style.top = `${this.offsetByDate(dawn)}px`;
//Apply rest of the styling rules for items that started yestarday //Apply rest of the styling rules for items that started yestarday
entryDiv.classList.add('started-yesterday') entryDiv.classList.add('started-yesterday');
} }
//Create entry title //Create entry title
const entryTitle = document.createElement('p'); const entryTitle = document.createElement('p');
entryTitle.textContent = utils.unescapeEntities(nowPlaying.title); entryTitle.textContent = utils.unescapeEntities(nowPlaying.title);
//Set entry div bottom-border location based on current time, round to match time marker
entryDiv.style.bottom = `${Math.round(this.offsetByDate(date, true))}px` //If we're looking at today
if(utils.isSameDate(this.day, new Date())){
//Set entry div bottom-border location based on current time, round to match time marker
entryDiv.style.bottom = `${Math.round(this.offsetByDate(date, true))}px`;
}else{
//Get midnight
const dusk = new Date();
dusk.setHours(23,59,59,999);
//Set stream to continue to run into the next morning
entryDiv.style.bottom = `${Math.round(this.offsetByDate(dusk, true))}px`;
//Apply rest of the styling rules for items that end after today
entryDiv.classList.add('ends-tomorrow');
}
//Assembly entryDiv //Assembly entryDiv
entryDiv.appendChild(entryTitle); entryDiv.appendChild(entryTitle);
@ -1285,8 +1304,11 @@ class queuePanel extends panelObj{
//Append entry div to queue container //Append entry div to queue container
this.queueContainer.appendChild(entryDiv); this.queueContainer.appendChild(entryDiv);
}else{ }else{
//Update existing entry, round offset to match time marker //If we're looking at today
staleEntry.style.bottom = `${Math.round(this.offsetByDate(date, true))}px` if(utils.isSameDate(this.day, new Date())){
//Update existing entry, round offset to match time marker
staleEntry.style.bottom = `${Math.round(this.offsetByDate(date, true))}px`
}
} }
//Keep tooltip date seperate so it re-calculates live duration properly //Keep tooltip date seperate so it re-calculates live duration properly