NerdVPN.de/invidious
1
0
Fork 0
mirror of https://git.nerdvpn.de/NerdVPN.de/invidious synced 2026-02-14 22:51:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update patches to latest upstream

Browse Source
This commit is contained in:
weidenwiesel
2026-02-11 19:16:46 +01:00
parent b464208670
commit a82f24767e
18 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build
+1 -1
Submodule build updated: 84a699f7b7...11db343cfb
patches/invidious/0001-nerdvpn.de-branding.patch
+7 -9
View File
@@ -1,20 +1,19 @@
From e95b4364979bd95ece3ecdbf18f2d60bf3f06a3f Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:23:17 +0100
Subject: [PATCH 01/16] NerdVPN.de branding
Subject: [PATCH 01/18] NerdVPN.de branding
---
src/invidious.cr | 4 ++--
src/invidious/views/template.ecr | 24 +++++++-----------------
2 files changed, 9 insertions(+), 19 deletions(-)
src/invidious/views/template.ecr | 23 +++++++-----------------
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/invidious.cr b/src/invidious.cr
index a61f91a9..52fbca27 100644
index d7c5b80b..dbfe270b 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -81,9 +81,9 @@ REQUEST_HEADERS_WHITELIST = {"accept", "accept-encoding", "cache-control", "con
RESPONSE_HEADERS_BLACKLIST = {"access-control-allow-origin", "alt-svc", "server", "cross-origin-opener-policy-report-only", "report-to", "cross-origin", "timing-allow-origin", "cross-origin-resource-policy"}
HTTP_CHUNK_SIZE = 10485760 # ~10MB
@@ -71,8 +71,8 @@ HOST_URL = make_host_url(Kemal.config)
MAX_ITEMS_PER_PAGE = 1500
-CURRENT_BRANCH = {{ "#{`git branch | sed -n '/* /s///p'`.strip}" }}
+CURRENT_BRANCH = "nerdvpn"
@@ -28,7 +27,7 @@ diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr
index 0e0f2e16..df83aab2 100644
--- a/src/invidious/views/template.ecr
+++ b/src/invidious/views/template.ecr
@@ -143,30 +143,20 @@
@@ -143,30 +143,19 @@
<i class="icon ion-ios-paper"></i>
<a href="/privacy"><%= translate(locale, "View privacy policy.") %></a>
</span>
@@ -36,7 +35,6 @@ index 0e0f2e16..df83aab2 100644
+ <i class="icon ion-ios-paper"></i>
+ <a href="https://nerdvpn.de/terms"><%= translate(locale, "View terms of use.") %></a>
+ </span>
+ </div>
</div>
<div class="pure-u-1 pure-u-md-1-3">
patches/invidious/0002-companion-backend-selector.patch
+17 -4
View File
@@ -1,7 +1,7 @@
From 7d8502bea6019f9c46f0dd50c11bd3db7ee09586 Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Thu, 1 Jan 2026 11:04:43 +0100
Subject: [PATCH 02/16] Companion backend selector
Subject: [PATCH 02/18] Companion backend selector
---
locales/en-US.json | 3 +-
@@ -262,8 +262,20 @@ diff --git a/src/invidious/routes/before_all.cr b/src/invidious/routes/before_al
index 63b935ec..d88a87e0 100644
--- a/src/invidious/routes/before_all.cr
+++ b/src/invidious/routes/before_all.cr
@@ -1,6 +1,9 @@
@@ -1,18 +1,9 @@
module Invidious::Routes::BeforeAll
- struct CompanionCSP
- property companion_urls : String = ""
-
- def initialize
- self.companion_urls = CONFIG.invidious_companion.reject(&.builtin_proxy).map do |companion|
- "#{companion.public_url.scheme}://#{companion.public_url.host}#{companion.public_url.port ? ":#{companion.public_url.port}" : ""}"
- end.join(" ")
- end
- end
-
- private COMPANION_CSP = CompanionCSP.new
-
def self.handle(env)
preferences = Preferences.from_json("{}")
+ host = env.request.headers["Host"]
@@ -338,10 +350,10 @@ index 63b935ec..d88a87e0 100644
- "img-src 'self' data:",
+ "img-src 'self' data: " + "#{scheme}://#{env.request.headers["Host"]?}",
"font-src 'self' data:",
- "connect-src 'self'",
- "connect-src 'self' " + COMPANION_CSP.companion_urls,
+ "connect-src 'self'" + extra_connect_csp,
"manifest-src 'self'",
- "media-src 'self' blob:",
- "media-src 'self' blob: " + COMPANION_CSP.companion_urls,
+ "media-src 'self' blob:" + extra_media_csp,
"child-src 'self' blob:",
"frame-src 'self'",
@@ -672,3 +684,4 @@ index dd709920..aab7a979 100644
--
2.39.5
patches/invidious/0003-hide-feeds-videos-view-count.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From a8ef3fd6a65a34f8488377604ba5bf8799d46dbb Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:27:06 +0100
Subject: [PATCH 03/16] Hide feeds videos view count
Subject: [PATCH 03/18] Hide feeds videos view count
---
src/invidious/views/components/item.ecr | 6 ------
patches/invidious/0004-donation-page.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From 61ed630e0f16af987fb82e8c3baca0b39a656474 Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:27:16 +0100
Subject: [PATCH 04/16] Donation page
Subject: [PATCH 04/18] Donation page
---
src/invidious/routes/misc.cr | 5 +++++
patches/invidious/0005-range-header-improvement.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From 57ce1ebd3bdc7594e41e4bae88fe6d9be5955da9 Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:27:24 +0100
Subject: [PATCH 05/16] Range header improvement
Subject: [PATCH 05/18] Range header improvement
---
assets/js/player.js | 6 ++++++
patches/invidious/0006-redis-for-video-cache.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From 3f19046c4766e145235ec3bde35ecf358cda7a6d Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:27:31 +0100
Subject: [PATCH 06/16] Redis for video cache
Subject: [PATCH 06/18] Redis for video cache
---
shard.lock | 8 ++++++++
patches/invidious/0007-remove-psql-materialized-views.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From 92ed10ab9f917a4de97d877807b36873a4306c41 Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:27:38 +0100
Subject: [PATCH 07/16] Remove PSQL materialized views
Subject: [PATCH 07/18] Remove PSQL materialized views
---
config/migrate-scripts/migrate-db-8bc91ce.sh | 6 ++
patches/invidious/0008-increase-yt-db-pool-timeout.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From 1e8c0c34c45efdd192396476d76b4880d9d9f5eb Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:27:47 +0100
Subject: [PATCH 08/16] Increase YT DB pool timeout
Subject: [PATCH 08/18] Increase YT DB pool timeout
---
src/invidious/yt_backend/connection_pool.cr | 2 +-
patches/invidious/0009-rephrase-yt-api-blocked-error-messages.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From 570adb966fb7966eda66ca8af16ddaa82b58fbf7 Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:27:57 +0100
Subject: [PATCH 09/16] Rephrase YT API/blocked error messages
Subject: [PATCH 09/18] Rephrase YT API/blocked error messages
---
locales/ar.json | 12 +++-
patches/invidious/0010-change-yt-api-error-code-message.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From 2bdbbe7342487ea52bfc91f5fcc23df7bf31b7b4 Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:28:06 +0100
Subject: [PATCH 10/16] Change YT API error code message
Subject: [PATCH 10/18] Change YT API error code message
---
src/invidious/yt_backend/youtube_api.cr | 4 +---
patches/invidious/0011-hide-shorts-feature.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From f87057ba75d3aa215982a7f0138b91797e870c9a Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:28:15 +0100
Subject: [PATCH 11/16] Hide shorts feature
Subject: [PATCH 11/18] Hide shorts feature
---
locales/ar.json | 1 +
patches/invidious/0012-add-feed-menu-to-all-pages.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From 6debc8c29457d67ee0c75ecab40d189ce4f0549a Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:28:23 +0100
Subject: [PATCH 12/16] Add feed menu to all pages
Subject: [PATCH 12/18] Add feed menu to all pages
---
src/invidious/views/channel.ecr | 2 ++
patches/invidious/0013-backends-health-status-page.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From 0cf0f1aeb0d3e9c8194174c2e7d4a3564a975238 Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:28:32 +0100
Subject: [PATCH 13/16] Backends health status page
Subject: [PATCH 13/18] Backends health status page
---
src/invidious/config.cr | 4 ++++
patches/invidious/0014-disable-unhealthy-backends.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From c3b9b658ce485afff913fc0383d652aeb52041bd Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:28:39 +0100
Subject: [PATCH 14/16] Disable unhealthy backends
Subject: [PATCH 14/18] Disable unhealthy backends
---
src/invidious/views/template.ecr | 21 +++++++++++++--------
patches/invidious/0015-force-local-proxy.patch
+2 -1
View File
@@ -1,7 +1,7 @@
From 15ecda80bd6c5b1c2c986a8c06bc00fd2d20dd48 Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:28:46 +0100
Subject: [PATCH 15/16] Force local proxy
Subject: [PATCH 15/18] Force local proxy
---
src/invidious/config.cr | 1 +
@@ -82,3 +82,4 @@ index 09651a14..64e93852 100644
--
2.39.5
patches/invidious/0016-change-dash-quality-levels.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From cebaeafcd661c730953067ef48457be3e26967a7 Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:28:56 +0100
Subject: [PATCH 16/16] Change DASH quality levels
Subject: [PATCH 16/18] Change DASH quality levels
---
src/invidious/views/user/preferences.ecr | 4 ++--
patches/invidious/0017-disable-livestreams.patch
+1 -1
View File
@@ -1,7 +1,7 @@
From cebaeafcd661c730953067ef48457be3e26967a7 Mon Sep 17 00:00:00 2001
From: weidenwiesel <webmaster@nerdvpn.de>
Date: Sat, 20 Dec 2025 11:28:56 +0100
Subject: [PATCH 17/17] Remove livestreams
Subject: [PATCH 17/18] Remove livestreams
---
src/invidious/routes/watch.cr | 4 ++++