Various small rewording

Various minor enhancements
Update AI_POLICY.md
2026-06-29 20:03:18 +05:30 · 2026-06-28 23:52:02 +02:00 · 2026-06-28 20:53:34 +02:00 · 2026-06-28 18:36:36 +02:00 · 2026-06-28 17:23:33 +02:00 · 2026-06-28 17:22:34 +02:00
118 changed files with 2705 additions and 2199 deletions
@@ -29,20 +29,20 @@ jobs:
          - os: ubuntu-24.04-arm
            platform: linux/arm64/v8
            name: "ARM64"
-            dockerfile: "docker/Dockerfile.arm64"
+            dockerfile: "docker/Dockerfile"
            tag_suffix: "-arm64"

    runs-on: ${{ matrix.os }}

    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4

      - name: Login to registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: quay.io
          username: ${{ secrets.QUAY_USERNAME }}
@@ -50,7 +50,7 @@ jobs:

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: quay.io/invidious/invidious
          flavor: |
@@ -62,13 +62,34 @@ jobs:
            quay.expires-after=12w

      - name: Build and push Docker ${{ matrix.name }} image for Push Event
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          context: .
-          file:  ${{ matrix.dockerfile }}
+          file: ${{ matrix.dockerfile }}
          platforms: ${{ matrix.platform }}
          labels: ${{ steps.meta.outputs.labels }}
          push: true
          tags: ${{ steps.meta.outputs.tags }}
          build-args: |
            "release=1"
+
+  combine-multiarch-images:
+    needs: release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to registry
+        uses: docker/login-action@v4
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+
+      # https://github.com/marketplace/actions/docker-manifest-create-action
+      - name: Create and push manifest
+        uses: int128/docker-manifest-create-action@v2.22.0
+        with:
+          push: true
+          tags: quay.io/invidious/invidious:master
+          sources: |
+            quay.io/invidious/invidious:master
+            quay.io/invidious/invidious:master-arm64
@@ -20,20 +20,20 @@ jobs:
          - os: ubuntu-24.04-arm
            platform: linux/arm64/v8
            name: "ARM64"
-            dockerfile: "docker/Dockerfile.arm64"
+            dockerfile: "docker/Dockerfile"
            tag_suffix: "-arm64"

    runs-on: ${{ matrix.os }}

    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4

      - name: Login to registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: quay.io
          username: ${{ secrets.QUAY_USERNAME }}
@@ -41,7 +41,7 @@ jobs:

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: quay.io/invidious/invidious
          flavor: |
@@ -54,13 +54,34 @@ jobs:
            quay.expires-after=12w

      - name: Build and push Docker ${{ matrix.name }} image for Push Event
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          context: .
-          file:  ${{ matrix.dockerfile }}
+          file: ${{ matrix.dockerfile }}
          platforms: ${{ matrix.platform }}
          labels: ${{ steps.meta.outputs.labels }}
          push: true
          tags: ${{ steps.meta.outputs.tags }}
          build-args: |
            "release=1"
+
+  combine-multiarch-images:
+    needs: release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to registry
+        uses: docker/login-action@v4
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+
+      # https://github.com/marketplace/actions/docker-manifest-create-action
+      - name: Create and push manifest
+        uses: int128/docker-manifest-create-action@v2.22.0
+        with:
+          push: true
+          tags: quay.io/invidious/invidious:latest
+          sources: |
+            quay.io/invidious/invidious:latest
+            quay.io/invidious/invidious:latest-arm64
@@ -38,17 +38,19 @@ jobs:
      matrix:
        stable: [true]
        crystal:
-          - 1.12.2
-          - 1.13.3
          - 1.14.1
          - 1.15.1
          - 1.16.3
+          - 1.17.1
+          - 1.18.2
+          - 1.19.2
+          - 1.20.2
        include:
          - crystal: nightly
            stable: false

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
        with:
          submodules: true

@@ -58,12 +60,12 @@ jobs:
        shell: bash

      - name: Install Crystal
-        uses: crystal-lang/install-crystal@v1.8.2
+        uses: crystal-lang/install-crystal@v1.9.2
        with:
          crystal: ${{ matrix.crystal }}

      - name: Cache Shards
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        with:
          path: |
            ./lib
@@ -80,7 +82,7 @@ jobs:
        run: crystal spec

      - name: Build
-        run: crystal build --warnings all --error-on-warnings --error-trace src/invidious.cr
+        run: crystal build --warnings all --error-on-warnings --stats --time --progress --error-trace src/invidious.cr

  build-docker:
    strategy:
@@ -96,11 +98,7 @@ jobs:
    runs-on: ${{ matrix.os }}

    steps:
-      - uses: actions/checkout@v5
-
-      - name: Use ARM64 Dockerfile if ARM64
-        if: ${{ matrix.name == 'ARM64' }}
-        run: sed -i 's/Dockerfile/Dockerfile.arm64/' docker-compose.yml
+      - uses: actions/checkout@v6

      - name: Build Docker
        run: docker compose build
@@ -128,18 +126,18 @@ jobs:
    continue-on-error: true

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
        with:
          submodules: true

      - name: Install Crystal
        id: lint_step_install_crystal
-        uses: crystal-lang/install-crystal@v1.8.2
+        uses: crystal-lang/install-crystal@v1.9.2
        with:
          crystal: latest

      - name: Cache Shards
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        with:
          path: |
            ./lib
