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,14 +23,31 @@ def produce_channel_content_continuation(ucid, content_type, page = 1, auto_gene
     else                    15 # Fallback to "videos"
     end
 
-  sort_by_numerical =
+  sort_type_numerical =
-    case sort_by
+    case content_type
-    when "newest"  then 1_i64
+    when "videos"      then 3
-    when "popular" then 2_i64
+    when "livestreams" then 5
-    when "oldest"  then 4_i64
+    else                    3 # Fallback to "videos"
-    else                1_i64 # Fallback to "newest"
     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
+      when "popular" then 2_i64
+      when "oldest"  then 4_i64
+      else                1_i64 # Fallback to "newest"
+      end
+  end
+
   object_inner_1 = {
     "110:embedded" => {
       "3: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/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 %>">
+<!-- This shouldn't be empty, ever. -->
-<meta property="og:video:secure_url" content="<%= HOST_URL %>/embed/<%= video.id %>">
+<meta property="og:video" content="<%= video_url %>"> 
-<meta property="og:video:type" content="text/html">
+<meta property="og:video:url" content="<%= video_url %>">
-<meta property="og:video:width" content="1280">
+<meta property="og:video:secure_url" content="<%= video_url %>">
-<meta property="og:video:height" content="720">
+<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 %>">