Update CI

To support OpenGraph clients like Discord and other platforms able to
pull the video from the OpenGraph metadata.

.forgejo/workflows/ci.yml

@@ -37,13 +37,15 @@ jobs:
           type=sha,format=short,prefix={{date 'YYYY.MM.DD'}}-,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
           type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
 
-    - uses: https://code.forgejo.org/docker/build-push-action@v5
+    - uses: https://code.forgejo.org/docker/build-push-action@v6
       name: Build images
       with:
         context: .
         file: docker/Dockerfile
         tags: ${{ steps.meta.outputs.tags }}
         platforms: linux/amd64
+        # cache-from: type=gha
+        # cache-to: type=gha,mode=max
         push: true
         build-args: |
           "release=1"

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM crystallang/crystal:1.12.1-alpine AS builder
+FROM crystallang/crystal:1.14.0-alpine AS builder
 
 RUN apk add --no-cache sqlite-static yaml-static
 

src/invidious/channels/videos.cr

@@ -23,6 +23,22 @@ def produce_channel_content_continuation(ucid, content_type, page = 1, auto_gene
     else                    15 # Fallback to "videos"
     end
 
+  sort_type_numerical =
+    case content_type
+    when "videos"      then 3
+    when "livestreams" then 5
+    else                    3 # Fallback to "videos"
+    end
+
+  if content_type == "livestreams"
+    sort_by_numerical =
+      case sort_by
+      when "newest"  then 12_i64
+      when "popular" then 14_i64
+      when "oldest"  then 13_i64
+      else                12_i64 # Fallback to "newest"
+      end
+  else
     sort_by_numerical =
       case sort_by
       when "newest"  then 1_i64
@@ -30,6 +46,7 @@ def produce_channel_content_continuation(ucid, content_type, page = 1, auto_gene
       when "oldest"  then 4_i64
       else                1_i64 # Fallback to "newest"
       end
+  end
 
   object_inner_1 = {
     "110:embedded" => {
@@ -41,7 +58,7 @@ def produce_channel_content_continuation(ucid, content_type, page = 1, auto_gene
           "2:embedded" => {
             "1:string" => "00000000-0000-0000-0000-000000000000",
           },
-          "3:varint" => sort_by_numerical,
+          "#{sort_type_numerical}:varint" => sort_by_numerical,
         },
       },
     },

src/invidious/helpers/redis_tokens.cr

@@ -6,9 +6,14 @@ module Tokens
   def refresh_tokens
     @@po_token = REDIS_DB.get("invidious:po_token")
     @@visitor_data = REDIS_DB.get("invidious:visitor_data")
-    LOGGER.debug("RefreshTokens: Tokens are:")
-    LOGGER.debug("RefreshTokens: po_token: #{@@po_token}")
-    LOGGER.debug("RefreshTokens: visitor_data: #{@@visitor_data}")
+	if !@@po_token.nil? && !@@visitor_data.nil?
+		LOGGER.debug("RefreshTokens: Successfully updated tokens")
+	else
+		LOGGER.warn("RefreshTokens: Tokens are empty!")
+	end
+    LOGGER.trace("RefreshTokens: Tokens are:")
+    LOGGER.trace("RefreshTokens: po_token: #{@@po_token}")
+    LOGGER.trace("RefreshTokens: visitor_data: #{@@visitor_data}")
   end
 
   def get_tokens

src/invidious/http_server/utils.cr

@@ -4,51 +4,28 @@ module Invidious::HttpServer
   module Utils
     extend self
 
-    @@proxy_list : Array(String) = [] of String
-    @@current_proxy : String = ""
-    @@count : Int64 = Time.utc.to_unix
+    @@proxy_alive : String = ""
 
     def check_external_proxy
       CONFIG.external_videoplayback_proxy.each do |proxy|
         begin
           response = HTTP::Client.get("#{proxy[:url]}/health")
           if response.status_code == 200
-            if @@proxy_list.includes?(proxy[:url])
-              next
-            end
-            if proxy[:balance]
-              @@proxy_list << proxy[:url]
-              LOGGER.debug("CheckExternalProxy: Adding proxy '#{proxy[:url]}' to the list of proxies")
-            end
-            break if proxy[:balance] == false && !@@proxy_list.empty?
-            @@proxy_list << proxy[:url]
+            @@proxy_alive = proxy[:url]
+            LOGGER.debug("CheckExternalProxy: Proxy set to: '#{proxy[:url]}'")
+            break
           end
         rescue
-          if @@proxy_list.includes?(proxy[:url])
-            LOGGER.debug("CheckExternalProxy: Proxy '#{proxy[:url]}' is not available, removing it from the list of proxies")
-            @@proxy_list.delete(proxy[:url])
-          end
           LOGGER.debug("CheckExternalProxy: Proxy '#{proxy[:url]}' is not available")
         end
       end
-      LOGGER.trace("CheckExternalProxy: List of proxies:")
-      LOGGER.trace("#{@@proxy_list.inspect}")
-    end
-
-    # TODO: If the function is called many times, it will return a random
-    # proxy from the list. That is not how it should be.
-    # It should return the same proxy, in multiple function calls
-    def select_proxy
-      if (@@count - (Time.utc.to_unix - 30)) <= 0
-        return if @@proxy_list.size <= 0
-        @@current_proxy = @@proxy_list[Random.rand(@@proxy_list.size)]
-        LOGGER.debug("Current proxy is: '#{@@current_proxy}'")
-        @@count = Time.utc.to_unix
+	  if @@proxy_alive.empty?
+		LOGGER.warn("CheckExternalProxy: No proxies alive! Using own server proxy")
 	  end
     end
 
     def get_external_proxy
-      return @@current_proxy
+      return @@proxy_alive
     end
 
     def proxy_video_url(raw_url : String, *, region : String? = nil, absolute : Bool = false)
@@ -61,8 +38,8 @@ module Invidious::HttpServer
       url.query_params = params
 
       if absolute
-        if !(proxy = get_external_proxy()).empty?
-          return "#{proxy}#{url.request_target}"
+        if !@@proxy_alive.empty?
+          return "#{@@proxy_alive}#{url.request_target}"
         else
           return "#{HOST_URL}#{url.request_target}"
         end

src/invidious/jobs/check_external_proxy.cr

@@ -5,9 +5,8 @@ class Invidious::Jobs::CheckExternalProxy < Invidious::Jobs::BaseJob
   def begin
     loop do
       HttpServer::Utils.check_external_proxy
-      HttpServer::Utils.select_proxy
-      LOGGER.info("CheckExternalProxy: Done, sleeping for 15 seconds")
-      sleep 15.seconds
+      LOGGER.info("CheckExternalProxy: Done, sleeping for 10 seconds")
+      sleep 10.seconds
       Fiber.yield
     end
   end

src/invidious/routes/watch.cr

@@ -152,6 +152,7 @@ module Invidious::Routes::Watch
       end
     end
 
+	# Removes non default audio tracks
     audio_streams.reject! do |z|
       z if z.dig?("audioTrack", "audioIsDefault") == false
     end
@@ -218,6 +219,12 @@ module Invidious::Routes::Watch
       captions: video.captions
     )
 
+	begin 
+		video_url = fmt_stream[0]["url"].to_s
+	rescue
+		video_url = nil
+	end
+
     templated "watch"
   end
 

src/invidious/views/watch.ecr

@@ -13,11 +13,13 @@
 <meta property="og:image" content="<%= HOST_URL %>/vi/<%= video.id %>/maxres.jpg">
 <meta property="og:description" content="<%= HTML.escape(video.short_description) %>">
 <meta property="og:type" content="video.other">
-<meta property="og:video:url" content="<%= HOST_URL %>/embed/<%= video.id %>">
-<meta property="og:video:secure_url" content="<%= HOST_URL %>/embed/<%= video.id %>">
-<meta property="og:video:type" content="text/html">
-<meta property="og:video:width" content="1280">
-<meta property="og:video:height" content="720">
+<!-- This shouldn't be empty, ever. -->
+<meta property="og:video" content="<%= video_url %>"> 
+<meta property="og:video:url" content="<%= video_url %>">
+<meta property="og:video:secure_url" content="<%= video_url %>">
+<meta property="og:video:type" content="video/mp4">
+<meta property="og:video:width" content="640">
+<meta property="og:video:height" content="360">
 <meta name="twitter:card" content="player">
 <meta name="twitter:url" content="<%= HOST_URL %>/watch?v=<%= video.id %>">
 <meta name="twitter:title" content="<%= title %>">