@@ -0,0 +1,36 @@
+Invidious is and has always been made by human first and foremost. However, things have changed recently with the rise of AI.
+
+This document is going to explain everything that you need to know if you ever contribute in any way to Invidious using any kind of AI.
+
+This document has been fully written, from scratch, by a Human.
+
+
+# Motivation
+
+Invidious is written in an obscure language: Crystal.
+
+Because it is obscure the number of people knowing it is really low.
+
+Invidious is the biggest Crystal project that exists, bigger than Crystal itself [(yes, seriously)](https://shards.info/).
+
+The problem of being the biggest software in an obscure language is that you're often effectively the first project to encounter a problem and because it's an obscure language, not a lot of libraries exist to make it easier for you, meaning, you usually have to make everything you need yourself.
+
+This makes it so working on Invidious far harder than working on most open source projects because you are effectively not benefiting and not using any external libraries for the vast majority of things. Almost any time you need anything, you have to make it yourself, which overcomplicates everything.
+
+We are aware that some people wont like this change and we might even end up on one of the "bad people" list, but we try to be reasonable. We ask that you, please, do not fork the project out of spite because of this new policy - let's not split the thin list of people able to contribute even thinner. Contributions are welcome and highly preferred to anything made by AI.
+
+This policy comes from a place of *need* not from a place of *choice*.
+
+
+# Policy
+
+
+Now that AIs exists and have become *reasonably good*, we will tolerate people using them with reasons and knowledge, as long those rules are respected:
+
+
+- **Any one using AI to report bugs or submit code MUST properly disclose it, this includes mentioning the name of the EXACT model used and the tools used to interact with it.**
+- The Human using AI MUST properly check the output manually in addition to any automated check that may exist or may have been created, **this includes BOTH codes AND bug reports**.
+- Any code submitted by a Human, written even partially by AI, is the responsibility of this Human - If it's malicious, broken, destructive or anything bad, the Human is the sole responsible. 
+- Any new code touching any of the actual functions of Invidious MUST BE thoroughly tested by the Human MANUALLY.
+- Team members using AIs are strongly encouraged to wait for the review of another Human before merging anything.
+- At any point [Human-in-the-loop](https://en.wikipedia.org/wiki/Human-in-the-loop) applies.
@@ -2,6 +2,183 @@

 ## vX.Y.0 (future)

+## v2.20260626.0
+
+### Wrap-up
+
+This release hardens playlists, channels, and search, adds a privacy option for searches, and modernizes the packaging and CI pipeline.
+
+Searches can now be submitted via `POST` so queries do not leak into server logs or browser history, Invidious cookies work across alternative domains, and "Watch on YouTube" / embed redirects use the correct timestamp and host. Playlist and channel parsing issues got fixed: outdated playlist parsing that hid all videos, paid course videos breaking imports, RSS feeds exposing private playlists without auth, broken author verification badges, and channel videos/playlists not loading from search. Thumbnail paths `/pl_c` / `/tvfilm_banner` are now supported, YouTube comments that were written in Japanese, Chinese, Korean and probably other languages do not longer swallows the last character when an emoji is present in the comment, and the search filters dropped the deprecated "sort by rating/date" options.
+
+Packaging moves Docker builds to the 84codes Crystal compiler image, updates OpenSSL to 3.6.2 and Crystal to 1.20.x in OCI, bumps Alpine to 3.24, and unifies the ARM64 and AMD64 Dockerfiles. Developers benefit from continued encapsulation of constants/helpers/translation/video-parser logic into dedicated modules, an `api/v1/channels.cr` lint pass, trailing-whitespace cleanup, and a sweep of dependency and GitHub Actions bumps.
+
+### New features & important changes
+#### For Users
+  - Searches can be submitted through `POST` requests so queries stay out of URLs, server logs and browser history (#5551)
+  - Invidious cookies are honoured across alternative configured domains (#5647)
+  - Embed and "Watch on YouTube" redirects use the correct `t`/`start` parameter and the `www.youtube.com` host consistently (#5660, #5768)
+  - The `referrerpolicy`/`noreferrer` handling was corrected now that YouTube requires referrers on embeds (#5642)
+  - The listen button on the title updates its elapsed time, and the deprecated "sort by rating/date" search filter options were removed (#5625, #5629)
+
+#### For instance owners
+  - Docker builds switched to the 84codes Crystal compiler container image, and OCI images were updated to Crystal 1.20.x with OpenSSL 3.6.2 (#5473, #5692)
+  - Alpine was bumped to 3.24 in the Docker image (#5778)
+  - ARM64 and AMD64 Dockerfiles were unified into a single workflow (#5700)
+
+#### For developers
+  - Constants and functions were encapsulated into dedicated `I18n`, `Helpers`, `Invidious::Videos::Parser` and `Invidious::Videos::Clip` modules (#5637, #5639, #5745)
+  - `api/v1/channels.cr` received a lint pass and trailing whitespaces were removed from the codebase (#5693, #5634)
+  - CI bumped the Crystal version matrix and displayed compile progress/stats, and the `crystal-lang/install-crystal` action was updated (#5691, #5696, #5703, #5686)
+
+### Bugs fixed
+#### User-side
+  - Playlists showed no videos because of outdated playlist parsing; this is fixed along with paid course videos breaking the importer (#5774, #5207)
+  - Private Invidious playlists were reachable through RSS feeds without authentication (#5776)
+  - Channel videos and playlists failed to load from search, and channel author verification was broken (#5736, #5751)
+  - A missing `collectionThumbnailViewModel` hash key crashed channel browsing (#5725)
+  - The `quality=medium` query parameter was appended to videos about to premiere (#5755)
+  - YouTube/Invidious links did not rewind their timestamp when playback position was rewound (#5601)
+  - The last character of a comment was lost when the comment contained emoji (#5587)
+  - Playlist RSS `watch` URLs only joined params with `&` when params were present, and thumbnail paths `/pl_c` and `/tvfilm_banner` are now supported (#5646, #5742)
+
+#### For instance owners
+  - Docker/OCI builds keep current with Crystal 1.20.1, OpenSSL 3.6.2, Alpine 3.24 and the unified multi-arch Dockerfile (#5703, #5701, #5778, #5700)
+
+#### For developers
+  - Dependency and GitHub Actions bumps kept CI current: `docker/login-action`, `build-push-action`, `metadata-action`, `setup-buildx-action`, `int128/docker-manifest-create-action` and `crystal-lang/install-crystal` (#5705, #5766, #5721, #5686, #5661, #5662, #5663, #5664)
+
+### Full list of pull requests merged since the last release (newest first)
+
+* fix: fix playlists not showing any videos due to outdated playlist parsing (https://github.com/iv-org/invidious/pull/5774, by @Fijxu)
+* chore(deps): bump alpine from 3.23 to 3.24 in /docker (https://github.com/iv-org/invidious/pull/5778, by @dependabot[bot])
+* fix: fix private invidious playlists on rss feeds from being fetched without authentication (https://github.com/iv-org/invidious/pull/5776, by @Fijxu)
+* Use "www.youtube.com" consistently (https://github.com/iv-org/invidious/pull/5768, by @janmoesen)
+* chore(deps): bump int128/docker-manifest-create-action from 2.21.0 to 2.22.0 (https://github.com/iv-org/invidious/pull/5766, by @dependabot[bot])
+* Add support for alternative domains for Invidious cookies (https://github.com/iv-org/invidious/pull/5647, by @Fijxu)
+* Only include '&' if params are present in `watch` urls for playlist RSS (https://github.com/iv-org/invidious/pull/5646, by @Fijxu)
+* Dockerfile: Switch to 84codes crystal compiler container image (https://github.com/iv-org/invidious/pull/5473, by @Fijxu)
+* fix: Do not append query params `quality=medium` to videos that are about to premiere (https://github.com/iv-org/invidious/pull/5755, by @Fijxu)
+* Fix Youtube and Invidious links not rewinding their time when video playback position is rewound (https://github.com/iv-org/invidious/pull/5601, by @Fijxu)
+* feat: Add support for POST requests on searches for privacy (https://github.com/iv-org/invidious/pull/5551, by @Fijxu)
+* Fix last character disappearance if emoji are in comment (https://github.com/iv-org/invidious/pull/5587, by @shiny-comic)
+* Encapsulate videos parser and clip functions inside it's own `Invidious::Videos::Parser` and `Invidious::Videos::Clip` module (https://github.com/iv-org/invidious/pull/5745, by @Fijxu)
+* fix: fix author verification in channels (https://github.com/iv-org/invidious/pull/5751, by @Fijxu)
+* Add support for `/pl_c` and `/tvfilm_banner` paths (thumbnails used in some playlists) (https://github.com/iv-org/invidious/pull/5742, by @Fijxu)
+* fix: fix channel videos and playlists on searches (https://github.com/iv-org/invidious/pull/5736, by @Fijxu)
+* fix: fix `Missing hash key: "collectionThumbnailViewModel"` (https://github.com/iv-org/invidious/pull/5725, by @Fijxu)
+* chore(deps): bump int128/docker-manifest-create-action from 2.20.0 to 2.21.0 (https://github.com/iv-org/invidious/pull/5721, by @dependabot[bot])
+* chore: update openssl to 3.6.2 in OCI (https://github.com/iv-org/invidious/pull/5701, by @Fijxu)
+* Bump int128/docker-manifest-create-action from 2.19.0 to 2.20.0 (https://github.com/iv-org/invidious/pull/5705, by @dependabot[bot])
+* CI: Unify ARM64 and AMD64 Dockerfiles (https://github.com/iv-org/invidious/pull/5700, by @Fijxu)
+* CI: update Crystal 1.20.0 to 1.20.1 in ci.yml matrix (https://github.com/iv-org/invidious/pull/5703, by @Fijxu)
+* CI: display progress and stats when compiling Invidious in ci.yml matrix (https://github.com/iv-org/invidious/pull/5696, by @Fijxu)
+* CI: Bump Crystal version matrix (https://github.com/iv-org/invidious/pull/5691, by @Fijxu)
+* chore: update Crystal to 1.20.0 in OCI (https://github.com/iv-org/invidious/pull/5692, by @Fijxu)
+* player: Use correct time parameter for YouTube embed redirects (https://github.com/iv-org/invidious/pull/5660, by @radmorecameron)
+* chore: lint api/v1/channels.cr (https://github.com/iv-org/invidious/pull/5693, by @Fijxu)
+* Encapsulate helpers constants and functions inside it's own `Helpers` module (https://github.com/iv-org/invidious/pull/5639, by @Fijxu)
+* Encapsulate translation constants and functions inside it's own `I18n` module (https://github.com/iv-org/invidious/pull/5637, by @Fijxu)
+* Bump crystal-lang/install-crystal from 1.9.1 to 1.9.2 (https://github.com/iv-org/invidious/pull/5686, by @dependabot[bot])
+* Playlists: fix parsing error when some videos are paid for in a course (https://github.com/iv-org/invidious/pull/5207, by @ChunkyProgrammer)
+* Bump docker/login-action from 3 to 4 (https://github.com/iv-org/invidious/pull/5661, by @dependabot[bot])
+* Bump docker/build-push-action from 6 to 7 (https://github.com/iv-org/invidious/pull/5662, by @dependabot[bot])
+* Bump docker/metadata-action from 5 to 6 (https://github.com/iv-org/invidious/pull/5663, by @dependabot[bot])
+* Bump docker/setup-buildx-action from 3 to 4 (https://github.com/iv-org/invidious/pull/5664, by @dependabot[bot])
+* Remove noreferrer since youtube now requires referrers on embeds (https://github.com/iv-org/invidious/pull/5642, by @ashleyirispuppy143)
+* Remove trailing whitespaces from codebase (https://github.com/iv-org/invidious/pull/5634, by @Fijxu)
+* Add title listen button time updates (https://github.com/iv-org/invidious/pull/5625, by @JeroenBoersma)
+* Remove sort by rating and date in video search filters (https://github.com/iv-org/invidious/pull/5629, by @Fijxu)
+
+## v2.20260207.0
+
+### Wrap-up
+
+This release hardens the Invidious companion pipeline and cleans up a long list of UI papercuts. Companion downloads now work end-to-end, CSP headers and check identifiers are generated once and reused, proxy responses strip stray headers, and the final traces of the legacy signature helper are gone so the helper can be rolled out safely.
+
+Livestream navigation, playlists, and channel metadata also see overdue fixes: Trending once again lists livestreams, "Watch on YouTube" buttons stop jumping to arbitrary timestamps, playlist imports/API calls handle missing data, and channel pages now display creator pronouns and playlist thumbnails. Deployments benefit from compiling OpenSSL into docker images to mitigate a long-standing memory leak observed with Alpine-provided OpenSSL, Crystal pinned back to 1.16.3 for docker and OCI builds, a rewritten static file handler, clarified README/HTTP proxy/unix socket docs, and dozens of smaller cleanups.
+
+### New features & important changes
+#### For Users
+  - Livestream experiences are restored: Trending shows livestreams again, the gaming feed remains accessible, and "Watch on YouTube" links stop carrying stale timestamps (#5480, #5555, #5481)
+  - Channel and playlist metadata is richer thanks to pronoun support, topic playlist thumbnails, and accurate related video counts (#5617, #5616, #5446)
+  - Downloads get smoother because download actions are URL-safe and downloads can flow through Invidious companion when available (#5367, #5561)
+  - Users see clearer feedback with Erroneous CAPTCHA messages, DMCA controls restored, and a footer link pointing at the current release (#5508, #5228, #4702)
+
+#### For instance owners
+  - Companion integration is sturdier: CSP is generated once, check identifiers persist, and the helper hyperlink is fixed (#5497, #5575, #5491)
+  - Proxied images and videoplayback strip unwanted response headers (shared header-strip list) (#5595)
+  - Runtime and packaging updates pin docker/OCI builds to Crystal 1.16.3, bring an optional Crystal 1.18.2 + Alpine 3.23 image, and compile OpenSSL from source to mitigate the memory leak seen with Alpine-provided OpenSSL (#5604, #5577, #5574, #5441)
+  - Configuration docs saw polish with unix socket instructions, refreshed HTTP proxy comments, and corrected README commands (#5347, #5586, #5607)
+  - Server stability improves via a larger `max_request_line_size` that is required to be able to access some next pages of Youtube channels videos and a rewritten static file handler (#5566, #5338)
+
+#### For developers
+  - Top-level constants moved into dedicated modules, preferences handling was cleaned up, and the legacy signature helper is finally removed (#5596, #5450, #5550)
+  - Crystal API updates replaced the deprecated `Socket#blocking` property and restored the shard target plus SPDX license metadata (#5538, #5608, #5552)
+  - CI/tooling stayed current with newer GitHub Actions, install-crystal releases, and cache/checkout bumps (#5569, #5544, #5530, #5499)
+
+### Bugs fixed
+#### User-side
+  - Playlist importer edge cases, playlist API author URLs, and channel continuation tokens now handle empty values without crashing (#4787, #5618, #5614)
+  - Thin mode community posts, posts that reference unavailable videos, and DMCA content toggles work again (#5567, #5549, #5228)
+  - UI cleanups prevent channel name/button overflow, show explicit Erroneous CAPTCHA errors, and keep livestream timestamps clean (#5553, #5452, #5508, #5481)
+  - Trending feeds and related video counts regained accuracy alongside livestream/gaming categories (#5555, #5480, #5446)
+
+#### For instance owners
+  - Companion downloads, CSP reuse, and check id generation behave predictably even under load (#5561, #5497, #5575)
+  - Proxy responses drop stray headers and HTTP proxy examples in the config were clarified (#5595, #5586)
+  - Docker/OCI builds were pinned to stable Crystal releases with OpenSSL bundled to avoid memory leaks (#5604, #5577, #5441)
+
+#### For developers
+  - README commit instructions, shard targets, and unix socket docs were corrected (#5607, #5608, #5347)
+  - Thin mode preference comparisons no longer convert unnecessary strings (#5568)
+  - URL encoding fixes in the download widget and socket API updates prevent regressions when upgrading Crystal (#5367, #5538)
+
+### Full list of pull requests merged since the last release (newest first)
+
+* refactor: Move top level constants to it's own modules (https://github.com/iv-org/invidious/pull/5596, by @Fijxu)
+* pages/watch: URL encode 'action' in download widget (https://github.com/iv-org/invidious/pull/5367, by @SamantazFox)
+* Document use of unix sockets for `db` (https://github.com/iv-org/invidious/pull/5347, by @Fijxu)
+* Generate companion CSP only once to reuse it (https://github.com/iv-org/invidious/pull/5497, by @Fijxu)
+* Fix youtube CSV playlist importer (https://github.com/iv-org/invidious/pull/4787, by @ThatMatrix)
+* Playlist API: return empty author url if ucid is empty (https://github.com/iv-org/invidious/pull/5618, by @radmorecameron)
+* Channels: parse pronouns and display them on channel page (https://github.com/iv-org/invidious/pull/5617, by @radmorecameron)
+* playlist: parse playlist thumbnails for topic autogenerated playlists (https://github.com/iv-org/invidious/pull/5616, by @radmorecameron)
+* fix: add missing embedded protobuf message in continuation token for channel videos (https://github.com/iv-org/invidious/pull/5614, by @Fijxu)
+* Update shard.yml to include target that was removed in commit 9d54cf9 (https://github.com/iv-org/invidious/pull/5608, by @Harm133)
+* chore: Do not convert thin_mode preference to string to compare it in before_all (https://github.com/iv-org/invidious/pull/5568, by @Fijxu)
+* Fix thin_mode preference for channel community page (https://github.com/iv-org/invidious/pull/5567, by @Fijxu)
+* Fix commit command in README instructions, as per #5606 (https://github.com/iv-org/invidious/pull/5607, by @kirisakow)
+* Revert "Bump crystallang/crystal from 1.16.3-alpine to 1.19.0-alpine in /docker" (https://github.com/iv-org/invidious/pull/5604, by @unixfox)
+* Bump crystallang/crystal from 1.16.3-alpine to 1.19.0-alpine in /docker (https://github.com/iv-org/invidious/pull/5603, by @dependabot[bot])
+* doc: Update HTTP proxy configuration comments (https://github.com/iv-org/invidious/pull/5586, by @unixfox)
+* Strip unwanted headers from response headers in images and videoplayback (https://github.com/iv-org/invidious/pull/5595, by @Fijxu)
+* Generate companion check id one time and add missing companion check id on captions (https://github.com/iv-org/invidious/pull/5575, by @Fijxu)
+* Downgrade Crystal to 1.16.3 in OCI (https://github.com/iv-org/invidious/pull/5577, by @Fijxu)
+* Allow downloading via companion (https://github.com/iv-org/invidious/pull/5561, by @JeroenBoersma)
+* chore: crystal 1.8.2 + alpine 3.23 (https://github.com/iv-org/invidious/pull/5574, by @unixfox)
+* Replace deprecated `blocking` property of `Socket` (https://github.com/iv-org/invidious/pull/5538, by @Fijxu)
+* Replace `Kemal::StaticFileHandler` with direct subclass of stdlib `HTTP::StaticFileHandler` on Crystal >= 1.17.0 (https://github.com/iv-org/invidious/pull/5338, by @syeopite)
+* dockerfile: compile openssl instead of using the one bundled on the crystal alpine image. (https://github.com/iv-org/invidious/pull/5441, by @Fijxu)
+* Bump actions/cache from 4 to 5 (https://github.com/iv-org/invidious/pull/5569, by @dependabot[bot])
+* Set Kemal `max_request_line_size` to 16384 for large channel continuation query parameters. (https://github.com/iv-org/invidious/pull/5566, by @Fijxu)
+* Add link to GitHub release/tag/commit in footer (https://github.com/iv-org/invidious/pull/4702, by @shaedrich)
+* Display "Erroneous CAPTCHA" for invalid captchas (https://github.com/iv-org/invidious/pull/5508, by @Fijxu)
+* Fix channel name overflow (https://github.com/iv-org/invidious/pull/5553, by @Fijxu)
+* Fix trending page by leaving livestream and gaming trending pages (https://github.com/iv-org/invidious/pull/5555, by @Fijxu)
+* fix: restore dmca_content functionality (https://github.com/iv-org/invidious/pull/5228, by @Fijxu)
+* Remove signature helper completely from Invidious (https://github.com/iv-org/invidious/pull/5550, by @Fijxu)
+* Fix community posts when there is a unavailable video in a post (https://github.com/iv-org/invidious/pull/5549, by @Fijxu)
+* chore: Update shard.yml to use SPDX license identifier (https://github.com/iv-org/invidious/pull/5552, by @Fijxu)
+* Store `preferences` in a variable when reused and rename `prefs` to `preferences` (https://github.com/iv-org/invidious/pull/5450, by @Fijxu)
+* Bump actions/checkout from 5 to 6 (https://github.com/iv-org/invidious/pull/5544, by @dependabot[bot])
+* Bump crystal-lang/install-crystal from 1.8.3 to 1.9.1 (https://github.com/iv-org/invidious/pull/5530, by @dependabot[bot])
+* Fix 0 view count on related videos section (https://github.com/iv-org/invidious/pull/5446, by @shiny-comic)
+* Prevent timestamp from being set for Livestreams on "Watch on Youtube" links (https://github.com/iv-org/invidious/pull/5481, by @Fijxu)
+* Add Livestreams to trending page (https://github.com/iv-org/invidious/pull/5480, by @Fijxu)
+* Fix button overflow (https://github.com/iv-org/invidious/pull/5452, by @Fijxu)
+* Bump crystal-lang/install-crystal from 1.8.2 to 1.8.3 (https://github.com/iv-org/invidious/pull/5499, by @dependabot[bot])
+* Fixed broken companion hyperlink (https://github.com/iv-org/invidious/pull/5491, by @ndsvw)
+
 ## v2.20250913.0

 ### Wrap-up
@@ -129,7 +129,7 @@ You can read more here: https://docs.invidious.io/applications/
 1.  Fork it ( https://github.com/iv-org/invidious/fork ).
 1.  Create your feature branch (`git checkout -b my-new-feature`).
 1.  Stage your files (`git add .`).
-1.  Commit your changes (`git commit -am 'Add some feature'`).
+1.  Commit your changes (`git commit -m 'Add some feature'`).
 1.  Push to the branch (`git push origin my-new-feature`).
 1.  Create a new pull request ( https://github.com/iv-org/invidious/compare ).

@@ -75,6 +75,16 @@ body {
  height: auto;
 }

+.channel-profile > .channel-name-pronouns {
+    display: inline-block;
+}
+
+.channel-profile > .channel-name-pronouns > .channel-pronouns {
+  font-style: italic;
+  font-size: .8em;
+  font-weight: lighter;
+}
+
 body a.channel-owner {
  background-color: #008bec;
  color: #fff;
@@ -167,6 +177,7 @@ body a.pure-button-primary,

 .pure-button-primary,
 .pure-button-secondary {
+  white-space: normal;
  border: 1px solid #a0a0a0;
  border-radius: 3px;
  margin: 0 .4em;
@@ -403,9 +414,15 @@ input[type="search"]::-webkit-search-cancel-button {

 .video-card-row { margin: 15px 0; }

-p.channel-name { margin: 0; }
+p.channel-name { margin: 0; overflow-wrap: anywhere;}
 p.video-data   { margin: 0; font-weight: bold; font-size: 80%; }

+.channel-profile > .channel-name,
+.channel-profile > .channel-name-pronouns >  .channel-name 
+{
+  overflow-wrap: anywhere;
+}
+

 /*
 * Comments & community posts
@@ -885,4 +902,11 @@ h1, h2, h3, h4, h5, p,
 .error-issue-template {
  padding: 20px;
  background: rgba(0, 0, 0, 0.12345);
+}
+
+.preference-description {
+  width: 250px;
+  padding-left: 10px;
+  display: inline-block;
+  vertical-align: top;
 }
@@ -211,9 +211,9 @@ window.helpers = window.helpers || {
                        helpers.storage.remove(key);
                    }
                },
-                set: function (key, value) { 
+                set: function (key, value) {
                    let encoded_value = encodeURIComponent(JSON.stringify(value))
-                    localStorage.setItem(key, encoded_value); 
+                    localStorage.setItem(key, encoded_value);
                },
                remove: function (key) { localStorage.removeItem(key); }
            };
@@ -104,14 +104,15 @@ if (video_data.params.quality === 'dash') {
 *
 * @param {String} url
 * @param {String} [base]
+ * @param {'t' | 'start'} param
 * @returns {URL} urlWithTimeArg
 */
-function addCurrentTimeToURL(url, base) {
+function addCurrentTimeToURL(url, base, param = 't') {
    var urlUsed = new URL(url, base);
    urlUsed.searchParams.delete('start');
    var currentTime = Math.ceil(player.currentTime());
    if (currentTime > 0)
-        urlUsed.searchParams.set('t', currentTime);
+        urlUsed.searchParams.set(param, currentTime);
    else if (urlUsed.searchParams.has('t'))
        urlUsed.searchParams.delete('t');
    return urlUsed;
@@ -132,21 +133,23 @@ var timeupdate_last_ts = 5;
 player.on('timeupdate', function () {
    // Only update once every second
    let current_ts = Math.floor(player.currentTime());
-    if (current_ts > timeupdate_last_ts) timeupdate_last_ts = current_ts;
+    if (current_ts != timeupdate_last_ts) timeupdate_last_ts = current_ts;
    else return;

    // YouTube links

-    let elem_yt_watch = document.getElementById('link-yt-watch');
-    if (elem_yt_watch) {
-        let base_url_yt_watch = elem_yt_watch.getAttribute('data-base-url');
-        elem_yt_watch.href = addCurrentTimeToURL(base_url_yt_watch);
-    }
-    
-    let elem_yt_embed = document.getElementById('link-yt-embed');
-    if (elem_yt_embed) {
-        let base_url_yt_embed = elem_yt_embed.getAttribute('data-base-url');
-        elem_yt_embed.href = addCurrentTimeToURL(base_url_yt_embed);
+    if (!video_data.live_now) {
+        let elem_yt_watch = document.getElementById('link-yt-watch');
+        if (elem_yt_watch) {
+            let base_url_yt_watch = elem_yt_watch.getAttribute('data-base-url');
+            elem_yt_watch.href = addCurrentTimeToURL(base_url_yt_watch);
+        }
+
+        let elem_yt_embed = document.getElementById('link-yt-embed');
+        if (elem_yt_embed) {
+            let base_url_yt_embed = elem_yt_embed.getAttribute('data-base-url');
+            elem_yt_embed.href = addCurrentTimeToURL(base_url_yt_embed, undefined, 'start');
+        }
    }

    // Invidious links
@@ -158,12 +161,18 @@ player.on('timeupdate', function () {
        let base_url_iv_embed = elem_iv_embed.getAttribute('data-base-url');
        elem_iv_embed.href = addCurrentTimeToURL(base_url_iv_embed, domain);
    }
-    
+
    let elem_iv_other = document.getElementById('link-iv-other');
    if (elem_iv_other) {
        let base_url_iv_other = elem_iv_other.getAttribute('data-base-url');
        elem_iv_other.href = addCurrentTimeToURL(base_url_iv_other, domain);
    }
+
+    let elem_iv_listen = document.getElementById('link-iv-listen');
+    if (elem_iv_listen) {
+        let base_url_iv_listen = elem_iv_listen.getAttribute('data-base-url');
+        elem_iv_listen.href = addCurrentTimeToURL(base_url_iv_listen, domain);
+    }
 });


@@ -626,7 +635,7 @@ function toggle_caption_window() {
    player.textTrackSettings.setValues({ windowOpacity: options.windowOpacity[newIndex] });
    update_captions();
 }
-  
+
 function toggle_caption_opacity() {
    const numOptions = options.textOpacity.length;
    const textOpacity = player.textTrackSettings.getValues().textOpacity || '1';
@@ -731,7 +740,7 @@ addEventListener('keydown', function (e) {

        case '>': action = increase_playback_rate.bind(this, 1); break;
        case '<': action = increase_playback_rate.bind(this, -1); break;
-        
+
        case '=': action = increase_caption_size.bind(this, 1); break;
        case '-': action = increase_caption_size.bind(this, -1); break;

@@ -8,6 +8,13 @@
 ## Database configuration with separate parameters.
 ## This setting is MANDATORY, unless 'database_url' is used.
 ##
+## Note: The 'db' setting allows the use of UNIX
+## sockets. To do so, set 'host' to ""
+## E.g:
+##    password: kemal
+##    host: ""
+##    port: 5432
+##
 db:
  user: kemal
  password: kemal
@@ -40,27 +47,13 @@ db:
 ##
 #check_tables: false

-
-##
-## Path to an external signature resolver, used to emulate
-## the Youtube client's Javascript. If no such server is
-## available, some videos will not be playable.
-##
-## When this setting is commented out, no external
-## resolver will be used.
-##
-## Accepted values: a path to a UNIX socket or "<IP>:<Port>"
-## Default: <none>
-##
-#signature_server:
-
 ##
 ## Invidious companion is an external program
 ## for loading the video streams from YouTube servers.
 ##
 ## When this setting is commented out, Invidious companion is not used.
 ## Otherwise, Invidious will proxy the requests to Invidious companion.
-## 
+##
 ## Note: multiple URL can be configured. In this case, Invidious will
 ## randomly pick one every time video data needs to be retrieved. This
 ## URL is then kept in the video metadata cache to allow video playback
@@ -70,7 +63,7 @@ db:
 ## The parameter private_url is required for the internal communication
 ## between Invidious companion and Invidious.
 ##
-## The optional parameter public_url is the public URL from which 
+## The optional parameter public_url is the public URL from which
 ## Invidious companion is listening to the requests from the user(s).
 ## When this setting is commented out, Invidious proxy all requests to
 ## Invidious companion. Useful for simple setups.
@@ -158,6 +151,26 @@ db:
 ##
 domain:

+##
+## List of alternative domains where the invidious instance is being served.
+## This needs to be set in order to be able to login and update user preferences
+## when using a domain that is not the same as the `domain` configuration,
+## like a .`onion` address, `.i2p` address, `.b32.i2p` address, etc.
+##
+## It will detect the alternative domain trough the `X-Forwarded-Host` header.
+## https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/X-Forwarded-Host
+##
+## Accepted values: a list of fully qualified domain names (FQDN)
+## Default: <none>
+##
+## Example:
+## alternative_domains:
+##   - invidious.example.com
+##   - inv.example.com
+##   - videos.example.com
+##
+alternative_domains:
+
 ##
 ## Tell Invidious that it is behind a proxy that provides only
 ## HTTPS, so all links must use the https:// scheme. This
@@ -237,9 +250,13 @@ https_only: false

 ##
 ## Configuration for using a HTTP proxy
-##
 ## If unset, then no HTTP proxy will be used.
-## 
+## Proxy type supported: HTTP, HTTPS
+##
+## This is not used for loading the video streams from YouTube servers (circumvent YouTube restrictions)
+## Please instead configure the proxy in Invidious companion:
+## https://github.com/iv-org/invidious-companion/blob/master/config/config.example.toml
+##
 #http_proxy:
 #  user:
 #  password:
@@ -259,19 +276,6 @@ https_only: false
 ##
 # use_innertube_for_captions: false

-##
-## Send Google session informations. This is useful when Invidious is blocked
-## by the message "This helps protect our community."
-## See https://github.com/iv-org/invidious/issues/4734.
-##
-## Warning: These strings gives much more identifiable information to Google!
-##
-## Accepted values: String
-## Default: <none>
-##
-# po_token: ""
-# visitor_data: ""
-
 # -----------------------------
 #  Logging
 # -----------------------------
@@ -901,7 +905,7 @@ default_user_preferences:
  ## Default: true
  ##
  #vr_mode: true
-  
+
  ##
  ## Save the playback position
  ## Allow to continue watching at the previous position when
@@ -36,7 +36,7 @@ services:
        # statistics_enabled: false
        hmac_key: "CHANGE_ME!!"
    healthcheck:
-      test: wget -nv --tries=1 --spider http://127.0.0.1:3000/api/v1/trending || exit 1
+      test: wget -nv --tries=1 --spider http://127.0.0.1:3000/api/v1/stats || exit 1
      interval: 30s
      timeout: 5s
      retries: 2
@@ -1,6 +1,29 @@
-FROM crystallang/crystal:1.16.3-alpine AS builder
+# https://github.com/openssl/openssl/releases/tag/openssl-3.6.2
+ARG OPENSSL_VERSION='3.6.2'
+ARG OPENSSL_SHA256='aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f'
+
+FROM 84codes/crystal:1.20.2-alpine AS dependabot-crystal
+
+# We compile openssl ourselves due to a memory leak in how crystal interacts
+# with openssl
+# Reference: https://github.com/iv-org/invidious/issues/1438#issuecomment-3087636228
+FROM dependabot-crystal AS openssl-builder
+RUN apk add --no-cache curl perl linux-headers
+
+WORKDIR /
+
+ARG OPENSSL_VERSION
+ARG OPENSSL_SHA256
+RUN curl -Ls "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz" --output openssl-${OPENSSL_VERSION}.tar.gz
+RUN echo "${OPENSSL_SHA256}  openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c
+RUN tar -xzvf openssl-${OPENSSL_VERSION}.tar.gz
+
+RUN cd openssl-${OPENSSL_VERSION} && ./Configure --openssldir=/etc/ssl && make -j$(nproc)
+
+FROM dependabot-crystal AS builder

 RUN apk add --no-cache sqlite-static yaml-static
+RUN apk del openssl-dev openssl-libs-static

 ARG release

@@ -20,19 +43,25 @@ COPY ./assets/ ./assets/
 COPY ./videojs-dependencies.yml ./videojs-dependencies.yml

 RUN crystal spec --warnings all \
-    --link-flags "-lxml2 -llzma"    
+    --link-flags "-lxml2 -llzma"
+
+ARG OPENSSL_VERSION
+COPY --from=openssl-builder /openssl-${OPENSSL_VERSION} /openssl-${OPENSSL_VERSION}
+
 RUN --mount=type=cache,target=/root/.cache/crystal if [[ "${release}" == 1 ]] ; then \
+        PKG_CONFIG_PATH=/openssl-${OPENSSL_VERSION} \
        crystal build ./src/invidious.cr \
        --release \
        --static --warnings all \
        --link-flags "-lxml2 -llzma"; \
    else \
+        PKG_CONFIG_PATH=/openssl-${OPENSSL_VERSION} \
        crystal build ./src/invidious.cr \
        --static --warnings all \
        --link-flags "-lxml2 -llzma"; \
    fi

-FROM alpine:3.21
+FROM alpine:3.24
 RUN apk add --no-cache rsvg-convert ttf-opensans tini tzdata
 WORKDIR /invidious
 RUN addgroup -g 1000 -S invidious && \
@@ -1,53 +0,0 @@
-FROM alpine:3.21 AS builder
-RUN apk add --no-cache 'crystal=1.14.0-r0' shards sqlite-static yaml-static yaml-dev libxml2-static \
-       zlib-static openssl-libs-static openssl-dev musl-dev xz-static
-
-ARG release
-
-WORKDIR /invidious
-COPY ./shard.yml ./shard.yml
-COPY ./shard.lock ./shard.lock
-RUN shards install --production
-
-COPY ./src/ ./src/
-# TODO: .git folder is required for building – this is destructive.
-# See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION.
-COPY ./.git/ ./.git/
-
-# Required for fetching player dependencies
-COPY ./scripts/ ./scripts/
-COPY ./assets/ ./assets/
-COPY ./videojs-dependencies.yml ./videojs-dependencies.yml
-
-RUN crystal spec --warnings all \
-    --link-flags "-lxml2 -llzma"
-
-RUN --mount=type=cache,target=/root/.cache/crystal if [[ "${release}" == 1 ]] ; then \
-        crystal build ./src/invidious.cr \
-        --release \
-        --static --warnings all \
-        --link-flags "-lxml2 -llzma"; \
-    else \
-        crystal build ./src/invidious.cr \
-        --static --warnings all \
-        --link-flags "-lxml2 -llzma"; \
-    fi
-
-FROM alpine:3.21
-RUN apk add --no-cache rsvg-convert ttf-opensans tini tzdata
-WORKDIR /invidious
-RUN addgroup -g 1000 -S invidious && \
-    adduser -u 1000 -S invidious -G invidious
-COPY --chown=invidious ./config/config.* ./config/
-RUN mv -n config/config.example.yml config/config.yml
-RUN sed -i 's/host: \(127.0.0.1\|localhost\)/host: invidious-db/' config/config.yml
-COPY ./config/sql/ ./config/sql/
-COPY ./locales/ ./locales/
-COPY --from=builder /invidious/assets ./assets/
-COPY --from=builder /invidious/invidious .
-RUN chmod o+rX -R ./assets ./config ./locales
-
-EXPOSE 3000
-USER invidious
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD [ "/invidious/invidious" ]
@@ -124,6 +124,8 @@
    "preferences_sort_label": "Sort videos by: ",
    "preferences_default_playlist": "Default playlist: ",
    "preferences_default_playlist_none": "No default playlist set",
+    "preferences_search_privacy_label": "Search privacy: ",
+    "preferences_search_privacy_description": "Enabling this preference will prevent your search queries from being saved in your browser history.",
    "published": "published",
    "published - reverse": "published - reverse",
    "alphabetically": "alphabetically",
@@ -408,6 +410,7 @@
    "Default": "Default",
    "Music": "Music",
    "Gaming": "Gaming",
+    "Livestreams": "Livestreams",
    "News": "News",
    "Movies": "Movies",
    "Download": "Download",
@@ -504,5 +507,6 @@
    "carousel_go_to": "Go to slide `x`",
    "timeline_parse_error_placeholder_heading": "Unable to parse item",
    "timeline_parse_error_placeholder_message": "Invidious encountered an error while trying to parse this item. For more information see below:",
-    "timeline_parse_error_show_technical_details": "Show technical details"
+    "timeline_parse_error_show_technical_details": "Show technical details",
+    "dmca_content": "This video cannot be downloaded on this instance due to a DMCA/copyright infringement letter sent to the instance administrator."
 }
@@ -24,7 +24,7 @@ def create_licence_tr(path, file_name, licence_name, licence_link, source_locati
    "<tr>
    <td><a href=\\"/#{path}\\">#{file_name}</a></td>
    <td><a href=\\"#{licence_link}\\">#{licence_name}</a></td>
-    <td><a href=\\"#{source_location}\\">\#{translate(locale, "source")}</a></td>
+    <td><a href=\\"#{source_location}\\">\#{I18n.translate(locale, "source")}</a></td>
    </tr>"
    HTML

@@ -3,7 +3,7 @@

 # Crystal linter
 # This is a modified version of the pre-commit hook from the crystal repo. https://github.com/crystal-lang/crystal/blob/master/scripts/git/pre-commit
-# Please refer to that if you'd like an version that doesn't automatically format staged files. 
+# Please refer to that if you'd like an version that doesn't automatically format staged files.
 changed_cr_files=$(git diff --cached --name-only --diff-filter=ACM | grep '\.cr$')
 if [ ! -z "$changed_cr_files" ]; then
  if [ -x bin/crystal ]; then
@@ -1,10 +1,14 @@
 name: invidious
-version: 2.20250913.0
+version: 2.20260626.0-dev

 authors:
  - Invidious team <contact@invidious.io>
  - Contributors!

+targets:
+  invidious:
+    main: src/invidious.cr
+
 description: |
   Invidious is an alternative front-end to YouTube 

@@ -38,7 +42,7 @@ development_dependencies:

 crystal: ">= 1.10.0, < 2.0.0"

-license: AGPLv3
+license: AGPL-3.0-only

 repository: https://github.com/iv-org/invidious
 homepage: https://invidious.io
@@ -0,0 +1 @@
+Hello world
@@ -0,0 +1,233 @@
+# Due to the way that specs are handled this file cannot be run together with
+# everything else without causing a compile time error that'll be incredibly
+# annoying to resolve.
+#
+# TODO: Create different spec categories that can then be ran through make.
+#       An implementation of this can be seen with the tests for the Crystal compiler itself.
+#
+# For now run this with `crystal spec spec/http_server/handlers/static_assets_handler_spec.cr -Drunning_by_self`
+
+{% skip_file if compare_versions(Crystal::VERSION, "1.17.0-dev") < 0 || !flag?(:running_by_self) %}
+
+require "http"
+require "spectator"
+require "../../../src/invidious/http_server/static_assets_handler.cr"
+
+private def get_static_assets_handler
+  return Invidious::HttpServer::StaticAssetsHandler.new "spec/http_server/handlers/static_assets_handler", directory_listing: false
+end
+
+# Slightly modified version of `handle` function from
+#
+# https://github.com/crystal-lang/crystal/blob/3f369d2c721e9462d9f6126cb0bcd4c6992f0225/spec/std/http/server/handlers/static_file_handler_spec.cr#L5
+
+private def handle(request, handler : HTTP::Handler? = nil, decompress : Bool = false)
+  io = IO::Memory.new
+  response = HTTP::Server::Response.new(io)
+  context = HTTP::Server::Context.new(request, response)
+
+  if !handler
+    handler = get_static_assets_handler
+    get_static_assets_handler.call context
+  else
+    handler.call(context)
+  end
+
+  response.close
+  io.rewind
+
+  HTTP::Client::Response.from_io(io, decompress: decompress)
+end
+
+# Makes and yields a temporary file with the given prefix
+private def make_temporary_file(prefix, contents = nil, &)
+  tempfile = File.tempfile(prefix, "static_assets_handler_spec", dir: "spec/http_server/handlers/static_assets_handler")
+  file_link = "/#{File.basename(tempfile.path)}"
+  yield tempfile, file_link
+ensure
+  tempfile.try &.delete
+end
+
+# Changes the contents of the temporary file after yield
+private def cycle_temporary_file_contents(temporary_file, initial, &)
+  temporary_file.rewind << initial
+  temporary_file.rewind.flush
+  yield
+  temporary_file.rewind << "something else"
+  temporary_file.rewind.flush
+end
+
+# Get relative file path to a file within the static_assets_handler folder
+macro get_file_path(basename)
+  "spec/http_server/handlers/static_assets_handler/#{ {{basename}} }"
+end
+
+Spectator.describe StaticAssetsHandler do
+  it "Can serve a file" do
+    response = handle HTTP::Request.new("GET", "/test.txt")
+    expect(response.status_code).to eq(200)
+    expect(response.body).to eq(File.read(get_file_path("test.txt")))
+  end
+
+  it "Can serve cached file" do
+    make_temporary_file("cache_test") do |temporary_file, file_link|
+      cycle_temporary_file_contents(temporary_file, "foo") do
+        expect(temporary_file.rewind.gets_to_end).to eq("foo")
+
+        # Should get cached by the first run
+        response = handle HTTP::Request.new("GET", file_link)
+        expect(response.status_code).to eq(200)
+        expect(response.body).to eq("foo")
+      end
+
+      # Temporary file is updated after `cycle_temporary_file_contents` is called
+      # but if the file is successfully cached then we'll only get the original
+      # contents.
+      response = handle HTTP::Request.new("GET", file_link)
+      expect(response.status_code).to eq(200)
+      expect(response.body).to eq("foo")
+    end
+  end
+
+  it "Adds cache headers" do
+    response = handle HTTP::Request.new("GET", "/test.txt")
+    expect(response.headers["cache_control"]).to eq("max-age=2629800")
+  end
+
+  context "Can handle range requests" do
+    it "Can serve range request" do
+      headers = HTTP::Headers{"Range" => "bytes=0-2"}
+      response = handle HTTP::Request.new("GET", "/test.txt", headers)
+
+      expect(response.status_code).to eq(206)
+      expect(response.headers["Content-Range"]?).to eq "bytes 0-2/11"
+      expect(response.body).to eq "Hel"
+    end
+
+    it "Will cache entire file even if doing partial requests" do
+      make_temporary_file("range_cache") do |temporary_file, file_link|
+        cycle_temporary_file_contents(temporary_file, "Hello world") do
+          handle HTTP::Request.new("GET", file_link, HTTP::Headers{"Range" => "bytes=0-2"})
+        end
+
+        # Second request shouldn't have changed
+        headers = HTTP::Headers{"Range" => "bytes=3-8"}
+        response = handle HTTP::Request.new("GET", file_link, headers)
+        expect(response.status_code).to eq(206)
+        expect(response.body).to eq "lo wor"
+      end
+    end
+  end
+
+  context "Is able to support compression" do
+    def decompressed(string : String)
+      decompressed = Compress::Gzip::Reader.open(IO::Memory.new(string)) do |gzip|
+        gzip.gets_to_end
+      end
+
+      return expect(decompressed)
+    end
+
+    it "For full file requests" do
+      handler = HTTP::CompressHandler.new
+      handler.next = get_static_assets_handler()
+
+      make_temporary_file("check decompression handler") do |temporary_file, file_link|
+        cycle_temporary_file_contents(temporary_file, "Hello world") do
+          response = handle HTTP::Request.new("GET", file_link, headers: HTTP::Headers{"Accept-Encoding" => "gzip"}), handler: handler
+          expect(response.headers["Content-Encoding"]).to eq("gzip")
+          decompressed(response.body).to eq("Hello world")
+        end
+
+        # Are cached requests working?
+        response = handle HTTP::Request.new("GET", file_link, headers: HTTP::Headers{"Accept-Encoding" => "gzip"}), handler: handler
+        expect(response.headers["Content-Encoding"]).to eq("gzip")
+        decompressed(response.body).to eq("Hello world")
+
+        # Able to retrieve non gzipped file?
+        response = handle HTTP::Request.new("GET", file_link), handler: handler
+        expect(response.body).to eq("Hello world")
+        expect(response.headers).to_not have_key("Content-Encoding")
+      end
+    end
+
+    # Inspired by the equivalent tests from upstream
+    it "For partial file requests" do
+      handler = HTTP::CompressHandler.new
+      handler.next = get_static_assets_handler()
+
+      make_temporary_file("check_decompression_handler_on_partial_requests") do |temporary_file, file_link|
+        cycle_temporary_file_contents(temporary_file, "Hello world this is a very long string") do
+          range_response_results = {
+            "10-20/38" => "d this is a",
+            "0-0/38"   => "H",
+            "5-9/38"   => " worl",
+          }
+
+          range_request_header_value = {"10-20", "5-9", "0-0"}.join(',')
+          range_response_header_value = range_response_results.keys
+
+          response = handle HTTP::Request.new("GET", file_link, headers: HTTP::Headers{"Range" => "bytes=#{range_request_header_value}", "Accept-Encoding" => "gzip"}), handler: handler
+          expect(response.headers["Content-Encoding"]).to eq("gzip")
+
+          # Decompress response
+          response = HTTP::Client::Response.new(
+            status: response.status,
+            headers: response.headers,
+            body_io: Compress::Gzip::Reader.new(IO::Memory.new(response.body)),
+          )
+
+          count = 0
+          MIME::Multipart.parse(response) do |headers, part|
+            part_range = headers["Content-Range"][6..]
+            expect(part_range).to be_within(range_response_header_value)
+            expect(part.gets_to_end).to eq(range_response_results[part_range])
+            count += 1
+          end
+
+          expect(count).to eq(3)
+        end
+
+        # Is the file cached?
+        temporary_file << "Something else"
+        temporary_file.flush.rewind
+
+        response = handle HTTP::Request.new("GET", file_link, headers: HTTP::Headers{"Accept-Encoding" => "gzip"}), handler: handler
+        decompressed(response.body).to eq("Hello world this is a very long string")
+      end
+    end
+  end
+
+  it "Will not cache additional files if the cache limit is reached" do
+    5.times do |times|
+      data = "a" * 1_000_000
+
+      make_temporary_file("test cache size limit #{times}") do |temporary_file, file_link|
+        cycle_temporary_file_contents(temporary_file, data) do
+          response = handle HTTP::Request.new("GET", file_link)
+          expect(response.status_code).to eq(200)
+          expect(response.body).to eq(data)
+        end
+
+        response = handle HTTP::Request.new("GET", file_link)
+        expect(response.status_code).to eq(200)
+        expect(response.body).to eq(data)
+      end
+    end
+
+    # Cache should be 5 mb so no more files will be cached.
+    make_temporary_file("test cache size limit uncached") do |temporary_file, file_link|
+      cycle_temporary_file_contents(temporary_file, "a") do
+        response = handle HTTP::Request.new("GET", file_link)
+        expect(response.status_code).to eq(200)
+        expect(response.body).to eq("a")
+      end
+
+      response = handle HTTP::Request.new("GET", file_link)
+      expect(response.status_code).to eq(200)
+      expect(response.body).to_not eq("a")
+    end
+  end
+
+  after_each { Invidious::HttpServer::StaticAssetsHandler.clear_cache }
+end
@@ -48,9 +48,7 @@ FEATURE_FILTERS = {

 SORT_FILTERS = {
  Invidious::Search::Filters::Sort::Relevance => "8AEB",
-  Invidious::Search::Filters::Sort::Date      => "CALwAQE%3D",
  Invidious::Search::Filters::Sort::Views     => "CAPwAQE%3D",
-  Invidious::Search::Filters::Sort::Rating    => "CAHwAQE%3D",
 }

 Spectator.describe Invidious::Search::Filters do
@@ -7,7 +7,7 @@ Spectator.describe "parse_video_info" do
    _next = load_mock("video/regular_mrbeast.next")

    raw_data = _player.merge!(_next)
-    info = parse_video_info("2isYuQZMbdU", raw_data)
+    info = Invidious::Videos::Parser.parse_video_info("2isYuQZMbdU", raw_data)

    # Some basic verifications
    expect(typeof(info)).to eq(Hash(String, JSON::Any))
@@ -52,7 +52,6 @@ Spectator.describe "parse_video_info" do
    expect(info["relatedVideos"][0]["title"]).to eq("$1 vs $250,000,000 Private Island!")
    expect(info["relatedVideos"][0]["author"]).to eq("MrBeast")
    expect(info["relatedVideos"][0]["ucid"]).to eq("UCX6OQ3DkcsbYNE6H8uQQuVA")
-    expect(info["relatedVideos"][0]["view_count"]).to eq("230617484")
    expect(info["relatedVideos"][0]["short_view_count"]).to eq("230M")
    expect(info["relatedVideos"][0]["author_verified"]).to eq("true")

@@ -89,7 +88,7 @@ Spectator.describe "parse_video_info" do
    _next = load_mock("video/regular_no-description.next")

    raw_data = _player.merge!(_next)
-    info = parse_video_info("iuevw6218F0", raw_data)
+    info = Invidious::Videos::Parser.parse_video_info("iuevw6218F0", raw_data)

    # Some basic verifications
    expect(typeof(info)).to eq(Hash(String, JSON::Any))
@@ -138,7 +137,6 @@ Spectator.describe "parse_video_info" do
    expect(info["relatedVideos"][0]["title"]).to eq("Chris Rea - The Road To Hell 1989 Full Version")
    expect(info["relatedVideos"][0]["author"]).to eq("NEA ZIXNH")
    expect(info["relatedVideos"][0]["ucid"]).to eq("UCYMEOGcvav3gCgImK2J07CQ")
-    expect(info["relatedVideos"][0]["view_count"]).to eq("53298661")
    expect(info["relatedVideos"][0]["short_view_count"]).to eq("53M")
    expect(info["relatedVideos"][0]["author_verified"]).to eq("false")

@@ -7,7 +7,7 @@ Spectator.describe "parse_video_info" do
    _next = load_mock("video/scheduled_live_PBD-Podcast.next")

    raw_data = _player.merge!(_next)
-    info = parse_video_info("N-yVic7BbY0", raw_data)
+    info = Invidious::Videos::Parser.parse_video_info("N-yVic7BbY0", raw_data)

    # Some basic verifications
    expect(typeof(info)).to eq(Hash(String, JSON::Any))
@@ -75,7 +75,6 @@ Spectator.describe "parse_video_info" do
    expect(info["relatedVideos"][0]["id"]).to eq("j7jPzzjbVuk")
    expect(info["relatedVideos"][0]["author"]).to eq("Democracy Now!")
    expect(info["relatedVideos"][0]["ucid"]).to eq("UCzuqE7-t13O4NIDYJfakrhw")
-    expect(info["relatedVideos"][0]["view_count"]).to eq("7576")
    expect(info["relatedVideos"][0]["short_view_count"]).to eq("7.5K")
    expect(info["relatedVideos"][0]["author_verified"]).to eq("true")

@@ -1,3 +1,24 @@
+{% if compare_versions(Crystal::VERSION, "1.17.0-dev") >= 0 %}
+  # Strip StaticFileHandler from the binary
+  #
+  # This allows us to compile on 1.17.0 as the compiler won't try to
+  # semantically check the outdated upstream code.
+  class Kemal::Config
+    private def setup_static_file_handler
+    end
+  end
+
+  # Nullify `Kemal::StaticFileHandler`
+  #
+  # Needed until the next release of Kemal after 1.7
+  class Kemal::StaticFileHandler < HTTP::StaticFileHandler
+    def call(context : HTTP::Server::Context)
+    end
+  end
+
+  {% skip_file %}
+{% end %}
+
 # Since systems have a limit on number of open files (`ulimit -a`),
 # we serve them from memory to avoid 'Too many open files' without needing
 # to modify ulimit.
@@ -67,23 +67,13 @@ rescue ex
  puts "Check your 'config.yml' database settings or PostgreSQL settings."
  exit(1)
 end
-ARCHIVE_URL = URI.parse("https://archive.org")
-PUBSUB_URL  = URI.parse("https://pubsubhubbub.appspot.com")
-REDDIT_URL  = URI.parse("https://www.reddit.com")
-YT_URL      = URI.parse("https://www.youtube.com")
-HOST_URL    = make_host_url(Kemal.config)
-
-CHARS_SAFE         = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"
-TEST_IDS           = {"AgbeGFYluEA", "BaW_jenozKc", "a9LDPn-MO4I", "ddFvjfvPnqk", "iqKdEhx-dD4"}
+HOST_URL           = make_host_url(Kemal.config)
 MAX_ITEMS_PER_PAGE = 1500

-REQUEST_HEADERS_WHITELIST  = {"accept", "accept-encoding", "cache-control", "content-length", "if-none-match", "range"}
-RESPONSE_HEADERS_BLACKLIST = {"access-control-allow-origin", "alt-svc", "server"}
-HTTP_CHUNK_SIZE            = 10485760 # ~10MB
-
 CURRENT_BRANCH  = {{ "#{`git branch | sed -n '/* /s///p'`.strip}" }}
 CURRENT_COMMIT  = {{ "#{`git rev-list HEAD --max-count=1 --abbrev-commit`.strip}" }}
 CURRENT_VERSION = {{ "#{`git log -1 --format=%ci | awk '{print $1}' | sed s/-/./g`.strip}" }}
+CURRENT_TAG     = {{ "#{`git tag --points-at HEAD`.strip}" }}

 # This is used to determine the `?v=` on the end of file URLs (for cache busting). We
 # only need to expire modified assets, so we can use this to find the last commit that changes
@@ -96,7 +86,7 @@ SOFTWARE = {
  "branch"  => "#{CURRENT_BRANCH}",
 }

-YT_POOL = YoutubeConnectionPool.new(YT_URL, capacity: CONFIG.pool_size)
+YT_POOL = YoutubeConnectionPool.new(URI.parse("https://www.youtube.com"), capacity: CONFIG.pool_size)

 # Image request pool

@@ -170,15 +160,6 @@ Invidious::Database.check_integrity(CONFIG)
  {% puts "\nDone checking player dependencies, now compiling Invidious...\n" %}
 {% end %}

-# Misc
-
-DECRYPT_FUNCTION =
-  if sig_helper_address = CONFIG.signature_server.presence
-    IV::DecryptFunction.new(sig_helper_address)
-  else
-    nil
-  end
-
 # Start jobs

 if CONFIG.channel_threads > 0
@@ -231,19 +212,25 @@ error 500 do |env, exception|
  error_template(500, exception)
 end

-static_headers do |env|
-  env.response.headers.add("Cache-Control", "max-age=2629800")
-end
-
 # Init Kemal

-public_folder "assets"
-
 Kemal.config.powered_by_header = false
 add_handler FilteredCompressHandler.new
 add_handler APIHandler.new
 add_handler AuthHandler.new
 add_handler DenyFrame.new
+
+{% if compare_versions(Crystal::VERSION, "1.17.0-dev") >= 0 %}
+  Kemal.config.serve_static = false
+  add_handler Invidious::HttpServer::StaticAssetsHandler.new("assets", directory_listing: false)
+{% else %}
+  public_folder "assets"
+
+  static_headers do |env|
+    env.response.headers.add("Cache-Control", "max-age=2629800")
+  end
+{% end %}
+
 add_context_storage_type(Array(String))
 add_context_storage_type(Preferences)
 add_context_storage_type(Invidious::User)
@@ -258,6 +245,8 @@ Kemal.config.app_name = "Invidious"
 {% end %}

 Kemal.run do |config|
+  config.server.not_nil!.max_request_line_size = 16384
+
  if socket_binding = CONFIG.socket_binding
    File.delete?(socket_binding.path)
    # Create a socket and set its desired permissions
@@ -12,6 +12,7 @@ record AboutChannel,
  sub_count : Int32,
  joined : Time,
  is_family_friendly : Bool,
+  pronouns : String?,
  allowed_regions : Array(String),
  tabs : Array(String),
  tags : Array(String),
@@ -82,11 +83,16 @@ def get_about_info(ucid, locale) : AboutChannel
      author = initdata["metadata"]["channelMetadataRenderer"]["title"].as_s
      author_url = initdata["metadata"]["channelMetadataRenderer"]["channelUrl"].as_s
      author_thumbnail = initdata["metadata"]["channelMetadataRenderer"]["avatar"]["thumbnails"][0]["url"].as_s
-      author_verified = has_verified_badge?(initdata.dig?("header", "c4TabbedHeaderRenderer", "badges"))
-
+      author_badge = initdata.dig?("header", "pageHeaderRenderer", "content", "pageHeaderViewModel", "title", "dynamicTextViewModel", "text", "attachmentRuns", 0, "element", "type", "imageType", "image", "sources", 0, "clientResource", "imageName")
+        .try &.as_s
+      # CHECK_CIRCLE_FILLED is used for normal channels and AUDIO_BADGE if used For
+      # music/artist channels
+      # TODO: Maybe separate verified author from verified artist?
+      author_verified = author_badge.try { |badge| badge == "CHECK_CIRCLE_FILLED" || badge == "AUDIO_BADGE" } || false
      ucid = initdata["metadata"]["channelMetadataRenderer"]["externalId"].as_s

      # Raises a KeyError on failure.
+      # TODO: Check if `c4TabbedHeaderRenderer` still exists on some channels.
      banners = initdata["header"]["c4TabbedHeaderRenderer"]?.try &.["banner"]?.try &.["thumbnails"]?
      banners ||= initdata.dig?("header", "pageHeaderRenderer", "content", "pageHeaderViewModel", "banner", "imageBannerViewModel", "image", "sources")
      banner = banners.try &.[-1]?.try &.["url"].as_s?
@@ -160,14 +166,21 @@ def get_about_info(ucid, locale) : AboutChannel
  end

  sub_count = 0
+  pronouns = nil

  if (metadata_rows = initdata.dig?("header", "pageHeaderRenderer", "content", "pageHeaderViewModel", "metadata", "contentMetadataViewModel", "metadataRows").try &.as_a)
    metadata_rows.each do |row|
-      metadata_part = row.dig?("metadataParts").try &.as_a.find { |i| i.dig?("text", "content").try &.as_s.includes?("subscribers") }
-      if !metadata_part.nil?
-        sub_count = short_text_to_number(metadata_part.dig("text", "content").as_s.split(" ")[0]).to_i32
+      subscribe_metadata_part = row.dig?("metadataParts").try &.as_a.find { |i| i.dig?("text", "content").try &.as_s.includes?("subscribers") }
+      if !subscribe_metadata_part.nil?
+        sub_count = short_text_to_number(subscribe_metadata_part.dig("text", "content").as_s.split(" ")[0]).to_i32
      end
-      break if sub_count != 0
+
+      pronoun_metadata_part = row.dig?("metadataParts").try &.as_a.find { |i| i.dig?("tooltip").try &.as_s.includes?("Pronouns") }
+      if !pronoun_metadata_part.nil?
+        pronouns = pronoun_metadata_part.dig("text", "content").as_s
+      end
+
+      break if sub_count != 0 && !pronouns.nil?
    end
  end

@@ -184,6 +197,7 @@ def get_about_info(ucid, locale) : AboutChannel
    sub_count: sub_count,
    joined: joined,
    is_family_friendly: is_family_friendly,
+    pronouns: pronouns,
    allowed_regions: allowed_regions,
    tabs: tab_names,
    tags: tags,
@@ -38,7 +38,7 @@ struct ChannelVideo
      json.field "authorId", self.ucid
      json.field "authorUrl", "/channel/#{self.ucid}"
      json.field "published", self.published.to_unix
-      json.field "publishedText", translate(locale, "`x` ago", recode_date(self.published, locale))
+      json.field "publishedText", I18n.translate(locale, "`x` ago", recode_date(self.published, locale))

      json.field "viewCount", self.views
    end
@@ -127,11 +127,11 @@ def extract_channel_community(items, *, ucid, locale, format, thin_mode, is_sing

              reply_count = short_text_to_number(post.dig?("actionButtons", "commentActionButtonsRenderer", "replyButton", "buttonRenderer", "text", "simpleText").try &.as_s || "0")

-              json.field "content", html_to_content(content_html)
+              json.field "content", Helpers.html_to_content(content_html)
              json.field "contentHtml", content_html

              json.field "published", published.to_unix
-              json.field "publishedText", translate(locale, "`x` ago", recode_date(published, locale))
+              json.field "publishedText", I18n.translate(locale, "`x` ago", recode_date(published, locale))

              json.field "likeCount", like_count
              json.field "replyCount", reply_count
@@ -143,7 +143,7 @@ def extract_channel_community(items, *, ucid, locale, format, thin_mode, is_sing
                  case attachment.as_h
                  when .has_key?("videoRenderer")
                    parse_item(attachment)
-                      .as(SearchVideo)
+                      .as(SearchVideo | ProblematicTimelineItem)
                      .to_json(locale, json)
                  when .has_key?("backstageImageRenderer")
                    json.object do
@@ -114,7 +114,11 @@ module Invidious::Channel::Tabs
        "2:embedded" => {
          "1:string" => "00000000-0000-0000-0000-000000000000",
        },
-        "4:varint" => sort_options_videos_short(sort_by),
+        "4:varint"   => sort_options_videos_short(sort_by),
+        "8:embedded" => {
+          "1:string" => "00000000-0000-0000-0000-000000000000",
+          "3:varint" => sort_options_videos_short(sort_by),
+        },
      },
    }

@@ -130,7 +134,11 @@ module Invidious::Channel::Tabs
        "2:embedded" => {
          "1:string" => "00000000-0000-0000-0000-000000000000",
        },
-        "4:varint" => sort_options_videos_short(sort_by),
+        "4:varint"   => sort_options_videos_short(sort_by),
+        "7:embedded" => {
+          "1:string" => "00000000-0000-0000-0000-000000000000",
+          "3:varint" => sort_options_videos_short(sort_by),
+        },
      },
    }

@@ -154,7 +162,11 @@ module Invidious::Channel::Tabs
        "2:embedded" => {
          "1:string" => "00000000-0000-0000-0000-000000000000",
        },
-        "5:varint" => sort_by_numerical,
+        "5:varint"   => sort_by_numerical,
+        "8:embedded" => {
+          "1:string" => "00000000-0000-0000-0000-000000000000",
+          "3:varint" => sort_by_numerical,
+        },
      },
    }

@@ -1,5 +1,6 @@
 module Invidious::Comments
  extend self
+  private REDDIT_URL = URI.parse("https://www.reddit.com")

  def fetch_reddit(id, sort_by = "confidence")
    client = make_client(REDDIT_URL)
@@ -254,7 +254,7 @@ module Invidious::Comments
                end

                content_html = html_content || ""
-                json.field "content", html_to_content(content_html)
+                json.field "content", Helpers.html_to_content(content_html)
                json.field "contentHtml", content_html

                if published_text != nil
@@ -268,7 +268,7 @@ module Invidious::Comments
                  end

                  json.field "published", published.to_unix
-                  json.field "publishedText", translate(locale, "`x` ago", recode_date(published, locale))
+                  json.field "publishedText", I18n.translate(locale, "`x` ago", recode_date(published, locale))
                end

                if node_replies && !response["commentRepliesContinuation"]?
@@ -54,6 +54,7 @@ struct ConfigPreferences
  property save_player_pos : Bool = false
  @[YAML::Field(ignore: true)]
  property default_playlist : String? = nil
+  property search_privacy : Bool = false

  def to_tuple
    {% begin %}
@@ -120,6 +121,8 @@ class Config
  property hmac_key : String = ""
  # Domain to be used for links to resources on the site where an absolute URL is required
  property domain : String?
+  # Additional domain list that is going to be used for cookie domain validation
+  property alternative_domains : Array(String) = [] of String
  # Subscribe to channels using PubSubHubbub (requires domain, hmac_key)
  property use_pubsub_feeds : Bool | Int32 = false
  property popular_enabled : Bool = true
@@ -153,9 +156,6 @@ class Config
  @[YAML::Field(converter: Preferences::FamilyConverter)]
  property force_resolve : Socket::Family = Socket::Family::UNSPEC

-  # External signature solver server socket (either a path to a UNIX domain socket or "<IP>:<Port>")
-  property signature_server : String? = nil
-
  # Port to listen for connections (overridden by command line argument)
  property port : Int32 = 3000
  # Host to bind (overridden by command line argument)
@@ -170,11 +170,6 @@ class Config
  # Use Innertube's transcripts API instead of timedtext for closed captions
  property use_innertube_for_captions : Bool = false

-  # visitor data ID for Google session
-  property visitor_data : String? = nil
-  # poToken for passing bot attestation
-  property po_token : String? = nil
-
  # Invidious companion
  property invidious_companion : Array(CompanionConfig) = [] of CompanionConfig

@@ -262,11 +257,7 @@ class Config
    {% end %}

    if config.invidious_companion.present?
-      # invidious_companion and signature_server can't work together
-      if config.signature_server
-        puts "Config: You can not run inv_sig_helper and invidious_companion at the same time."
-        exit(1)
-      elsif config.invidious_companion_key.empty?
+      if config.invidious_companion_key.empty?
        puts "Config: Please configure a key if you are using invidious companion."
        exit(1)
      elsif config.invidious_companion_key == "CHANGE_ME!!"
@@ -284,10 +275,8 @@ class Config
          companion.builtin_proxy = true
        end
      end
-    elsif config.signature_server
-      puts("WARNING: inv-sig-helper is deprecated. Please switch to Invidious companion: https://docs.invidious.io/companion-installation/")
    else
-      puts("WARNING: Invidious companion is required to view and playback videos. For more information see https://docs.invidious.io/companion-installation/")
+      puts("WARNING: Invidious companion is required to view and playback videos. For more information see https://docs.invidious.io/installation/")
    end

    # HMAC_key is mandatory
@@ -28,14 +28,14 @@ module Invidious::Frontend::ChannelPage

          if tab == selected_tab
            str << "\t<b>"
-            str << translate(locale, "channel_tab_#{tab_name}_label")
+            str << I18n.translate(locale, "channel_tab_#{tab_name}_label")
            str << "</b>\n"
          else
            # Video tab doesn't have the last path component
            url = tab.videos? ? base_url : "#{base_url}/#{tab_name}"

            str << %(\t<a href=") << url << %(">)
-            str << translate(locale, "channel_tab_#{tab_name}_label")
+            str << I18n.translate(locale, "channel_tab_#{tab_name}_label")
            str << "</a>\n"
          end

@@ -32,9 +32,9 @@ module Invidious::Frontend::Comments
          <p>
            <a href="javascript:void(0)" data-onclick="toggle_parent">[ − ]</a>
            <b><a href="https://www.reddit.com/user/#{child.author}">#{child.author}</a></b>
-            #{translate_count(locale, "comments_points_count", child.score, NumberFormatting::Separator)}
-            <span title="#{child.created_utc.to_s("%a %B %-d %T %Y UTC")}">#{translate(locale, "`x` ago", recode_date(child.created_utc, locale))}</span>
-            <a href="https://www.reddit.com#{child.permalink}" title="#{translate(locale, "permalink")}">#{translate(locale, "permalink")}</a>
+            #{I18n.translate_count(locale, "comments_points_count", child.score, I18n::NumberFormatting::Separator)}
+            <span title="#{child.created_utc.to_s("%a %B %-d %T %Y UTC")}">#{I18n.translate(locale, "`x` ago", recode_date(child.created_utc, locale))}</span>
+            <a href="https://www.reddit.com#{child.permalink}" title="#{I18n.translate(locale, "permalink")}">#{I18n.translate(locale, "permalink")}</a>
            </p>
            <div>
            #{body_html}
@@ -6,10 +6,10 @@ module Invidious::Frontend::Comments
      root = comments["comments"].as_a
      root.each do |child|
        if child["replies"]?
-          replies_count_text = translate_count(locale,
+          replies_count_text = I18n.translate_count(locale,
            "comments_view_x_replies",
            child["replies"]["replyCount"].as_i64 || 0,
-            NumberFormatting::Separator
+            I18n::NumberFormatting::Separator
          )

          replies_html = <<-END_HTML
@@ -25,10 +25,10 @@ module Invidious::Frontend::Comments
          END_HTML
        elsif comments["authorId"]? && !comments["singlePost"]?
          # for posts we should display a link to the post
-          replies_count_text = translate_count(locale,
+          replies_count_text = I18n.translate_count(locale,
            "comments_view_x_replies",
            child["replyCount"].as_i64 || 0,
-            NumberFormatting::Separator
+            I18n::NumberFormatting::Separator
          )

          replies_html = <<-END_HTML
@@ -61,7 +61,7 @@ module Invidious::Frontend::Comments
          sponsor_icon = String.build do |str|
            str << %(<img alt="" )
            str << %(src="/ggpht) << URI.parse(child["sponsorIconUrl"].as_s).request_target << "\" "
-            str << %(title=") << translate(locale, "Channel Sponsor") << "\" "
+            str << %(title=") << I18n.translate(locale, "Channel Sponsor") << "\" "
            str << %(width="16" height="16" />)
          end
        end
@@ -110,14 +110,14 @@ module Invidious::Frontend::Comments
          when "multiImage"
            html << <<-END_HTML
              <section class="carousel">
-              <a class="skip-link" href="#skip-#{child["commentId"]}">#{translate(locale, "carousel_skip")}</a>
+              <a class="skip-link" href="#skip-#{child["commentId"]}">#{I18n.translate(locale, "carousel_skip")}</a>
              <div class="slides">
              END_HTML
            image_array = attachment["images"].as_a

            image_array.each_index do |i|
              html << <<-END_HTML
-                  <div class="slides-item slide-#{i + 1}" id="#{child["commentId"]}-slide-#{i + 1}" aria-label="#{translate(locale, "carousel_slide", {"current" => (i + 1).to_s, "total" => image_array.size.to_s})}" tabindex="0">
+                  <div class="slides-item slide-#{i + 1}" id="#{child["commentId"]}-slide-#{i + 1}" aria-label="#{I18n.translate(locale, "carousel_slide", {"current" => (i + 1).to_s, "total" => image_array.size.to_s})}" tabindex="0">
                    <img loading="lazy" src="/ggpht#{URI.parse(image_array[i][1]["url"].as_s).request_target}" alt="" />
                  </div>
                END_HTML
@@ -129,7 +129,7 @@ module Invidious::Frontend::Comments
              END_HTML
            attachment["images"].as_a.each_index do |i|
              html << <<-END_HTML
-                  <a class="slider-nav" href="##{child["commentId"]}-slide-#{i + 1}" aria-label="#{translate(locale, "carousel_go_to", (i + 1).to_s)}" tabindex="-1" aria-hidden="true">#{i + 1}</a>
+                  <a class="slider-nav" href="##{child["commentId"]}-slide-#{i + 1}" aria-label="#{I18n.translate(locale, "carousel_go_to", (i + 1).to_s)}" tabindex="-1" aria-hidden="true">#{i + 1}</a>
                END_HTML
            end
            html << <<-END_HTML
@@ -143,18 +143,18 @@ module Invidious::Frontend::Comments

        html << <<-END_HTML
        <p>
-          <span title="#{Time.unix(child["published"].as_i64).to_s(translate(locale, "%A %B %-d, %Y"))}">#{translate(locale, "`x` ago", recode_date(Time.unix(child["published"].as_i64), locale))} #{child["isEdited"] == true ? translate(locale, "(edited)") : ""}</span>
+          <span title="#{Time.unix(child["published"].as_i64).to_s(I18n.translate(locale, "%A %B %-d, %Y"))}">#{I18n.translate(locale, "`x` ago", recode_date(Time.unix(child["published"].as_i64), locale))} #{child["isEdited"] == true ? I18n.translate(locale, "(edited)") : ""}</span>
          |
        END_HTML

        if comments["videoId"]?
          html << <<-END_HTML
-            <a rel="noreferrer noopener" href="https://www.youtube.com/watch?v=#{comments["videoId"]}&lc=#{child["commentId"]}" title="#{translate(locale, "YouTube comment permalink")}">[YT]</a>
+            <a rel="noreferrer noopener" href="https://www.youtube.com/watch?v=#{comments["videoId"]}&lc=#{child["commentId"]}" title="#{I18n.translate(locale, "YouTube comment permalink")}">[YT]</a>
            |
          END_HTML
        elsif comments["authorId"]?
          html << <<-END_HTML
-            <a rel="noreferrer noopener" href="https://www.youtube.com/channel/#{comments["authorId"]}/community?lb=#{child["commentId"]}" title="#{translate(locale, "YouTube comment permalink")}">[YT]</a>
+            <a rel="noreferrer noopener" href="https://www.youtube.com/channel/#{comments["authorId"]}/community?lb=#{child["commentId"]}" title="#{I18n.translate(locale, "YouTube comment permalink")}">[YT]</a>
            |
          END_HTML
        end
@@ -172,7 +172,7 @@ module Invidious::Frontend::Comments

          html << <<-END_HTML
            &nbsp;
-            <span class="creator-heart-container" title="#{translate(locale, "`x` marked it with a ❤", child["creatorHeart"]["creatorName"].as_s)}">
+            <span class="creator-heart-container" title="#{I18n.translate(locale, "`x` marked it with a ❤", child["creatorHeart"]["creatorName"].as_s)}">
                <span class="creator-heart">
                    <img loading="lazy" class="creator-heart-background-hearted" src="#{creator_thumbnail}" alt="" />
                    <span class="creator-heart-small-hearted">
@@ -197,7 +197,7 @@ module Invidious::Frontend::Comments
          <div class="pure-u-1">
            <p>
              <a href="javascript:void(0)" data-continuation="#{comments["continuation"]}"
-                data-onclick="get_youtube_replies" data-load-more #{"data-load-replies" if is_replies}>#{translate(locale, "Load more")}</a>
+                data-onclick="get_youtube_replies" data-load-more #{"data-load-replies" if is_replies}>#{I18n.translate(locale, "Load more")}</a>
            </p>
          </div>
        </div>
@@ -2,9 +2,9 @@ module Invidious::Frontend::Misc
  extend self

  def redirect_url(env : HTTP::Server::Context)
-    prefs = env.get("preferences").as(Preferences)
+    preferences = env.get("preferences").as(Preferences)

-    if prefs.automatic_instance_redirect
+    if preferences.automatic_instance_redirect
      current_page = env.get?("current_page").as(String)
      return "/redirect?referer=#{current_page}"
    else
@@ -6,16 +6,16 @@ module Invidious::Frontend::Pagination
  private def first_page(str : String::Builder, locale : String?, url : String)
    str << %(<a href=") << url << %(" class="pure-button pure-button-secondary">)

-    if locale_is_rtl?(locale)
+    if I18n.locale_is_rtl?(locale)
      # Inverted arrow ("first" points to the right)
-      str << translate(locale, "First page")
+      str << I18n.translate(locale, "First page")
      str << "&nbsp;&nbsp;"
      str << %(<i class="icon ion-ios-arrow-forward"></i>)
    else
      # Regular arrow ("first" points to the left)
      str << %(<i class="icon ion-ios-arrow-back"></i>)
      str << "&nbsp;&nbsp;"
-      str << translate(locale, "First page")
+      str << I18n.translate(locale, "First page")
    end

    str << "</a>"
@@ -25,16 +25,16 @@ module Invidious::Frontend::Pagination
    # Link
    str << %(<a href=") << url << %(" class="pure-button pure-button-secondary">)

-    if locale_is_rtl?(locale)
+    if I18n.locale_is_rtl?(locale)
      # Inverted arrow ("previous" points to the right)
-      str << translate(locale, "Previous page")
+      str << I18n.translate(locale, "Previous page")
      str << "&nbsp;&nbsp;"
      str << %(<i class="icon ion-ios-arrow-forward"></i>)
    else
      # Regular arrow ("previous" points to the left)
      str << %(<i class="icon ion-ios-arrow-back"></i>)
      str << "&nbsp;&nbsp;"
-      str << translate(locale, "Previous page")
+      str << I18n.translate(locale, "Previous page")
    end

    str << "</a>"
@@ -44,14 +44,14 @@ module Invidious::Frontend::Pagination
    # Link
    str << %(<a href=") << url << %(" class="pure-button pure-button-secondary">)

-    if locale_is_rtl?(locale)
+    if I18n.locale_is_rtl?(locale)
      # Inverted arrow ("next" points to the left)
      str << %(<i class="icon ion-ios-arrow-back"></i>)
      str << "&nbsp;&nbsp;"
-      str << translate(locale, "Next page")
+      str << I18n.translate(locale, "Next page")
    else
      # Regular arrow ("next" points to the right)
-      str << translate(locale, "Next page")
+      str << I18n.translate(locale, "Next page")
      str << "&nbsp;&nbsp;"
      str << %(<i class="icon ion-ios-arrow-forward"></i>)
    end
@@ -6,7 +6,7 @@ module Invidious::Frontend::SearchFilters
    return String.build(8000) do |str|
      str << "<div id='filters'>\n"
      str << "\t<details id='filters-collapse'>"
-      str << "\t\t<summary>" << translate(locale, "search_filters_title") << "</summary>\n"
+      str << "\t\t<summary>" << I18n.translate(locale, "search_filters_title") << "</summary>\n"

      str << "\t\t<div id='filters-box'><form action='/search' method='get'>\n"

@@ -25,7 +25,7 @@ module Invidious::Frontend::SearchFilters

      str << "\t\t\t<div id='filters-apply'>"
      str << "<button type='submit' class=\"pure-button pure-button-primary\">"
-      str << translate(locale, "search_filters_apply_button")
+      str << I18n.translate(locale, "search_filters_apply_button")
      str << "</button></div>\n"

      str << "\t\t</form></div>\n"
@@ -41,7 +41,7 @@ module Invidious::Frontend::SearchFilters
    str << "\t\t\t\t<div class=\"filter-column\"><fieldset>\n"

    str << "\t\t\t\t\t<legend><div class=\"filter-name underlined\">"
-    str << translate(locale, "search_filters_{{name}}_label")
+    str << I18n.translate(locale, "search_filters_{{name}}_label")
    str << "</div></legend>\n"

    str << "\t\t\t\t\t<div class=\"filter-options\">\n"
@@ -62,7 +62,7 @@ module Invidious::Frontend::SearchFilters
      str << '>'

      str << "<label for='filter-date-{{date}}'>"
-      str << translate(locale, "search_filters_date_option_{{date}}")
+      str << I18n.translate(locale, "search_filters_date_option_{{date}}")
      str << "</label></div>\n"
    {% end %}
  end
@@ -78,7 +78,7 @@ module Invidious::Frontend::SearchFilters
      str << '>'

      str << "<label for='filter-type-{{type}}'>"
-      str << translate(locale, "search_filters_type_option_{{type}}")
+      str << I18n.translate(locale, "search_filters_type_option_{{type}}")
      str << "</label></div>\n"
    {% end %}
  end
@@ -94,7 +94,7 @@ module Invidious::Frontend::SearchFilters
      str << '>'

      str << "<label for='filter-duration-{{duration}}'>"
-      str << translate(locale, "search_filters_duration_option_{{duration}}")
+      str << I18n.translate(locale, "search_filters_duration_option_{{duration}}")
      str << "</label></div>\n"
    {% end %}
  end
@@ -111,7 +111,7 @@ module Invidious::Frontend::SearchFilters
        str << '>'

        str << "<label for='filter-feature-{{feature}}'>"
-        str << translate(locale, "search_filters_features_option_{{feature}}")
+        str << I18n.translate(locale, "search_filters_features_option_{{feature}}")
        str << "</label></div>\n"
      {% end %}
    {% end %}
@@ -128,7 +128,7 @@ module Invidious::Frontend::SearchFilters
      str << '>'

      str << "<label for='filter-sort-{{sort}}'>"
-      str << translate(locale, "search_filters_sort_option_{{sort}}")
+      str << I18n.translate(locale, "search_filters_sort_option_{{sort}}")
      str << "</label></div>\n"
    {% end %}
  end
@@ -20,7 +20,11 @@ module Invidious::Frontend::WatchPage

  def download_widget(locale : String, video : Video, video_assets : VideoAssets) : String
    if CONFIG.disabled?("downloads")
-      return "<p id=\"download\">#{translate(locale, "Download is disabled")}</p>"
+      return "<p id=\"download\">#{I18n.translate(locale, "Download is disabled")}</p>"
+    end
+
+    if CONFIG.dmca_content.includes?(video.id)
+      return "<p id=\"download\">#{I18n.translate(locale, "dmca_content")}</p>"
    end

    url = "/download"
@@ -32,7 +36,7 @@ module Invidious::Frontend::WatchPage
    return String.build(4000) do |str|
      str << "<form"
      str << " class=\"pure-form pure-form-stacked\""
-      str << " action='#{url}'"
+      str << " action='" << HTML.escape(url) << "'"
      str << " method='post'"
      str << " rel='noopener noreferrer'"
      str << " target='_blank'>"
@@ -45,7 +49,7 @@ module Invidious::Frontend::WatchPage
      str << "\t<div class=\"pure-control-group\">\n"

      str << "\t\t<label for='download_widget'>"
-      str << translate(locale, "Download as: ")
+      str << I18n.translate(locale, "Download as: ")
      str << "</label>\n"

      str << "\t\t<select name='download_widget' id='download_widget'>\n"
@@ -94,7 +98,7 @@ module Invidious::Frontend::WatchPage
        value = {"label": caption.name, "ext": "#{caption.language_code}.vtt"}.to_json

        str << "\t\t\t<option value='" << value << "'>"
-        str << translate(locale, "download_subtitles", translate(locale, caption.name))
+        str << I18n.translate(locale, "download_subtitles", I18n.translate(locale, caption.name))
        str << "</option>\n"
      end

@@ -104,7 +108,7 @@ module Invidious::Frontend::WatchPage
      str << "\t</div>\n"

      str << "\t<button type=\"submit\" class=\"pure-button pure-button-primary\">\n"
-      str << "\t\t<b>" << translate(locale, "Download") << "</b>\n"
+      str << "\t\t<b>" << I18n.translate(locale, "Download") << "</b>\n"
      str << "\t</button>\n"

      str << "</form>\n"
@@ -3,15 +3,28 @@
 # IPv6 addresses.
 #
 class TCPSocket
-  def initialize(host, port, dns_timeout = nil, connect_timeout = nil, blocking = false, family = Socket::Family::UNSPEC)
-    Addrinfo.tcp(host, port, timeout: dns_timeout, family: family) do |addrinfo|
-      super(addrinfo.family, addrinfo.type, addrinfo.protocol, blocking)
-      connect(addrinfo, timeout: connect_timeout) do |error|
-        close
-        error
+  {% if compare_versions(Crystal::VERSION, "1.18.0-dev") >= 0 %}
+    def initialize(host : String, port, dns_timeout = nil, connect_timeout = nil, blocking = false, family = Socket::Family::UNSPEC)
+      Addrinfo.tcp(host, port, timeout: dns_timeout, family: family) do |addrinfo|
+        super(family: addrinfo.family, type: addrinfo.type, protocol: addrinfo.protocol)
+        Socket.set_blocking(self.fd, blocking)
+        connect(addrinfo, timeout: connect_timeout) do |error|
+          close
+          error
+        end
      end
    end
-  end
+  {% else %}
+    def initialize(host : String, port, dns_timeout = nil, connect_timeout = nil, blocking = false, family = Socket::Family::UNSPEC)
+      Addrinfo.tcp(host, port, timeout: dns_timeout, family: family) do |addrinfo|
+        super(addrinfo.family, addrinfo.type, addrinfo.protocol, blocking)
+        connect(addrinfo, timeout: connect_timeout) do |error|
+          close
+          error
+        end
+      end
+    end
+  {% end %}
 end

 # :ditto:
@@ -63,19 +63,19 @@ def error_template_helper(env : HTTP::Server::Context, status_code : Int32, exce

  error_message = <<-END_HTML
    <div class="error_message">
-      <h2>#{translate(locale, "crash_page_you_found_a_bug")}</h2>
+      <h2>#{I18n.translate(locale, "crash_page_you_found_a_bug")}</h2>
      <br/><br/>

-      <p><b>#{translate(locale, "crash_page_before_reporting")}</b></p>
+      <p><b>#{I18n.translate(locale, "crash_page_before_reporting")}</b></p>
      <ul>
-        <li>#{translate(locale, "crash_page_refresh", env.request.resource)}</li>
-        <li>#{translate(locale, "crash_page_switch_instance", url_switch)}</li>
-        <li>#{translate(locale, "crash_page_read_the_faq", url_faq)}</li>
-        <li>#{translate(locale, "crash_page_search_issue", url_search_issues)}</li>
+        <li>#{I18n.translate(locale, "crash_page_refresh", env.request.resource)}</li>
+        <li>#{I18n.translate(locale, "crash_page_switch_instance", url_switch)}</li>
+        <li>#{I18n.translate(locale, "crash_page_read_the_faq", url_faq)}</li>
+        <li>#{I18n.translate(locale, "crash_page_search_issue", url_search_issues)}</li>
      </ul>

      <br/>
-      <p>#{translate(locale, "crash_page_report_issue", url_new_issue)}</p>
+      <p>#{I18n.translate(locale, "crash_page_report_issue", url_new_issue)}</p>

      <!-- TODO: Add a "copy to clipboard" button -->
      <pre class="error-issue-template">#{issue_template}</pre>
@@ -95,7 +95,7 @@ def error_template_helper(env : HTTP::Server::Context, status_code : Int32, mess

  locale = env.get("preferences").as(Preferences).locale

-  error_message = translate(locale, message)
+  error_message = I18n.translate(locale, message)
  next_steps = error_redirect_helper(env)

  return templated "error"
@@ -186,10 +186,10 @@ def error_redirect_helper(env : HTTP::Server::Context)

  if request_path.starts_with?("/search") || request_path.starts_with?("/watch") ||
     request_path.starts_with?("/channel") || request_path.starts_with?("/playlist?list=PL")
-    next_steps_text = translate(locale, "next_steps_error_message")
-    refresh = translate(locale, "next_steps_error_message_refresh")
-    go_to_youtube = translate(locale, "next_steps_error_message_go_to_youtube")
-    switch_instance = translate(locale, "Switch Invidious Instance")
+    next_steps_text = I18n.translate(locale, "next_steps_error_message")
+    refresh = I18n.translate(locale, "next_steps_error_message_refresh")
+    go_to_youtube = I18n.translate(locale, "next_steps_error_message_go_to_youtube")
+    switch_instance = I18n.translate(locale, "Switch Invidious Instance")

    return <<-END_HTML
      <p style="margin-bottom: 4px;">#{next_steps_text}</p>
@@ -201,7 +201,7 @@ def error_redirect_helper(env : HTTP::Server::Context)
          <a href="/redirect?referer=#{env.get("current_page")}">#{switch_instance}</a>
        </li>
        <li>
-          <a rel="noreferrer noopener" href="https://youtube.com#{env.request.resource}">#{go_to_youtube}</a>
+          <a rel="noreferrer noopener" href="https://www.youtube.com#{env.request.resource}">#{go_to_youtube}</a>
        </li>
      </ul>
    END_HTML
@@ -22,60 +22,124 @@ struct Annotation
  property annotations : String
 end

-def html_to_content(description_html : String)
-  description = description_html.gsub(/(<br>)|(<br\/>)/, {
-    "<br>":  "\n",
-    "<br/>": "\n",
-  })
+module Helpers
+  extend self

-  if !description.empty?
-    description = XML.parse_html(description).content.strip("\n ")
-  end
+  private TEST_IDS = {"AgbeGFYluEA", "BaW_jenozKc", "a9LDPn-MO4I", "ddFvjfvPnqk", "iqKdEhx-dD4"}

-  return description
-end
+  def html_to_content(description_html : String)
+    description = description_html.gsub(/(<br>)|(<br\/>)/, {
+      "<br>":  "\n",
+      "<br/>": "\n",
+    })

-def cache_annotation(id, annotations)
-  if !CONFIG.cache_annotations
-    return
-  end
-
-  body = XML.parse(annotations)
-  nodeset = body.xpath_nodes(%q(/document/annotations/annotation))
-
-  return if nodeset == 0
-
-  has_legacy_annotations = false
-  nodeset.each do |node|
-    if !{"branding", "card", "drawer"}.includes? node["type"]?
-      has_legacy_annotations = true
-      break
+    if !description.empty?
+      description = XML.parse_html(description).content.strip("\n ")
    end
+
+    return description
  end

-  Invidious::Database::Annotations.insert(id, annotations) if has_legacy_annotations
-end
+  def cache_annotation(id, annotations)
+    if !CONFIG.cache_annotations
+      return
+    end

-def create_notification_stream(env, topics, connection_channel)
-  connection = Channel(PQ::Notification).new(8)
-  connection_channel.send({true, connection})
+    body = XML.parse(annotations)
+    nodeset = body.xpath_nodes(%q(/document/annotations/annotation))

-  locale = env.get("preferences").as(Preferences).locale
+    return if nodeset == 0

-  since = env.params.query["since"]?.try &.to_i?
-  id = 0
+    has_legacy_annotations = false
+    nodeset.each do |node|
+      if !{"branding", "card", "drawer"}.includes? node["type"]?
+        has_legacy_annotations = true
+        break
+      end
+    end
+
+    Invidious::Database::Annotations.insert(id, annotations) if has_legacy_annotations
+  end
+
+  def create_notification_stream(env, topics, connection_channel)
+    connection = Channel(PQ::Notification).new(8)
+    connection_channel.send({true, connection})
+
+    locale = env.get("preferences").as(Preferences).locale
+
+    since = env.params.query["since"]?.try &.to_i?
+    id = 0
+
+    if topics.includes? "debug"
+      spawn do
+        begin
+          loop do
+            time_span = [0, 0, 0, 0]
+            time_span[rand(4)] = rand(30) + 5
+            published = Time.utc - Time::Span.new(days: time_span[0], hours: time_span[1], minutes: time_span[2], seconds: time_span[3])
+            video_id = TEST_IDS[rand(TEST_IDS.size)]
+
+            video = get_video(video_id)
+            video.published = published
+            response = JSON.parse(video.to_json(locale, nil))
+
+            env.response.puts "id: #{id}"
+            env.response.puts "data: #{response.to_json}"
+            env.response.puts
+            env.response.flush
+
+            id += 1
+
+            sleep 1.minute
+            Fiber.yield
+          end
+        rescue ex
+        end
+      end
+    end
+
+    spawn do
+      begin
+        if since
+          since_unix = Time.unix(since.not_nil!)
+
+          topics.try &.each do |topic|
+            case topic
+            when .match(/UC[A-Za-z0-9_-]{22}/)
+              Invidious::Database::ChannelVideos.select_notfications(topic, since_unix).each do |video|
+                response = JSON.parse(video.to_json(locale))
+
+                env.response.puts "id: #{id}"
+                env.response.puts "data: #{response.to_json}"
+                env.response.puts
+                env.response.flush
+
+                id += 1
+              end
+            else
+              # TODO
+            end
+          end
+        end
+      end
+    end

-  if topics.includes? "debug"
    spawn do
      begin
        loop do
-          time_span = [0, 0, 0, 0]
-          time_span[rand(4)] = rand(30) + 5
-          published = Time.utc - Time::Span.new(days: time_span[0], hours: time_span[1], minutes: time_span[2], seconds: time_span[3])
-          video_id = TEST_IDS[rand(TEST_IDS.size)]
+          event = connection.receive
+
+          notification = JSON.parse(event.payload)
+          topic = notification["topic"].as_s
+          video_id = notification["videoId"].as_s
+          published = notification["published"].as_i64
+
+          if !topics.try &.includes? topic
+            next
+          end

          video = get_video(video_id)
-          video.published = published
+          video.published = Time.unix(published)
          response = JSON.parse(video.to_json(locale, nil))

          env.response.puts "id: #{id}"
@@ -84,65 +148,20 @@ def create_notification_stream(env, topics, connection_channel)
          env.response.flush

          id += 1
-
-          sleep 1.minute
-          Fiber.yield
        end
      rescue ex
+      ensure
+        connection_channel.send({false, connection})
      end
    end
-  end

-  spawn do
-    begin
-      if since
-        since_unix = Time.unix(since.not_nil!)
-
-        topics.try &.each do |topic|
-          case topic
-          when .match(/UC[A-Za-z0-9_-]{22}/)
-            Invidious::Database::ChannelVideos.select_notfications(topic, since_unix).each do |video|
-              response = JSON.parse(video.to_json(locale))
-
-              env.response.puts "id: #{id}"
-              env.response.puts "data: #{response.to_json}"
-              env.response.puts
-              env.response.flush
-
-              id += 1
-            end
-          else
-            # TODO
-          end
-        end
-      end
-    end
-  end
-
-  spawn do
    begin
+      # Send heartbeat
      loop do
-        event = connection.receive
-
-        notification = JSON.parse(event.payload)
-        topic = notification["topic"].as_s
-        video_id = notification["videoId"].as_s
-        published = notification["published"].as_i64
-
-        if !topics.try &.includes? topic
-          next
-        end
-
-        video = get_video(video_id)
-        video.published = Time.unix(published)
-        response = JSON.parse(video.to_json(locale, nil))
-
-        env.response.puts "id: #{id}"
-        env.response.puts "data: #{response.to_json}"
+        env.response.puts ":keepalive #{Time.utc.to_unix}"
        env.response.puts
        env.response.flush
-
-        id += 1
+        sleep (20 + rand(11)).seconds
      end
    rescue ex
    ensure
@@ -150,51 +169,38 @@ def create_notification_stream(env, topics, connection_channel)
    end
  end

-  begin
-    # Send heartbeat
-    loop do
-      env.response.puts ":keepalive #{Time.utc.to_unix}"
-      env.response.puts
-      env.response.flush
-      sleep (20 + rand(11)).seconds
-    end
-  rescue ex
-  ensure
-    connection_channel.send({false, connection})
-  end
-end
-
-def extract_initial_data(body) : Hash(String, JSON::Any)
-  return JSON.parse(body.match(/(window\["ytInitialData"\]|var\s*ytInitialData)\s*=\s*(?<info>{.*?});<\/script>/mx).try &.["info"] || "{}").as_h
-end
-
-def proxy_file(response, env)
-  if response.headers.includes_word?("Content-Encoding", "gzip")
-    Compress::Gzip::Writer.open(env.response) do |deflate|
-      IO.copy response.body_io, deflate
-    end
-  elsif response.headers.includes_word?("Content-Encoding", "deflate")
-    Compress::Deflate::Writer.open(env.response) do |deflate|
-      IO.copy response.body_io, deflate
-    end
-  else
-    IO.copy response.body_io, env.response
-  end
-end
-
-# Fetch the playback requests tracker from the statistics endpoint.
-#
-# Creates a new tracker when unavailable.
-def get_playback_statistic
-  if (tracker = Invidious::Jobs::StatisticsRefreshJob::STATISTICS["playback"]) && tracker.as(Hash).empty?
-    tracker = {
-      "totalRequests"      => 0_i64,
-      "successfulRequests" => 0_i64,
-      "ratio"              => 0_f64,
-    }
-
-    Invidious::Jobs::StatisticsRefreshJob::STATISTICS["playback"] = tracker
+  def extract_initial_data(body) : Hash(String, JSON::Any)
+    return JSON.parse(body.match(/(window\["ytInitialData"\]|var\s*ytInitialData)\s*=\s*(?<info>{.*?});<\/script>/mx).try &.["info"] || "{}").as_h
  end

-  return tracker.as(Hash(String, Int64 | Float64))
+  def proxy_file(response, env)
+    if response.headers.includes_word?("Content-Encoding", "gzip")
+      Compress::Gzip::Writer.open(env.response) do |deflate|
+        IO.copy response.body_io, deflate
+      end
+    elsif response.headers.includes_word?("Content-Encoding", "deflate")
+      Compress::Deflate::Writer.open(env.response) do |deflate|
+        IO.copy response.body_io, deflate
+      end
+    else
+      IO.copy response.body_io, env.response
+    end
+  end
+
+  # Fetch the playback requests tracker from the statistics endpoint.
+  #
+  # Creates a new tracker when unavailable.
+  def get_playback_statistic
+    if (tracker = Invidious::Jobs::StatisticsRefreshJob::STATISTICS["playback"]) && tracker.as(Hash).empty?
+      tracker = {
+        "totalRequests"      => 0_i64,
+        "successfulRequests" => 0_i64,
+        "ratio"              => 0_f64,
+      }
+
+      Invidious::Jobs::StatisticsRefreshJob::STATISTICS["playback"] = tracker
+    end
+
+    return tracker.as(Hash(String, Int64 | Float64))
+  end
 end
@@ -1,199 +1,203 @@
-# Languages requiring a better level of translation (at least 20%)
-# to be added to the list below:
-#
-#  "af"      => "", # Afrikaans
-#  "az"      => "", # Azerbaijani
-#  "be"      => "", # Belarusian
-#  "bn_BD"   => "", # Bengali (Bangladesh)
-#  "ia"      => "", # Interlingua
-#  "or"      => "", # Odia
-#  "tk"      => "", # Turkmen
-#  "tok      => "", # Toki Pona
-#
-LOCALES_LIST = {
-  "ar"      => "العربية",               # Arabic
-  "bg"      => "български",             # Bulgarian
-  "bn"      => "বাংলা",                 # Bengali
-  "ca"      => "Català",                # Catalan
-  "cs"      => "Čeština",               # Czech
-  "cy"      => "Cymraeg",               # Welsh
-  "da"      => "Dansk",                 # Danish
-  "de"      => "Deutsch",               # German
-  "el"      => "Ελληνικά",              # Greek
-  "en-US"   => "English",               # English
-  "eo"      => "Esperanto",             # Esperanto
-  "es"      => "Español",               # Spanish
-  "et"      => "Eesti keel",            # Estonian
-  "eu"      => "Euskara",               # Basque
-  "fa"      => "فارسی",                 # Persian
-  "fi"      => "Suomi",                 # Finnish
-  "fr"      => "Français",              # French
-  "he"      => "עברית",                 # Hebrew
-  "hi"      => "हिन्दी",                # Hindi
-  "hr"      => "Hrvatski",              # Croatian
-  "hu-HU"   => "Magyar Nyelv",          # Hungarian
-  "id"      => "Bahasa Indonesia",      # Indonesian
-  "is"      => "Íslenska",              # Icelandic
-  "it"      => "Italiano",              # Italian
-  "ja"      => "日本語",                   # Japanese
-  "ko"      => "한국어",                   # Korean
-  "lmo"     => "Lombard",               # Lombard
-  "lt"      => "Lietuvių",              # Lithuanian
-  "nb-NO"   => "Norsk bokmål",          # Norwegian Bokmål
-  "nl"      => "Nederlands",            # Dutch
-  "pl"      => "Polski",                # Polish
-  "pt"      => "Português",             # Portuguese
-  "pt-BR"   => "Português Brasileiro",  # Portuguese (Brazil)
-  "pt-PT"   => "Português de Portugal", # Portuguese (Portugal)
-  "ro"      => "Română",                # Romanian
-  "ru"      => "Русский",               # Russian
-  "si"      => "සිංහල",                 # Sinhala
-  "sk"      => "Slovenčina",            # Slovak
-  "sl"      => "Slovenščina",           # Slovenian
-  "sq"      => "Shqip",                 # Albanian
-  "sr"      => "Srpski (latinica)",     # Serbian (Latin)
-  "sr_Cyrl" => "Српски (ћирилица)",     # Serbian (Cyrillic)
-  "sv-SE"   => "Svenska",               # Swedish
-  "ta"      => "தமிழ்",                 # Tamil
-  "tr"      => "Türkçe",                # Turkish
-  "uk"      => "Українська",            # Ukrainian
-  "vi"      => "Tiếng Việt",            # Vietnamese
-  "zh-CN"   => "汉语",                    # Chinese (Simplified)
-  "zh-TW"   => "漢語",                    # Chinese (Traditional)
-}
+module I18n
+  extend self

-LOCALES = load_all_locales()
+  # Languages requiring a better level of translation (at least 20%)
+  # to be added to the list below:
+  #
+  #  "af"      => "", # Afrikaans
+  #  "az"      => "", # Azerbaijani
+  #  "be"      => "", # Belarusian
+  #  "bn_BD"   => "", # Bengali (Bangladesh)
+  #  "ia"      => "", # Interlingua
+  #  "or"      => "", # Odia
+  #  "tk"      => "", # Turkmen
+  #  "tok      => "", # Toki Pona
+  #
+  LOCALES_LIST = {
+    "ar"      => "العربية",               # Arabic
+    "bg"      => "български",             # Bulgarian
+    "bn"      => "বাংলা",                 # Bengali
+    "ca"      => "Català",                # Catalan
+    "cs"      => "Čeština",               # Czech
+    "cy"      => "Cymraeg",               # Welsh
+    "da"      => "Dansk",                 # Danish
+    "de"      => "Deutsch",               # German
+    "el"      => "Ελληνικά",              # Greek
+    "en-US"   => "English",               # English
+    "eo"      => "Esperanto",             # Esperanto
+    "es"      => "Español",               # Spanish
+    "et"      => "Eesti keel",            # Estonian
+    "eu"      => "Euskara",               # Basque
+    "fa"      => "فارسی",                 # Persian
+    "fi"      => "Suomi",                 # Finnish
+    "fr"      => "Français",              # French
+    "he"      => "עברית",                 # Hebrew
+    "hi"      => "हिन्दी",                # Hindi
+    "hr"      => "Hrvatski",              # Croatian
+    "hu-HU"   => "Magyar Nyelv",          # Hungarian
+    "id"      => "Bahasa Indonesia",      # Indonesian
+    "is"      => "Íslenska",              # Icelandic
+    "it"      => "Italiano",              # Italian
+    "ja"      => "日本語",                   # Japanese
+    "ko"      => "한국어",                   # Korean
+    "lmo"     => "Lombard",               # Lombard
+    "lt"      => "Lietuvių",              # Lithuanian
+    "nb-NO"   => "Norsk bokmål",          # Norwegian Bokmål
+    "nl"      => "Nederlands",            # Dutch
+    "pl"      => "Polski",                # Polish
+    "pt"      => "Português",             # Portuguese
+    "pt-BR"   => "Português Brasileiro",  # Portuguese (Brazil)
+    "pt-PT"   => "Português de Portugal", # Portuguese (Portugal)
+    "ro"      => "Română",                # Romanian
+    "ru"      => "Русский",               # Russian
+    "si"      => "සිංහල",                 # Sinhala
+    "sk"      => "Slovenčina",            # Slovak
+    "sl"      => "Slovenščina",           # Slovenian
+    "sq"      => "Shqip",                 # Albanian
+    "sr"      => "Srpski (latinica)",     # Serbian (Latin)
+    "sr_Cyrl" => "Српски (ћирилица)",     # Serbian (Cyrillic)
+    "sv-SE"   => "Svenska",               # Swedish
+    "ta"      => "தமிழ்",                 # Tamil
+    "tr"      => "Türkçe",                # Turkish
+    "uk"      => "Українська",            # Ukrainian
+    "vi"      => "Tiếng Việt",            # Vietnamese
+    "zh-CN"   => "汉语",                    # Chinese (Simplified)
+    "zh-TW"   => "漢語",                    # Chinese (Traditional)
+  }

-CONTENT_REGIONS = {
-  "AE", "AR", "AT", "AU", "AZ", "BA", "BD", "BE", "BG", "BH", "BO", "BR", "BY",
-  "CA", "CH", "CL", "CO", "CR", "CY", "CZ", "DE", "DK", "DO", "DZ", "EC", "EE",
-  "EG", "ES", "FI", "FR", "GB", "GE", "GH", "GR", "GT", "HK", "HN", "HR", "HU",
-  "ID", "IE", "IL", "IN", "IQ", "IS", "IT", "JM", "JO", "JP", "KE", "KR", "KW",
-  "KZ", "LB", "LI", "LK", "LT", "LU", "LV", "LY", "MA", "ME", "MK", "MT", "MX",
-  "MY", "NG", "NI", "NL", "NO", "NP", "NZ", "OM", "PA", "PE", "PG", "PH", "PK",
-  "PL", "PR", "PT", "PY", "QA", "RO", "RS", "RU", "SA", "SE", "SG", "SI", "SK",
-  "SN", "SV", "TH", "TN", "TR", "TW", "TZ", "UA", "UG", "US", "UY", "VE", "VN",
-  "YE", "ZA", "ZW",
-}
+  LOCALES = load_all_locales()

-# Enum for the different types of number formats
-enum NumberFormatting
-  None      # Print the number as-is
-  Separator # Use a separator for thousands
-  Short     # Use short notation (k/M/B)
-  HtmlSpan  # Surround with <span id="count"></span>
-end
+  CONTENT_REGIONS = {
+    "AE", "AR", "AT", "AU", "AZ", "BA", "BD", "BE", "BG", "BH", "BO", "BR", "BY",
+    "CA", "CH", "CL", "CO", "CR", "CY", "CZ", "DE", "DK", "DO", "DZ", "EC", "EE",
+    "EG", "ES", "FI", "FR", "GB", "GE", "GH", "GR", "GT", "HK", "HN", "HR", "HU",
+    "ID", "IE", "IL", "IN", "IQ", "IS", "IT", "JM", "JO", "JP", "KE", "KR", "KW",
+    "KZ", "LB", "LI", "LK", "LT", "LU", "LV", "LY", "MA", "ME", "MK", "MT", "MX",
+    "MY", "NG", "NI", "NL", "NO", "NP", "NZ", "OM", "PA", "PE", "PG", "PH", "PK",
+    "PL", "PR", "PT", "PY", "QA", "RO", "RS", "RU", "SA", "SE", "SG", "SI", "SK",
+    "SN", "SV", "TH", "TN", "TR", "TW", "TZ", "UA", "UG", "US", "UY", "VE", "VN",
+    "YE", "ZA", "ZW",
+  }

-def load_all_locales
-  locales = {} of String => Hash(String, JSON::Any)
-
-  LOCALES_LIST.each_key do |name|
-    locales[name] = JSON.parse(File.read("locales/#{name}.json")).as_h
+  # Enum for the different types of number formats
+  enum NumberFormatting
+    None      # Print the number as-is
+    Separator # Use a separator for thousands
+    Short     # Use short notation (k/M/B)
+    HtmlSpan  # Surround with <span id="count"></span>
  end

-  return locales
-end
+  def load_all_locales
+    locales = {} of String => Hash(String, JSON::Any)

-def translate(locale : String?, key : String, text : String | Hash(String, String) | Nil = nil) : String
-  # Log a warning if "key" doesn't exist in en-US locale and return
-  # that key as the text, so this is more or less transparent to the user.
-  if !LOCALES["en-US"].has_key?(key)
-    LOGGER.warn("i18n: Missing translation key \"#{key}\"")
-    return key
-  end
-
-  # Default to english, whenever the locale doesn't exist,
-  # or the key requested has not been translated
-  if locale && LOCALES.has_key?(locale) && LOCALES[locale].has_key?(key)
-    raw_data = LOCALES[locale][key]
-  else
-    raw_data = LOCALES["en-US"][key]
-  end
-
-  case raw_data
-  when .as_h?
-    # Init
-    translation = ""
-    match_length = 0
-
-    raw_data.as_h.each do |hash_key, value|
-      if text.is_a?(String)
-        if md = text.try &.match(/#{hash_key}/)
-          if md[0].size >= match_length
-            translation = value.as_s
-            match_length = md[0].size
-          end
-        end
-      end
+    LOCALES_LIST.each_key do |name|
+      locales[name] = JSON.parse(File.read("locales/#{name}.json")).as_h
    end
-  when .as_s?
-    translation = raw_data.as_s
-  else
-    raise "Invalid translation \"#{raw_data}\""
+
+    return locales
  end

-  if text.is_a?(String)
-    translation = translation.gsub("`x`", text)
-  elsif text.is_a?(Hash(String, String))
-    # adds support for multi string interpolation. Based on i18next https://www.i18next.com/translation-function/interpolation#basic
-    text.each_key do |hash_key|
-      translation = translation.gsub("{{#{hash_key}}}", text[hash_key])
-    end
-  end
-
-  return translation
-end
-
-def translate_count(locale : String, key : String, count : Int, format = NumberFormatting::None) : String
-  # Fallback on english if locale doesn't exist
-  locale = "en-US" if !LOCALES.has_key?(locale)
-
-  # Retrieve suffix
-  suffix = I18next::Plurals::RESOLVER.get_suffix(locale, count)
-  plural_key = key + suffix
-
-  if LOCALES[locale].has_key?(plural_key)
-    translation = LOCALES[locale][plural_key].as_s
-  else
-    # Try #1: Fallback to singular in the same locale
-    singular_suffix = I18next::Plurals::RESOLVER.get_suffix(locale, 1)
-
-    if LOCALES[locale].has_key?(key + singular_suffix)
-      translation = LOCALES[locale][key + singular_suffix].as_s
-    elsif locale != "en-US"
-      # Try #2: Fallback to english
-      translation = translate_count("en-US", key, count)
-    else
-      # Return key if we're already in english, as the translation is missing
+  def translate(locale : String?, key : String, text : String | Hash(String, String) | Nil = nil) : String
+    # Log a warning if "key" doesn't exist in en-US locale and return
+    # that key as the text, so this is more or less transparent to the user.
+    if !LOCALES["en-US"].has_key?(key)
      LOGGER.warn("i18n: Missing translation key \"#{key}\"")
      return key
    end
+
+    # Default to english, whenever the locale doesn't exist,
+    # or the key requested has not been translated
+    if locale && LOCALES.has_key?(locale) && LOCALES[locale].has_key?(key)
+      raw_data = LOCALES[locale][key]
+    else
+      raw_data = LOCALES["en-US"][key]
+    end
+
+    case raw_data
+    when .as_h?
+      # Init
+      translation = ""
+      match_length = 0
+
+      raw_data.as_h.each do |hash_key, value|
+        if text.is_a?(String)
+          if md = text.try &.match(/#{hash_key}/)
+            if md[0].size >= match_length
+              translation = value.as_s
+              match_length = md[0].size
+            end
+          end
+        end
+      end
+    when .as_s?
+      translation = raw_data.as_s
+    else
+      raise "Invalid translation \"#{raw_data}\""
+    end
+
+    if text.is_a?(String)
+      translation = translation.gsub("`x`", text)
+    elsif text.is_a?(Hash(String, String))
+      # adds support for multi string interpolation. Based on i18next https://www.i18next.com/translation-function/interpolation#basic
+      text.each_key do |hash_key|
+        translation = translation.gsub("{{#{hash_key}}}", text[hash_key])
+      end
+    end
+
+    return translation
  end

-  case format
-  when .separator? then count_txt = number_with_separator(count)
-  when .short?     then count_txt = number_to_short_text(count)
-  when .html_span? then count_txt = "<span id=\"count\">" + count.to_s + "</span>"
-  else                  count_txt = count.to_s
+  def translate_count(locale : String, key : String, count : Int, format = NumberFormatting::None) : String
+    # Fallback on english if locale doesn't exist
+    locale = "en-US" if !LOCALES.has_key?(locale)
+
+    # Retrieve suffix
+    suffix = I18next::Plurals::RESOLVER.get_suffix(locale, count)
+    plural_key = key + suffix
+
+    if LOCALES[locale].has_key?(plural_key)
+      translation = LOCALES[locale][plural_key].as_s
+    else
+      # Try #1: Fallback to singular in the same locale
+      singular_suffix = I18next::Plurals::RESOLVER.get_suffix(locale, 1)
+
+      if LOCALES[locale].has_key?(key + singular_suffix)
+        translation = LOCALES[locale][key + singular_suffix].as_s
+      elsif locale != "en-US"
+        # Try #2: Fallback to english
+        translation = self.translate_count("en-US", key, count)
+      else
+        # Return key if we're already in english, as the translation is missing
+        LOGGER.warn("i18n: Missing translation key \"#{key}\"")
+        return key
+      end
+    end
+
+    case format
+    when .separator? then count_txt = number_with_separator(count)
+    when .short?     then count_txt = number_to_short_text(count)
+    when .html_span? then count_txt = "<span id=\"count\">" + count.to_s + "</span>"
+    else                  count_txt = count.to_s
+    end
+
+    return translation.gsub("{{count}}", count_txt)
  end

-  return translation.gsub("{{count}}", count_txt)
-end
+  def translate_bool(locale : String?, translation : Bool)
+    case translation
+    when true
+      return self.translate(locale, "Yes")
+    when false
+      return self.translate(locale, "No")
+    end
+  end

-def translate_bool(locale : String?, translation : Bool)
-  case translation
-  when true
-    return translate(locale, "Yes")
-  when false
-    return translate(locale, "No")
+  def locale_is_rtl?(locale : String?)
+    # Fallback to en-US
+    return false if locale.nil?
+
+    # Arabic, Persian, Hebrew
+    # See https://en.wikipedia.org/wiki/Right-to-left_script#List_of_RTL_scripts
+    return {"ar", "fa", "he"}.includes? locale
  end
 end
-
-def locale_is_rtl?(locale : String?)
-  # Fallback to en-US
-  return false if locale.nil?
-
-  # Arabic, Persian, Hebrew
-  # See https://en.wikipedia.org/wiki/Right-to-left_script#List_of_RTL_scripts
-  return {"ar", "fa", "he"}.includes? locale
-end
@@ -53,7 +53,7 @@ struct SearchVideo
            xml.element("img", src: "#{HOST_URL}/vi/#{self.id}/mqdefault.jpg")
          end

-          xml.element("p", style: "word-break:break-word;white-space:pre-wrap") { xml.text html_to_content(self.description_html) }
+          xml.element("p", style: "word-break:break-word;white-space:pre-wrap") { xml.text Helpers.html_to_content(self.description_html) }
        end
      end

@@ -63,7 +63,7 @@ struct SearchVideo
        xml.element("media:title") { xml.text self.title }
        xml.element("media:thumbnail", url: "#{HOST_URL}/vi/#{self.id}/mqdefault.jpg",
          width: "320", height: "180")
-        xml.element("media:description") { xml.text html_to_content(self.description_html) }
+        xml.element("media:description") { xml.text Helpers.html_to_content(self.description_html) }
      end

      xml.element("media:community") do
@@ -111,13 +111,13 @@ struct SearchVideo
        Invidious::JSONify::APIv1.thumbnails(json, self.id)
      end

-      json.field "description", html_to_content(self.description_html)
+      json.field "description", Helpers.html_to_content(self.description_html)
      json.field "descriptionHtml", self.description_html

      json.field "viewCount", self.views
-      json.field "viewCountText", translate_count(locale, "generic_views_count", self.views, NumberFormatting::Short)
+      json.field "viewCountText", I18n.translate_count(locale, "generic_views_count", self.views, I18n::NumberFormatting::Short)
      json.field "published", self.published.to_unix
-      json.field "publishedText", translate(locale, "`x` ago", recode_date(self.published, locale))
+      json.field "publishedText", I18n.translate(locale, "`x` ago", recode_date(self.published, locale))
      json.field "lengthSeconds", self.length_seconds
      json.field "liveNow", self.badges.live_now?
      json.field "premium", self.badges.premium?
@@ -255,7 +255,7 @@ struct SearchChannel
      json.field "videoCount", self.video_count
      json.field "channelHandle", self.channel_handle

-      json.field "description", html_to_content(self.description_html)
+      json.field "description", Helpers.html_to_content(self.description_html)
      json.field "descriptionHtml", self.description_html
    end
  end
@@ -327,8 +327,8 @@ struct ProblematicTimelineItem
      xml.element("content", type: "xhtml") do
        xml.element("div", xmlns: "http://www.w3.org/1999/xhtml") do
          xml.element("div") do
-            xml.element("h4") { translate(locale, "timeline_parse_error_placeholder_heading") }
-            xml.element("p") { translate(locale, "timeline_parse_error_placeholder_message") }
+            xml.element("h4") { I18n.translate(locale, "timeline_parse_error_placeholder_heading") }
+            xml.element("p") { I18n.translate(locale, "timeline_parse_error_placeholder_message") }
          end

          xml.element("pre") do
@@ -1,349 +0,0 @@
-require "uri"
-require "socket"
-require "socket/tcp_socket"
-require "socket/unix_socket"
-
-{% if flag?(:advanced_debug) %}
-  require "io/hexdump"
-{% end %}
-
-private alias NetworkEndian = IO::ByteFormat::NetworkEndian
-
-module Invidious::SigHelper
-  enum UpdateStatus
-    Updated
-    UpdateNotRequired
-    Error
-  end
-
-  # -------------------
-  #  Payload types
-  # -------------------
-
-  abstract struct Payload
-  end
-
-  struct StringPayload < Payload
-    getter string : String
-
-    def initialize(str : String)
-      raise Exception.new("SigHelper: String can't be empty") if str.empty?
-      @string = str
-    end
-
-    def self.from_bytes(slice : Bytes)
-      size = IO::ByteFormat::NetworkEndian.decode(UInt16, slice)
-      if size == 0 # Error code
-        raise Exception.new("SigHelper: Server encountered an error")
-      end
-
-      if (slice.bytesize - 2) != size
-        raise Exception.new("SigHelper: String size mismatch")
-      end
-
-      if str = String.new(slice[2..])
-        return self.new(str)
-      else
-        raise Exception.new("SigHelper: Can't read string from socket")
-      end
-    end
-
-    def to_io(io)
-      # `.to_u16` raises if there is an overflow during the conversion
-      io.write_bytes(@string.bytesize.to_u16, NetworkEndian)
-      io.write(@string.to_slice)
-    end
-  end
-
-  private enum Opcode
-    FORCE_UPDATE            = 0
-    DECRYPT_N_SIGNATURE     = 1
-    DECRYPT_SIGNATURE       = 2
-    GET_SIGNATURE_TIMESTAMP = 3
-    GET_PLAYER_STATUS       = 4
-    PLAYER_UPDATE_TIMESTAMP = 5
-  end
-
-  private record Request,
-    opcode : Opcode,
-    payload : Payload?
-
-  # ----------------------
-  #  High-level functions
-  # ----------------------
-
-  class Client
-    @mux : Multiplexor
-
-    def initialize(uri_or_path)
-      @mux = Multiplexor.new(uri_or_path)
-    end
-
-    # Forces the server to re-fetch the YouTube player, and extract the necessary
-    # components from it (nsig function code, sig function code, signature timestamp).
-    def force_update : UpdateStatus
-      request = Request.new(Opcode::FORCE_UPDATE, nil)
-
-      value = send_request(request) do |bytes|
-        IO::ByteFormat::NetworkEndian.decode(UInt16, bytes)
-      end
-
-      case value
-      when 0x0000 then return UpdateStatus::Error
-      when 0xFFFF then return UpdateStatus::UpdateNotRequired
-      when 0xF44F then return UpdateStatus::Updated
-      else
-        code = value.nil? ? "nil" : value.to_s(base: 16)
-        raise Exception.new("SigHelper: Invalid status code received #{code}")
-      end
-    end
-
-    # Decrypt a provided n signature using the server's current nsig function
-    # code, and return the result (or an error).
-    def decrypt_n_param(n : String) : String?
-      request = Request.new(Opcode::DECRYPT_N_SIGNATURE, StringPayload.new(n))
-
-      n_dec = self.send_request(request) do |bytes|
-        StringPayload.from_bytes(bytes).string
-      end
-
-      return n_dec
-    end
-
-    # Decrypt a provided s signature using the server's current sig function
-    # code, and return the result (or an error).
-    def decrypt_sig(sig : String) : String?
-      request = Request.new(Opcode::DECRYPT_SIGNATURE, StringPayload.new(sig))
-
-      sig_dec = self.send_request(request) do |bytes|
-        StringPayload.from_bytes(bytes).string
-      end
-
-      return sig_dec
-    end
-
-    # Return the signature timestamp from the server's current player
-    def get_signature_timestamp : UInt64?
-      request = Request.new(Opcode::GET_SIGNATURE_TIMESTAMP, nil)
-
-      return self.send_request(request) do |bytes|
-        IO::ByteFormat::NetworkEndian.decode(UInt64, bytes)
-      end
-    end
-
-    # Return the current player's version
-    def get_player : UInt32?
-      request = Request.new(Opcode::GET_PLAYER_STATUS, nil)
-
-      return self.send_request(request) do |bytes|
-        has_player = (bytes[0] == 0xFF)
-        player_version = IO::ByteFormat::NetworkEndian.decode(UInt32, bytes[1..4])
-        has_player ? player_version : nil
-      end
-    end
-
-    # Return when the player was last updated
-    def get_player_timestamp : UInt64?
-      request = Request.new(Opcode::PLAYER_UPDATE_TIMESTAMP, nil)
-
-      return self.send_request(request) do |bytes|
-        IO::ByteFormat::NetworkEndian.decode(UInt64, bytes)
-      end
-    end
-
-    private def send_request(request : Request, &)
-      channel = @mux.send(request)
-      slice = channel.receive
-      return yield slice
-    rescue ex
-      LOGGER.debug("SigHelper: Error when sending a request")
-      LOGGER.trace(ex.inspect_with_backtrace)
-      return nil
-    end
-  end
-
-  # ---------------------
-  #  Low level functions
-  # ---------------------
-
-  class Multiplexor
-    alias TransactionID = UInt32
-    record Transaction, channel = ::Channel(Bytes).new
-
-    @prng = Random.new
-    @mutex = Mutex.new
-    @queue = {} of TransactionID => Transaction
-
-    @conn : Connection
-    @uri_or_path : String
-
-    def initialize(@uri_or_path)
-      @conn = Connection.new(uri_or_path)
-      listen
-    end
-
-    def listen : Nil
-      raise "Socket is closed" if @conn.closed?
-
-      LOGGER.debug("SigHelper: Multiplexor listening")
-
-      spawn do
-        loop do
-          begin
-            receive_data
-          rescue ex
-            LOGGER.info("SigHelper: Connection to helper died with '#{ex.message}' trying to reconnect...")
-            # We close the socket because for some reason is not closed.
-            @conn.close
-            loop do
-              begin
-                @conn = Connection.new(@uri_or_path)
-                LOGGER.info("SigHelper: Reconnected to SigHelper!")
-              rescue ex
-                LOGGER.debug("SigHelper: Reconnection to helper unsuccessful with error '#{ex.message}'. Retrying")
-                sleep 500.milliseconds
-                next
-              end
-              break if !@conn.closed?
-            end
-          end
-          Fiber.yield
-        end
-      end
-    end
-
-    def send(request : Request)
-      transaction = Transaction.new
-      transaction_id = @prng.rand(TransactionID)
-
-      # Add transaction to queue
-      @mutex.synchronize do
-        # On a 32-bits random integer, this should never happen. Though, just in case, ...
-        if @queue[transaction_id]?
-          raise Exception.new("SigHelper: Duplicate transaction ID! You got a shiny pokemon!")
-        end
-
-        @queue[transaction_id] = transaction
-      end
-
-      write_packet(transaction_id, request)
-
-      return transaction.channel
-    end
-
-    def receive_data
-      transaction_id, slice = read_packet
-
-      @mutex.synchronize do
-        if transaction = @queue.delete(transaction_id)
-          # Remove transaction from queue and send data to the channel
-          transaction.channel.send(slice)
-          LOGGER.trace("SigHelper: Transaction unqueued and data sent to channel")
-        else
-          raise Exception.new("SigHelper: Received transaction was not in queue")
-        end
-      end
-    end
-
-    # Read a single packet from the socket
-    private def read_packet : {TransactionID, Bytes}
-      # Header
-      transaction_id = @conn.read_bytes(UInt32, NetworkEndian)
-      length = @conn.read_bytes(UInt32, NetworkEndian)
-
-      LOGGER.trace("SigHelper: Recv transaction 0x#{transaction_id.to_s(base: 16)} / length #{length}")
-
-      if length > 67_000
-        raise Exception.new("SigHelper: Packet longer than expected (#{length})")
-      end
-
-      # Payload
-      slice = Bytes.new(length)
-      @conn.read(slice) if length > 0
-
-      LOGGER.trace("SigHelper: payload = #{slice}")
-      LOGGER.trace("SigHelper: Recv transaction 0x#{transaction_id.to_s(base: 16)} - Done")
-
-      return transaction_id, slice
-    end
-
-    # Write a single packet to the socket
-    private def write_packet(transaction_id : TransactionID, request : Request)
-      LOGGER.trace("SigHelper: Send transaction 0x#{transaction_id.to_s(base: 16)} / opcode #{request.opcode}")
-
-      io = IO::Memory.new(1024)
-      io.write_bytes(request.opcode.to_u8, NetworkEndian)
-      io.write_bytes(transaction_id, NetworkEndian)
-
-      if payload = request.payload
-        payload.to_io(io)
-      end
-
-      @conn.send(io)
-      @conn.flush
-
-      LOGGER.trace("SigHelper: Send transaction 0x#{transaction_id.to_s(base: 16)} - Done")
-    end
-  end
-
-  class Connection
-    @socket : UNIXSocket | TCPSocket
-
-    {% if flag?(:advanced_debug) %}
-      @io : IO::Hexdump
-    {% end %}
-
-    def initialize(host_or_path : String)
-      case host_or_path
-      when .starts_with?('/')
-        # Make sure that the file exists
-        if File.exists?(host_or_path)
-          @socket = UNIXSocket.new(host_or_path)
-        else
-          raise Exception.new("SigHelper: '#{host_or_path}' no such file")
-        end
-      when .starts_with?("tcp://")
-        uri = URI.parse(host_or_path)
-        @socket = TCPSocket.new(uri.host.not_nil!, uri.port.not_nil!)
-      else
-        uri = URI.parse("tcp://#{host_or_path}")
-        @socket = TCPSocket.new(uri.host.not_nil!, uri.port.not_nil!)
-      end
-      LOGGER.info("SigHelper: Using helper at '#{host_or_path}'")
-
-      {% if flag?(:advanced_debug) %}
-        @io = IO::Hexdump.new(@socket, output: STDERR, read: true, write: true)
-      {% end %}
-
-      @socket.sync = false
-      @socket.blocking = false
-    end
-
-    def closed? : Bool
-      return @socket.closed?
-    end
-
-    def close : Nil
-      @socket.close if !@socket.closed?
-    end
-
-    def flush(*args, **options)
-      @socket.flush(*args, **options)
-    end
-
-    def send(*args, **options)
-      @socket.send(*args, **options)
-    end
-
-    # Wrap IO functions, with added debug tooling if needed
-    {% for function in %w(read read_bytes write write_bytes) %}
-      def {{function.id}}(*args, **options)
-        {% if flag?(:advanced_debug) %}
-          @io.{{function.id}}(*args, **options)
-        {% else %}
-          @socket.{{function.id}}(*args, **options)
-        {% end %}
-      end
-    {% end %}
-  end
-end
@@ -1,53 +0,0 @@
-require "http/params"
-require "./sig_helper"
-
-class Invidious::DecryptFunction
-  @last_update : Time = Time.utc - 42.days
-
-  def initialize(uri_or_path)
-    @client = SigHelper::Client.new(uri_or_path)
-    self.check_update
-  end
-
-  def check_update
-    # If we have updated in the last 5 minutes, do nothing
-    return if (Time.utc - @last_update) < 5.minutes
-
-    # Get the amount of time elapsed since when the player was updated, in the
-    # event where multiple invidious processes are run in parallel.
-    update_time_elapsed = (@client.get_player_timestamp || 301).seconds
-
-    if update_time_elapsed > 5.minutes
-      LOGGER.debug("Signature: Player might be outdated, updating")
-      @client.force_update
-      @last_update = Time.utc
-    end
-  end
-
-  def decrypt_nsig(n : String) : String?
-    self.check_update
-    return @client.decrypt_n_param(n)
-  rescue ex
-    LOGGER.debug(ex.message || "Signature: Unknown error")
-    LOGGER.trace(ex.inspect_with_backtrace)
-    return nil
-  end
-
-  def decrypt_signature(str : String) : String?
-    self.check_update
-    return @client.decrypt_sig(str)
-  rescue ex
-    LOGGER.debug(ex.message || "Signature: Unknown error")
-    LOGGER.trace(ex.inspect_with_backtrace)
-    return nil
-  end
-
-  def get_sts : UInt64?
-    self.check_update
-    return @client.get_signature_timestamp
-  rescue ex
-    LOGGER.debug(ex.message || "Signature: Unknown error")
-    LOGGER.trace(ex.inspect_with_backtrace)
-    return nil
-  end
-end
@@ -1,3 +1,5 @@
+PUBSUB_URL = URI.parse("https://pubsubhubbub.appspot.com")
+
 # See http://www.evanmiller.org/how-not-to-sort-by-average-rating.html
 def ci_lower_bound(pos, n)
  if n == 0
@@ -144,19 +146,19 @@ def recode_date(time : Time, locale)
  span = Time.utc - time

  if span.total_days > 365.0
-    return translate_count(locale, "generic_count_years", span.total_days.to_i // 365)
+    return I18n.translate_count(locale, "generic_count_years", span.total_days.to_i // 365)
  elsif span.total_days > 30.0
-    return translate_count(locale, "generic_count_months", span.total_days.to_i // 30)
+    return I18n.translate_count(locale, "generic_count_months", span.total_days.to_i // 30)
  elsif span.total_days > 7.0
-    return translate_count(locale, "generic_count_weeks", span.total_days.to_i // 7)
+    return I18n.translate_count(locale, "generic_count_weeks", span.total_days.to_i // 7)
  elsif span.total_hours > 24.0
-    return translate_count(locale, "generic_count_days", span.total_days.to_i)
+    return I18n.translate_count(locale, "generic_count_days", span.total_days.to_i)
  elsif span.total_minutes > 60.0
-    return translate_count(locale, "generic_count_hours", span.total_hours.to_i)
+    return I18n.translate_count(locale, "generic_count_hours", span.total_hours.to_i)
  elsif span.total_seconds > 60.0
-    return translate_count(locale, "generic_count_minutes", span.total_minutes.to_i)
+    return I18n.translate_count(locale, "generic_count_minutes", span.total_minutes.to_i)
  else
-    return translate_count(locale, "generic_count_seconds", span.total_seconds.to_i)
+    return I18n.translate_count(locale, "generic_count_seconds", span.total_seconds.to_i)
  end
 end

@@ -0,0 +1,120 @@
+{% skip_file if compare_versions(Crystal::VERSION, "1.17.0-dev") < 0 %}
+
+module Invidious::HttpServer
+  class StaticAssetsHandler < HTTP::StaticFileHandler
+    # In addition to storing the actual data of a file, it also implements the required
+    # getters needed for the object to imitate a `File::Stat` within `StaticFileHandler`.
+    #
+    # Since the `File::Stat` is created once in `#call` and then passed around to the
+    # rest of the class's methods, imitating the object allows us to only lookup
+    # the cache hash once for every request.
+    #
+    private record CachedFile, data : Bytes, size : Int64, modification_time : Time do
+      def directory?
+        false
+      end
+
+      def file?
+        true
+      end
+    end
+
+    CACHE_LIMIT = 5_000_000 # 5MB
+    @@current_cache_size = 0
+    @@cached_files = {} of Path => CachedFile
+
+    # Returns metadata for the requested file
+    #
+    # If the requested file is cached, a `CachedFile` is returned instead of a `File::Stat`.
+    # This represents the metadata info of a cached file and implements all the methods of `File::Stat` that
+    # is used by the `StaticAssetsHandler`.
+    #
+    # The `CachedFile` also stores the raw bytes of the cached file, and this method serves as the place where
+    # the cached file is retrieved if it exists. Though the data will only be read in `#serve_file`
+    private def file_info(expanded_path : Path)
+      file_path = @public_dir.join(expanded_path.to_kind(Path::Kind.native))
+      {@@cached_files[file_path]? || File.info?(file_path), file_path}
+    end
+
+    # Add "Cache-Control" header to the response
+    private def add_cache_headers(response_headers : HTTP::Headers, last_modified : Time) : Nil
+      super; response_headers["Cache-Control"] = "max-age=2629800"
+    end
+
+    # Serves and caches the file at the given path.
+    #
+    # This is an override of `serve_file` to allow serving a file from memory, and to cache it
+    # it as needed.
+    private def serve_file(context : HTTP::Server::Context, file_info, file_path : Path, original_file_path : Path, last_modified : Time)
+      context.response.content_type = MIME.from_filename(original_file_path.to_s, "application/octet-stream")
+
+      range_header = context.request.headers["Range"]?
+
+      # If the file is cached we can just directly serve it
+      if file_info.is_a? CachedFile
+        return dispatch_serve(context, file_info.data, file_info, range_header)
+      end
+
+      # Otherwise we'll need to read from disk and cache it
+      retrieve_bytes_from = IO::Memory.new
+      File.open(file_path) do |file|
+        # We cannot cache partial data so we'll rewind and read from the start
+        if range_header
+          dispatch_serve(context, file, file_info, range_header)
+          IO.copy(file.rewind, retrieve_bytes_from)
+        else
+          context.response.output = IO::MultiWriter.new(context.response.output, retrieve_bytes_from, sync_close: true)
+          dispatch_serve(context, file, file_info, range_header)
+        end
+      end
+
+      return flush_io_to_cache(retrieve_bytes_from, file_path, file_info)
+    end
+
+    # Writes file data to the cache
+    private def flush_io_to_cache(io, file_path, file_info)
+      if (@@current_cache_size += file_info.size) <= CACHE_LIMIT
+        @@cached_files[file_path] = CachedFile.new(io.to_slice, file_info.size, file_info.modification_time)
+      end
+    end
+
+    # Either send the file in full, or just fragments of it depending on the request
+    private def dispatch_serve(context, file, file_info, range_header)
+      if range_header
+        # an IO is needed for `serve_file_range`
+        file = file.is_a?(Bytes) ? IO::Memory.new(file, writeable: false) : file
+        serve_file_range(context, file, range_header, file_info)
+      else
+        context.response.headers["Accept-Ranges"] = "bytes"
+        serve_file_full(context, file, file_info)
+      end
+    end
+
+    # If we're serving the full file right away then there's no need for an IO at all.
+    private def serve_file_full(context : HTTP::Server::Context, file : Bytes, file_info)
+      context.response.status = :ok
+      context.response.content_length = file_info.size
+      context.response.write file
+    end
+
+    # Serves segments of a file based on the `Range header`
+    #
+    # An override of `serve_file_range` to allow using a generic IO rather than a `File`.
+    # Literally the same code as what we inherited but just with the `file` argument's type
+    # being set to `IO` rather than `File`
+    #
+    # Can be removed once https://github.com/crystal-lang/crystal/issues/15817 is fixed.
+    private def serve_file_range(context : HTTP::Server::Context, file : IO, range_header : String, file_info)
+      # Paste in the body of inherited serve_file_range
+      {{@type.superclass.methods.select(&.name.==("serve_file_range"))[0].body}}
+    end
+
+    # Clear cached files.
+    #
+    # This is only used in the specs to clear the cache before each handler test
+    def self.clear_cache
+      @@current_cache_size = 0
+      return @@cached_files.clear
+    end
+  end
+end
@@ -22,7 +22,7 @@ module Invidious::JSONify::APIv1
      json.field "description", video.description
      json.field "descriptionHtml", video.description_html
      json.field "published", video.published.to_unix
-      json.field "publishedText", translate(locale, "`x` ago", recode_date(video.published, locale))
+      json.field "publishedText", I18n.translate(locale, "`x` ago", recode_date(video.published, locale))
      json.field "keywords", video.keywords

      json.field "viewCount", video.views
@@ -266,10 +266,9 @@ module Invidious::JSONify::APIv1

                json.field "lengthSeconds", rv["length_seconds"]?.try &.to_i
                json.field "viewCountText", rv["short_view_count"]?
-                json.field "viewCount", rv["view_count"]?.try &.empty? ? nil : rv["view_count"].to_i64
                json.field "published", rv["published"]?
                if rv["published"]?.try &.presence
-                  json.field "publishedText", translate(locale, "`x` ago", recode_date(Time.parse_rfc3339(rv["published"].to_s), locale))
+                  json.field "publishedText", I18n.translate(locale, "`x` ago", recode_date(Time.parse_rfc3339(rv["published"].to_s), locale))
                else
                  json.field "publishedText", ""
                end
@@ -27,7 +27,7 @@ def fetch_mix(rdid, video_id, cookies = nil, locale = nil)

  video_id = "CvFH_6DNRCY" if rdid.starts_with? "OLAK5uy_"
  response = YT_POOL.client &.get("/watch?v=#{video_id}&list=#{rdid}&gl=US&hl=en", headers)
-  initial_data = extract_initial_data(response.body)
+  initial_data = Helpers.extract_initial_data(response.body)

  if !initial_data["contents"]["twoColumnWatchNextResults"]["playlist"]?
    raise InfoException.new("Could not create mix.")
@@ -107,7 +107,11 @@ struct Playlist

      json.field "author", self.author
      json.field "authorId", self.ucid
-      json.field "authorUrl", "/channel/#{self.ucid}"
+      if !self.ucid.empty?
+        json.field "authorUrl", "/channel/#{self.ucid}"
+      else
+        json.field "authorUrl", ""
+      end
      json.field "subtitle", self.subtitle

      json.field "authorThumbnails" do
@@ -195,7 +199,7 @@ struct InvidiousPlaylist
      json.field "authorUrl", nil
      json.field "authorThumbnails", [] of String

-      json.field "description", html_to_content(self.description_html)
+      json.field "description", Helpers.html_to_content(self.description_html)
      json.field "descriptionHtml", self.description_html
      json.field "videoCount", self.video_count

@@ -359,6 +363,9 @@ def fetch_playlist(plid : String)
  thumbnail = playlist_info.dig?(
    "thumbnailRenderer", "playlistVideoThumbnailRenderer",
    "thumbnail", "thumbnails", 0, "url"
+  ).try &.as_s || playlist_info.dig?(
+    "thumbnailRenderer", "playlistCustomThumbnailRenderer",
+    "thumbnail", "thumbnails", 0, "url"
  ).try &.as_s

  views = 0_i64
@@ -377,7 +384,7 @@ def fetch_playlist(plid : String)
      video_count = text.gsub(/\D/, "").to_i? || 0
    elsif text.includes? "view"
      views = text.gsub(/\D/, "").to_i64? || 0_i64
-    else
+    elsif !text.includes? "Pay to watch"
      updated = decode_date(text.lchop("Last updated on ").lchop("Updated "))
    end
  end
@@ -438,7 +445,7 @@ def get_playlist_videos(playlist : InvidiousPlaylist | Playlist, offset : Int32,
      # 100 videos per request
      ctoken = produce_playlist_continuation(playlist.id, offset)
      initial_data = YoutubeAPI.browse(ctoken)
-      videos += extract_playlist_videos(initial_data)
+      videos += extract_playlist_videos(playlist.id, initial_data)

      offset += 100
    end
@@ -447,7 +454,11 @@ def get_playlist_videos(playlist : InvidiousPlaylist | Playlist, offset : Int32,
  end
 end

-def extract_playlist_videos(initial_data : Hash(String, JSON::Any))
+# TODO (2026-06-24): Migrate this function to use parsers instead, as it uses,
+# the same LockupViewModel used in Channel videos and Youtube playlists that
+# appears on searches (Invidious /search endpoint).
+# Related to https://github.com/iv-org/invidious/pull/5736
+def extract_playlist_videos(playlist_id : String, initial_data : Hash(String, JSON::Any))
  videos = [] of PlaylistVideo | ProblematicTimelineItem

  if initial_data["contents"]?
@@ -460,8 +471,7 @@ def extract_playlist_videos(initial_data : Hash(String, JSON::Any))
      tabs_contents = tabs_renderer.["contents"]? || tabs_renderer.["content"]

      list_renderer = tabs_contents.["sectionListRenderer"]["contents"][0]
-      item_renderer = list_renderer.["itemSectionRenderer"]["contents"][0]
-      contents = item_renderer.["playlistVideoListRenderer"]["contents"].as_a
+      contents = list_renderer.["itemSectionRenderer"]["contents"].as_a
    else
      # Continuation data
      contents = initial_data["onResponseReceivedActions"][0]?
@@ -472,15 +482,39 @@ def extract_playlist_videos(initial_data : Hash(String, JSON::Any))
  end

  contents.try &.each do |item|
-    if i = item["playlistVideoRenderer"]?
-      video_id = i["navigationEndpoint"]["watchEndpoint"]["videoId"].as_s
-      plid = i["navigationEndpoint"]["watchEndpoint"]["playlistId"].as_s
-      index = i["navigationEndpoint"]["watchEndpoint"]["index"].as_i64
+    if i = item["lockupViewModel"]?
+      thumbnail_view_model = i.dig?(
+        "contentImage", "thumbnailViewModel"
+      )
+
+      watch_endpoint = i.dig?("rendererContext", "commandContext", "onTap", "innertubeCommand", "watchEndpoint")
+      video_id = watch_endpoint.try &.["videoId"]?.try &.as_s
+      plid = watch_endpoint.try &.["playlistId"]?.try &.as_s || playlist_id
+      index = watch_endpoint.try &.["index"]?.try &.as_i64
+
+      metadata = i["metadata"]?
+      lockup_metadata_view_model = metadata.try &.dig?("lockupMetadataViewModel")
+      title = lockup_metadata_view_model.try &.dig?("title", "content").try &.as_s
+      lockup_metadata = lockup_metadata_view_model.try &.dig?("metadata")
+      metadata_rows = lockup_metadata.try &.dig?("contentMetadataViewModel", "metadataRows").try &.as_a
+
+      # Find the metadataParts with commandRuns inside, which contains author
+      # information.
+      metadata_parts = metadata_rows.try &.find { |row|
+        parts = row["metadataParts"]?.try &.as_a
+        parts && parts.any? { |item2| item2.dig?("text", "commandRuns").try &.as_a }
+      }.try &.["metadataParts"].as_a
+
+      if author_info = metadata_parts.try &.find(&.dig?("text", "commandRuns"))
+           .try &.["text"]
+        author = author_info["content"].as_s
+        ucid = author_info.dig?("commandRuns", 0, "onTap", "innertubeCommand", "browseEndpoint", "browseId")
+          .try &.as_s
+      end
+
+      length = thumbnail_view_model.try &.dig?("overlays", 0, "thumbnailBottomOverlayViewModel", "badges", 0, "thumbnailBadgeViewModel", "text").try &.as_s
+      length_seconds = decode_length_seconds(length) if length

-      title = i["title"].try { |t| t["simpleText"]? || t["runs"]?.try &.[0]["text"]? }.try &.as_s || ""
-      author = i["shortBylineText"]?.try &.["runs"][0]["text"].as_s || ""
-      ucid = i["shortBylineText"]?.try &.["runs"][0]["navigationEndpoint"]["browseEndpoint"]["browseId"].as_s || ""
-      length_seconds = i["lengthSeconds"]?.try &.as_s.to_i
      live = false

      if !length_seconds
@@ -489,15 +523,15 @@ def extract_playlist_videos(initial_data : Hash(String, JSON::Any))
      end

      videos << PlaylistVideo.new({
-        title:          title,
-        id:             video_id,
-        author:         author,
-        ucid:           ucid,
+        title:          title || "",
+        id:             video_id || "",
+        author:         author || "",
+        ucid:           ucid || "",
        length_seconds: length_seconds,
        published:      Time.utc,
        plid:           plid,
        live_now:       live,
-        index:          index,
+        index:          index || -1_i64,
      })
    end
  rescue ex
@@ -8,7 +8,7 @@ module Invidious::Routes::API::V1::Authenticated
  #   topics = env.params.body["topics"]?.try &.split(",").uniq.first(1000)
  #   topics ||= [] of String

-  #   create_notification_stream(env, topics, connection_channel)
+  #   Helpers.create_notification_stream(env, topics, connection_channel)
  # end

  def self.get_preferences(env)
@@ -485,6 +485,6 @@ module Invidious::Routes::API::V1::Authenticated
    topics = raw_topics.try &.split(",").uniq.first(1000)
    topics ||= [] of String

-    create_notification_stream(env, topics, CONNECTION_CHANNEL)
+    Helpers.create_notification_stream(env, topics, CONNECTION_CHANNEL)
  end
 end
@@ -97,13 +97,14 @@ module Invidious::Routes::API::V1::Channels
        json.field "autoGenerated", channel.auto_generated
        json.field "ageGated", channel.is_age_gated
        json.field "isFamilyFriendly", channel.is_family_friendly
-        json.field "description", html_to_content(channel.description_html)
+        json.field "description", Helpers.html_to_content(channel.description_html)
        json.field "descriptionHtml", channel.description_html

        json.field "allowedRegions", channel.allowed_regions
        json.field "tabs", channel.tabs
        json.field "tags", channel.tags
        json.field "authorVerified", channel.verified
+        json.field "pronouns", channel.pronouns

        json.field "latestVideos" do
          json.array do
@@ -127,7 +128,6 @@ module Invidious::Routes::API::V1::Channels
            end
          end
        end # relatedChannels
-
      end
    end
  end
@@ -1,6 +1,9 @@
 require "html"

 module Invidious::Routes::API::V1::Videos
+  private INTERNET_ARCHIVE_URL = URI.parse("https://archive.org")
+  private CHARS_SAFE           = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"
+
  def self.videos(env)
    locale = env.get("preferences").as(Preferences).locale

@@ -279,7 +282,7 @@ module Invidious::Routes::API::V1::Videos

        file = URI.encode_www_form("#{id[0, 3]}/#{id}.xml")

-        location = make_client(ARCHIVE_URL, &.get("/download/youtubeannotations_#{index}/#{id[0, 2]}.tar/#{file}"))
+        location = make_client(INTERNET_ARCHIVE_URL, &.get("/download/youtubeannotations_#{index}/#{id[0, 2]}.tar/#{file}"))

        if !location.headers["Location"]?
          env.response.status_code = location.status_code
@@ -297,7 +300,7 @@ module Invidious::Routes::API::V1::Videos

        annotations = response.body

-        cache_annotation(id, annotations)
+        Helpers.cache_annotation(id, annotations)
      end
    else # "youtube"
      response = YT_POOL.client &.get("/annotations_invideo?video_id=#{id}")
@@ -407,7 +410,7 @@ module Invidious::Routes::API::V1::Videos
    clip_title = nil

    if params = response.dig?("endpoint", "watchEndpoint", "params").try &.as_s
-      start_time, end_time, clip_title = parse_clip_parameters(params)
+      start_time, end_time, clip_title = Invidious::Videos::Clip.parse_clip_parameters(params)
    end

    begin
@@ -1,4 +1,16 @@
 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("{}")

@@ -7,7 +19,7 @@ module Invidious::Routes::BeforeAll
        preferences = Preferences.from_json(URI.decode_www_form(prefs_cookie.value))
      else
        if language_header = env.request.headers["Accept-Language"]?
-          if language = ANG.language_negotiator.best(language_header, LOCALES.keys)
+          if language = ANG.language_negotiator.best(language_header, I18n::LOCALES.keys)
            preferences.locale = language.header
          end
        end
@@ -20,6 +32,8 @@ module Invidious::Routes::BeforeAll
    env.response.headers["X-XSS-Protection"] = "1; mode=block"
    env.response.headers["X-Content-Type-Options"] = "nosniff"

+    env.set "header_x-forwarded-host", env.request.headers["X-Forwarded-Host"]?
+
    # Only allow the pages at /embed/* to be embedded
    if env.request.resource.starts_with?("/embed")
      frame_ancestors = "'self' file: http: https:"
@@ -35,9 +49,9 @@ module Invidious::Routes::BeforeAll
      "style-src 'self' 'unsafe-inline'",
      "img-src 'self' data:",
      "font-src 'self' data:",
-      "connect-src 'self'",
+      "connect-src 'self' " + COMPANION_CSP.companion_urls,
      "manifest-src 'self'",
-      "media-src 'self' blob:",
+      "media-src 'self' blob: " + COMPANION_CSP.companion_urls,
      "child-src 'self' blob:",
      "frame-src 'self'",
      "frame-ancestors " + frame_ancestors,
@@ -94,8 +108,8 @@ module Invidious::Routes::BeforeAll
    end

    dark_mode = convert_theme(env.params.query["dark_mode"]?) || preferences.dark_mode.to_s
-    thin_mode = env.params.query["thin_mode"]? || preferences.thin_mode.to_s
-    thin_mode = thin_mode == "true"
+    thin_mode = env.params.query["thin_mode"]?
+    thin_mode = (thin_mode == "true") || preferences.thin_mode
    locale = env.params.query["hl"]? || preferences.locale

    preferences.dark_mode = dark_mode
@@ -231,8 +231,10 @@ module Invidious::Routes::Channels
      env.redirect "/post/#{URI.encode_www_form(lb)}?ucid=#{URI.encode_www_form(ucid)}"
    end

-    thin_mode = env.params.query["thin_mode"]? || env.get("preferences").as(Preferences).thin_mode
-    thin_mode = thin_mode == "true"
+    preferences = env.get("preferences").as(Preferences)
+
+    thin_mode = env.params.query["thin_mode"]?
+    thin_mode = (thin_mode == "true") || preferences.thin_mode

    continuation = env.params.query["continuation"]?

@@ -264,11 +266,11 @@ module Invidious::Routes::Channels
    id = env.params.url["id"]
    ucid = env.params.query["ucid"]?

-    prefs = env.get("preferences").as(Preferences)
+    preferences = env.get("preferences").as(Preferences)

-    locale = prefs.locale
+    locale = preferences.locale

-    thin_mode = env.params.query["thin_mode"]? || prefs.thin_mode
+    thin_mode = env.params.query["thin_mode"]? || preferences.thin_mode
    thin_mode = thin_mode == "true"

    nojs = env.params.query["nojs"]?
@@ -349,10 +351,10 @@ module Invidious::Routes::Channels
    invidious_url_params.delete_all("user")

    begin
-      resolved_url = YoutubeAPI.resolve_url("https://youtube.com#{env.request.path}#{yt_url_params.size > 0 ? "?#{yt_url_params}" : ""}")
+      resolved_url = YoutubeAPI.resolve_url("https://www.youtube.com#{env.request.path}#{yt_url_params.size > 0 ? "?#{yt_url_params}" : ""}")
      ucid = resolved_url["endpoint"]["browseEndpoint"]["browseId"]
    rescue ex : InfoException | KeyError
-      return error_template(404, translate(locale, "This channel does not exist."))
+      return error_template(404, I18n.translate(locale, "This channel does not exist."))
    end

    selected_tab = env.params.url["tab"]?
@@ -1,5 +1,5 @@
 module Invidious::Routes::Companion
-  # /companion
+  # GET /companion
  def self.get_companion(env)
    url = env.request.path
    if env.request.query
@@ -16,6 +16,23 @@ module Invidious::Routes::Companion
    end
  end

+  # POST /companion
+  def self.post_companion(env)
+    url = env.request.path
+    if env.request.query
+      url += "?#{env.request.query}"
+    end
+
+    begin
+      COMPANION_POOL.client do |wrapper|
+        wrapper.client.post(url, env.request.headers, env.request.body) do |resp|
+          return self.proxy_companion(env, resp)
+        end
+      end
+    rescue ex
+    end
+  end
+
  def self.options_companion(env)
    url = env.request.path
    if env.request.query
@@ -10,7 +10,7 @@ module Invidious::Routes::Embed
        videos = get_playlist_videos(playlist, offset: offset)
        if videos.empty?
          url = "/playlist?list=#{plid}"
-          raise NotFoundException.new(translate(locale, "error_video_not_in_playlist", url))
+          raise NotFoundException.new(I18n.translate(locale, "error_video_not_in_playlist", url))
        end

        first_playlist_video = videos[0].as(PlaylistVideo)
@@ -33,7 +33,8 @@ module Invidious::Routes::Embed
  end

  def self.show(env)
-    locale = env.get("preferences").as(Preferences).locale
+    preferences = env.get("preferences").as(Preferences)
+    locale = preferences.locale
    id = env.params.url["id"]

    plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
@@ -45,8 +46,6 @@ module Invidious::Routes::Embed
      env.params.query.delete("playlist")
    end

-    preferences = env.get("preferences").as(Preferences)
-
    if id.includes?("%20") || id.includes?("+") || env.params.query.to_s.includes?("%20") || env.params.query.to_s.includes?("+")
      id = env.params.url["id"].gsub("%20", "").delete("+")

@@ -72,7 +71,7 @@ module Invidious::Routes::Embed
          videos = get_playlist_videos(playlist, offset: offset)
          if videos.empty?
            url = "/playlist?list=#{plid}"
-            raise NotFoundException.new(translate(locale, "error_video_not_in_playlist", url))
+            raise NotFoundException.new(I18n.translate(locale, "error_video_not_in_playlist", url))
          end

          first_playlist_video = videos[0].as(PlaylistVideo)
@@ -123,7 +122,7 @@ module Invidious::Routes::Embed
    else nil # Continue
    end

-    params = process_video_params(env.params.query, preferences)
+    params = Invidious::Videos.process_video_params(env.params.query, preferences)

    user = env.get?("user").try &.as(User)
    if user
@@ -209,17 +208,6 @@ module Invidious::Routes::Embed

    if CONFIG.invidious_companion.present?
      invidious_companion = CONFIG.invidious_companion.sample
-      invidious_companion_urls = CONFIG.invidious_companion.reject(&.builtin_proxy).map do |companion|
-        uri =
-          "#{companion.public_url.scheme}://#{companion.public_url.host}#{companion.public_url.port ? ":#{companion.public_url.port}" : ""}"
-      end.join(" ")
-
-      if !invidious_companion_urls.empty?
-        env.response.headers["Content-Security-Policy"] =
-          env.response.headers["Content-Security-Policy"]
-            .gsub("media-src", "media-src #{invidious_companion_urls}")
-            .gsub("connect-src", "connect-src #{invidious_companion_urls}")
-      end
    end

    rendered "embed"
@@ -8,7 +8,7 @@ module Invidious::Routes::ErrorRoutes
    if md = env.request.path.match(/^\/(?<id>([a-zA-Z0-9_-]{11})|(\w+))$/)
      item = md["id"]

-      # Check if item is branding URL e.g. https://youtube.com/gaming
+      # Check if item is branding URL e.g. https://www.youtube.com/gaming
      response = YT_POOL.client &.get("/#{item}")

      if response.status_code == 301
@@ -37,19 +37,20 @@ module Invidious::Routes::Feeds
    if CONFIG.popular_enabled
      templated "feeds/popular"
    else
-      message = translate(locale, "The Popular feed has been disabled by the administrator.")
+      message = I18n.translate(locale, "The Popular feed has been disabled by the administrator.")
      templated "message"
    end
  end

  def self.trending(env)
-    locale = env.get("preferences").as(Preferences).locale
+    preferences = env.get("preferences").as(Preferences)
+    locale = preferences.locale

    trending_type = env.params.query["type"]?
    trending_type ||= "Default"

    region = env.params.query["region"]?
-    region ||= env.get("preferences").as(Preferences).region
+    region ||= preferences.region

    begin
      trending, plid = fetch_trending(trending_type, region, locale)
@@ -258,7 +259,7 @@ module Invidious::Routes::Feeds
        xml.element("link", "type": "text/html", rel: "alternate", href: "#{HOST_URL}/feed/subscriptions")
        xml.element("link", "type": "application/atom+xml", rel: "self",
          href: "#{HOST_URL}#{env.request.resource}")
-        xml.element("title") { xml.text translate(locale, "Invidious Private Feed for `x`", user.email) }
+        xml.element("title") { xml.text I18n.translate(locale, "Invidious Private Feed for `x`", user.email) }

        (notifications + videos).each do |video|
          video.to_xml(locale, params, xml)
@@ -282,6 +283,11 @@ module Invidious::Routes::Feeds
      if playlist = Invidious::Database::Playlists.select(id: plid)
        videos = get_playlist_videos(playlist, offset: 0)

+        user = env.get?("user").try &.as(User)
+        if !playlist || playlist.privacy.private? && playlist.author != user.try &.email
+          return error_atom(404, "Playlist does not exist.")
+        end
+
        return XML.build(indent: "  ", encoding: "UTF-8") do |xml|
          xml.element("feed", "xmlns:yt": "http://www.youtube.com/xml/schemas/2015",
            "xmlns:media": "http://search.yahoo.com/mrss/", xmlns: "http://www.w3.org/2005/Atom",
@@ -319,7 +325,7 @@ module Invidious::Routes::Feeds
        case attribute.name
        when "url", "href"
          request_target = URI.parse(node[attribute.name]).request_target
-          query_string_opt = request_target.starts_with?("/watch?v=") ? "&#{params}" : ""
+          query_string_opt = request_target.starts_with?("/watch?v=") ? ("&#{params}" if !params.empty?) : ""
          node[attribute.name] = "#{HOST_URL}#{request_target}#{query_string_opt}"
        else nil # Skip
        end
@@ -51,7 +51,7 @@ module Invidious::Routes::Images
  end

  # ??? maybe also for storyboards?
-  def self.s_p_image(env)
+  def self.s_p_image(env, authority = "i9")
    id = env.params.url["id"]
    name = env.params.url["name"]
    url = env.request.resource
@@ -65,13 +65,23 @@ module Invidious::Routes::Images
    end

    begin
-      get_ytimg_pool("i9").client &.get(url, headers) do |resp|
+      get_ytimg_pool(authority).client &.get(url, headers) do |resp|
        return self.proxy_image(env, resp)
      end
    rescue ex
    end
  end

+  # Both pl_c and tvfilm_banner use the same logic used in s_p_image(env)
+  # just with a different authority ("i").
+  def self.pl_c_image(env)
+    self.s_p_image(env, "i")
+  end
+
+  def self.tvfilm_banner_image(env)
+    self.s_p_image(env, "i")
+  end
+
  def self.yts_image(env)
    headers = HTTP::Headers.new
    REQUEST_HEADERS_WHITELIST.each do |header|
@@ -96,7 +106,7 @@ module Invidious::Routes::Images
          break
        end

-        proxy_file(response, env)
+        Helpers.proxy_file(response, env)
      end
    rescue ex
    end
@@ -148,6 +158,6 @@ module Invidious::Routes::Images
      return env.response.headers.delete("Transfer-Encoding")
    end

-    return proxy_file(response, env)
+    return Helpers.proxy_file(response, env)
  end
 end
@@ -26,6 +26,7 @@ module Invidious::Routes::Login

  def self.login(env)
    locale = env.get("preferences").as(Preferences).locale
+    host = env.get("header_x-forwarded-host")

    referer = get_referer(env, "/feed/subscriptions")

@@ -57,7 +58,11 @@ module Invidious::Routes::Login
          sid = Base64.urlsafe_encode(Random::Secure.random_bytes(32))
          Invidious::Database::SessionIDs.insert(sid, email)

-          env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.domain, sid)
+          if alt = CONFIG.alternative_domains.index(host)
+            env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.alternative_domains[alt], sid)
+          else
+            env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.domain, sid)
+          end
        else
          return error_template(401, "Wrong username or password")
        end
@@ -98,6 +103,8 @@ module Invidious::Routes::Login

            begin
              validate_request(tokens[0], answer, env.request, HMAC_KEY, locale)
+            rescue ex : InfoException
+              return error_template(400, InfoException.new("Erroneous CAPTCHA"))
            rescue ex
              return error_template(400, ex)
            end
@@ -110,7 +117,7 @@ module Invidious::Routes::Login
        user, sid = create_user(sid, email, password)

        if language_header = env.request.headers["Accept-Language"]?
-          if language = ANG.language_negotiator.best(language_header, LOCALES.keys)
+          if language = ANG.language_negotiator.best(language_header, I18n::LOCALES.keys)
            user.preferences.locale = language.header
          end
        end
@@ -121,7 +128,11 @@ module Invidious::Routes::Login
        view_name = "subscriptions_#{sha256(user.email)}"
        PG_DB.exec("CREATE MATERIALIZED VIEW #{view_name} AS #{MATERIALIZED_VIEW_SQL.call(user.email)}")

-        env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.domain, sid)
+        if alt = CONFIG.alternative_domains.index(host)
+          env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.alternative_domains[alt], sid)
+        else
+          env.response.cookies["SID"] = Invidious::User::Cookies.sid(CONFIG.domain, sid)
+        end

        if env.request.cookies["PREFS"]?
          user.preferences = env.get("preferences").as(Preferences)
@@ -225,10 +225,10 @@ module Invidious::Routes::Playlists
  end

  def self.add_playlist_items_page(env)
-    prefs = env.get("preferences").as(Preferences)
-    locale = prefs.locale
+    preferences = env.get("preferences").as(Preferences)
+    locale = preferences.locale

-    region = env.params.query["region"]? || prefs.region
+    region = env.params.query["region"]? || preferences.region

    user = env.get? "user"
    sid = env.get? "sid"
@@ -2,12 +2,11 @@

 module Invidious::Routes::PreferencesRoute
  def self.show(env)
-    locale = env.get("preferences").as(Preferences).locale
+    preferences = env.get("preferences").as(Preferences)
+    locale = preferences.locale

    referer = get_referer(env)

-    preferences = env.get("preferences").as(Preferences)
-
    templated "user/preferences"
  end

@@ -146,6 +145,10 @@ module Invidious::Routes::PreferencesRoute

    default_playlist = env.params.body["default_playlist"]?.try &.as(String)

+    search_privacy = env.params.body["search_privacy"]?.try &.as(String)
+    search_privacy ||= "off"
+    search_privacy = search_privacy == "on"
+
    # Convert to JSON and back again to take advantage of converters used for compatibility
    preferences = Preferences.from_json({
      annotations:                 annotations,
@@ -183,6 +186,7 @@ module Invidious::Routes::PreferencesRoute
      show_nick:                   show_nick,
      save_player_pos:             save_player_pos,
      default_playlist:            default_playlist,
+      search_privacy:              search_privacy,
    }.to_json)

    if user = env.get? "user"
@@ -227,7 +231,12 @@ module Invidious::Routes::PreferencesRoute
        File.write("config/config.yml", CONFIG.to_yaml)
      end
    else
-      env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.domain, preferences)
+      host = env.get("header_x-forwarded-host")
+      if alt = CONFIG.alternative_domains.index(host)
+        env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.alternative_domains[alt], preferences)
+      else
+        env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.domain, preferences)
+      end
    end

    env.redirect referer
@@ -262,7 +271,12 @@ module Invidious::Routes::PreferencesRoute
        preferences.dark_mode = "dark"
      end

-      env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.domain, preferences)
+      host = env.get("header_x-forwarded-host")
+      if alt = CONFIG.alternative_domains.index(host)
+        env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.alternative_domains[alt], preferences)
+      else
+        env.response.cookies["PREFS"] = Invidious::User::Cookies.prefs(CONFIG.domain, preferences)
+      end
    end

    if redirect
@@ -0,0 +1,20 @@
+module Invidious::Routes
+  private REQUEST_HEADERS_WHITELIST = {
+    "accept",
+    "accept-encoding",
+    "cache-control",
+    "content-length",
+    "if-none-match",
+    "range",
+  }
+  private 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",
+  }
+end
@@ -37,12 +37,19 @@ module Invidious::Routes::Search
  end

  def self.search(env)
-    prefs = env.get("preferences").as(Preferences)
-    locale = prefs.locale
+    preferences = env.get("preferences").as(Preferences)
+    locale = preferences.locale

-    region = env.params.query["region"]? || prefs.region
+    uri_params = URI::Params.new
+    if env.request.method == "GET"
+      uri_params = env.params.query
+    else
+      uri_params = env.params.body
+    end

-    query = Invidious::Search::Query.new(env.params.query, :regular, region)
+    region = uri_params["region"]? || preferences.region
+
+    query = Invidious::Search::Query.new(uri_params, :regular, region)

    if query.empty?
      # Display the full page search box implemented in #1977
@@ -1,4 +1,6 @@
 module Invidious::Routes::VideoPlayback
+  private HTTP_CHUNK_SIZE = 10485760 # ~10MB
+
  # /videoplayback
  def self.get_video_playback(env)
    locale = env.get("preferences").as(Preferences).locale
@@ -81,7 +83,7 @@ module Invidious::Routes::VideoPlayback
    # Remove the Range header added previously.
    headers.delete("Range") if range_header.nil?

-    playback_statistics = get_playback_statistic()
+    playback_statistics = Helpers.get_playback_statistic
    playback_statistics["totalRequests"] += 1

    if response.status_code >= 400
@@ -193,7 +195,7 @@ module Invidious::Routes::VideoPlayback
              end
            end

-            proxy_file(resp, env)
+            Helpers.proxy_file(resp, env)
          end
        rescue ex
          if ex.message != "Error reading socket: Connection reset by peer"
@@ -2,7 +2,8 @@

 module Invidious::Routes::Watch
  def self.handle(env)
-    locale = env.get("preferences").as(Preferences).locale
+    preferences = env.get("preferences").as(Preferences)
+    locale = preferences.locale
    region = env.params.query["region"]?

    if env.params.query.to_s.includes?("%20") || env.params.query.to_s.includes?("+")
@@ -38,8 +39,6 @@ module Invidious::Routes::Watch
    nojs ||= "0"
    nojs = nojs == "1"

-    preferences = env.get("preferences").as(Preferences)
-
    user = env.get?("user").try &.as(User)
    if user
      subscriptions = user.subscriptions
@@ -48,7 +47,7 @@ module Invidious::Routes::Watch
    end
    subscriptions ||= [] of String

-    params = process_video_params(env.params.query, preferences)
+    params = Invidious::Videos.process_video_params(env.params.query, preferences)
    env.params.query.delete_all("listen")

    begin
@@ -130,17 +129,20 @@ module Invidious::Routes::Watch
    video_streams = video.video_streams
    audio_streams = video.audio_streams

-    # Older videos may not have audio sources available.
-    # We redirect here so they're not unplayable
-    if audio_streams.empty? && !video.live_now
-      if params.quality == "dash"
-        env.params.query.delete_all("quality")
-        env.params.query["quality"] = "medium"
-        return env.redirect "/watch?#{env.params.query}"
-      elsif params.listen
-        env.params.query.delete_all("listen")
-        env.params.query["listen"] = "0"
-        return env.redirect "/watch?#{env.params.query}"
+    # Videos that are a premiere do not have audio streams.
+    if video.premiere_timestamp.nil?
+      # Older videos may not have audio sources available.
+      # We redirect here so they're not unplayable
+      if audio_streams.empty? && !video.live_now
+        if params.quality == "dash"
+          env.params.query.delete_all("quality")
+          env.params.query["quality"] = "medium"
+          return env.redirect "/watch?#{env.params.query}"
+        elsif params.listen
+          env.params.query.delete_all("listen")
+          env.params.query["listen"] = "0"
+          return env.redirect "/watch?#{env.params.query}"
+        end
      end
    end

@@ -194,17 +196,6 @@ module Invidious::Routes::Watch

    if CONFIG.invidious_companion.present?
      invidious_companion = CONFIG.invidious_companion.sample
-      invidious_companion_urls = CONFIG.invidious_companion.reject(&.builtin_proxy).map do |companion|
-        uri =
-          "#{companion.public_url.scheme}://#{companion.public_url.host}#{companion.public_url.port ? ":#{companion.public_url.port}" : ""}"
-      end.join(" ")
-
-      if !invidious_companion_urls.empty?
-        env.response.headers["Content-Security-Policy"] =
-          env.response.headers["Content-Security-Policy"]
-            .gsub("media-src", "media-src #{invidious_companion_urls}")
-            .gsub("connect-src", "connect-src #{invidious_companion_urls}")
-      end
    end

    templated "watch"
@@ -285,7 +276,7 @@ module Invidious::Routes::Watch

    if video_id = response.dig?("endpoint", "watchEndpoint", "videoId")
      if params = response.dig?("endpoint", "watchEndpoint", "params").try &.as_s
-        start_time, end_time, _ = parse_clip_parameters(params)
+        start_time, end_time, _ = Invidious::Videos::Clip.parse_clip_parameters(params)
        env.params.query["start"] = start_time.to_s if start_time != nil
        env.params.query["end"] = end_time.to_s if end_time != nil
      end
@@ -185,6 +185,7 @@ module Invidious::Routing
    get "/opensearch.xml", Routes::Search, :opensearch
    get "/results", Routes::Search, :results
    get "/search", Routes::Search, :search
+    post "/search", Routes::Search, :search
    get "/hashtag/:hashtag", Routes::Search, :hashtag
  end

@@ -222,11 +223,14 @@ module Invidious::Routing
    get "/s_p/:id/:name", Routes::Images, :s_p_image
    get "/yts/img/:name", Routes::Images, :yts_image
    get "/vi/:id/:name", Routes::Images, :thumbnails
+    get "/pl_c/:id/:name", Routes::Images, :pl_c_image
+    get "/tvfilm_banner/:id/:name", Routes::Images, :tvfilm_banner_image
  end

  def register_companion_routes
    if CONFIG.invidious_companion.present?
      get "/companion/*", Routes::Companion, :get_companion
+      post "/companion/*", Routes::Companion, :post_companion
      options "/companion/*", Routes::Companion, :options_companion
    end
  end
@@ -57,8 +57,6 @@ module Invidious::Search
    # Values correspond to { "1:varint": <X> }
    enum Sort
      Relevance = 0
-      Rating    = 1
-      Date      = 2
      Views     = 3
    end

@@ -21,7 +21,7 @@ module Invidious::Search
      if response.status_code == 404
        response = YT_POOL.client &.get("/user/#{query.channel}")
        response = YT_POOL.client &.get("/c/#{query.channel}") if response.status_code == 404
-        initial_data = extract_initial_data(response.body)
+        initial_data = Helpers.extract_initial_data(response.body)
        ucid = initial_data.dig?("header", "c4TabbedHeaderRenderer", "channelId").try(&.as_s?)
        raise ChannelSearchException.new(query.channel) if !ucid
      else
@@ -4,19 +4,25 @@ def fetch_trending(trending_type, region, locale)

  plid = nil

+  browse_id = ""
+
  case trending_type.try &.downcase
-  when "music"
-    params = "4gINGgt5dG1hX2NoYXJ0cw%3D%3D"
  when "gaming"
-    params = "4gIcGhpnYW1pbmdfY29ycHVzX21vc3RfcG9wdWxhcg%3D%3D"
-  when "movies"
-    params = "4gIKGgh0cmFpbGVycw%3D%3D"
-  else # Default
-    params = ""
+    browse_id = "UCOpNcN46UbXVtpKMrmU4Abg"
+    params = "Egh0cmVuZGluZw%3D%3D"
+  when "livestreams"
+    browse_id = "UC4R8DWoMoI7CAwX8_LjQHig"
+    params = "EgdsaXZldGFikgEDCKEK"
+  else
+    # Livestreams is the default one as Youtube removed
+    # the aggregated trending page
+    # https://github.com/iv-org/invidious/issues/5397#issuecomment-3218928458
+    browse_id = "UC4R8DWoMoI7CAwX8_LjQHig"
+    params = "EgdsaXZldGFikgEDCKEK"
  end

  client_config = YoutubeAPI::ClientConfig.new(region: region)
-  initial_data = YoutubeAPI.browse("FEtrending", params: params, client_config: client_config)
+  initial_data = YoutubeAPI.browse(browse_id, params: params, client_config: client_config)

  items, _ = extract_items(initial_data)

@@ -6,17 +6,24 @@ struct Invidious::User

    # Note: we use ternary operator because the two variables
    # used in here are not booleans.
-    SECURE = (Kemal.config.ssl || CONFIG.https_only) ? true : false
+    @@secure = (Kemal.config.ssl || CONFIG.https_only) ? true : false

    # Session ID (SID) cookie
    # Parameter "domain" comes from the global config
    def sid(domain : String?, sid) : HTTP::Cookie
+      # Not secure if it's being accessed from I2P
+      # Browsers expect the domain to include https. On I2P there is no HTTPS
+      # Tor browser works fine with secure being true
+      if (domain.try &.split(".").last == "i2p") && @@secure
+        @@secure = false
+      end
+
      return HTTP::Cookie.new(
        name: "SID",
        domain: domain,
        value: sid,
        expires: Time.utc + 2.years,
-        secure: SECURE,
+        secure: @@secure,
        http_only: true,
        samesite: HTTP::Cookie::SameSite::Lax
      )
@@ -25,12 +32,19 @@ struct Invidious::User
    # Preferences (PREFS) cookie
    # Parameter "domain" comes from the global config
    def prefs(domain : String?, preferences : Preferences) : HTTP::Cookie
+      # Not secure if it's being accessed from I2P
+      # Browsers expect the domain to include https. On I2P there is no HTTPS
+      # Tor browser works fine with secure being true
+      if (domain.try &.split(".").last == "i2p") && @@secure
+        @@secure = false
+      end
+
      return HTTP::Cookie.new(
        name: "PREFS",
        domain: domain,
        value: URI.encode_www_form(preferences.to_json),
        expires: Time.utc + 2.years,
-        secure: SECURE,
+        secure: @@secure,
        http_only: false,
        samesite: HTTP::Cookie::SameSite::Lax
      )
@@ -15,7 +15,7 @@ struct Invidious::User
              playlists.each do |playlist|
                json.object do
                  json.field "title", playlist.title
-                  json.field "description", html_to_content(playlist.description_html)
+                  json.field "description", Helpers.html_to_content(playlist.description_html)
                  json.field "privacy", playlist.privacy.to_s
                  json.field "videos" do
                    json.array do
@@ -30,28 +30,24 @@ struct Invidious::User
      return subscriptions
    end

-    def parse_playlist_export_csv(user : User, raw_input : String)
+    # Parse a CSV Google Takeout - Youtube Playlist file
+    def parse_playlist_export_csv(user : User, playlist_name : String, raw_input : String)
      # Split the input into head and body content
-      raw_head, raw_body = raw_input.strip('\n').split("\n\n", limit: 2, remove_empty: true)
+      raw_head, raw_body = raw_input.split("\n", limit: 2, remove_empty: true)

      # Create the playlist from the head content
      csv_head = CSV.new(raw_head.strip('\n'), headers: true)
      csv_head.next
-      title = csv_head[4]
-      description = csv_head[5]
-      visibility = csv_head[6]
+      title = playlist_name

-      if visibility.compare("Public", case_insensitive: true) == 0
-        privacy = PlaylistPrivacy::Public
-      else
-        privacy = PlaylistPrivacy::Private
-      end
+      description = "This is the default description of an imported playlist. Feel Free to change it as you see fit."
+      privacy = PlaylistPrivacy::Private

      playlist = create_playlist(title, privacy, user)
      Invidious::Database::Playlists.update_description(playlist.id, description)

      # Add each video to the playlist from the body content
-      csv_body = CSV.new(raw_body.strip('\n'), headers: true)
+      csv_body = CSV.new(raw_body.strip('\n'), headers: false)
      csv_body.each do |row|
        video_id = row[0]
        if playlist
@@ -204,10 +200,12 @@ struct Invidious::User
    end

    def from_youtube_pl(user : User, body : String, filename : String, type : String) : Bool
-      extension = filename.split(".").last
+      filename_array = filename.split(".")
+      playlist_name = filename_array.first
+      extension = filename_array.last

      if extension == "csv" || type == "text/csv"
-        playlist = parse_playlist_export_csv(user, body)
+        playlist = parse_playlist_export_csv(user, playlist_name, body)
        if playlist
          return true
        else
@@ -57,6 +57,7 @@ struct Preferences
  property volume : Int32 = CONFIG.default_user_preferences.volume
  property save_player_pos : Bool = CONFIG.default_user_preferences.save_player_pos
  property default_playlist : String? = nil
+  property search_privacy : Bool = CONFIG.default_user_preferences.search_privacy

  module BoolToString
    def self.to_json(value : String, json : JSON::Builder)
@@ -81,9 +81,10 @@ struct Video
  end

  def premiere_timestamp : Time?
-    info
-      .dig?("microformat", "playerMicroformatRenderer", "liveBroadcastDetails", "startTimestamp")
-      .try { |t| Time.parse_rfc3339(t.as_s) }
+    if self.video_type == VideoType::Scheduled
+      return info["published"]?
+        .try { |t| Time.parse_rfc3339(t.as_s) }
+    end
  end

  def related_videos
@@ -324,7 +325,15 @@ rescue DB::Error
 end

 def fetch_video(id, region)
-  info = extract_video_info(video_id: id)
+  info = Invidious::Videos::Parser.extract_video_info(video_id: id)
+
+  if info.nil?
+    raise InfoException.new("Invidious companion is not available. \
+    Video playback cannot continue. \
+    If you are the administrator of this instance, install Invidious companion \
+    following the installation instructions \
+    <a href=\"https://docs.invidious.io/installation/\">https://docs.invidious.io/installation/</a>")
+  end

  if reason = info["reason"]?
    if reason == "Video unavailable"
@@ -1,22 +1,26 @@
 require "json"

-# returns start_time, end_time and clip_title
-def parse_clip_parameters(params) : {Float64?, Float64?, String?}
-  decoded_protobuf = params.try { |i| URI.decode_www_form(i) }
-    .try { |i| Base64.decode(i) }
-    .try { |i| IO::Memory.new(i) }
-    .try { |i| Protodec::Any.parse(i) }
+module Invidious::Videos::Clip
+  extend self

-  start_time = decoded_protobuf
-    .try(&.["50:0:embedded"]["2:1:varint"].as_i64)
-    .try { |i| i/1000 }
+  # returns start_time, end_time and clip_title
+  def parse_clip_parameters(params) : {Float64?, Float64?, String?}
+    decoded_protobuf = params.try { |i| URI.decode_www_form(i) }
+      .try { |i| Base64.decode(i) }
+      .try { |i| IO::Memory.new(i) }
+      .try { |i| Protodec::Any.parse(i) }

-  end_time = decoded_protobuf
-    .try(&.["50:0:embedded"]["3:2:varint"].as_i64)
-    .try { |i| i/1000 }
+    start_time = decoded_protobuf
+      .try(&.["50:0:embedded"]["2:1:varint"].as_i64)
+      .try { |i| i/1000 }

-  clip_title = decoded_protobuf
-    .try(&.["50:0:embedded"]["4:3:string"].as_s)
+    end_time = decoded_protobuf
+      .try(&.["50:0:embedded"]["3:2:varint"].as_i64)
+      .try { |i| i/1000 }

-  return start_time, end_time, clip_title
+    clip_title = decoded_protobuf
+      .try(&.["50:0:embedded"]["4:3:string"].as_s)
+
+    return start_time, end_time, clip_title
+  end
 end
@@ -21,8 +21,6 @@ private def copy_string(str : String::Builder, iter : Iterator, count : Int) : I
      str << cp.chr
    end

-    # A codepoint from the SMP counts twice
-    copied += 1 if cp > 0xFFFF
    copied += 1
  end

@@ -44,10 +42,6 @@ def parse_description(desc, video_id : String) : String?
    end
  end

-  # Not everything is stored in UTF-8 on youtube's side. The SMP codepoints
-  # (0x10000 and above) are encoded as UTF-16 surrogate pairs, which are
-  # automatically decoded by the JSON parser. It means that we need to count
-  # copied byte in a special manner, preventing the use of regular string copy.
  iter = content.each_codepoint

  index = 0
@@ -1,512 +1,469 @@
 require "json"

-# Use to parse both "compactVideoRenderer" and "endScreenVideoRenderer".
-# The former is preferred as it has more videos in it. The second has
-# the same 11 first entries as the compact rendered.
-#
-# TODO: "compactRadioRenderer" (Mix) and
-# TODO: Use a proper struct/class instead of a hacky JSON object
-def parse_related_video(related : JSON::Any) : Hash(String, JSON::Any)?
-  return nil if !related["videoId"]?
+module Invidious::Videos::Parser
+  extend self

-  # The compact renderer has video length in seconds, where the end
-  # screen rendered has a full text version ("42:40")
-  length = related["lengthInSeconds"]?.try &.as_i.to_s
-  length ||= related.dig?("lengthText", "simpleText").try do |box|
-    decode_length_seconds(box.as_s).to_s
+  # Use to parse both "compactVideoRenderer" and "endScreenVideoRenderer".
+  # The former is preferred as it has more videos in it. The second has
+  # the same 11 first entries as the compact rendered.
+  #
+  # TODO: "compactRadioRenderer" (Mix) and
+  # TODO: Use a proper struct/class instead of a hacky JSON object
+  def parse_related_video(related : JSON::Any) : Hash(String, JSON::Any)?
+    return nil if !related["videoId"]?
+
+    # The compact renderer has video length in seconds, where the end
+    # screen rendered has a full text version ("42:40")
+    length = related["lengthInSeconds"]?.try &.as_i.to_s
+    length ||= related.dig?("lengthText", "simpleText").try do |box|
+      decode_length_seconds(box.as_s).to_s
+    end
+
+    # Both have "short", so the "long" option shouldn't be required
+    channel_info = (related["shortBylineText"]? || related["longBylineText"]?)
+      .try &.dig?("runs", 0)
+
+    author = channel_info.try &.dig?("text")
+    author_verified = has_verified_badge?(related["ownerBadges"]?).to_s
+
+    ucid = channel_info.try { |ci| HelperExtractors.get_browse_id(ci) }
+
+    short_view_count = related.try do |r|
+      HelperExtractors.get_short_view_count(r).to_s
+    end
+
+    LOGGER.trace("parse_related_video: Found \"watchNextEndScreenRenderer\" container")
+
+    if published_time_text = related["publishedTimeText"]?
+      decoded_time = decode_date(published_time_text["simpleText"].to_s)
+      published = decoded_time.to_rfc3339.to_s
+    else
+      published = nil
+    end
+
+    # TODO: when refactoring video types, make a struct for related videos
+    # or reuse an existing type, if that fits.
+    return {
+      "id"               => related["videoId"],
+      "title"            => related["title"]["simpleText"],
+      "author"           => author || JSON::Any.new(""),
+      "ucid"             => JSON::Any.new(ucid || ""),
+      "length_seconds"   => JSON::Any.new(length || "0"),
+      "short_view_count" => JSON::Any.new(short_view_count || "0"),
+      "author_verified"  => JSON::Any.new(author_verified),
+      "published"        => JSON::Any.new(published || ""),
+    }
  end

-  # Both have "short", so the "long" option shouldn't be required
-  channel_info = (related["shortBylineText"]? || related["longBylineText"]?)
-    .try &.dig?("runs", 0)
+  def extract_video_info(video_id : String)
+    # Fetch data from the player endpoint
+    player_response = YoutubeAPI.player(video_id: video_id)

-  author = channel_info.try &.dig?("text")
-  author_verified = has_verified_badge?(related["ownerBadges"]?).to_s
+    if player_response.nil?
+      return nil
+    end

-  ucid = channel_info.try { |ci| HelperExtractors.get_browse_id(ci) }
+    playability_status = player_response.dig?("playabilityStatus", "status").try &.as_s

-  # "4,088,033 views", only available on compact renderer
-  # and when video is not a livestream
-  view_count = related.dig?("viewCountText", "simpleText")
-    .try &.as_s.gsub(/\D/, "")
+    if playability_status != "OK"
+      subreason = player_response.dig?("playabilityStatus", "errorScreen", "playerErrorMessageRenderer", "subreason")
+      reason = subreason.try &.[]?("simpleText").try &.as_s
+      reason ||= subreason.try &.[]("runs").as_a.map(&.[]("text")).join("")
+      reason ||= player_response.dig("playabilityStatus", "reason").as_s

-  short_view_count = related.try do |r|
-    HelperExtractors.get_short_view_count(r).to_s
-  end
+      # Stop here if video is not a scheduled livestream or
+      # for LOGIN_REQUIRED when videoDetails element is not found because retrying won't help
+      if !{"LIVE_STREAM_OFFLINE", "LOGIN_REQUIRED"}.any?(playability_status) ||
+         playability_status == "LOGIN_REQUIRED" && !player_response.dig?("videoDetails")
+        return {
+          "version" => JSON::Any.new(Video::SCHEMA_VERSION.to_i64),
+          "reason"  => JSON::Any.new(reason),
+        }
+      end
+    elsif video_id != player_response.dig?("videoDetails", "videoId")
+      # YouTube may return a different video player response than expected.
+      # See: https://github.com/TeamNewPipe/NewPipe/issues/8713
+      # Line to be reverted if one day we solve the video not available issue.

-  LOGGER.trace("parse_related_video: Found \"watchNextEndScreenRenderer\" container")
+      # Although technically not a call to /videoplayback the fact that YouTube is returning the
+      # wrong video means that we should count it as a failure.
+      Helpers.get_playback_statistic["totalRequests"] += 1

-  if published_time_text = related["publishedTimeText"]?
-    decoded_time = decode_date(published_time_text["simpleText"].to_s)
-    published = decoded_time.to_rfc3339.to_s
-  else
-    published = nil
-  end
-
-  # TODO: when refactoring video types, make a struct for related videos
-  # or reuse an existing type, if that fits.
-  return {
-    "id"               => related["videoId"],
-    "title"            => related["title"]["simpleText"],
-    "author"           => author || JSON::Any.new(""),
-    "ucid"             => JSON::Any.new(ucid || ""),
-    "length_seconds"   => JSON::Any.new(length || "0"),
-    "view_count"       => JSON::Any.new(view_count || "0"),
-    "short_view_count" => JSON::Any.new(short_view_count || "0"),
-    "author_verified"  => JSON::Any.new(author_verified),
-    "published"        => JSON::Any.new(published || ""),
-  }
-end
-
-def extract_video_info(video_id : String)
-  # Init client config for the API
-  client_config = YoutubeAPI::ClientConfig.new
-
-  # Fetch data from the player endpoint
-  player_response = YoutubeAPI.player(video_id: video_id, params: "2AMB", client_config: client_config)
-
-  playability_status = player_response.dig?("playabilityStatus", "status").try &.as_s
-
-  if playability_status != "OK"
-    subreason = player_response.dig?("playabilityStatus", "errorScreen", "playerErrorMessageRenderer", "subreason")
-    reason = subreason.try &.[]?("simpleText").try &.as_s
-    reason ||= subreason.try &.[]("runs").as_a.map(&.[]("text")).join("")
-    reason ||= player_response.dig("playabilityStatus", "reason").as_s
-
-    # Stop here if video is not a scheduled livestream or
-    # for LOGIN_REQUIRED when videoDetails element is not found because retrying won't help
-    if !{"LIVE_STREAM_OFFLINE", "LOGIN_REQUIRED"}.any?(playability_status) ||
-       playability_status == "LOGIN_REQUIRED" && !player_response.dig?("videoDetails")
      return {
        "version" => JSON::Any.new(Video::SCHEMA_VERSION.to_i64),
-        "reason"  => JSON::Any.new(reason),
+        "reason"  => JSON::Any.new("Can't load the video on this Invidious instance. YouTube is currently trying to block Invidious instances. <a href=\"https://github.com/iv-org/invidious/issues/3822\">Click here for more info about the issue.</a>"),
      }
+    else
+      reason = nil
    end
-  elsif video_id != player_response.dig?("videoDetails", "videoId")
-    # YouTube may return a different video player response than expected.
-    # See: https://github.com/TeamNewPipe/NewPipe/issues/8713
-    # Line to be reverted if one day we solve the video not available issue.

-    # Although technically not a call to /videoplayback the fact that YouTube is returning the
-    # wrong video means that we should count it as a failure.
-    get_playback_statistic()["totalRequests"] += 1
+    # Don't fetch the next endpoint if the video is unavailable.
+    if {"OK", "LIVE_STREAM_OFFLINE", "LOGIN_REQUIRED"}.any?(playability_status)
+      next_response = YoutubeAPI.next({"videoId": video_id, "params": ""})
+      # Remove the microformat returned by the /next endpoint on some videos
+      # to prevent player_response microformat from being overwritten.
+      next_response.delete("microformat")
+      player_response = player_response.merge(next_response)
+    end

-    return {
-      "version" => JSON::Any.new(Video::SCHEMA_VERSION.to_i64),
-      "reason"  => JSON::Any.new("Can't load the video on this Invidious instance. YouTube is currently trying to block Invidious instances. <a href=\"https://github.com/iv-org/invidious/issues/3822\">Click here for more info about the issue.</a>"),
-    }
-  else
-    reason = nil
-  end
+    params = self.parse_video_info(video_id, player_response)
+    params["reason"] = JSON::Any.new(reason) if reason

-  # Don't fetch the next endpoint if the video is unavailable.
-  if {"OK", "LIVE_STREAM_OFFLINE", "LOGIN_REQUIRED"}.any?(playability_status)
-    next_response = YoutubeAPI.next({"videoId": video_id, "params": ""})
-    # Remove the microformat returned by the /next endpoint on some videos
-    # to prevent player_response microformat from being overwritten.
-    next_response.delete("microformat")
-    player_response = player_response.merge(next_response)
-  end
+    {"captions", "playabilityStatus", "playerConfig", "storyboards"}.each do |f|
+      params[f] = player_response[f] if player_response[f]?
+    end

-  params = parse_video_info(video_id, player_response)
-  params["reason"] = JSON::Any.new(reason) if reason
-
-  if !CONFIG.invidious_companion.present?
-    if player_response.dig?("streamingData", "adaptiveFormats", 0, "url").nil?
-      LOGGER.warn("Missing URLs for adaptive formats, falling back to other YT clients.")
-      players_fallback = {YoutubeAPI::ClientType::TvSimply, YoutubeAPI::ClientType::WebMobile}
-
-      players_fallback.each do |player_fallback|
-        client_config.client_type = player_fallback
-
-        next if !(player_fallback_response = try_fetch_streaming_data(video_id, client_config))
-
-        adaptive_formats = player_fallback_response.dig?("streamingData", "adaptiveFormats")
-        if adaptive_formats && (adaptive_formats.dig?(0, "url") || adaptive_formats.dig?(0, "signatureCipher"))
-          streaming_data = player_response["streamingData"].as_h
-          streaming_data["adaptiveFormats"] = adaptive_formats
-          player_response["streamingData"] = JSON::Any.new(streaming_data)
-          break
+    # Convert URLs, if those are present
+    if streaming_data = player_response["streamingData"]?
+      %w[formats adaptiveFormats].each do |key|
+        streaming_data.as_h[key]?.try &.as_a.each do |format|
+          format = format.as_h
+          if format["url"]?.nil?
+            format["url"] = format["signatureCipher"]
+          end
+          format["url"] = JSON::Any.new(convert_url(format))
        end
-      rescue InfoException
-        next LOGGER.warn("Failed to fetch streams with #{player_fallback}")
      end
+
+      params["streamingData"] = streaming_data
    end

-    # Seems like video page can still render even without playable streams.
-    # its better than nothing.
-    #
-    # # Were we able to find playable video streams?
-    # if player_response.dig?("streamingData", "adaptiveFormats", 0, "url").nil?
-    #   # No :(
-    # end
+    # Data structure version, for cache control
+    params["version"] = JSON::Any.new(Video::SCHEMA_VERSION.to_i64)
+
+    return params
  end

-  {"captions", "playabilityStatus", "playerConfig", "storyboards"}.each do |f|
-    params[f] = player_response[f] if player_response[f]?
+  def try_fetch_streaming_data(id : String, client_config : YoutubeAPI::ClientConfig) : Hash(String, JSON::Any)?
+    LOGGER.debug("try_fetch_streaming_data: [#{id}] Using #{client_config.client_type} client.")
+    response = YoutubeAPI.player(video_id: id)
+
+    playability_status = response["playabilityStatus"]["status"]
+    LOGGER.debug("try_fetch_streaming_data: [#{id}] Got playabilityStatus == #{playability_status}.")
+
+    if id != response.dig?("videoDetails", "videoId")
+      # YouTube may return a different video player response than expected.
+      # See: https://github.com/TeamNewPipe/NewPipe/issues/8713
+      raise InfoException.new(
+        "The video returned by YouTube isn't the requested one. (#{client_config.client_type} client)"
+      )
+    elsif playability_status == "OK"
+      return response
+    else
+      return nil
+    end
  end

-  # Convert URLs, if those are present
-  if streaming_data = player_response["streamingData"]?
-    %w[formats adaptiveFormats].each do |key|
-      streaming_data.as_h[key]?.try &.as_a.each do |format|
-        format = format.as_h
-        if format["url"]?.nil?
-          format["url"] = format["signatureCipher"]
-        end
-        format["url"] = JSON::Any.new(convert_url(format))
-      end
+  def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any)) : Hash(String, JSON::Any)
+    # Top level elements
+
+    main_results = player_response.dig?("contents", "twoColumnWatchNextResults")
+
+    raise BrokenTubeException.new("twoColumnWatchNextResults") if !main_results
+
+    # Primary results are not available on Music videos
+    # See: https://github.com/iv-org/invidious/pull/3238#issuecomment-1207193725
+    if primary_results = main_results.dig?("results", "results", "contents")
+      video_primary_renderer = primary_results
+        .as_a.find(&.["videoPrimaryInfoRenderer"]?)
+        .try &.["videoPrimaryInfoRenderer"]
+
+      video_secondary_renderer = primary_results
+        .as_a.find(&.["videoSecondaryInfoRenderer"]?)
+        .try &.["videoSecondaryInfoRenderer"]
+
+      raise BrokenTubeException.new("videoPrimaryInfoRenderer") if !video_primary_renderer
+      raise BrokenTubeException.new("videoSecondaryInfoRenderer") if !video_secondary_renderer
    end

-    params["streamingData"] = streaming_data
-  end
+    video_details = player_response.dig?("videoDetails")
+    if !(microformat = player_response.dig?("microformat", "playerMicroformatRenderer"))
+      microformat = {} of String => JSON::Any
+    end

-  # Data structure version, for cache control
-  params["version"] = JSON::Any.new(Video::SCHEMA_VERSION.to_i64)
+    raise BrokenTubeException.new("videoDetails") if !video_details

-  return params
-end
+    # Basic video infos

-def try_fetch_streaming_data(id : String, client_config : YoutubeAPI::ClientConfig) : Hash(String, JSON::Any)?
-  LOGGER.debug("try_fetch_streaming_data: [#{id}] Using #{client_config.client_type} client.")
-  response = YoutubeAPI.player(video_id: id, params: "2AMB", client_config: client_config)
+    title = video_details["title"]?.try &.as_s

-  playability_status = response["playabilityStatus"]["status"]
-  LOGGER.debug("try_fetch_streaming_data: [#{id}] Got playabilityStatus == #{playability_status}.")
-
-  if id != response.dig?("videoDetails", "videoId")
-    # YouTube may return a different video player response than expected.
-    # See: https://github.com/TeamNewPipe/NewPipe/issues/8713
-    raise InfoException.new(
-      "The video returned by YouTube isn't the requested one. (#{client_config.client_type} client)"
+    # We have to try to extract viewCount from videoPrimaryInfoRenderer first,
+    # then from videoDetails, as the latter is "0" for livestreams (we want
+    # to get the amount of viewers watching).
+    views_txt = extract_text(
+      video_primary_renderer
+        .try &.dig?("viewCount", "videoViewCountRenderer", "viewCount")
    )
-  elsif playability_status == "OK"
-    return response
-  else
-    return nil
-  end
-end
+    views_txt ||= video_details["viewCount"]?.try &.as_s || ""
+    views = views_txt.gsub(/\D/, "").to_i64?

-def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any)) : Hash(String, JSON::Any)
-  # Top level elements
+    length_txt = (microformat["lengthSeconds"]? || video_details["lengthSeconds"])
+      .try &.as_s.to_i64

-  main_results = player_response.dig?("contents", "twoColumnWatchNextResults")
+    published = microformat["publishDate"]?
+      .try { |t| Time.parse(t.as_s, "%Y-%m-%d", Time::Location::UTC) } || Time.utc

-  raise BrokenTubeException.new("twoColumnWatchNextResults") if !main_results
+    premiere_timestamp = microformat.dig?("liveBroadcastDetails", "startTimestamp")
+      .try { |t| Time.parse_rfc3339(t.as_s) }

-  # Primary results are not available on Music videos
-  # See: https://github.com/iv-org/invidious/pull/3238#issuecomment-1207193725
-  if primary_results = main_results.dig?("results", "results", "contents")
-    video_primary_renderer = primary_results
-      .as_a.find(&.["videoPrimaryInfoRenderer"]?)
-      .try &.["videoPrimaryInfoRenderer"]
-
-    video_secondary_renderer = primary_results
-      .as_a.find(&.["videoSecondaryInfoRenderer"]?)
-      .try &.["videoSecondaryInfoRenderer"]
-
-    raise BrokenTubeException.new("videoPrimaryInfoRenderer") if !video_primary_renderer
-    raise BrokenTubeException.new("videoSecondaryInfoRenderer") if !video_secondary_renderer
-  end
-
-  video_details = player_response.dig?("videoDetails")
-  if !(microformat = player_response.dig?("microformat", "playerMicroformatRenderer"))
-    microformat = {} of String => JSON::Any
-  end
-
-  raise BrokenTubeException.new("videoDetails") if !video_details
-
-  # Basic video infos
-
-  title = video_details["title"]?.try &.as_s
-
-  # We have to try to extract viewCount from videoPrimaryInfoRenderer first,
-  # then from videoDetails, as the latter is "0" for livestreams (we want
-  # to get the amount of viewers watching).
-  views_txt = extract_text(
-    video_primary_renderer
-      .try &.dig?("viewCount", "videoViewCountRenderer", "viewCount")
-  )
-  views_txt ||= video_details["viewCount"]?.try &.as_s || ""
-  views = views_txt.gsub(/\D/, "").to_i64?
-
-  length_txt = (microformat["lengthSeconds"]? || video_details["lengthSeconds"])
-    .try &.as_s.to_i64
-
-  published = microformat["publishDate"]?
-    .try { |t| Time.parse(t.as_s, "%Y-%m-%d", Time::Location::UTC) } || Time.utc
-
-  premiere_timestamp = microformat.dig?("liveBroadcastDetails", "startTimestamp")
-    .try { |t| Time.parse_rfc3339(t.as_s) }
-
-  premiere_timestamp ||= player_response.dig?(
-    "playabilityStatus", "liveStreamability",
-    "liveStreamabilityRenderer", "offlineSlate",
-    "liveStreamOfflineSlateRenderer", "scheduledStartTime"
-  )
-    .try &.as_s.to_i64
-      .try { |t| Time.unix(t) }
-
-  live_now = microformat.dig?("liveBroadcastDetails", "isLiveNow")
-    .try &.as_bool
-  live_now ||= video_details.dig?("isLive").try &.as_bool || false
-
-  post_live_dvr = video_details.dig?("isPostLiveDvr")
-    .try &.as_bool || false
-
-  # Extra video infos
-
-  allowed_regions = microformat["availableCountries"]?
-    .try &.as_a.map &.as_s || [] of String
-
-  allow_ratings = video_details["allowRatings"]?.try &.as_bool
-  family_friendly = microformat["isFamilySafe"]?.try &.as_bool
-  is_listed = video_details["isCrawlable"]?.try &.as_bool
-  is_upcoming = video_details["isUpcoming"]?.try &.as_bool
-
-  keywords = video_details["keywords"]?
-    .try &.as_a.map &.as_s || [] of String
-
-  # Related videos
-
-  LOGGER.debug("extract_video_info: parsing related videos...")
-
-  related = [] of JSON::Any
-
-  # Parse "compactVideoRenderer" items (under secondary results)
-  secondary_results = main_results
-    .dig?("secondaryResults", "secondaryResults", "results")
-  secondary_results.try &.as_a.each do |element|
-    if item = element["compactVideoRenderer"]?
-      related_video = parse_related_video(item)
-      related << JSON::Any.new(related_video) if related_video
-    end
-  end
-
-  # If nothing was found previously, fall back to end screen renderer
-  if related.empty?
-    # Container for "endScreenVideoRenderer" items
-    player_overlays = player_response.dig?(
-      "playerOverlays", "playerOverlayRenderer",
-      "endScreen", "watchNextEndScreenRenderer", "results"
+    premiere_timestamp ||= player_response.dig?(
+      "playabilityStatus", "liveStreamability",
+      "liveStreamabilityRenderer", "offlineSlate",
+      "liveStreamOfflineSlateRenderer", "scheduledStartTime"
    )
+      .try &.as_s.to_i64
+        .try { |t| Time.unix(t) }

-    player_overlays.try &.as_a.each do |element|
-      if item = element["endScreenVideoRenderer"]?
-        related_video = parse_related_video(item)
+    live_now = microformat.dig?("liveBroadcastDetails", "isLiveNow")
+      .try &.as_bool
+    live_now ||= video_details.dig?("isLive").try &.as_bool || false
+
+    post_live_dvr = video_details.dig?("isPostLiveDvr")
+      .try &.as_bool || false
+
+    # Extra video infos
+
+    allowed_regions = microformat["availableCountries"]?
+      .try &.as_a.map &.as_s || [] of String
+
+    allow_ratings = video_details["allowRatings"]?.try &.as_bool
+    family_friendly = microformat["isFamilySafe"]?.try &.as_bool
+    is_listed = video_details["isCrawlable"]?.try &.as_bool
+    is_upcoming = video_details["isUpcoming"]?.try &.as_bool
+
+    keywords = video_details["keywords"]?
+      .try &.as_a.map &.as_s || [] of String
+
+    # Related videos
+
+    LOGGER.debug("extract_video_info: parsing related videos...")
+
+    related = [] of JSON::Any
+
+    # Parse "compactVideoRenderer" items (under secondary results)
+    secondary_results = main_results
+      .dig?("secondaryResults", "secondaryResults", "results")
+    secondary_results.try &.as_a.each do |element|
+      if item = element["compactVideoRenderer"]?
+        related_video = self.parse_related_video(item)
        related << JSON::Any.new(related_video) if related_video
      end
    end
-  end

-  # Likes
-
-  toplevel_buttons = video_primary_renderer
-    .try &.dig?("videoActions", "menuRenderer", "topLevelButtons")
-
-  if toplevel_buttons
-    # New Format as of december 2023
-    likes_button = toplevel_buttons.dig?(0,
-      "segmentedLikeDislikeButtonViewModel",
-      "likeButtonViewModel",
-      "likeButtonViewModel",
-      "toggleButtonViewModel",
-      "toggleButtonViewModel",
-      "defaultButtonViewModel",
-      "buttonViewModel"
-    )
-
-    likes_button ||= toplevel_buttons.try &.as_a
-      .find(&.dig?("toggleButtonRenderer", "defaultIcon", "iconType").=== "LIKE")
-      .try &.["toggleButtonRenderer"]
-
-    # New format as of september 2022
-    likes_button ||= toplevel_buttons.try &.as_a
-      .find(&.["segmentedLikeDislikeButtonRenderer"]?)
-      .try &.dig?(
-        "segmentedLikeDislikeButtonRenderer",
-        "likeButton", "toggleButtonRenderer"
+    # If nothing was found previously, fall back to end screen renderer
+    if related.empty?
+      # Container for "endScreenVideoRenderer" items
+      player_overlays = player_response.dig?(
+        "playerOverlays", "playerOverlayRenderer",
+        "endScreen", "watchNextEndScreenRenderer", "results"
      )

-    if likes_button
-      likes_txt = likes_button.dig?("accessibilityText")
-      # Note: The like count from `toggledText` is off by one, as it would
-      # represent the new like count in the event where the user clicks on "like".
-      likes_txt ||= (likes_button["defaultText"]? || likes_button["toggledText"]?)
-        .try &.dig?("accessibility", "accessibilityData", "label")
-      likes = likes_txt.as_s.gsub(/\D/, "").to_i64? if likes_txt
-
-      LOGGER.trace("extract_video_info: Found \"likes\" button. Button text is \"#{likes_txt}\"")
-      LOGGER.debug("extract_video_info: Likes count is #{likes}") if likes
-    end
-  end
-
-  # Description
-
-  description = microformat.dig?("description", "simpleText").try &.as_s || ""
-  short_description = player_response.dig?("videoDetails", "shortDescription")
-
-  # description_html = video_secondary_renderer.try &.dig?("description", "runs")
-  #  .try &.as_a.try { |t| content_to_comment_html(t, video_id) }
-
-  description_html = parse_description(video_secondary_renderer.try &.dig?("attributedDescription"), video_id)
-
-  # Video metadata
-
-  metadata = video_secondary_renderer
-    .try &.dig?("metadataRowContainer", "metadataRowContainerRenderer", "rows")
-      .try &.as_a
-
-  genre = microformat["category"]?
-  genre_ucid = nil
-  license = nil
-
-  metadata.try &.each do |row|
-    metadata_title = extract_text(row.dig?("metadataRowRenderer", "title"))
-    contents = row.dig?("metadataRowRenderer", "contents", 0)
-
-    if metadata_title == "Category"
-      contents = contents.try &.dig?("runs", 0)
-
-      genre = contents.try &.["text"]?
-      genre_ucid = contents.try &.dig?("navigationEndpoint", "browseEndpoint", "browseId")
-    elsif metadata_title == "License"
-      license = contents.try &.dig?("runs", 0, "text")
-    elsif metadata_title == "Licensed to YouTube by"
-      license = contents.try &.["simpleText"]?
-    end
-  end
-
-  # Music section
-
-  music_list = [] of VideoMusic
-  music_desclist = player_response.dig?(
-    "engagementPanels", 1, "engagementPanelSectionListRenderer",
-    "content", "structuredDescriptionContentRenderer", "items", 2,
-    "videoDescriptionMusicSectionRenderer", "carouselLockups"
-  )
-
-  music_desclist.try &.as_a.each do |music_desc|
-    artist = nil
-    album = nil
-    music_license = nil
-
-    # Used when the video has multiple songs
-    if song_title = music_desc.dig?("carouselLockupRenderer", "videoLockup", "compactVideoRenderer", "title")
-      # "simpleText" for plain text / "runs" when song has a link
-      song = song_title["simpleText"]? || song_title.dig?("runs", 0, "text")
-
-      # some videos can have empty tracks. See: https://www.youtube.com/watch?v=eBGIQ7ZuuiU
-      next if !song
-    end
-
-    music_desc.dig?("carouselLockupRenderer", "infoRows").try &.as_a.each do |desc|
-      desc_title = extract_text(desc.dig?("infoRowRenderer", "title"))
-      if desc_title == "ARTIST"
-        artist = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
-      elsif desc_title == "SONG"
-        song = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
-      elsif desc_title == "ALBUM"
-        album = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
-      elsif desc_title == "LICENSES"
-        music_license = extract_text(desc.dig?("infoRowRenderer", "expandedMetadata"))
+      player_overlays.try &.as_a.each do |element|
+        if item = element["endScreenVideoRenderer"]?
+          related_video = self.parse_related_video(item)
+          related << JSON::Any.new(related_video) if related_video
+        end
      end
    end
-    music_list << VideoMusic.new(song.to_s, album.to_s, artist.to_s, music_license.to_s)
-  end

-  # Author infos
+    # Likes

-  author = video_details["author"]?.try &.as_s
-  ucid = video_details["channelId"]?.try &.as_s
+    toplevel_buttons = video_primary_renderer
+      .try &.dig?("videoActions", "menuRenderer", "topLevelButtons")

-  if author_info = video_secondary_renderer.try &.dig?("owner", "videoOwnerRenderer")
-    author_thumbnail = author_info.dig?("thumbnail", "thumbnails", 0, "url")
-    author_verified = has_verified_badge?(author_info["badges"]?)
+    if toplevel_buttons
+      # New Format as of december 2023
+      likes_button = toplevel_buttons.dig?(0,
+        "segmentedLikeDislikeButtonViewModel",
+        "likeButtonViewModel",
+        "likeButtonViewModel",
+        "toggleButtonViewModel",
+        "toggleButtonViewModel",
+        "defaultButtonViewModel",
+        "buttonViewModel"
+      )

-    subs_text = author_info["subscriberCountText"]?
-      .try { |t| t["simpleText"]? || t.dig?("runs", 0, "text") }
-      .try &.as_s.split(" ", 2)[0]
-  end
+      likes_button ||= toplevel_buttons.try &.as_a
+        .find(&.dig?("toggleButtonRenderer", "defaultIcon", "iconType").=== "LIKE")
+        .try &.["toggleButtonRenderer"]

-  # Return data
+      # New format as of september 2022
+      likes_button ||= toplevel_buttons.try &.as_a
+        .find(&.["segmentedLikeDislikeButtonRenderer"]?)
+        .try &.dig?(
+          "segmentedLikeDislikeButtonRenderer",
+          "likeButton", "toggleButtonRenderer"
+        )

-  if live_now
-    video_type = VideoType::Livestream
-  elsif !premiere_timestamp.nil?
-    video_type = VideoType::Scheduled
-    published = premiere_timestamp || Time.utc
-  else
-    video_type = VideoType::Video
-  end
+      if likes_button
+        likes_txt = likes_button.dig?("accessibilityText")
+        # Note: The like count from `toggledText` is off by one, as it would
+        # represent the new like count in the event where the user clicks on "like".
+        likes_txt ||= (likes_button["defaultText"]? || likes_button["toggledText"]?)
+          .try &.dig?("accessibility", "accessibilityData", "label")
+        likes = likes_txt.as_s.gsub(/\D/, "").to_i64? if likes_txt
+
+        LOGGER.trace("extract_video_info: Found \"likes\" button. Button text is \"#{likes_txt}\"")
+        LOGGER.debug("extract_video_info: Likes count is #{likes}") if likes
+      end
+    end

-  params = {
-    "videoType" => JSON::Any.new(video_type.to_s),
-    # Basic video infos
-    "title"         => JSON::Any.new(title || ""),
-    "views"         => JSON::Any.new(views || 0_i64),
-    "likes"         => JSON::Any.new(likes || 0_i64),
-    "lengthSeconds" => JSON::Any.new(length_txt || 0_i64),
-    "published"     => JSON::Any.new(published.to_rfc3339),
-    # Extra video infos
-    "allowedRegions"   => JSON::Any.new(allowed_regions.map { |v| JSON::Any.new(v) }),
-    "allowRatings"     => JSON::Any.new(allow_ratings || false),
-    "isFamilyFriendly" => JSON::Any.new(family_friendly || false),
-    "isListed"         => JSON::Any.new(is_listed || false),
-    "isUpcoming"       => JSON::Any.new(is_upcoming || false),
-    "keywords"         => JSON::Any.new(keywords.map { |v| JSON::Any.new(v) }),
-    "isPostLiveDvr"    => JSON::Any.new(post_live_dvr),
-    # Related videos
-    "relatedVideos" => JSON::Any.new(related),
    # Description
-    "description"      => JSON::Any.new(description || ""),
-    "descriptionHtml"  => JSON::Any.new(description_html || "<p></p>"),
-    "shortDescription" => JSON::Any.new(short_description.try &.as_s || nil),
+
+    description = microformat.dig?("description", "simpleText").try &.as_s || ""
+    short_description = player_response.dig?("videoDetails", "shortDescription")
+
+    # description_html = video_secondary_renderer.try &.dig?("description", "runs")
+    #  .try &.as_a.try { |t| content_to_comment_html(t, video_id) }
+
+    description_html = parse_description(video_secondary_renderer.try &.dig?("attributedDescription"), video_id)
+
    # Video metadata
-    "genre"     => JSON::Any.new(genre.try &.as_s || ""),
-    "genreUcid" => JSON::Any.new(genre_ucid.try &.as_s?),
-    "license"   => JSON::Any.new(license.try &.as_s || ""),
+
+    metadata = video_secondary_renderer
+      .try &.dig?("metadataRowContainer", "metadataRowContainerRenderer", "rows")
+        .try &.as_a
+
+    genre = microformat["category"]?
+    genre_ucid = nil
+    license = nil
+
+    metadata.try &.each do |row|
+      metadata_title = extract_text(row.dig?("metadataRowRenderer", "title"))
+      contents = row.dig?("metadataRowRenderer", "contents", 0)
+
+      if metadata_title == "Category"
+        contents = contents.try &.dig?("runs", 0)
+
+        genre = contents.try &.["text"]?
+        genre_ucid = contents.try &.dig?("navigationEndpoint", "browseEndpoint", "browseId")
+      elsif metadata_title == "License"
+        license = contents.try &.dig?("runs", 0, "text")
+      elsif metadata_title == "Licensed to YouTube by"
+        license = contents.try &.["simpleText"]?
+      end
+    end
+
    # Music section
-    "music" => JSON.parse(music_list.to_json),
+
+    music_list = [] of VideoMusic
+    music_desclist = player_response.dig?(
+      "engagementPanels", 1, "engagementPanelSectionListRenderer",
+      "content", "structuredDescriptionContentRenderer", "items", 2,
+      "videoDescriptionMusicSectionRenderer", "carouselLockups"
+    )
+
+    music_desclist.try &.as_a.each do |music_desc|
+      artist = nil
+      album = nil
+      music_license = nil
+
+      # Used when the video has multiple songs
+      if song_title = music_desc.dig?("carouselLockupRenderer", "videoLockup", "compactVideoRenderer", "title")
+        # "simpleText" for plain text / "runs" when song has a link
+        song = song_title["simpleText"]? || song_title.dig?("runs", 0, "text")
+
+        # some videos can have empty tracks. See: https://www.youtube.com/watch?v=eBGIQ7ZuuiU
+        next if !song
+      end
+
+      music_desc.dig?("carouselLockupRenderer", "infoRows").try &.as_a.each do |desc|
+        desc_title = extract_text(desc.dig?("infoRowRenderer", "title"))
+        if desc_title == "ARTIST"
+          artist = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
+        elsif desc_title == "SONG"
+          song = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
+        elsif desc_title == "ALBUM"
+          album = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
+        elsif desc_title == "LICENSES"
+          music_license = extract_text(desc.dig?("infoRowRenderer", "expandedMetadata"))
+        end
+      end
+      music_list << VideoMusic.new(song.to_s, album.to_s, artist.to_s, music_license.to_s)
+    end
+
    # Author infos
-    "author"          => JSON::Any.new(author || ""),
-    "ucid"            => JSON::Any.new(ucid || ""),
-    "authorThumbnail" => JSON::Any.new(author_thumbnail.try &.as_s || ""),
-    "authorVerified"  => JSON::Any.new(author_verified || false),
-    "subCountText"    => JSON::Any.new(subs_text || "-"),
-  }

-  return params
-end
+    author = video_details["author"]?.try &.as_s
+    ucid = video_details["channelId"]?.try &.as_s

-private def convert_url(fmt)
-  if cfr = fmt["signatureCipher"]?.try { |json| HTTP::Params.parse(json.as_s) }
-    sp = cfr["sp"]
-    url = URI.parse(cfr["url"])
-    params = url.query_params
+    if author_info = video_secondary_renderer.try &.dig?("owner", "videoOwnerRenderer")
+      author_thumbnail = author_info.dig?("thumbnail", "thumbnails", 0, "url")
+      author_verified = has_verified_badge?(author_info["badges"]?)

-    LOGGER.debug("convert_url: Decoding '#{cfr}'")
+      subs_text = author_info["subscriberCountText"]?
+        .try { |t| t["simpleText"]? || t.dig?("runs", 0, "text") }
+        .try &.as_s.split(" ", 2)[0]
+    end

-    unsig = DECRYPT_FUNCTION.try &.decrypt_signature(cfr["s"])
-    params[sp] = unsig if unsig
-  else
-    url = URI.parse(fmt["url"].as_s)
-    params = url.query_params
+    # Return data
+
+    if live_now
+      video_type = VideoType::Livestream
+    elsif !premiere_timestamp.nil?
+      video_type = VideoType::Scheduled
+      published = premiere_timestamp || Time.utc
+    else
+      video_type = VideoType::Video
+    end
+
+    params = {
+      "videoType" => JSON::Any.new(video_type.to_s),
+      # Basic video infos
+      "title"         => JSON::Any.new(title || ""),
+      "views"         => JSON::Any.new(views || 0_i64),
+      "likes"         => JSON::Any.new(likes || 0_i64),
+      "lengthSeconds" => JSON::Any.new(length_txt || 0_i64),
+      "published"     => JSON::Any.new(published.to_rfc3339),
+      # Extra video infos
+      "allowedRegions"   => JSON::Any.new(allowed_regions.map { |v| JSON::Any.new(v) }),
+      "allowRatings"     => JSON::Any.new(allow_ratings || false),
+      "isFamilyFriendly" => JSON::Any.new(family_friendly || false),
+      "isListed"         => JSON::Any.new(is_listed || false),
+      "isUpcoming"       => JSON::Any.new(is_upcoming || false),
+      "keywords"         => JSON::Any.new(keywords.map { |v| JSON::Any.new(v) }),
+      "isPostLiveDvr"    => JSON::Any.new(post_live_dvr),
+      # Related videos
+      "relatedVideos" => JSON::Any.new(related),
+      # Description
+      "description"      => JSON::Any.new(description || ""),
+      "descriptionHtml"  => JSON::Any.new(description_html || "<p></p>"),
+      "shortDescription" => JSON::Any.new(short_description.try &.as_s || nil),
+      # Video metadata
+      "genre"     => JSON::Any.new(genre.try &.as_s || ""),
+      "genreUcid" => JSON::Any.new(genre_ucid.try &.as_s?),
+      "license"   => JSON::Any.new(license.try &.as_s || ""),
+      # Music section
+      "music" => JSON.parse(music_list.to_json),
+      # Author infos
+      "author"          => JSON::Any.new(author || ""),
+      "ucid"            => JSON::Any.new(ucid || ""),
+      "authorThumbnail" => JSON::Any.new(author_thumbnail.try &.as_s || ""),
+      "authorVerified"  => JSON::Any.new(author_verified || false),
+      "subCountText"    => JSON::Any.new(subs_text || "-"),
+    }
+
+    return params
  end

-  n = DECRYPT_FUNCTION.try &.decrypt_nsig(params["n"])
-  params["n"] = n if n
+  private def convert_url(fmt)
+    if cfr = fmt["signatureCipher"]?.try { |json| HTTP::Params.parse(json.as_s) }
+      url = URI.parse(cfr["url"])
+      params = url.query_params

-  if token = CONFIG.po_token
-    params["pot"] = token
+      LOGGER.debug("convert_url: Decoding '#{cfr}'")
+    else
+      url = URI.parse(fmt["url"].as_s)
+      params = url.query_params
+    end
+
+    url.query_params = params
+    LOGGER.trace("convert_url: new url is '#{url}'")
+
+    return url.to_s
+  rescue ex
+    LOGGER.debug("convert_url: Error when parsing video URL")
+    LOGGER.trace(ex.inspect_with_backtrace)
+    return ""
  end
-
-  url.query_params = params
-  LOGGER.trace("convert_url: new url is '#{url}'")
-
-  return url.to_s
-rescue ex
-  LOGGER.debug("convert_url: Error when parsing video URL")
-  LOGGER.trace(ex.inspect_with_backtrace)
-  return ""
 end
@@ -1,162 +1,166 @@
-struct VideoPreferences
-  include JSON::Serializable
+module Invidious::Videos
+  extend self

-  property annotations : Bool
-  property preload : Bool
-  property autoplay : Bool
-  property comments : Array(String)
-  property continue : Bool
-  property continue_autoplay : Bool
-  property controls : Bool
-  property listen : Bool
-  property local : Bool
-  property preferred_captions : Array(String)
-  property player_style : String
-  property quality : String
-  property quality_dash : String
-  property raw : Bool
-  property region : String?
-  property related_videos : Bool
-  property speed : Float32 | Float64
-  property video_end : Float64 | Int32
-  property video_loop : Bool
-  property extend_desc : Bool
-  property video_start : Float64 | Int32
-  property volume : Int32
-  property vr_mode : Bool
-  property save_player_pos : Bool
-end
-
-def process_video_params(query, preferences)
-  annotations = query["iv_load_policy"]?.try &.to_i?
-  preload = query["preload"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-  autoplay = query["autoplay"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-  comments = query["comments"]?.try &.split(",").map(&.downcase)
-  continue = query["continue"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-  continue_autoplay = query["continue_autoplay"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-  listen = query["listen"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-  local = query["local"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-  player_style = query["player_style"]?
-  preferred_captions = query["subtitles"]?.try &.split(",").map(&.downcase)
-  quality = query["quality"]?
-  quality_dash = query["quality_dash"]?
-  region = query["region"]?
-  related_videos = query["related_videos"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-  speed = query["speed"]?.try &.rchop("x").to_f?
-  video_loop = query["loop"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-  extend_desc = query["extend_desc"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-  volume = query["volume"]?.try &.to_i?
-  vr_mode = query["vr_mode"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-  save_player_pos = query["save_player_pos"]?.try { |q| (q == "true" || q == "1").to_unsafe }
-
-  if preferences
-    # region ||= preferences.region
-    annotations ||= preferences.annotations.to_unsafe
-    preload ||= preferences.preload.to_unsafe
-    autoplay ||= preferences.autoplay.to_unsafe
-    comments ||= preferences.comments
-    continue ||= preferences.continue.to_unsafe
-    continue_autoplay ||= preferences.continue_autoplay.to_unsafe
-    listen ||= preferences.listen.to_unsafe
-    local ||= preferences.local.to_unsafe
-    player_style ||= preferences.player_style
-    preferred_captions ||= preferences.captions
-    quality ||= preferences.quality
-    quality_dash ||= preferences.quality_dash
-    related_videos ||= preferences.related_videos.to_unsafe
-    speed ||= preferences.speed
-    video_loop ||= preferences.video_loop.to_unsafe
-    extend_desc ||= preferences.extend_desc.to_unsafe
-    volume ||= preferences.volume
-    vr_mode ||= preferences.vr_mode.to_unsafe
-    save_player_pos ||= preferences.save_player_pos.to_unsafe
-  end
-
-  annotations ||= CONFIG.default_user_preferences.annotations.to_unsafe
-  preload ||= CONFIG.default_user_preferences.preload.to_unsafe
-  autoplay ||= CONFIG.default_user_preferences.autoplay.to_unsafe
-  comments ||= CONFIG.default_user_preferences.comments
-  continue ||= CONFIG.default_user_preferences.continue.to_unsafe
-  continue_autoplay ||= CONFIG.default_user_preferences.continue_autoplay.to_unsafe
-  listen ||= CONFIG.default_user_preferences.listen.to_unsafe
-  local ||= CONFIG.default_user_preferences.local.to_unsafe
-  player_style ||= CONFIG.default_user_preferences.player_style
-  preferred_captions ||= CONFIG.default_user_preferences.captions
-  quality ||= CONFIG.default_user_preferences.quality
-  quality_dash ||= CONFIG.default_user_preferences.quality_dash
-  related_videos ||= CONFIG.default_user_preferences.related_videos.to_unsafe
-  speed ||= CONFIG.default_user_preferences.speed
-  video_loop ||= CONFIG.default_user_preferences.video_loop.to_unsafe
-  extend_desc ||= CONFIG.default_user_preferences.extend_desc.to_unsafe
-  volume ||= CONFIG.default_user_preferences.volume
-  vr_mode ||= CONFIG.default_user_preferences.vr_mode.to_unsafe
-  save_player_pos ||= CONFIG.default_user_preferences.save_player_pos.to_unsafe
-
-  annotations = annotations == 1
-  preload = preload == 1
-  autoplay = autoplay == 1
-  continue = continue == 1
-  continue_autoplay = continue_autoplay == 1
-  listen = listen == 1
-  local = local == 1
-  related_videos = related_videos == 1
-  video_loop = video_loop == 1
-  extend_desc = extend_desc == 1
-  vr_mode = vr_mode == 1
-  save_player_pos = save_player_pos == 1
-
-  if CONFIG.disabled?("dash") && quality == "dash"
-    quality = "high"
-  end
-
-  if CONFIG.disabled?("local") && local
-    local = false
-  end
-
-  if start = query["t"]? || query["time_continue"]? || query["start"]?
-    video_start = decode_time(start)
-  end
-  video_start ||= 0
-
-  if query["end"]?
-    video_end = decode_time(query["end"])
-  end
-  video_end ||= -1
-
-  raw = query["raw"]?.try &.to_i?
-  raw ||= 0
-  raw = raw == 1
-
-  controls = query["controls"]?.try &.to_i?
-  controls ||= 1
-  controls = controls >= 1
-
-  params = VideoPreferences.new({
-    annotations:        annotations,
-    preload:            preload,
-    autoplay:           autoplay,
-    comments:           comments,
-    continue:           continue,
-    continue_autoplay:  continue_autoplay,
-    controls:           controls,
-    listen:             listen,
-    local:              local,
-    player_style:       player_style,
-    preferred_captions: preferred_captions,
-    quality:            quality,
-    quality_dash:       quality_dash,
-    raw:                raw,
-    region:             region,
-    related_videos:     related_videos,
-    speed:              speed,
-    video_end:          video_end,
-    video_loop:         video_loop,
-    extend_desc:        extend_desc,
-    video_start:        video_start,
-    volume:             volume,
-    vr_mode:            vr_mode,
-    save_player_pos:    save_player_pos,
-  })
-
-  return params
+  struct VideoPreferences
+    include JSON::Serializable
+
+    property annotations : Bool
+    property preload : Bool
+    property autoplay : Bool
+    property comments : Array(String)
+    property continue : Bool
+    property continue_autoplay : Bool
+    property controls : Bool
+    property listen : Bool
+    property local : Bool
+    property preferred_captions : Array(String)
+    property player_style : String
+    property quality : String
+    property quality_dash : String
+    property raw : Bool
+    property region : String?
+    property related_videos : Bool
+    property speed : Float32 | Float64
+    property video_end : Float64 | Int32
+    property video_loop : Bool
+    property extend_desc : Bool
+    property video_start : Float64 | Int32
+    property volume : Int32
+    property vr_mode : Bool
+    property save_player_pos : Bool
+  end
+
+  def process_video_params(query, preferences)
+    annotations = query["iv_load_policy"]?.try &.to_i?
+    preload = query["preload"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+    autoplay = query["autoplay"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+    comments = query["comments"]?.try &.split(",").map(&.downcase)
+    continue = query["continue"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+    continue_autoplay = query["continue_autoplay"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+    listen = query["listen"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+    local = query["local"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+    player_style = query["player_style"]?
+    preferred_captions = query["subtitles"]?.try &.split(",").map(&.downcase)
+    quality = query["quality"]?
+    quality_dash = query["quality_dash"]?
+    region = query["region"]?
+    related_videos = query["related_videos"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+    speed = query["speed"]?.try &.rchop("x").to_f?
+    video_loop = query["loop"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+    extend_desc = query["extend_desc"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+    volume = query["volume"]?.try &.to_i?
+    vr_mode = query["vr_mode"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+    save_player_pos = query["save_player_pos"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+
+    if preferences
+      # region ||= preferences.region
+      annotations ||= preferences.annotations.to_unsafe
+      preload ||= preferences.preload.to_unsafe
+      autoplay ||= preferences.autoplay.to_unsafe
+      comments ||= preferences.comments
+      continue ||= preferences.continue.to_unsafe
+      continue_autoplay ||= preferences.continue_autoplay.to_unsafe
+      listen ||= preferences.listen.to_unsafe
+      local ||= preferences.local.to_unsafe
+      player_style ||= preferences.player_style
+      preferred_captions ||= preferences.captions
+      quality ||= preferences.quality
+      quality_dash ||= preferences.quality_dash
+      related_videos ||= preferences.related_videos.to_unsafe
+      speed ||= preferences.speed
+      video_loop ||= preferences.video_loop.to_unsafe
+      extend_desc ||= preferences.extend_desc.to_unsafe
+      volume ||= preferences.volume
+      vr_mode ||= preferences.vr_mode.to_unsafe
+      save_player_pos ||= preferences.save_player_pos.to_unsafe
+    end
+
+    annotations ||= CONFIG.default_user_preferences.annotations.to_unsafe
+    preload ||= CONFIG.default_user_preferences.preload.to_unsafe
+    autoplay ||= CONFIG.default_user_preferences.autoplay.to_unsafe
+    comments ||= CONFIG.default_user_preferences.comments
+    continue ||= CONFIG.default_user_preferences.continue.to_unsafe
+    continue_autoplay ||= CONFIG.default_user_preferences.continue_autoplay.to_unsafe
+    listen ||= CONFIG.default_user_preferences.listen.to_unsafe
+    local ||= CONFIG.default_user_preferences.local.to_unsafe
+    player_style ||= CONFIG.default_user_preferences.player_style
+    preferred_captions ||= CONFIG.default_user_preferences.captions
+    quality ||= CONFIG.default_user_preferences.quality
+    quality_dash ||= CONFIG.default_user_preferences.quality_dash
+    related_videos ||= CONFIG.default_user_preferences.related_videos.to_unsafe
+    speed ||= CONFIG.default_user_preferences.speed
+    video_loop ||= CONFIG.default_user_preferences.video_loop.to_unsafe
+    extend_desc ||= CONFIG.default_user_preferences.extend_desc.to_unsafe
+    volume ||= CONFIG.default_user_preferences.volume
+    vr_mode ||= CONFIG.default_user_preferences.vr_mode.to_unsafe
+    save_player_pos ||= CONFIG.default_user_preferences.save_player_pos.to_unsafe
+
+    annotations = annotations == 1
+    preload = preload == 1
+    autoplay = autoplay == 1
+    continue = continue == 1
+    continue_autoplay = continue_autoplay == 1
+    listen = listen == 1
+    local = local == 1
+    related_videos = related_videos == 1
+    video_loop = video_loop == 1
+    extend_desc = extend_desc == 1
+    vr_mode = vr_mode == 1
+    save_player_pos = save_player_pos == 1
+
+    if CONFIG.disabled?("dash") && quality == "dash"
+      quality = "high"
+    end
+
+    if CONFIG.disabled?("local") && local
+      local = false
+    end
+
+    if start = query["t"]? || query["time_continue"]? || query["start"]?
+      video_start = decode_time(start)
+    end
+    video_start ||= 0
+
+    if query["end"]?
+      video_end = decode_time(query["end"])
+    end
+    video_end ||= -1
+
+    raw = query["raw"]?.try &.to_i?
+    raw ||= 0
+    raw = raw == 1
+
+    controls = query["controls"]?.try &.to_i?
+    controls ||= 1
+    controls = controls >= 1
+
+    params = VideoPreferences.new({
+      annotations:        annotations,
+      preload:            preload,
+      autoplay:           autoplay,
+      comments:           comments,
+      continue:           continue,
+      continue_autoplay:  continue_autoplay,
+      controls:           controls,
+      listen:             listen,
+      local:              local,
+      player_style:       player_style,
+      preferred_captions: preferred_captions,
+      quality:            quality,
+      quality_dash:       quality_dash,
+      raw:                raw,
+      region:             region,
+      related_videos:     related_videos,
+      speed:              speed,
+      video_end:          video_end,
+      video_loop:         video_loop,
+      extend_desc:        extend_desc,
+      video_start:        video_start,
+      volume:             volume,
+      vr_mode:            vr_mode,
+      save_player_pos:    save_player_pos,
+    })
+
+    return params
+  end
 end
@@ -8,12 +8,12 @@
    <div class="pure-u-1 pure-u-lg-3-5">
        <div class="h-box">
            <form class="pure-form pure-form-aligned" action="/add_playlist_items" method="get">
-                <legend><a href="/playlist?list=<%= playlist.id %>"><%= translate(locale, "Editing playlist `x`", %|"#{HTML.escape(playlist.title)}"|) %></a></legend>
+                <legend><a href="/playlist?list=<%= playlist.id %>"><%= I18n.translate(locale, "Editing playlist `x`", %|"#{HTML.escape(playlist.title)}"|) %></a></legend>

                <fieldset>
                    <input class="pure-input-1" type="search" name="q"
                      <% if query %>value="<%= HTML.escape(query.text) %>"<% end %>
-                      placeholder="<%= translate(locale, "Search for videos") %>">
+                      placeholder="<%= I18n.translate(locale, "Search for videos") %>">
                    <input type="hidden" name="list" value="<%= plid %>">
                </fieldset>
            </form>
@@ -35,10 +35,10 @@
 <%=
 {
    "ucid" => ucid,
-    "youtube_comments_text" => HTML.escape(translate(locale, "View YouTube comments")),
-    "comments_text" => HTML.escape(translate(locale, "View `x` comments", "{commentCount}")),
-    "hide_replies_text" => HTML.escape(translate(locale, "Hide replies")),
-    "show_replies_text" => HTML.escape(translate(locale, "Show replies")),
+    "youtube_comments_text" => HTML.escape(I18n.translate(locale, "View YouTube comments")),
+    "comments_text" => HTML.escape(I18n.translate(locale, "View `x` comments", "{commentCount}")),
+    "hide_replies_text" => HTML.escape(I18n.translate(locale, "Hide replies")),
+    "show_replies_text" => HTML.escape(I18n.translate(locale, "Show replies")),
    "preferences" => env.get("preferences").as(Preferences)
 }.to_pretty_json
 %>
@@ -12,7 +12,10 @@
    <div class="pure-u-1-2 flex-left flexible">
        <div class="channel-profile">
            <img src="/ggpht<%= channel_profile_pic %>" alt="" />
-            <span><%= author %></span><% if !channel.verified.nil? && channel.verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %>
+            <div class="channel-name-pronouns">
+                <span class="channel-name"><%= author %></span><% if !channel.verified.nil? && channel.verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %>
+                <% if !channel.pronouns.nil? %><br /><span class="channel-pronouns"><%= channel.pronouns %></span><% end %>
+            </div>
        </div>
    </div>

@@ -24,7 +27,7 @@

        <div class="pure-u">
            <a class="pure-button pure-button-secondary" dir="auto" href="/feed/channel/<%= ucid %>">
-                <i class="icon ion-logo-rss"></i>&nbsp;<%= translate(locale, "generic_button_rss") %>
+                <i class="icon ion-logo-rss"></i>&nbsp;<%= I18n.translate(locale, "generic_button_rss") %>
            </a>
        </div>
    </div>
@@ -37,10 +40,10 @@
 <div class="pure-g h-box">
    <div class="pure-u-1-2">
        <div class="pure-u-1 pure-md-1-3">
-            <a href="<%= youtube_url %>"><%= translate(locale, "View channel on YouTube") %></a>
+            <a href="<%= youtube_url %>"><%= I18n.translate(locale, "View channel on YouTube") %></a>
        </div>
        <div class="pure-u-1 pure-md-1-3">
-            <a href="<%= redirect_url %>"><%= translate(locale, "Switch Invidious Instance") %></a>
+            <a href="<%= redirect_url %>"><%= I18n.translate(locale, "Switch Invidious Instance") %></a>
        </div>

        <%= Invidious::Frontend::ChannelPage.generate_tabs_links(locale, channel, selected_tab) %>
@@ -50,9 +53,9 @@
            <% sort_options.each do |sort| %>
                <div class="pure-u-1 pure-md-1-3">
                    <% if sort_by == sort %>
-                        <b><%= translate(locale, sort) %></b>
+                        <b><%= I18n.translate(locale, sort) %></b>
                    <% else %>
-                        <a href="<%= relative_url %>?sort_by=<%= sort %>"><%= translate(locale, sort) %></a>
+                        <a href="<%= relative_url %>?sort_by=<%= sort %>"><%= I18n.translate(locale, sort) %></a>
                    <% end %>
                </div>
            <% end %>
@@ -5,7 +5,7 @@
    <% end %>
    <% feed_menu.each do |feed| %>
        <a href="/feed/<%= feed.downcase %>" class="feed-menu-item pure-menu-heading">
-            <%= translate(locale, feed) %>
+            <%= I18n.translate(locale, feed) %>
        </a>
    <% end %>
 </div>
@@ -27,8 +27,8 @@
            </div>

            <% if !item.channel_handle.nil? %><p class="channel-name" dir="auto"><%= item.channel_handle %></p><% end %>
-            <p><%= translate_count(locale, "generic_subscribers_count", item.subscriber_count, NumberFormatting::Separator) %></p>
-            <% if !item.auto_generated && item.channel_handle.nil? %><p><%= translate_count(locale, "generic_videos_count", item.video_count, NumberFormatting::Separator) %></p><% end %>
+            <p><%= I18n.translate_count(locale, "generic_subscribers_count", item.subscriber_count, I18n::NumberFormatting::Separator) %></p>
+            <% if !item.auto_generated && item.channel_handle.nil? %><p><%= I18n.translate_count(locale, "generic_videos_count", item.video_count, I18n::NumberFormatting::Separator) %></p><% end %>
            <h5><%= item.description_html %></h5>
        <% when SearchHashtag %>
            <% if !thin_mode %>
@@ -45,13 +45,13 @@

            <div class="video-card-row">
                <%- if item.video_count != 0 -%>
-                    <p><%= translate_count(locale, "generic_videos_count", item.video_count, NumberFormatting::Separator) %></p>
+                    <p><%= I18n.translate_count(locale, "generic_videos_count", item.video_count, I18n::NumberFormatting::Separator) %></p>
                <%- end -%>
            </div>

            <div class="video-card-row">
                <%- if item.channel_count != 0 -%>
-                    <p><%= translate_count(locale, "generic_channels_count", item.channel_count, NumberFormatting::Separator) %></p>
+                    <p><%= I18n.translate_count(locale, "generic_channels_count", item.channel_count, I18n::NumberFormatting::Separator) %></p>
                <%- end -%>
            </div>
        <% when SearchPlaylist, InvidiousPlaylist %>
@@ -73,7 +73,7 @@
                <%- end -%>

                <div class="bottom-right-overlay">
-                    <p class="length"><%= translate_count(locale, "generic_videos_count", item.video_count, NumberFormatting::Separator) %></p>
+                    <p class="length"><%= I18n.translate_count(locale, "generic_videos_count", item.video_count, I18n::NumberFormatting::Separator) %></p>
                </div>
            </div>

@@ -101,11 +101,11 @@
            <div class="error-card">
                <div class="explanation">
                    <i class="icon ion-ios-alert"></i>
-                    <h4><%=translate(locale, "timeline_parse_error_placeholder_heading")%></h4>
-                    <p><%=translate(locale, "timeline_parse_error_placeholder_message")%></p>
+                    <h4><%=I18n.translate(locale, "timeline_parse_error_placeholder_heading")%></h4>
+                    <p><%=I18n.translate(locale, "timeline_parse_error_placeholder_message")%></p>
                </div>
                <details>
-                    <summary class="pure-button pure-button-secondary"><%=translate(locale, "timeline_parse_error_show_technical_details")%></summary>
+                    <summary class="pure-button pure-button-secondary"><%=I18n.translate(locale, "timeline_parse_error_show_technical_details")%></summary>
                    <pre class="error-issue-template"><%=get_issue_template(env, item.parse_exception)[1]%></pre>
                </details>
            </div>
@@ -168,7 +168,7 @@

                <div class="bottom-right-overlay">
                    <%- if item.responds_to?(:live_now) && item.live_now -%>
-                        <p class="length" dir="auto"><i class="icon ion-ios-play-circle"></i>&nbsp;<%= translate(locale, "LIVE") %></p>
+                        <p class="length" dir="auto"><i class="icon ion-ios-play-circle"></i>&nbsp;<%= I18n.translate(locale, "LIVE") %></p>
                    <%- elsif item.length_seconds != 0 -%>
                        <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
                    <%- end -%>
@@ -200,15 +200,15 @@
            <div class="video-card-row flexible">
                <div class="flex-left">
                    <% if item.responds_to?(:premiere_timestamp) && item.premiere_timestamp.try &.> Time.utc %>
-                        <p class="video-data" dir="auto"><%= translate(locale, "Premieres in `x`", recode_date((item.premiere_timestamp.as(Time) - Time.utc).ago, locale)) %></p>
+                        <p class="video-data" dir="auto"><%= I18n.translate(locale, "Premieres in `x`", recode_date((item.premiere_timestamp.as(Time) - Time.utc).ago, locale)) %></p>
                    <% elsif item.responds_to?(:published) && (Time.utc - item.published) > 1.minute %>
-                        <p class="video-data" dir="auto"><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></p>
+                        <p class="video-data" dir="auto"><%= I18n.translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></p>
                    <% end %>
                </div>

                <% if item.responds_to?(:views) && item.views %>
                <div class="flex-right">
-                    <p class="video-data" dir="auto"><%= translate_count(locale, "generic_views_count", item.views || 0, NumberFormatting::Short) %></p>
+                    <p class="video-data" dir="auto"><%= I18n.translate_count(locale, "generic_views_count", item.views || 0, I18n::NumberFormatting::Short) %></p>
                </div>
                <% end %>
            </div>
@@ -11,9 +11,9 @@
 <script id="pagination-data" type="application/json">
 <%=
 {
-   "next_page" => translate(locale, "Next page"),
-   "prev_page" => translate(locale, "Previous page"),
-   "is_rtl"    => locale_is_rtl?(locale)
+   "next_page" => I18n.translate(locale, "Next page"),
+   "prev_page" => I18n.translate(locale, "Previous page"),
+   "is_rtl"    => I18n.locale_is_rtl?(locale)
 }.to_pretty_json
 %>
 </script>
@@ -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 %>"
@@ -22,8 +25,8 @@
               audio_streams.each_with_index do |fmt, i|
                src_url  = "/latest_version?id=#{video.id}&itag=#{fmt["itag"]}"
                src_url += "&local=true" if params.local
-                src_url = invidious_companion.public_url.to_s + src_url + 
-                            "&check=#{invidious_companion_encrypt(video.id)}" if (invidious_companion)
+                src_url = invidious_companion.public_url.to_s + src_url +
+                            "&check=#{invidious_companion_check_id}" if (invidious_companion)

                bitrate = fmt["bitrate"]
                mimetype = HTML.escape(fmt["mimeType"].as_s)
@@ -39,7 +42,7 @@
            <% if params.quality == "dash"
               src_url = "/api/manifest/dash/id/" + video.id + "?local=true&unique_res=1"
               src_url = invidious_companion.public_url.to_s + 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 %>
@@ -51,7 +54,7 @@
                src_url  = "/latest_version?id=#{video.id}&itag=#{fmt["itag"]}"
                src_url += "&local=true" if params.local
                src_url = invidious_companion.public_url.to_s + 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)
@@ -68,15 +71,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>
@@ -1,12 +1,20 @@
+<%
+	search_privacy = preferences.search_privacy
+%>
+
+<% if search_privacy %>
+<form class="pure-form" action="/search" method="post">
+<% else %>
 <form class="pure-form" action="/search" method="get">
+<% end %>
 	<fieldset>
 		<input type="search" id="searchbox" autocorrect="off"
 		autocapitalize="none" spellcheck="false" <% if autofocus %>autofocus<% end %>
-		name="q" placeholder="<%= translate(locale, "search") %>"
-		title="<%= translate(locale, "search") %>"
+		name="q" placeholder="<%= I18n.translate(locale, "search") %>"
+		title="<%= I18n.translate(locale, "search") %>"
 		value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } %>">
 	</fieldset>
-	<button type="submit" id="searchbutton" aria-label="<%= translate(locale, "search") %>">
+	<button type="submit" id="searchbutton" aria-label="<%= I18n.translate(locale, "search") %>">
 		<i class="icon ion-ios-search"></i>
 	</button>
 </form>
@@ -3,14 +3,14 @@
            <form action="/subscription_ajax?action=remove_subscriptions&c=<%= ucid %>&referer=<%= env.get("current_page") %>" method="post">
                <input type="hidden" name="csrf_token" value="<%= HTML.escape(env.get?("csrf_token").try &.as(String) || "") %>">
                <button data-type="unsubscribe" id="subscribe" class="pure-button pure-button-primary">
-                    <b><input style="all:unset" type="submit" value="<%= translate(locale, "Unsubscribe") %> | <%= sub_count_text %>"></b>
+                    <b><input style="all:unset" type="submit" value="<%= I18n.translate(locale, "Unsubscribe") %> | <%= sub_count_text %>"></b>
                </button>
            </form>
    <% else %>
            <form action="/subscription_ajax?action=create_subscription_to_channel&c=<%= ucid %>&referer=<%= env.get("current_page") %>" method="post">
                <input type="hidden" name="csrf_token" value="<%= HTML.escape(env.get?("csrf_token").try &.as(String) || "") %>">
                <button data-type="subscribe" id="subscribe" class="pure-button pure-button-primary">
-                    <b><input style="all:unset" type="submit" value="<%= translate(locale, "Subscribe") %> | <%= sub_count_text %>"></b>
+                    <b><input style="all:unset" type="submit" value="<%= I18n.translate(locale, "Subscribe") %> | <%= sub_count_text %>"></b>
                </button>
            </form>
    <% end %>
@@ -22,8 +22,8 @@
        "author" => HTML.escape(author),
        "sub_count_text" => HTML.escape(sub_count_text),
        "csrf_token" => URI.encode_www_form(env.get?("csrf_token").try &.as(String) || ""),
-        "subscribe_text" => HTML.escape(translate(locale, "Subscribe")),
-        "unsubscribe_text" => HTML.escape(translate(locale, "Unsubscribe"))
+        "subscribe_text" => HTML.escape(I18n.translate(locale, "Subscribe")),
+        "unsubscribe_text" => HTML.escape(I18n.translate(locale, "Unsubscribe"))
    }.to_pretty_json
    %>
    </script>
@@ -31,6 +31,6 @@
 <% else %>
        <a id="subscribe" class="pure-button pure-button-primary"
            href="/login?referer=<%= env.get("current_page") %>">
-            <b><%= translate(locale, "Subscribe") %> | <%= sub_count_text %></b>
+            <b><%= I18n.translate(locale, "Subscribe") %> | <%= sub_count_text %></b>
        </a>
 <% end %>
@@ -1,21 +1,21 @@
 <div class="flex-right flexible">
    <div class="icon-buttons">
-        <a title="<%=translate(locale, "videoinfo_watch_on_youTube")%>" rel="noreferrer noopener" href="https://www.youtube.com/watch<%=endpoint_params%>">
+        <a title="<%=I18n.translate(locale, "videoinfo_watch_on_youTube")%>" rel="noreferrer noopener" href="https://www.youtube.com/watch<%=endpoint_params%>">
            <i class="icon ion-logo-youtube"></i>
        </a>
-        <a title="<%=translate(locale, "Audio mode")%>" href="/watch<%=endpoint_params%>&listen=1">
+        <a title="<%=I18n.translate(locale, "Audio mode")%>" href="/watch<%=endpoint_params%>&listen=1">
            <i class="icon ion-md-headset"></i>
        </a>

        <% if env.get("preferences").as(Preferences).automatic_instance_redirect%>
-            <a title="<%=translate(locale, "Switch Invidious Instance")%>" href="/redirect?referer=%2Fwatch<%=URI.encode_www_form(endpoint_params)%>">
+            <a title="<%=I18n.translate(locale, "Switch Invidious Instance")%>" href="/redirect?referer=%2Fwatch<%=URI.encode_www_form(endpoint_params)%>">
                <i class="icon ion-md-jet"></i>
            </a>
        <% else %>
-            <a title="<%=translate(locale, "Switch Invidious Instance")%>" href="https://redirect.invidious.io/watch<%=endpoint_params%>">
+            <a title="<%=I18n.translate(locale, "Switch Invidious Instance")%>" href="https://redirect.invidious.io/watch<%=endpoint_params%>">
                <i class="icon ion-md-jet"></i>
            </a>
        <% end %>

    </div>
-</div>
+</div>
@@ -1,5 +1,5 @@
 <% content_for "header" do %>
-<title><%= translate(locale, "Create playlist") %> - Invidious</title>
+<title><%= I18n.translate(locale, "Create playlist") %> - Invidious</title>
 <% end %>

 <div class="pure-g">
@@ -8,25 +8,25 @@
        <div class="h-box">
            <form class="pure-form pure-form-aligned" action="/create_playlist?referer=<%= URI.encode_www_form(referer) %>" method="post">
                <fieldset>
-                    <legend><%= translate(locale, "Create playlist") %></legend>
+                    <legend><%= I18n.translate(locale, "Create playlist") %></legend>

                    <div class="pure-control-group">
-                        <label for="title"><%= translate(locale, "Title") %> :</label>
-                        <input required name="title" type="text" placeholder="<%= translate(locale, "Title") %>">
+                        <label for="title"><%= I18n.translate(locale, "Title") %> :</label>
+                        <input required name="title" type="text" placeholder="<%= I18n.translate(locale, "Title") %>">
                    </div>

                    <div class="pure-control-group">
-                        <label for="privacy"><%= translate(locale, "Playlist privacy") %> :</label>
+                        <label for="privacy"><%= I18n.translate(locale, "Playlist privacy") %> :</label>
                        <select name="privacy" id="privacy">
                            <% PlaylistPrivacy.names.each do |option| %>
-                                <option value="<%= option %>" <% if option == "Public" %> selected <% end %>><%= translate(locale,  option) %></option>
+                                <option value="<%= option %>" <% if option == "Public" %> selected <% end %>><%= I18n.translate(locale,  option) %></option>
                            <% end %>
                        </select>
                    </div>

                    <div class="pure-controls">
                        <button type="submit" name="action" value="create_playlist" class="pure-button pure-button-primary">
-                            <%= translate(locale, "Create playlist") %>
+                            <%= I18n.translate(locale, "Create playlist") %>
                        </button>
                    </div>

@@ -1,20 +1,20 @@
 <% content_for "header" do %>
-<title><%= translate(locale, "Delete playlist") %> - Invidious</title>
+<title><%= I18n.translate(locale, "Delete playlist") %> - Invidious</title>
 <% end %>

 <div class="h-box">
    <form class="pure-form pure-form-aligned" action="/delete_playlist?list=<%= plid %>&referer=<%= URI.encode_www_form(referer) %>" method="post">
-        <legend><%= translate(locale, "Delete playlist `x`?", %|"#{HTML.escape(playlist.title)}"|) %></legend>
+        <legend><%= I18n.translate(locale, "Delete playlist `x`?", %|"#{HTML.escape(playlist.title)}"|) %></legend>

        <div class="pure-g">
            <div class="pure-u-1-2">
                <button type="submit" name="submit" value="delete_playlist" class="pure-button pure-button-primary">
-                    <%= translate(locale, "Yes") %>
+                    <%= I18n.translate(locale, "Yes") %>
                </button>
            </div>
            <div class="pure-u-1-2">
                <a class="pure-button" href="/playlist?list=<%= plid %>">
-                    <%= translate(locale, "No") %>
+                    <%= I18n.translate(locale, "No") %>
                </a>
            </div>
        </div>
@@ -10,17 +10,17 @@
        <div class="flex-right button-container">
            <div class="pure-u">
                <a class="pure-button pure-button-secondary low-profile" dir="auto" href="/playlist?list=<%= plid %>">
-                    <i class="icon ion-md-close"></i>&nbsp;<%= translate(locale, "generic_button_cancel") %>
+                    <i class="icon ion-md-close"></i>&nbsp;<%= I18n.translate(locale, "generic_button_cancel") %>
                </a>
            </div>
            <div class="pure-u">
                <button class="pure-button pure-button-secondary low-profile" dir="auto" type="submit">
-                    <i class="icon ion-md-save"></i>&nbsp;<%= translate(locale, "generic_button_save") %>
+                    <i class="icon ion-md-save"></i>&nbsp;<%= I18n.translate(locale, "generic_button_save") %>
                </button>
            </div>
            <div class="pure-u">
                <a class="pure-button pure-button-secondary low-profile" dir="auto" href="/delete_playlist?list=<%= plid %>">
-                    <i class="icon ion-md-trash"></i>&nbsp;<%= translate(locale, "generic_button_delete") %>
+                    <i class="icon ion-md-trash"></i>&nbsp;<%= I18n.translate(locale, "generic_button_delete") %>
                </a>
            </div>
        </div>
@@ -36,11 +36,11 @@
        <div class="pure-u-1-1">
            <b>
                <%= HTML.escape(playlist.author) %> |
-                <%= translate_count(locale, "generic_videos_count", playlist.video_count) %> |
+                <%= I18n.translate_count(locale, "generic_videos_count", playlist.video_count) %> |
            </b>
            <select name="privacy">
            <%- {"Public", "Unlisted", "Private"}.each do |option| -%>
-                <option value="<%= option %>" <% if option == playlist.privacy.to_s %>selected<% end %>><%= translate(locale, option) %></option>
+                <option value="<%= option %>" <% if option == playlist.privacy.to_s %>selected<% end %>><%= I18n.translate(locale, option) %></option>
            <%- end -%>
            </select>
        </div>
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%= env.get("preferences").as(Preferences).locale %>">
+<html lang="<%= preferences.locale %>">

 <head>
    <meta charset="utf-8">
@@ -1,19 +1,19 @@
 <% content_for "header" do %>
-<title><%= translate(locale, "History") %> - Invidious</title>
+<title><%= I18n.translate(locale, "History") %> - Invidious</title>
 <% end %>

 <div class="pure-g h-box">
    <div class="pure-u-1-3">
-        <h3><%= translate_count(locale, "generic_videos_count", user.watched.size, NumberFormatting::HtmlSpan) %></h3>
+        <h3><%= I18n.translate_count(locale, "generic_videos_count", user.watched.size, I18n::NumberFormatting::HtmlSpan) %></h3>
    </div>
    <div class="pure-u-1-3">
        <h3 style="text-align:center">
-            <a href="/feed/subscriptions"><%= translate_count(locale, "generic_subscriptions_count", user.subscriptions.size, NumberFormatting::HtmlSpan) %></a>
+            <a href="/feed/subscriptions"><%= I18n.translate_count(locale, "generic_subscriptions_count", user.subscriptions.size, I18n::NumberFormatting::HtmlSpan) %></a>
        </h3>
    </div>
    <div class="pure-u-1-3">
        <h3 style="text-align:right">
-            <a href="/clear_watch_history"><%= translate(locale, "Clear watch history") %></a>
+            <a href="/clear_watch_history"><%= I18n.translate(locale, "Clear watch history") %></a>
        </h3>
    </div>
 </div>
@@ -1,22 +1,22 @@
 <% content_for "header" do %>
-<title><%= translate(locale, "Playlists") %> - Invidious</title>
+<title><%= I18n.translate(locale, "Playlists") %> - Invidious</title>
 <% end %>

 <%= rendered "components/feed_menu" %>

 <div class="pure-g h-box">
    <div class="pure-u-1-3">
-        <h3><%= translate(locale, "user_created_playlists", %(<span id="count">#{items_created.size}</span>)) %></h3>
+        <h3><%= I18n.translate(locale, "user_created_playlists", %(<span id="count">#{items_created.size}</span>)) %></h3>
    </div>
    <div class="pure-u-1-3">
        <h3 style="text-align:center">
-            <a href="/create_playlist?referer=<%= URI.encode_www_form("/feed/playlists") %>"><%= translate(locale, "Create playlist") %></a>
+            <a href="/create_playlist?referer=<%= URI.encode_www_form("/feed/playlists") %>"><%= I18n.translate(locale, "Create playlist") %></a>
        </h3>
    </div>
    <div class="pure-u-1-3">
        <h3 style="text-align:right">
            <a href="/data_control?referer=<%= URI.encode_www_form("/feed/playlists") %>">
-                <%= translate(locale, "Import/export") %>
+                <%= I18n.translate(locale, "Import/export") %>
            </a>
        </h3>
    </div>
@@ -30,7 +30,7 @@

 <div class="pure-g h-box">
    <div class="pure-u-1">
-        <h3><%= translate(locale, "user_saved_playlists", %(<span id="count">#{items_saved.size}</span>)) %></h3>
+        <h3><%= I18n.translate(locale, "user_saved_playlists", %(<span id="count">#{items_saved.size}</span>)) %></h3>
    </div>
 </div>

@@ -1,8 +1,8 @@
 <% content_for "header" do %>
-<meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
+<meta name="description" content="<%= I18n.translate(locale, "An alternative front-end to YouTube") %>">
 <title>
    <% if env.get("preferences").as(Preferences).default_home != "Popular" %>
-        <%= translate(locale, "Popular") %> - Invidious
+        <%= I18n.translate(locale, "Popular") %> - Invidious
    <% else %>
        Invidious
    <% end %>
@@ -1,5 +1,5 @@
 <% content_for "header" do %>
-<title><%= translate(locale, "Subscriptions") %> - Invidious</title>
+<title><%= I18n.translate(locale, "Subscriptions") %> - Invidious</title>
 <link rel="alternate" type="application/rss+xml" title="RSS" href="/feed/private?token=<%= token %>" />
 <% end %>

@@ -8,12 +8,12 @@
 <div class="pure-g h-box">
    <div class="pure-u-1-3">
        <h3>
-            <a href="/subscription_manager"><%= translate(locale, "Manage subscriptions") %></a>
+            <a href="/subscription_manager"><%= I18n.translate(locale, "Manage subscriptions") %></a>
        </h3>
    </div>
    <div class="pure-u-1-3">
        <h3 style="text-align:center">
-            <a href="/feed/history"><%= translate(locale, "Watch history") %></a>
+            <a href="/feed/history"><%= I18n.translate(locale, "Watch history") %></a>
        </h3>
    </div>
    <div class="pure-u-1-3">
@@ -26,7 +26,7 @@
 <% if CONFIG.enable_user_notifications %>

 <center>
-    <%= translate_count(locale, "subscriptions_unseen_notifs_count", notifications.size) %>
+    <%= I18n.translate_count(locale, "subscriptions_unseen_notifs_count", notifications.size) %>
 </center>

 <% if !notifications.empty? %>
@@ -1,8 +1,8 @@
 <% content_for "header" do %>
-<meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
+<meta name="description" content="<%= I18n.translate(locale, "An alternative front-end to YouTube") %>">
 <title>
    <% if env.get("preferences").as(Preferences).default_home != "Trending" %>
-        <%= translate(locale, "Trending") %> - Invidious
+        <%= I18n.translate(locale, "Trending") %> - Invidious
    <% else %>
        Invidious
    <% end %>
@@ -15,19 +15,19 @@
    <div style="align-self:flex-end" class="pure-u-2-3">
        <% if plid %>
            <a href="/playlist?list=<%= plid %>">
-                <%= translate(locale, "View as playlist") %>
+                <%= I18n.translate(locale, "View as playlist") %>
            </a>
        <% end %>
    </div>
    <div class="pure-u-1-3">
        <div class="pure-g" style="text-align:right">
-            <% {"Default", "Music", "Gaming", "Movies"}.each do |option| %>
+            <% {"Livestreams", "Gaming"}.each do |option| %>
                <div class="pure-u-1 pure-md-1-3">
                    <% if trending_type == option %>
-                        <b><%= translate(locale, option) %></b>
+                        <b><%= I18n.translate(locale, option) %></b>
                    <% else %>
                        <a href="/feed/trending?type=<%= option %>&region=<%= region %>">
-                            <%= translate(locale, option) %>
+                            <%= I18n.translate(locale, option) %>
                        </a>
                    <% end %>
                </div>
@@ -7,7 +7,7 @@
 </head>

 <body>
-    <h1><%= translate(locale, "JavaScript license information") %></h1>
+    <h1><%= I18n.translate(locale, "JavaScript license information") %></h1>
    <table id="jslicense-labels1">
        <tr>
            <td>
@@ -19,7 +19,7 @@
            </td>

            <td>
-                <a href="https://github.com/iv-org/videojs-quality-selector"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/iv-org/videojs-quality-selector"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -33,7 +33,7 @@
            </td>

            <td>
-                <a href="https://github.com/mpetazzoni/sse.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/mpetazzoni/sse.js"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -47,7 +47,7 @@
            </td>

            <td>
-                <a href="https://github.com/videojs/videojs-contrib-quality-levels"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/videojs/videojs-contrib-quality-levels"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -61,7 +61,7 @@
            </td>

            <td>
-                <a href="https://github.com/jfujita/videojs-http-source-selector"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/jfujita/videojs-http-source-selector"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -75,7 +75,7 @@
            </td>

            <td>
-                <a href="https://github.com/mister-ben/videojs-mobile-ui"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/mister-ben/videojs-mobile-ui"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -89,7 +89,7 @@
            </td>

            <td>
-                <a href="https://github.com/spchuang/videojs-markers"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/spchuang/videojs-markers"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -103,7 +103,7 @@
            </td>

            <td>
-                <a href="https://github.com/brightcove/videojs-overlay"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/brightcove/videojs-overlay"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -117,7 +117,7 @@
            </td>

            <td>
-                <a href="https://github.com/mkhazov/videojs-share"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/mkhazov/videojs-share"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -131,7 +131,7 @@
            </td>

            <td>
-                <a href="https://github.com/chrisboustead/videojs-vtt-thumbnails"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/chrisboustead/videojs-vtt-thumbnails"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -145,7 +145,7 @@
            </td>

            <td>
-                <a href="https://github.com/afrmtbl/videojs-youtube-annotations"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/afrmtbl/videojs-youtube-annotations"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -159,7 +159,7 @@
            </td>

            <td>
-                <a href="https://github.com/videojs/videojs-vr"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/videojs/videojs-vr"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

@@ -173,7 +173,7 @@
            </td>

            <td>
-                <a href="https://github.com/videojs/video.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/videojs/video.js"><%= I18n.translate(locale, "source") %></a>
            </td>
        </tr>

--- a/Show More
+++ b/Show More