From 3f0df75398a812d8ac047134ddc7c6d8b3c3cdef Mon Sep 17 00:00:00 2001
From: Dominika Liberda <dominika@sakamoto.pl>
Date: Thu, 18 Feb 2021 01:18:37 +0100
Subject: [PATCH] * fixes playlist behaviour :^)

---
 webroot/watch.shs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/webroot/watch.shs b/webroot/watch.shs
index ad67f01..c8b84a4 100755
--- a/webroot/watch.shs
+++ b/webroot/watch.shs
@@ -100,35 +100,37 @@ if [[ "${get_data[v]}" ]]; then
 		</div><hr>"
 	done
 
-	if [[ ${get_data[playlist]} ]]; then
-		playlist=$(haruhi-dl $([[ ${cfg[_cookies]} != "" ]] && echo -n -- "-c ${cfg[_cookies]}") -j --flat-playlist https://www.youtube.com/playlist?list=${get_data[playlist]})
+	if [[ "${get_data[playlist]}" ]]; then
+		playlist=$(haruhi-dl $([[ ${cfg[_cookies]} != "" ]] && echo -n -- "-c ${cfg[_cookies]}") -j --flat-playlist "https://www.youtube.com/playlist?list=${get_data[playlist]}")
 	
 		IFS=$'\n'
 		video_title=($(jq -r '.title' <<< $playlist))
 		video_id=($(jq -r '.id' <<< $playlist))
-
-		next='dQw4w9WgXcQ'
 		
 		for (( i=0; i<${#video_id[@]}; i++ )); do
-			if [[ ${video_id[$i]} == ${get_data[v]} ]]; then
-				next=${video_id[$((i+1))]}
+			if [[ "${video_id[$i]}" == "${get_data[v]}" ]]; then
+				next="${video_id[$((i+1))]}"
 				break
 			fi
 		done
 
+		[[ "$next" == '' ]] && next='dQw4w9WgXcQ'
+		
+		echo "$next"
+
 		echo "<script type='text/javascript'>
 		window.addEventListener('DOMContentLoaded', (event) => {
 			var video = document.getElementById('player');
 			// video.play();
 			video.addEventListener('ended',function(){
-				window.location = 'watch.shs?v=$next&playlist=${get_data[playlist]}';
+				window.location = 'watch.shs?v=$next&playlist=$(html_encode ${get_data[playlist]})';
 			});
 		});
 		</script>"
 		echo "<h1>Playlist</h1>"
 	
 		for (( i=0; i<${#video_id[@]}; i++ )); do
-			echo "<a href='watch.shs?v=${video_id[$i]}&playlist=${get_data[playlist]}'><img src='http://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg'><br>${video_title[$i]}</a><br>"
+			echo "<a href='watch.shs?v=${video_id[$i]}&playlist=$(html_encode ${get_data[playlist]})'><img src='http://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg'><br>${video_title[$i]}</a><br>"
 		done
 	fi