Merge remote-tracking branch 'upstream'

docker/Dockerfile.arm64

@@ -2,7 +2,7 @@
 ARG OPENSSL_VERSION='3.5.2'
 ARG OPENSSL_SHA256='c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec'
 
-FROM alpine:3.23 AS dependabot-alpine
+FROM alpine:3.22 AS dependabot-alpine
 
 # We compile openssl ourselves due to a memory leak in how crystal interacts
 # with openssl
@@ -21,7 +21,7 @@ RUN tar -xzvf openssl-${OPENSSL_VERSION}.tar.gz
 RUN cd openssl-${OPENSSL_VERSION} && ./Configure --openssldir=/etc/ssl && make -j$(nproc)
 
 FROM dependabot-alpine AS builder
-RUN apk add --no-cache 'crystal=1.18.2-r0' shards \
+RUN apk add --no-cache 'crystal=1.16.3-r0' shards \
         sqlite-static yaml-static yaml-dev \
         pcre2-static gc-static \
         libxml2-static zlib-static \
@@ -63,7 +63,7 @@ RUN --mount=type=cache,target=/root/.cache/crystal if [[ "${release}" == 1 ]] ;
         --link-flags "-lxml2 -llzma"; \
     fi
 
-FROM alpine:3.23
+FROM alpine:3.22
 RUN apk add --no-cache rsvg-convert ttf-opensans tini tzdata
 WORKDIR /invidious
 RUN addgroup -g 1000 -S invidious && \

src/invidious/routes/companion.cr

@@ -37,7 +37,6 @@ module Invidious::Routes::Companion
     end
   end
 
-
   def self.options_companion(env)
     current_companion = env.get("current_companion").as(Int32)
 

src/invidious/views/components/player.ecr

@@ -1,3 +1,6 @@
+<%
+    invidious_companion_check_id = invidious_companion_encrypt(video.id) if invidious_companion
+%>
 <video style="outline:none;width:100%;background-color:#000" playsinline poster="<%= thumbnail %>"
     id="player" class="on-video_player video-js player-style-<%= params.player_style %>"
     preload="<% if params.preload %>auto<% else %>none<% end %>"
@@ -24,7 +27,7 @@
                 src_url += "&local=true" if params.local
                 companion_public_url = env.get("companion_public_url").as(String)
                 src_url = companion_public_url + src_url + 
-                            "&check=#{invidious_companion_encrypt(video.id)}" if (invidious_companion)
+                            "&check=#{invidious_companion_check_id}" if (invidious_companion)
 
                 bitrate = fmt["bitrate"]
                 mimetype = HTML.escape(fmt["mimeType"].as_s)
@@ -41,7 +44,7 @@
                src_url = "/api/manifest/dash/id/" + video.id + "?local=true&unique_res=1"
                companion_public_url = env.get("companion_public_url").as(String)
                src_url = companion_public_url + src_url +
-                            "&check=#{invidious_companion_encrypt(video.id)}" if (invidious_companion)
+                            "&check=#{invidious_companion_check_id}" if (invidious_companion)
             %>
                 <source src="<%= src_url %>" type='application/dash+xml' label="dash">
             <% end %>
@@ -54,7 +57,7 @@
                 src_url += "&local=true" if params.local
                 companion_public_url = env.get("companion_public_url").as(String)
                 src_url = companion_public_url + src_url +
-                            "&check=#{invidious_companion_encrypt(video.id)}" if (invidious_companion)
+                            "&check=#{invidious_companion_check_id}" if (invidious_companion)
 
                 quality = fmt["quality"]
                 mimetype = HTML.escape(fmt["mimeType"].as_s)
@@ -71,15 +74,17 @@
         <% preferred_captions.each do |caption|
             api_captions_url = "/api/v1/captions/"
             api_captions_url = invidious_companion.public_url.to_s + api_captions_url if (invidious_companion)
+            api_captions_check_id = "&check=#{invidious_companion_check_id}"
         %>
-            <track kind="captions" src="<%= api_captions_url %><%= video.id %>?label=<%= caption.name %>" label="<%= caption.name %>">
+            <track kind="captions" src="<%= api_captions_url %><%= video.id %>?label=<%= caption.name %><%= api_captions_check_id %>" label="<%= caption.name %>">
         <% end %>
 
         <% captions.each do |caption|
             api_captions_url = "/api/v1/captions/"
             api_captions_url = invidious_companion.public_url.to_s + api_captions_url if (invidious_companion)
+            api_captions_check_id = "&check=#{invidious_companion_check_id}"
         %>
-            <track kind="captions" src="<%= api_captions_url %><%= video.id %>?label=<%= caption.name %>" label="<%= caption.name %>">
+            <track kind="captions" src="<%= api_captions_url %><%= video.id %>?label=<%= caption.name %><%= api_captions_check_id %>" label="<%= caption.name %>">
         <% end %>
     <% end %>
 </video>