mirror of
https://github.com/iv-org/invidious.git
synced 2026-07-07 14:16:45 -05:00
Merge branch 'master' into optional-disable-api-features
This commit is contained in:
commit
669c685d5e
@ -86,7 +86,7 @@ jobs:
|
|||||||
|
|
||||||
# https://github.com/marketplace/actions/docker-manifest-create-action
|
# https://github.com/marketplace/actions/docker-manifest-create-action
|
||||||
- name: Create and push manifest
|
- name: Create and push manifest
|
||||||
uses: int128/docker-manifest-create-action@v2.20.0
|
uses: int128/docker-manifest-create-action@v2.21.0
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: quay.io/invidious/invidious:master
|
tags: quay.io/invidious/invidious:master
|
||||||
|
|||||||
2
.github/workflows/build-stable-container.yml
vendored
2
.github/workflows/build-stable-container.yml
vendored
@ -78,7 +78,7 @@ jobs:
|
|||||||
|
|
||||||
# https://github.com/marketplace/actions/docker-manifest-create-action
|
# https://github.com/marketplace/actions/docker-manifest-create-action
|
||||||
- name: Create and push manifest
|
- name: Create and push manifest
|
||||||
uses: int128/docker-manifest-create-action@v2.20.0
|
uses: int128/docker-manifest-create-action@v2.21.0
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: quay.io/invidious/invidious:latest
|
tags: quay.io/invidious/invidious:latest
|
||||||
|
|||||||
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -44,7 +44,7 @@ jobs:
|
|||||||
- 1.17.1
|
- 1.17.1
|
||||||
- 1.18.2
|
- 1.18.2
|
||||||
- 1.19.2
|
- 1.19.2
|
||||||
- 1.20.1
|
- 1.20.2
|
||||||
include:
|
include:
|
||||||
- crystal: nightly
|
- crystal: nightly
|
||||||
stable: false
|
stable: false
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
# https://github.com/openssl/openssl/releases/tag/openssl-3.5.2
|
# https://github.com/openssl/openssl/releases/tag/openssl-3.6.2
|
||||||
ARG OPENSSL_VERSION='3.5.2'
|
ARG OPENSSL_VERSION='3.6.2'
|
||||||
ARG OPENSSL_SHA256='c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec'
|
ARG OPENSSL_SHA256='aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f'
|
||||||
|
|
||||||
FROM crystallang/crystal:1.20.1-alpine AS dependabot-crystal
|
FROM crystallang/crystal:1.20.2-alpine AS dependabot-crystal
|
||||||
|
|
||||||
# We compile openssl ourselves due to a memory leak in how crystal interacts
|
# We compile openssl ourselves due to a memory leak in how crystal interacts
|
||||||
# with openssl
|
# with openssl
|
||||||
|
|||||||
@ -125,7 +125,7 @@ we're going to need to do it here in order to allow for translations.
|
|||||||
end
|
end
|
||||||
-%>
|
-%>
|
||||||
<a id="link-yt-watch" rel="noreferrer noopener" data-base-url="<%= link_yt_watch %>" href="<%= link_yt_watch %>"><%= I18n.translate(locale, "videoinfo_watch_on_youTube") %></a>
|
<a id="link-yt-watch" rel="noreferrer noopener" data-base-url="<%= link_yt_watch %>" href="<%= link_yt_watch %>"><%= I18n.translate(locale, "videoinfo_watch_on_youTube") %></a>
|
||||||
(<a id="link-yt-embed" rel="noopener" data-base-url="<%= link_yt_embed %>" href="<%= link_yt_embed %>"><%= I18n.translate(locale, "videoinfo_youTube_embed_link") %></a>)
|
(<a id="link-yt-embed" referrerpolicy="origin-when-cross-origin" rel="noopener" data-base-url="<%= link_yt_embed %>" href="<%= link_yt_embed %>"><%= I18n.translate(locale, "videoinfo_youTube_embed_link") %></a>)
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<p id="watch-on-another-invidious-instance">
|
<p id="watch-on-another-invidious-instance">
|
||||||
|
|||||||
@ -650,9 +650,8 @@ private module Parsers
|
|||||||
private def parse_internal(item_contents, author_fallback)
|
private def parse_internal(item_contents, author_fallback)
|
||||||
playlist_id = item_contents["contentId"].as_s
|
playlist_id = item_contents["contentId"].as_s
|
||||||
|
|
||||||
thumbnail_view_model = item_contents.dig?(
|
thumbnail_view_model = item_contents.dig(
|
||||||
"contentImage", "collectionThumbnailViewModel",
|
"contentImage", "thumbnailViewModel"
|
||||||
"primaryThumbnail", "thumbnailViewModel"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
return nil if thumbnail_view_model.nil?
|
return nil if thumbnail_view_model.nil?
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user