From 906466d7fb31686b208f04172dbd6ecaa9e1f1c6 Mon Sep 17 00:00:00 2001
From: Samantaz Fox <coding@samantaz.fr>
Date: Wed, 10 Aug 2022 00:22:40 +0200
Subject: [PATCH] routing: move watch/embed routes registration to
 Invidious::Routing

---
 src/invidious.cr         | 17 ++---------------
 src/invidious/routing.cr | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/invidious.cr b/src/invidious.cr
index 9daf5380..b9c88114 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -333,23 +333,10 @@ end
   Invidious::Routing.get "/", Invidious::Routes::Misc, :home
   Invidious::Routing.get "/privacy", Invidious::Routes::Misc, :privacy
   Invidious::Routing.get "/licenses", Invidious::Routes::Misc, :licenses
-
-  Invidious::Routing.register_channel_routes
-
-  Invidious::Routing.get "/watch", Invidious::Routes::Watch, :handle
-  Invidious::Routing.post "/watch_ajax", Invidious::Routes::Watch, :mark_watched
-  Invidious::Routing.get "/watch/:id", Invidious::Routes::Watch, :redirect
-  Invidious::Routing.get "/shorts/:id", Invidious::Routes::Watch, :redirect
-  Invidious::Routing.get "/clip/:clip", Invidious::Routes::Watch, :clip
-  Invidious::Routing.get "/w/:id", Invidious::Routes::Watch, :redirect
-  Invidious::Routing.get "/v/:id", Invidious::Routes::Watch, :redirect
-  Invidious::Routing.get "/e/:id", Invidious::Routes::Watch, :redirect
   Invidious::Routing.get "/redirect", Invidious::Routes::Misc, :cross_instance_redirect
 
-  Invidious::Routing.post "/download", Invidious::Routes::Watch, :download
-
-  Invidious::Routing.get "/embed/", Invidious::Routes::Embed, :redirect
-  Invidious::Routing.get "/embed/:id", Invidious::Routes::Embed, :show
+  Invidious::Routing.register_channel_routes
+  Invidious::Routing.register_watch_routes
 
   Invidious::Routing.get "/create_playlist", Invidious::Routes::Playlists, :new
   Invidious::Routing.post "/create_playlist", Invidious::Routes::Playlists, :create
diff --git a/src/invidious/routing.cr b/src/invidious/routing.cr
index 45ae7c6b..4f6db78c 100644
--- a/src/invidious/routing.cr
+++ b/src/invidious/routing.cr
@@ -71,6 +71,22 @@ module Invidious::Routing
     end
   end
 
+  def register_watch_routes
+    get "/watch", Routes::Watch, :handle
+    post "/watch_ajax", Routes::Watch, :mark_watched
+    get "/watch/:id", Routes::Watch, :redirect
+    get "/shorts/:id", Routes::Watch, :redirect
+    get "/clip/:clip", Routes::Watch, :clip
+    get "/w/:id", Routes::Watch, :redirect
+    get "/v/:id", Routes::Watch, :redirect
+    get "/e/:id", Routes::Watch, :redirect
+
+    post "/download", Routes::Watch, :download
+
+    get "/embed/", Routes::Embed, :redirect
+    get "/embed/:id", Routes::Embed, :show
+  end
+
   def register_api_manifest_routes
     get "/api/manifest/dash/id/:id", Routes::API::Manifest, :get_dash_video_id