From 2b2e0a0275cf561e1fea786f7cf144666dd79bc8 Mon Sep 17 00:00:00 2001 From: William Kuijltjes Date: Mon, 18 Mar 2024 16:51:34 +0100 Subject: [PATCH] Fix dynamic times that should be static and vice versa if logged in user has queued --- marietje/queues/templates/queues/queue.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/marietje/queues/templates/queues/queue.html b/marietje/queues/templates/queues/queue.html index e38035e..dc76cd0 100644 --- a/marietje/queues/templates/queues/queue.html +++ b/marietje/queues/templates/queues/queue.html @@ -365,7 +365,9 @@ const current_song = this.queue[i]; if (i === 0) { const current_song_remaining_seconds = current_song.song.duration - this.queue[1].time_until_song_seconds; - infoBar['length_personal_queue'] -= current_song_remaining_seconds; + if (current_song.user !== null && current_song.user.id === this.user_data.id) { + infoBar['length_personal_queue'] -= current_song_remaining_seconds; + } infoBar['length_total_queue'] -= current_song_remaining_seconds; } infoBar['length_total_queue'] += current_song.song.duration; @@ -373,7 +375,7 @@ infoBar['length_personal_queue'] += current_song.song.duration; infoBar['end_personal_queue'] = infoBar['length_total_queue']; if (infoBar['start_personal_queue'] === null) { - infoBar['start_personal_queue'] = infoBar['length_total_queue'] - current_song.song.duration - this.queue[1].time_until_song_seconds; + infoBar['start_personal_queue'] = infoBar['length_total_queue'] - current_song.song.duration; } } }