Clean useless database arguments (4/5)

11 files changed, 19 insertions, 19 deletions

diff --git a/src/invidious.cr b/src/invidious.cr
index d400c0ba..fb67af87 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -793,7 +793,7 @@ post "/data_control" do |env|
               next if !video_id
 
               begin
-                video = get_video(video_id, PG_DB)
+                video = get_video(video_id)
               rescue ex
                 next
               end
diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr
index 982bcda1..c3b53339 100644
--- a/src/invidious/helpers/helpers.cr
+++ b/src/invidious/helpers/helpers.cr
@@ -60,7 +60,7 @@ def html_to_content(description_html : String)
   return description
 end
 
-def cache_annotation(db, id, annotations)
+def cache_annotation(id, annotations)
   if !CONFIG.cache_annotations
     return
   end
@@ -99,7 +99,7 @@ def create_notification_stream(env, topics, connection_channel)
           published = Time.utc - Time::Span.new(days: time_span[0], hours: time_span[1], minutes: time_span[2], seconds: time_span[3])
           video_id = TEST_IDS[rand(TEST_IDS.size)]
 
-          video = get_video(video_id, PG_DB)
+          video = get_video(video_id)
           video.published = published
           response = JSON.parse(video.to_json(locale, nil))
 
@@ -176,7 +176,7 @@ def create_notification_stream(env, topics, connection_channel)
           next
         end
 
-        video = get_video(video_id, PG_DB)
+        video = get_video(video_id)
         video.published = Time.unix(published)
         response = JSON.parse(video.to_json(locale, nil))
 
diff --git a/src/invidious/routes/api/manifest.cr b/src/invidious/routes/api/manifest.cr
index 12687ec6..b6183001 100644
--- a/src/invidious/routes/api/manifest.cr
+++ b/src/invidious/routes/api/manifest.cr
@@ -13,7 +13,7 @@ module Invidious::Routes::API::Manifest
     unique_res = env.params.query["unique_res"]?.try { |q| (q == "true" || q == "1").to_unsafe }
 
     begin
-      video = get_video(id, PG_DB, region: region)
+      video = get_video(id, region: region)
     rescue ex : VideoRedirect
       return env.redirect env.request.resource.gsub(id, ex.video_id)
     rescue ex
diff --git a/src/invidious/routes/api/v1/authenticated.cr b/src/invidious/routes/api/v1/authenticated.cr
index c3f751f7..44603c9a 100644
--- a/src/invidious/routes/api/v1/authenticated.cr
+++ b/src/invidious/routes/api/v1/authenticated.cr
@@ -245,7 +245,7 @@ module Invidious::Routes::API::V1::Authenticated
     end
 
     begin
-      video = get_video(video_id, PG_DB)
+      video = get_video(video_id)
     rescue ex
       return error_json(500, ex)
     end
diff --git a/src/invidious/routes/api/v1/videos.cr b/src/invidious/routes/api/v1/videos.cr
index f982329c..4d244e7f 100644
--- a/src/invidious/routes/api/v1/videos.cr
+++ b/src/invidious/routes/api/v1/videos.cr
@@ -8,7 +8,7 @@ module Invidious::Routes::API::V1::Videos
     region = env.params.query["region"]?
 
     begin
-      video = get_video(id, PG_DB, region: region)
+      video = get_video(id, region: region)
     rescue ex : VideoRedirect
       env.response.headers["Location"] = env.request.resource.gsub(id, ex.video_id)
       return error_json(302, "Video is unavailable", {"videoId" => ex.video_id})
@@ -36,7 +36,7 @@ module Invidious::Routes::API::V1::Videos
     # getting video info.
 
     begin
-      video = get_video(id, PG_DB, region: region)
+      video = get_video(id, region: region)
     rescue ex : VideoRedirect
       env.response.headers["Location"] = env.request.resource.gsub(id, ex.video_id)
       return error_json(302, "Video is unavailable", {"videoId" => ex.video_id})
@@ -157,7 +157,7 @@ module Invidious::Routes::API::V1::Videos
     region = env.params.query["region"]?
 
     begin
-      video = get_video(id, PG_DB, region: region)
+      video = get_video(id, region: region)
     rescue ex : VideoRedirect
       env.response.headers["Location"] = env.request.resource.gsub(id, ex.video_id)
       return error_json(302, "Video is unavailable", {"videoId" => ex.video_id})
@@ -271,7 +271,7 @@ module Invidious::Routes::API::V1::Videos
 
         annotations = response.body
 
-        cache_annotation(PG_DB, id, annotations)
+        cache_annotation(id, annotations)
       end
     else # "youtube"
       response = YT_POOL.client &.get("/annotations_invideo?video_id=#{id}")
