routing: register API routes with a function, rather than a macro

2 files changed, 76 insertions, 69 deletions

diff --git a/src/invidious.cr b/src/invidious.cr
index 91bf6935..1188710f 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -420,7 +420,7 @@ Invidious::Routing.get "/yts/img/:name", Invidious::Routes::Images, :yts_image
 Invidious::Routing.get "/vi/:id/:name", Invidious::Routes::Images, :thumbnails
 
 # API routes (macro)
-define_v1_api_routes()
+Invidious::Routing.register_api_v1_routes
 
 # Video playback (macros)
 define_api_manifest_routes()
diff --git a/src/invidious/routing.cr b/src/invidious/routing.cr
index 23119e62..9e8ce34d 100644
--- a/src/invidious/routing.cr
+++ b/src/invidious/routing.cr
@@ -11,6 +11,10 @@ module Invidious::Routing
 
   {% end %}
 
+  # -------------------
+  #  Invidious routes
+  # -------------------
+
   def register_user_routes
     # User login/out
     get "/login", Routes::Login, :login_page
@@ -39,75 +43,78 @@ module Invidious::Routing
     post "/subscription_ajax", Routes::Subscriptions, :toggle_subscription
     get "/subscription_manager", Routes::Subscriptions, :subscription_manager
   end
-end
-
-macro define_v1_api_routes
-  {{namespace = Invidious::Routes::API::V1}}
-  # Videos
-  Invidious::Routing.get "/api/v1/videos/:id", {{namespace}}::Videos, :videos
-  Invidious::Routing.get "/api/v1/storyboards/:id", {{namespace}}::Videos, :storyboards
-  Invidious::Routing.get "/api/v1/captions/:id", {{namespace}}::Videos, :captions
-  Invidious::Routing.get "/api/v1/annotations/:id", {{namespace}}::Videos, :annotations
-  Invidious::Routing.get "/api/v1/comments/:id", {{namespace}}::Videos, :comments
-
-  # Feeds
-  Invidious::Routing.get "/api/v1/trending", {{namespace}}::Feeds, :trending
-  Invidious::Routing.get "/api/v1/popular", {{namespace}}::Feeds, :popular
-
-  # Channels
-  Invidious::Routing.get "/api/v1/channels/:ucid", {{namespace}}::Channels, :home
-  {% for route in {"videos", "latest", "playlists", "community", "search"} %}
-    Invidious::Routing.get "/api/v1/channels/#{{{route}}}/:ucid", {{namespace}}::Channels, :{{route}}
-    Invidious::Routing.get "/api/v1/channels/:ucid/#{{{route}}}", {{namespace}}::Channels, :{{route}}
-  {% end %}
-
-  # 301 redirects to new /api/v1/channels/community/:ucid and /:ucid/community
-  Invidious::Routing.get "/api/v1/channels/comments/:ucid", {{namespace}}::Channels, :channel_comments_redirect
-  Invidious::Routing.get "/api/v1/channels/:ucid/comments", {{namespace}}::Channels, :channel_comments_redirect
-
-
-  # Search
-  Invidious::Routing.get "/api/v1/search", {{namespace}}::Search, :search
-  Invidious::Routing.get "/api/v1/search/suggestions", {{namespace}}::Search, :search_suggestions
-
-  # Authenticated
-
-  # The notification APIs cannot be extracted yet! They require the *local* notifications constant defined in invidious.cr
-  #
-  # Invidious::Routing.get "/api/v1/auth/notifications", {{namespace}}::Authenticated, :notifications
-  # Invidious::Routing.post "/api/v1/auth/notifications", {{namespace}}::Authenticated, :notifications
-
-  Invidious::Routing.get "/api/v1/auth/preferences", {{namespace}}::Authenticated, :get_preferences
-  Invidious::Routing.post "/api/v1/auth/preferences", {{namespace}}::Authenticated, :set_preferences
 
