From 9bad7e29405536abfe35dcd1c4315918659a5d3c Mon Sep 17 00:00:00 2001
From: Samantaz Fox <coding@samantaz.fr>
Date: Tue, 7 Dec 2021 03:40:15 +0100
Subject: [PATCH] Clean useless database arguments (1/5)

---
 src/invidious.cr                             | 12 ++++++------
 src/invidious/channels/channels.cr           | 12 ++++++------
 src/invidious/routes/api/v1/authenticated.cr |  2 +-
 src/invidious/users.cr                       |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/invidious.cr b/src/invidious.cr
index ef02f143..e1d3e37b 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -603,7 +603,7 @@ post "/subscription_ajax" do |env|
   case action
   when "action_create_subscription_to_channel"
     if !user.subscriptions.includes? channel_id
-      get_channel(channel_id, PG_DB, false, false)
+      get_channel(channel_id, false, false)
       Invidious::Database::Users.subscribe_channel(user, channel_id)
     end
   when "action_remove_subscriptions"
@@ -757,7 +757,7 @@ post "/data_control" do |env|
           user.subscriptions += body["subscriptions"].as_a.map(&.as_s)
           user.subscriptions.uniq!
 
-          user.subscriptions = get_batch_channels(user.subscriptions, PG_DB, false, false)
+          user.subscriptions = get_batch_channels(user.subscriptions, false, false)
 
           Invidious::Database::Users.update_subscriptions(user)
         end
@@ -829,7 +829,7 @@ post "/data_control" do |env|
         end
         user.subscriptions.uniq!
 
-        user.subscriptions = get_batch_channels(user.subscriptions, PG_DB, false, false)
+        user.subscriptions = get_batch_channels(user.subscriptions, false, false)
 
         Invidious::Database::Users.update_subscriptions(user)
       when "import_freetube"
@@ -838,7 +838,7 @@ post "/data_control" do |env|
         end
         user.subscriptions.uniq!
 
-        user.subscriptions = get_batch_channels(user.subscriptions, PG_DB, false, false)
+        user.subscriptions = get_batch_channels(user.subscriptions, false, false)
 
         Invidious::Database::Users.update_subscriptions(user)
       when "import_newpipe_subscriptions"
@@ -857,7 +857,7 @@ post "/data_control" do |env|
         end
         user.subscriptions.uniq!
 
-        user.subscriptions = get_batch_channels(user.subscriptions, PG_DB, false, false)
+        user.subscriptions = get_batch_channels(user.subscriptions, false, false)
 
         Invidious::Database::Users.update_subscriptions(user)
       when "import_newpipe"
@@ -876,7 +876,7 @@ post "/data_control" do |env|
               user.subscriptions += db.query_all("SELECT url FROM subscriptions", as: String).map(&.lchop("https://www.youtube.com/channel/"))
               user.subscriptions.uniq!
 
-              user.subscriptions = get_batch_channels(user.subscriptions, PG_DB, false, false)
+              user.subscriptions = get_batch_channels(user.subscriptions, false, false)
 
               Invidious::Database::Users.update_subscriptions(user)
 
diff --git a/src/invidious/channels/channels.cr b/src/invidious/channels/channels.cr
index 2ec510f0..155ec559 100644
--- a/src/invidious/channels/channels.cr
+++ b/src/invidious/channels/channels.cr
@@ -114,7 +114,7 @@ class ChannelRedirect < Exception
   end
 end
 
-def get_batch_channels(channels, db, refresh = false, pull_all_videos = true, max_threads = 10)
+def get_batch_channels(channels, refresh = false, pull_all_videos = true, max_threads = 10)
   finished_channel = Channel(String | Nil).new
 
   spawn do
@@ -130,7 +130,7 @@ def get_batch_channels(channels, db, refresh = false, pull_all_videos = true, ma
       active_threads += 1
       spawn do
         begin
-          get_channel(ucid, db, refresh, pull_all_videos)
+          get_channel(ucid, refresh, pull_all_videos)
           finished_channel.send(ucid)
         rescue ex
           finished_channel.send(nil)
@@ -151,21 +151,21 @@ def get_batch_channels(channels, db, refresh = false, pull_all_videos = true, ma
   return final
 end
 
-def get_channel(id, db, refresh = true, pull_all_videos = true)
+def get_channel(id, refresh = true, pull_all_videos = true)
   if channel = Invidious::Database::Channels.select(id)
     if refresh && Time.utc - channel.updated > 10.minutes
-      channel = fetch_channel(id, db, pull_all_videos: pull_all_videos)
+      channel = fetch_channel(id, pull_all_videos: pull_all_videos)
       Invidious::Database::Channels.insert(channel, update_on_conflict: true)
     end
   else
-    channel = fetch_channel(id, db, pull_all_videos: pull_all_videos)
+    channel = fetch_channel(id, pull_all_videos: pull_all_videos)
     Invidious::Database::Channels.insert(channel)
   end
 
   return channel
 end
 
-def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
+def fetch_channel(ucid, pull_all_videos = true, locale = nil)
   LOGGER.debug("fetch_channel: #{ucid}")
   LOGGER.trace("fetch_channel: #{ucid} : pull_all_videos = #{pull_all_videos}, locale = #{locale}")
 
diff --git a/src/invidious/routes/api/v1/authenticated.cr b/src/invidious/routes/api/v1/authenticated.cr
index 62b09f79..c4c06420 100644
--- a/src/invidious/routes/api/v1/authenticated.cr
+++ b/src/invidious/routes/api/v1/authenticated.cr
@@ -92,7 +92,7 @@ module Invidious::Routes::API::V1::Authenticated
     ucid = env.params.url["ucid"]
 
     if !user.subscriptions.includes? ucid
-      get_channel(ucid, PG_DB, false, false)
+      get_channel(ucid, false, false)
       Invidious::Database::Users.subscribe_channel(user, ucid)
     end
 
diff --git a/src/invidious/users.cr b/src/invidious/users.cr
index efc4dd52..ef97d3d6 100644
--- a/src/invidious/users.cr
+++ b/src/invidious/users.cr
@@ -74,7 +74,7 @@ def fetch_user(sid, headers, db)
     end
   end
 
-  channels = get_batch_channels(channels, db, false, false)
+  channels = get_batch_channels(channels, false, false)
 
   email = feed.xpath_node(%q(//a[@class="yt-masthead-picker-header yt-masthead-picker-active-account"]))
   if email