Minor refactor

src/invidious.cr

@@ -148,7 +148,6 @@ statistics = {
 }
 if config.statistics_enabled
   spawn do
-    loop do
     statistics = {
       "version"           => "2.0",
       "software"          => SOFTWARE,
@@ -162,12 +161,19 @@ if config.statistics_enabled
       },
       "metadata" => {
         "updatedAt"              => Time.utc.to_unix,
-          "lastChannelRefreshedAt" => PG_DB.query_one?("SELECT updated FROM channels ORDER BY updated DESC LIMIT 1", as: Time).try &.to_unix || 0,
+        "lastChannelRefreshedAt" => PG_DB.query_one?("SELECT updated FROM channels ORDER BY updated DESC LIMIT 1", as: Time).try &.to_unix || 0_i64,
       },
     }
 
+    loop do
       sleep 1.minute
       Fiber.yield
+
+      statistics["usage"].as(Hash)["users"].as(Hash)["total"] = PG_DB.query_one("SELECT count(*) FROM users", as: Int64)
+      statistics["usage"].as(Hash)["users"].as(Hash)["activeHalfyear"] = PG_DB.query_one("SELECT count(*) FROM users WHERE CURRENT_TIMESTAMP - updated < '6 months'", as: Int64)
+      statistics["usage"].as(Hash)["users"].as(Hash)["activeMonth"] = PG_DB.query_one("SELECT count(*) FROM users WHERE CURRENT_TIMESTAMP - updated < '1 month'", as: Int64)
+      statistics["metadata"].as(Hash(String, Int64))["updatedAt"] = Time.utc.to_unix
+      statistics["metadata"].as(Hash(String, Int64))["lastChannelRefreshedAt"] = PG_DB.query_one?("SELECT updated FROM channels ORDER BY updated DESC LIMIT 1", as: Time).try &.to_unix || 0_i64
     end
   end
 end
@@ -3223,7 +3229,8 @@ get "/api/v1/storyboards/:id" do |env|
     storyboard = storyboard[0]
   end
 
-  webvtt = <<-END_VTT
+  String.build do |str|
+    str << <<-END_VTT
     WEBVTT
 
 
@@ -3238,7 +3245,7 @@ get "/api/v1/storyboards/:id" do |env|
 
       storyboard[:storyboard_height].times do |j|
         storyboard[:storyboard_width].times do |k|
-        webvtt += <<-END_CUE
+          str << <<-END_CUE
           #{start_time}.000 --> #{end_time}.000
           #{url}#xywh=#{storyboard[:width] * k},#{storyboard[:height] * j},#{storyboard[:width]},#{storyboard[:height]}
 
@@ -3250,8 +3257,7 @@ get "/api/v1/storyboards/:id" do |env|
         end
       end
     end
-
+  end
-  webvtt
 end
 
 get "/api/v1/captions/:id" do |env|
@@ -3321,7 +3327,7 @@ get "/api/v1/captions/:id" do |env|
     caption = caption[0]
   end
 
-  url = caption.baseUrl + "&tlang=#{tlang}"
+  url = "#{caption.baseUrl}&tlang=#{tlang}"
 
   # Auto-generated captions often have cues that aren't aligned properly with the video,
   # as well as some other markup that makes it cumbersome, so we try to fix that here
@@ -3329,7 +3335,8 @@ get "/api/v1/captions/:id" do |env|
     caption_xml = client.get(url).body
     caption_xml = XML.parse(caption_xml)
 
-    webvtt = <<-END_VTT
+    webvtt = String.build do |str|
+      str << <<-END_VTT
       WEBVTT
       Kind: captions
       Language: #{tlang || caption.languageCode}
@@ -3359,16 +3366,16 @@ get "/api/v1/captions/:id" do |env|
           text = "<v #{md["name"]}>#{md["text"]}</v>"
         end
 
-      webvtt += <<-END_CUE
+        str << <<-END_CUE
         #{start_time} --> #{end_time}
         #{text}
 
 
         END_CUE
       end
+    end
   else
-    url += "&format=vtt"
+    webvtt = client.get("#{url}&format=vtt").body
-    webvtt = client.get(url).body
   end
 
   if title = env.params.query["title"]?
@@ -4833,43 +4840,6 @@ get "/videoplayback" do |env|
     end
   end
 
