Login redirect to referer on logged-in user (#3556)

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)

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