diff --git a/src/invidious/routes/embed.cr b/src/invidious/routes/embed.cr
index 13422993..ab722ae2 100644
--- a/src/invidious/routes/embed.cr
+++ b/src/invidious/routes/embed.cr
@@ -30,7 +30,7 @@ module Invidious::Routes::Embed
     id = env.params.url["id"]
 
     plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
-    continuation = process_continuation(PG_DB, env.params.query, plid, id)
+    continuation = process_continuation(env.params.query, plid, id)
 
     if md = env.params.query["playlist"]?
          .try &.match(/[a-zA-Z0-9_-]{11}(,[a-zA-Z0-9_-]{11})*/)
@@ -119,7 +119,7 @@ module Invidious::Routes::Embed
     subscriptions ||= [] of String
 
     begin
-      video = get_video(id, PG_DB, region: params.region)
+      video = get_video(id, region: params.region)
     rescue ex : VideoRedirect
       return env.redirect env.request.resource.gsub(id, ex.video_id)
     rescue ex
diff --git a/src/invidious/routes/feeds.cr b/src/invidious/routes/feeds.cr
index 458519b8..5dcef351 100644
--- a/src/invidious/routes/feeds.cr
+++ b/src/invidious/routes/feeds.cr
@@ -393,7 +393,7 @@ module Invidious::Routes::Feeds
         published = Time.parse_rfc3339(entry.xpath_node("published").not_nil!.content)
         updated = Time.parse_rfc3339(entry.xpath_node("updated").not_nil!.content)
 
-        video = get_video(id, PG_DB, force_refresh: true)
+        video = get_video(id, force_refresh: true)
 
         # Deliver notifications to `/api/v1/auth/notifications`
         payload = {
diff --git a/src/invidious/routes/playlists.cr b/src/invidious/routes/playlists.cr
index d33c699b..d437b79c 100644
--- a/src/invidious/routes/playlists.cr
+++ b/src/invidious/routes/playlists.cr
@@ -345,7 +345,7 @@ module Invidious::Routes::Playlists
       video_id = env.params.query["video_id"]
 
       begin
-        video = get_video(video_id, PG_DB)
+        video = get_video(video_id)
       rescue ex
         if redirect
           return error_template(500, ex)
diff --git a/src/invidious/routes/video_playback.cr b/src/invidious/routes/video_playback.cr
index 06ba6b8c..8a58b034 100644
--- a/src/invidious/routes/video_playback.cr
+++ b/src/invidious/routes/video_playback.cr
@@ -263,7 +263,7 @@ module Invidious::Routes::VideoPlayback
       haltf env, status_code: 400, response: "TESTING"
     end
 
-    video = get_video(id, PG_DB, region: region)
+    video = get_video(id, region: region)
 
     fmt = video.fmt_stream.find(nil) { |f| f["itag"].as_i == itag } || video.adaptive_fmts.find(nil) { |f| f["itag"].as_i == itag }
     url = fmt.try &.["url"]?.try &.as_s
diff --git a/src/invidious/routes/watch.cr b/src/invidious/routes/watch.cr
index f7bd7d81..1198f48f 100644
--- a/src/invidious/routes/watch.cr
+++ b/src/invidious/routes/watch.cr
@@ -39,7 +39,7 @@ module Invidious::Routes::Watch
     end
 
     plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
-    continuation = process_continuation(PG_DB, env.params.query, plid, id)
+    continuation = process_continuation(env.params.query, plid, id)
 
     nojs = env.params.query["nojs"]?
 
@@ -60,7 +60,7 @@ module Invidious::Routes::Watch
     env.params.query.delete_all("listen")
 
     begin
-      video = get_video(id, PG_DB, region: params.region)
+      video = get_video(id, region: params.region)
     rescue ex : VideoRedirect
       return env.redirect env.request.resource.gsub(id, ex.video_id)
     rescue ex
diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
index 645d3678..6c89b445 100644
--- a/src/invidious/videos.cr
+++ b/src/invidious/videos.cr
@@ -993,7 +993,7 @@ def extract_video_info(video_id : String, proxy_region : String? = nil, context_
   return params
 end
 
-def get_video(id, db, refresh = true, region = nil, force_refresh = false)
+def get_video(id, refresh = true, region = nil, force_refresh = false)
   if (video = Invidious::Database::Videos.select(id)) && !region
     # If record was last updated over 10 minutes ago, or video has since premiered,
     # refresh (expire param in response lasts for 6 hours)
@@ -1056,7 +1056,7 @@ def itag_to_metadata?(itag : JSON::Any)
   return VIDEO_FORMATS[itag.to_s]?
 end
 
-def process_continuation(db, query, plid, id)
+def process_continuation(query, plid, id)
   continuation = nil
   if plid
     if index = query["index"]?.try &.to_i?