From f69e6589e3b81cb3c2394f7f8542ae9a194275f8 Mon Sep 17 00:00:00 2001
From: "4 raccoons in a trenchcoat. / luna vivian" <nightlyonie@airmail.cc>
Date: Thu, 20 Apr 2023 12:20:01 +0200
Subject: [PATCH] fix login issue from watch page closes issue #3

You can finally log in from the watch page and be redirected back to it. :3
---
 templates/themes/default-v2/watch.html | 2 +-
 webroot/watch.shs                      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/themes/default-v2/watch.html b/templates/themes/default-v2/watch.html
index c4db12b..721f06a 100644
--- a/templates/themes/default-v2/watch.html
+++ b/templates/themes/default-v2/watch.html
@@ -15,7 +15,7 @@
 				{{start ?unfav}}<a href='unfav.shs?v={{.id}}' target='_blank'>Remove from favourites</a><br>{{else ?unfav}}{{end ?unfav}}
 				{{start ?sub}}<a href='subscribe.shs?id={{.channel_id}}' target='_blank'>Subscribe to {{.uploader}}!</a><br>{{end ?sub}}
 				{{start ?unsub}}<a href='unsubscribe.shs?id={{.channel_id}}' target='_blank'>Unsubscribe from {{.uploader}}!</a><br>{{end ?unsub}}
-				{{start ?login}}<b><a href='/login.shs?r={{.r}}'>Log in</a> to add this video to your favourites and/or subscribe to this channel!</b><br>{{end ?login}}
+				{{start ?login}}<b><a href='/login.shs?r={{.login_r}}'>Log in</a> to add this video to your favourites and/or subscribe to this channel!</b><br>{{end ?login}}
 			</td>
 			<td style="text-align: right; vertical-align: top;">
 				<b>{{.view_count}}</b> views<br>
diff --git a/webroot/watch.shs b/webroot/watch.shs
index e2feda5..f0b745d 100755
--- a/webroot/watch.shs
+++ b/webroot/watch.shs
@@ -156,7 +156,8 @@ if [[ "${get_data[v]}" ]]; then
 		fi
 	else
 		strings[?login]=true
-		strings[login_r]=$(sed -s 's/?/___/' <<< "${r[url]}")
+		#strings[login_r]=$(sed -s 's/?/___/' <<< "${r[url]}")
+		strings[login_r]="watch___v=${get_data[v]}"
 	fi
 	strings[description]=$(jq -r '.description' <<< "$video")