-  response = HTTP::Client::Response.new(403)
-  5.times do
-    begin
-      client = make_client(URI.parse(host), region)
-      response = client.head(url, headers)
-      break
-    rescue Socket::Addrinfo::Error
-      if !mns.empty?
-        mn = mns.pop
-      end
-      fvip = "3"
-
-      host = "https://r#{fvip}---#{mn}.googlevideo.com"
-    rescue ex
-    end
-  end
-
-  if response.headers["Location"]?
-    url = URI.parse(response.headers["Location"])
-    host = url.host
-    env.response.headers["Access-Control-Allow-Origin"] = "*"
-
-    url = url.full_path
-    url += "&host=#{host}"
-
-    if region
-      url += "&region=#{region}"
-    end
-
-    next env.redirect url
-  end
-
-  if response.status_code >= 400
-    env.response.status_code = response.status_code
-    next
-  end
-
   if url.includes? "&file=seg.ts"
     if CONFIG.disabled?("livestreams")
       env.response.status_code = 403
@@ -4957,11 +4927,7 @@ get "/videoplayback" do |env|
 
             if location = response.headers["Location"]?
               location = URI.parse(location)
-              location = "#{location.full_path}&host=#{location.host}"
+              location = "#{location.full_path}&host=#{location.host}#{region ? "&region=#{region}" : ""}"
-
-              if region
-                location += "&region=#{region}"
-              end
 
               env.redirect location
               break

src/invidious/helpers/handlers.cr

@@ -159,10 +159,9 @@ class APIHandler < Kemal::Handler
       call_next env
 
       env.response.output.rewind
-      response = env.response.output.gets_to_end
 
-      if env.response.headers["Content-Type"]?.try &.== "application/json"
+      if env.response.headers.includes_word?("Content-Type", "application/json")
-        response = JSON.parse(response)
+        response = JSON.parse(env.response.output)
 
         if fields_text = env.params.query["fields"]?
           begin
@@ -178,6 +177,8 @@ class APIHandler < Kemal::Handler
         else
           response = response.to_json
         end
+      else
+        response = env.response.output.gets_to_end
       end
     rescue ex
     ensure

src/invidious/users.cr

@@ -295,8 +295,7 @@ def get_subscription_feed(db, user, max_results = 40, page = 1)
 
     args = arg_array(notifications)
 
-    notifications = db.query_all("SELECT * FROM channel_videos WHERE id IN (#{args})
+    notifications = db.query_all("SELECT * FROM channel_videos WHERE id IN (#{args}) ORDER BY published DESC", notifications, as: ChannelVideo)
-    ORDER BY published DESC", notifications, as: ChannelVideo)
     videos = [] of ChannelVideo
 
     notifications.sort_by! { |video| video.published }.reverse!
@@ -322,14 +321,11 @@ def get_subscription_feed(db, user, max_results = 40, page = 1)
         else
           values = "VALUES #{user.watched.map { |id| %(('#{id}')) }.join(",")}"
         end
-        videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} WHERE \
+        videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} WHERE NOT id = ANY (#{values}) ORDER BY ucid, published DESC", as: ChannelVideo)
-        NOT id = ANY (#{values}) \
-        ORDER BY ucid, published DESC", as: ChannelVideo)
       else
         # Show latest video from each channel
 
-        videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} \
+        videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} ORDER BY ucid, published DESC", as: ChannelVideo)
-        ORDER BY ucid, published DESC", as: ChannelVideo)
       end
 
       videos.sort_by! { |video| video.published }.reverse!
@@ -342,14 +338,11 @@ def get_subscription_feed(db, user, max_results = 40, page = 1)
         else
           values = "VALUES #{user.watched.map { |id| %(('#{id}')) }.join(",")}"
         end
-        videos = PG_DB.query_all("SELECT * FROM #{view_name} WHERE \
+        videos = PG_DB.query_all("SELECT * FROM #{view_name} WHERE NOT id = ANY (#{values}) ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
-        NOT id = ANY (#{values}) \
-        ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
       else
         # Sort subscriptions as normal
 
-        videos = PG_DB.query_all("SELECT * FROM #{view_name} \
+        videos = PG_DB.query_all("SELECT * FROM #{view_name} ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
-        ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
       end
     end
 
@@ -366,16 +359,11 @@ def get_subscription_feed(db, user, max_results = 40, page = 1)
       videos.sort_by! { |video| video.author }.reverse!
     end
 
-    notifications = PG_DB.query_one("SELECT notifications FROM users WHERE email = $1", user.email,
+    notifications = PG_DB.query_one("SELECT notifications FROM users WHERE email = $1", user.email, as: Array(String))
-      as: Array(String))
 
     notifications = videos.select { |v| notifications.includes? v.id }
     videos = videos - notifications
   end
 
-  if !limit
-    videos = videos[0..max_results]
-  end
-
   return videos, notifications
 end