-  Invidious::Routing.get "/api/v1/auth/feed", {{namespace}}::Authenticated, :feed
-
-  Invidious::Routing.get "/api/v1/auth/subscriptions", {{namespace}}::Authenticated, :get_subscriptions
-  Invidious::Routing.post "/api/v1/auth/subscriptions/:ucid", {{namespace}}::Authenticated, :subscribe_channel
-  Invidious::Routing.delete "/api/v1/auth/subscriptions/:ucid", {{namespace}}::Authenticated, :unsubscribe_channel
-
-
-  Invidious::Routing.get "/api/v1/auth/playlists", {{namespace}}::Authenticated, :list_playlists
-  Invidious::Routing.post "/api/v1/auth/playlists", {{namespace}}::Authenticated, :create_playlist
-  Invidious::Routing.patch "/api/v1/auth/playlists/:plid",{{namespace}}:: Authenticated, :update_playlist_attribute
-  Invidious::Routing.delete "/api/v1/auth/playlists/:plid", {{namespace}}::Authenticated, :delete_playlist
-
-
-  Invidious::Routing.post "/api/v1/auth/playlists/:plid/videos", {{namespace}}::Authenticated, :insert_video_into_playlist
-  Invidious::Routing.delete "/api/v1/auth/playlists/:plid/videos/:index", {{namespace}}::Authenticated, :delete_video_in_playlist
-
-  Invidious::Routing.get "/api/v1/auth/tokens", {{namespace}}::Authenticated, :get_tokens
-  Invidious::Routing.post "/api/v1/auth/tokens/register", {{namespace}}::Authenticated, :register_token
-  Invidious::Routing.post "/api/v1/auth/tokens/unregister", {{namespace}}::Authenticated, :unregister_token
-
-  Invidious::Routing.get "/api/v1/auth/notifications", {{namespace}}::Authenticated, :notifications
-  Invidious::Routing.post "/api/v1/auth/notifications", {{namespace}}::Authenticated, :notifications
-
-  # Misc
-  Invidious::Routing.get "/api/v1/stats", {{namespace}}::Misc, :stats
-  Invidious::Routing.get "/api/v1/playlists/:plid", {{namespace}}::Misc, :get_playlist
-  Invidious::Routing.get "/api/v1/auth/playlists/:plid", {{namespace}}::Misc, :get_playlist
-  Invidious::Routing.get "/api/v1/mixes/:rdid", {{namespace}}::Misc, :mixes
+  # -------------------
+  #  API routes
+  # -------------------
+
+  def register_api_v1_routes
+    {% begin %}
+      {{namespace = Routes::API::V1}}
+
+      # Videos
+      get "/api/v1/videos/:id", {{namespace}}::Videos, :videos
+      get "/api/v1/storyboards/:id", {{namespace}}::Videos, :storyboards
+      get "/api/v1/captions/:id", {{namespace}}::Videos, :captions
+      get "/api/v1/annotations/:id", {{namespace}}::Videos, :annotations
+      get "/api/v1/comments/:id", {{namespace}}::Videos, :comments
+
+      # Feeds
+      get "/api/v1/trending", {{namespace}}::Feeds, :trending
+      get "/api/v1/popular", {{namespace}}::Feeds, :popular
+
+      # Channels
+      get "/api/v1/channels/:ucid", {{namespace}}::Channels, :home
+      {% for route in {"videos", "latest", "playlists", "community", "search"} %}
+        get "/api/v1/channels/#{{{route}}}/:ucid", {{namespace}}::Channels, :{{route}}
+        get "/api/v1/channels/:ucid/#{{{route}}}", {{namespace}}::Channels, :{{route}}
+      {% end %}
+
+      # 301 redirects to new /api/v1/channels/community/:ucid and /:ucid/community
+      get "/api/v1/channels/comments/:ucid", {{namespace}}::Channels, :channel_comments_redirect
+      get "/api/v1/channels/:ucid/comments", {{namespace}}::Channels, :channel_comments_redirect
+
+      # Search
+      get "/api/v1/search", {{namespace}}::Search, :search
+      get "/api/v1/search/suggestions", {{namespace}}::Search, :search_suggestions
+
+      # Authenticated
+
+      # The notification APIs cannot be extracted yet! They require the *local* notifications constant defined in invidious.cr
+      #
+      # Invidious::Routing.get "/api/v1/auth/notifications", {{namespace}}::Authenticated, :notifications
+      # Invidious::Routing.post "/api/v1/auth/notifications", {{namespace}}::Authenticated, :notifications
+
+      get "/api/v1/auth/preferences", {{namespace}}::Authenticated, :get_preferences
+      post "/api/v1/auth/preferences", {{namespace}}::Authenticated, :set_preferences
+
+      get "/api/v1/auth/feed", {{namespace}}::Authenticated, :feed
+
+      get "/api/v1/auth/subscriptions", {{namespace}}::Authenticated, :get_subscriptions
+      post "/api/v1/auth/subscriptions/:ucid", {{namespace}}::Authenticated, :subscribe_channel
+      delete "/api/v1/auth/subscriptions/:ucid", {{namespace}}::Authenticated, :unsubscribe_channel
+
+      get "/api/v1/auth/playlists", {{namespace}}::Authenticated, :list_playlists
+      post "/api/v1/auth/playlists", {{namespace}}::Authenticated, :create_playlist
+      patch "/api/v1/auth/playlists/:plid",{{namespace}}:: Authenticated, :update_playlist_attribute
+      delete "/api/v1/auth/playlists/:plid", {{namespace}}::Authenticated, :delete_playlist
+      post "/api/v1/auth/playlists/:plid/videos", {{namespace}}::Authenticated, :insert_video_into_playlist
+      delete "/api/v1/auth/playlists/:plid/videos/:index", {{namespace}}::Authenticated, :delete_video_in_playlist
+
+      get "/api/v1/auth/tokens", {{namespace}}::Authenticated, :get_tokens
+      post "/api/v1/auth/tokens/register", {{namespace}}::Authenticated, :register_token
+      post "/api/v1/auth/tokens/unregister", {{namespace}}::Authenticated, :unregister_token
+
+      get "/api/v1/auth/notifications", {{namespace}}::Authenticated, :notifications
+      post "/api/v1/auth/notifications", {{namespace}}::Authenticated, :notifications
+
+      # Misc
+      get "/api/v1/stats", {{namespace}}::Misc, :stats
+      get "/api/v1/playlists/:plid", {{namespace}}::Misc, :get_playlist
+      get "/api/v1/auth/playlists/:plid", {{namespace}}::Misc, :get_playlist
+      get "/api/v1/mixes/:rdid", {{namespace}}::Misc, :mixes
+    {% end %}
+  end
 end
 
 macro define_api_manifest_routes