From 88ea794fdb6222011020b6fc778f6cd5da70484a Mon Sep 17 00:00:00 2001
From: Samantaz Fox <coding@samantaz.fr>
Date: Wed, 10 Aug 2022 01:00:44 +0200
Subject: [PATCH] routes: move error 404 logic to its own module

---
 src/invidious.cr               | 44 +------------------------------
 src/invidious/routes/errors.cr | 47 ++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 43 deletions(-)
 create mode 100644 src/invidious/routes/errors.cr

diff --git a/src/invidious.cr b/src/invidious.cr
index 4a3b0003..aff879e3 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -187,49 +187,7 @@ end
 Invidious::Routing.register_all
 
 error 404 do |env|
-  if md = env.request.path.match(/^\/(?<id>([a-zA-Z0-9_-]{11})|(\w+))$/)
-    item = md["id"]
-
-    # Check if item is branding URL e.g. https://youtube.com/gaming
-    response = YT_POOL.client &.get("/#{item}")
-
-    if response.status_code == 301
-      response = YT_POOL.client &.get(URI.parse(response.headers["Location"]).request_target)
-    end
-
-    if response.body.empty?
-      env.response.headers["Location"] = "/"
-      halt env, status_code: 302
-    end
-
-    html = XML.parse_html(response.body)
-    ucid = html.xpath_node(%q(//link[@rel="canonical"])).try &.["href"].split("/")[-1]
-
-    if ucid
-      env.response.headers["Location"] = "/channel/#{ucid}"
-      halt env, status_code: 302
-    end
-
-    params = [] of String
-    env.params.query.each do |k, v|
-      params << "#{k}=#{v}"
-    end
-    params = params.join("&")
-
-    url = "/watch?v=#{item}"
-    if !params.empty?
-      url += "&#{params}"
-    end
-
-    # Check if item is video ID
-    if item.match(/^[a-zA-Z0-9_-]{11}$/) && YT_POOL.client &.head("/watch?v=#{item}").status_code != 404
-      env.response.headers["Location"] = url
-      halt env, status_code: 302
-    end
-  end
-
-  env.response.headers["Location"] = "/"
-  halt env, status_code: 302
+  Invidious::Routes::ErrorRoutes.error_404(env)
 end
 
 error 500 do |env, ex|
diff --git a/src/invidious/routes/errors.cr b/src/invidious/routes/errors.cr
new file mode 100644
index 00000000..b138b562
--- /dev/null
+++ b/src/invidious/routes/errors.cr
@@ -0,0 +1,47 @@
+module Invidious::Routes::ErrorRoutes
+  def self.error_404(env)
+    if md = env.request.path.match(/^\/(?<id>([a-zA-Z0-9_-]{11})|(\w+))$/)
+      item = md["id"]
+
+      # Check if item is branding URL e.g. https://youtube.com/gaming
+      response = YT_POOL.client &.get("/#{item}")
+
+      if response.status_code == 301
+        response = YT_POOL.client &.get(URI.parse(response.headers["Location"]).request_target)
+      end
+
+      if response.body.empty?
+        env.response.headers["Location"] = "/"
+        haltf env, status_code: 302
+      end
+
+      html = XML.parse_html(response.body)
+      ucid = html.xpath_node(%q(//link[@rel="canonical"])).try &.["href"].split("/")[-1]
+
+      if ucid
+        env.response.headers["Location"] = "/channel/#{ucid}"
+        haltf env, status_code: 302
+      end
+
+      params = [] of String
+      env.params.query.each do |k, v|
+        params << "#{k}=#{v}"
+      end
+      params = params.join("&")
+
+      url = "/watch?v=#{item}"
+      if !params.empty?
+        url += "&#{params}"
+      end
+
+      # Check if item is video ID
+      if item.match(/^[a-zA-Z0-9_-]{11}$/) && YT_POOL.client &.head("/watch?v=#{item}").status_code != 404
+        env.response.headers["Location"] = url
+        haltf env, status_code: 302
+      end
+    end
+
+    env.response.headers["Location"] = "/"
+    haltf env, status_code: 302
+  end
+end