From 01acb9bfbfda00c4fdcb8de87c33174d694de530 Mon Sep 17 00:00:00 2001
From: Brahim Hadriche <brahim.hadriche@gmail.com>
Date: Fri, 13 Jan 2023 19:04:37 -0500
Subject: [PATCH 1/2] Login redirect to referer on logged-in user

---
 src/invidious/helpers/utils.cr | 2 +-
 src/invidious/routes/login.cr  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/invidious/helpers/utils.cr b/src/invidious/helpers/utils.cr
index ed0cca38..4448508c 100644
--- a/src/invidious/helpers/utils.cr
+++ b/src/invidious/helpers/utils.cr
@@ -259,7 +259,7 @@ def get_referer(env, fallback = "/", unroll = true)
   end
 
   referer = referer.request_target
-  referer = "/" + referer.gsub(/[^\/?@&%=\-_.0-9a-zA-Z]/, "").lstrip("/\\")
+  referer = "/" + referer.gsub(/[^\/?@&%=\-_.:,0-9a-zA-Z]/, "").lstrip("/\\")
 
   if referer == env.request.path
     referer = fallback
diff --git a/src/invidious/routes/login.cr b/src/invidious/routes/login.cr
index 99fc13a2..6454131a 100644
--- a/src/invidious/routes/login.cr
+++ b/src/invidious/routes/login.cr
@@ -6,14 +6,14 @@ module Invidious::Routes::Login
 
     user = env.get? "user"
 
-    return env.redirect "/feed/subscriptions" if user
+    referer = get_referer(env, "/feed/subscriptions")
+
+    return env.redirect referer if user
 
     if !CONFIG.login_enabled
       return error_template(400, "Login has been disabled by administrator.")
     end
 
-    referer = get_referer(env, "/feed/subscriptions")
-
     email = nil
     password = nil
     captcha = nil

From f6a4d04070203111c294520301ef6e439e110ade Mon Sep 17 00:00:00 2001
From: Brahim Hadriche <brahim.hadriche@gmail.com>
Date: Wed, 18 Jan 2023 15:58:59 -0500
Subject: [PATCH 2/2] Redirect auth token to login

---
 src/invidious/routes/account.cr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/invidious/routes/account.cr b/src/invidious/routes/account.cr
index 9bb73136..e6a70ed2 100644
--- a/src/invidious/routes/account.cr
+++ b/src/invidious/routes/account.cr
@@ -203,7 +203,7 @@ module Invidious::Routes::Account
     referer = get_referer(env)
 
     if !user
-      return env.redirect referer
+      return env.redirect "/login?referer=#{URI.encode_path_segment(env.request.resource)}"
     end
 
     user = user.as(User)