2025-04-19 15:15:47 -04:00
120 changed files with 936 additions and 2804 deletions
--- a/.ameba.yml
+++ b/.ameba.yml
@ -38,9 +38,6 @@ Style/RedundantBegin:
 Style/RedundantReturn:
  Enabled: false

-Style/RedundantNext:
-  Enabled: false
-
 Style/ParenthesesAroundCondition:
  Enabled: false

--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -6,7 +6,7 @@ docker/ @unixfox
 kubernetes/ @unixfox

 README.md @thefrenchghosty
-config/config.example.yml @SamantazFox @unixfox
+config/config.example.yml @thefrenchghosty @SamantazFox @unixfox

 scripts/ @syeopite
 shards.lock @syeopite
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -10,10 +10,8 @@ assignees: ''
 <!--
  BEFORE TRYING TO REPORT A BUG:
 
-  * Read the FAQ: https://docs.invidious.io/faq/!
-  * Use the search function to check if there is already an issue open for your problem: https://github.com/search?q=repo%3Aiv-org%2Finvidious+replace+me+with+your+bug&type=issues!
-
-  MAKE SURE TO FOLLOW THE TWO STEPS ABOVE BEFORE REPORTING A BUG. A BUG THAT ALREADY EXIST WILL IMMEDIATELY CLOSED.
+  * Read the FAQ!
+  * Use the search function to check if there is already an issue open for your problem!

  If you want to suggest a new feature please use "Feature request" instead
  If you want to suggest an enhancement to an existing feature please use "Enhancement" instead
--- a/.github/workflows/build-nightly-container.yml
+++ b/.github/workflows/build-nightly-container.yml
@ -23,6 +23,19 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4

+      - name: Install Crystal
+        uses: crystal-lang/install-crystal@v1.8.2
+        with:
+          crystal: 1.12.2
+
+      - name: Run lint
+        run: |
+          if ! crystal tool format --check; then
+            crystal tool format
+            git diff
+            exit 1
+          fi
+
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
        with:
--- a/.github/workflows/build-stable-container.yml
+++ b/.github/workflows/build-stable-container.yml
@ -14,6 +14,19 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4

+      - name: Install Crystal
+        uses: crystal-lang/install-crystal@v1.8.2
+        with:
+          crystal: 1.12.2
+
+      - name: Run lint
+        run: |
+          if ! crystal tool format --check; then
+            crystal tool format
+            git diff
+            exit 1
+          fi
+
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
        with:
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -38,10 +38,10 @@ jobs:
      matrix:
        stable: [true]
        crystal:
+          - 1.9.2
+          - 1.10.1
+          - 1.11.2
          - 1.12.1
-          - 1.13.2
-          - 1.14.0
-          - 1.15.0
        include:
          - crystal: nightly
            stable: false
@ -51,11 +51,6 @@ jobs:
        with:
          submodules: true

-      - name: Install required APT packages
-        run: |
-          sudo apt install -y libsqlite3-dev
-        shell: bash
-
      - name: Install Crystal
        uses: crystal-lang/install-crystal@v1.8.0
        with:
@ -64,9 +59,7 @@ jobs:
      - name: Cache Shards
        uses: actions/cache@v3
        with:
-          path: |
-            ./lib
-            ./bin
+          path: ./lib
          key: shards-${{ hashFiles('shard.lock') }}

      - name: Install Shards
@ -78,6 +71,14 @@ jobs:
      - name: Run tests
        run: crystal spec

+      - name: Run lint
+        run: |
+          if ! crystal tool format --check; then
+            crystal tool format
+            git diff
+            exit 1
+          fi
+
      - name: Build
        run: crystal build --warnings all --error-on-warnings --error-trace src/invidious.cr

@ -123,19 +124,14 @@ jobs:
      - name: Test Docker
        run: while curl -Isf http://localhost:3000; do sleep 1; done

-  lint:
-
+  ameba_lint:
    runs-on: ubuntu-latest
-
-    continue-on-error: true
-
    steps:
      - uses: actions/checkout@v4
        with:
          submodules: true

      - name: Install Crystal
-        id: lint_step_install_crystal
        uses: crystal-lang/install-crystal@v1.8.0
        with:
          crystal: latest
@ -146,21 +142,10 @@ jobs:
          path: |
            ./lib
            ./bin
-          key: shards-${{ hashFiles('shard.lock') }}-${{ steps.lint_step_install_crystal.outputs.crystal }}
+          key: shards-${{ hashFiles('shard.lock') }}

      - name: Install Shards
-        run: |
-          if ! shards check; then
-            shards install
-          fi
-
-      - name: Check Crystal formatter compliance
-        run: |
-          if ! crystal tool format --check; then
-            crystal tool format
-            git diff
-            exit 1
-          fi
+        run: shards install

      - name: Run Ameba linter
        run: bin/ameba
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@ -13,11 +13,14 @@ jobs:
    - uses: actions/stale@v8
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-stale: 730
-        days-before-pr-stale: -1 
-        days-before-close: 60
+        days-before-stale: 365
+        days-before-pr-stale: 90 
+        days-before-close: 30
+        exempt-pr-labels: blocked,exempt-stale
        stale-issue-message: 'This issue has been automatically marked as stale and will be closed in 30 days because it has not had recent activity and is much likely outdated. If you think this issue is still relevant and applicable, you just have to post a comment and it will be unmarked.'
+        stale-pr-message: 'This pull request has been automatically marked as stale and will be closed in 30 days because it has not had recent activity and is much likely abandoned or outdated. If you think this pull request is still relevant and applicable, you just have to post a comment and it will be unmarked.'
        stale-issue-label: "stale"
+        stale-pr-label: "stale"
        ascending: true
-        # Exempt the following types of issues from being staled
-        exempt-issue-labels: "feature-request,enhancement,discussion,exempt-stale"
+        # Never mark feature requests/enhancements as stale
+        exempt-issue-labels: "feature-request,enhancement,exempt-stale"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,244 +1,5 @@
 # CHANGELOG

-## vX.Y.0 (future)
-
-## v2.20250314.0
-
-### Wrap-up
-
-This release brings the long awaited feature of supporting multiple audio tracks in a video, some bug fixes and UX improvements, and many other things primarily oriented to self-hosting instances, and developers using the API.
-
-The `Community` channel tab has been replaced by `Posts` in light of YouTube changes, but the URL remains the same.
-
-Tamil is now available as an interface language
-
-Automatic instance redirects will no longer have the chance to annoyingly redirect to the same instance you're on.
-
-Due to their requirements for video playback, Invidious will log warning messages when either inv-sig-helper, `po_token` or `visitor_data` is not configured
-
-Invidious is now able to listen through a UNIX socket
-
-User notifications are now batched for each channel
-
-**The minimum Crystal version supported by Invidious now `1.12.0`**
-
-### New features & important changes
-
-#### For users
-
-* Invidious now supports videos with multiple audio tracks allowing you to select which one you want to hear with!
-* Channel pages now have a proper previous page button
-* RSS feeds for channels will no longer contain the channel's profile picture
-* Support for channel `courses` page has been added
-* `Community` tabs has been replaced with `Posts` to comply with YouTube changes
-* Tamil is now an available interface language.
-
-#### For instance owners
-* Invidious is now able to listen on a UNIX socket
-* User notifications are now batched by channels, significantly reducing database load.
-* **`1.12.0` is now the oldest Crystal version that Invidious supports**
-* The example config will no longer force an http proxy to be configured
-* Invidious will now warn when any top-level config option must be set to a custom value, instead of just `HMAC_KEY`
-* Due to their requirements for video playback, Invidious will log warning messages when either inv-sig-helper, `po_token` or `visitor_data` is not configured
-
-#### For developers
-* Invidious is now compliant to Crystal 1.15 formatting rules, which are incompatible with earlier versions.
-* `/api/v1/transcripts/{id}` has been added to the API to allow for fetching the transcripts for a video. The arguments are the same as the captions endpoint.
-* `author_thumbnail` field has been added to videos in the various paged api endpoints
-* `published` field has been added to the API response for a video's related videos.
-* Docker builds now uses the Crystal compiler cache, reducing build times on repeated builds significantly.
-* Invidious ajax action handlers has undergone a clean up and may face compatibility issues with code that depends on these endpoints.
-* The versions of Crystal that we test in CI/CD are now: `1.12.1`, `1.13.2`, `1.14.0`, `1.15.0`
-
-### Bugs fixed
-
-#### User-side
-* Local video listen mode is now preserved when clicking on a video in the sidebar playlist widget
-* Automatic instance redirects will no longer redirect to the same instance the user is on
-* Fix some thumbnails responses returning 404
-* Videos: Fix missing host parameter on playback URLs when `local=true`
-* Fix HLS being used for non-livestream videos
-* Fix timeupdate event errors when required elements are missing
-* User: Ensure IO is properly closed when importing NewPipe subscriptions
-
-#### For instance owners
-* Fix http proxy configuration being forced by the standard example config
-
-#### API
-* `/api/v1/videos/{id}` will no longer return an occasional empty JSON response
-
-### Full list of pull requests merged since the last release (newest first)
-* Make Invidious compliant to Crystal 1.15 formatting rules (https://github.com/iv-org/invidious/pull/5014, by @syeopite)
-* Remove formatter check on container workflows (https://github.com/iv-org/invidious/pull/5153, by @syeopite)
-* Videos: Fix missing host parameter on playback URLs when `local=true` (https://github.com/iv-org/invidious/pull/4992, by @SamantazFox)
-* Remove stdlib override for proxy initialization (https://github.com/iv-org/invidious/pull/5065, by @syeopite)
-* Add support for author thumbnails in search api for videos (https://github.com/iv-org/invidious/pull/5072, thanks @ChunkyProgrammer)
-* Skip route if resp got closed by before handlers (https://github.com/iv-org/invidious/pull/5073, by @syeopite)
-* Fix video thumbnails in mixes (https://github.com/iv-org/invidious/pull/5116, thanks @iBicha)
-* CI: Drop support for versions prior to 1.12 and add 1.15.0 (https://github.com/iv-org/invidious/pull/5148, by @syeopite)
-* [Continuing #5094] Set language info for dash audio streams and sort (https://github.com/iv-org/invidious/pull/5149, thanks @giuliano-macedo)
-* Warn when any top-level config is "CHANGE_ME!!" (https://github.com/iv-org/invidious/pull/5150, by @syeopite)
-* Comment out http_proxy in example config (https://github.com/iv-org/invidious/pull/5151, by @syeopite)
-* API: Add a 'published' video parameter for related videos (https://github.com/iv-org/invidious/pull/4149, thanks @RadoslavL)
-* Ensure IO is properly closed when importing NewPipe subscriptions (https://github.com/iv-org/invidious/pull/4346, thanks @ChunkyProgrammer)
-* Carry over audio-only mode in playlist links (https://github.com/iv-org/invidious/pull/4784, thanks @krystof1119)
-* Routes: Clean ajax actions handlers (https://github.com/iv-org/invidious/pull/5036, by @SamantazFox)
-* Frontend: Add a first page and previous page buttons for channel navigation (https://github.com/iv-org/invidious/pull/4123, thanks @RadoslavL)
-* RSS: Channel + Playlist improvements (https://github.com/iv-org/invidious/pull/4298, thanks @ChunkyProgrammer)
-* Batch user notifications together (https://github.com/iv-org/invidious/pull/4486, thanks @999eagle)
-* JS: Update timeupdate event making it more defensive to prevent errors (https://github.com/iv-org/invidious/pull/4782, thanks @PMK)
-* Add API endpoint for fetching transcripts from YouTube by (https://github.com/iv-org/invidious/pull/4788, by @syeopite)
-* Translations update from Hosted Weblate by (https://github.com/iv-org/invidious/pull/4989, thanks to our many translators)
-* Add the ability to listen on UNIX sockets (https://github.com/iv-org/invidious/pull/5112, thanks @Caian)
-* Pick a different instance upon redirect (https://github.com/iv-org/invidious/pull/5154, thanks @epicsam123)
-* Add Courses to channel page and channel API (https://github.com/iv-org/invidious/pull/5158, thanks @ChunkyProgrammer)
-* fix /api/v1/videos/:id returns 200 with no content (https://github.com/iv-org/invidious/pull/5162, thanks @Drikanis)
-* Use Crystal compiler cache in docker builds (https://github.com/iv-org/invidious/pull/5163, by @syeopite)
-* Channels: Fix community tab by (https://github.com/iv-org/invidious/pull/5183, thanks @Fijxu)
-* Fix typo in `src/invidious/routes/images.cr` (https://github.com/iv-org/invidious/pull/5184, by @syeopite)
-* Fix an issue with the HLS manifest check for livestream videos (https://github.com/iv-org/invidious/pull/5189, thanks @alexmaras)
-* Warn when `po_token`, `visitor_data` and/or `inv-sig-helper` is not configured (https://github.com/iv-org/invidious/pull/5202, by @syeopite)
-## v2.20241110.0
-
-### Wrap-up
-
-This release is most importantly here to fix to the annoying "Youtube API returned error 400"
-error that prevented all channel pages from loading.
-
-If you're updating from the previous release, it provides no improvements on the ability to play
-videos. If updating from a commit in-between release, it removes the "Please sign in" error caused
-by a previous attempt at restoring video playback on large instances.
-
-In the preferences, a new option allows for control of video preload. When enabled, this option
-tells the browser to load the video as soon as the page is loaded (this used to be the default).
-When disabled, the video starts loading only when the "play" button is pressed.
-
-New interface languages available: Bulgarian, Welsh and Lombard
-
-New dependency required: `tzdata`.
-
-An HTTP proxy can be configured directly in Invidious, if needed. \
-**NOTE:** In that case, it is recommended to comment out `force_resolve`.
-
-
-### New features & important changes
-
-#### For users
-
-* Channels: Fix "Youtube API returned error 400" error preventing channel pages from loading
-* Channels: Shorts can now be sorted by "newest", "oldest" and "popular"
-* Preferences: Addition of the new "preload" option
-* New interface languages available: Bulgarian, Welsh and Lombard
-* Added "Filipino (auto-generated)" to the list of caption languages available
-* Lots of new translations from Weblate
-
-#### For instance owners
-
-* Allow the configuration of an HTTP proxy to talk to Youtube
-* Invidious tries to reconnect to `inv_sig_helper` if the socket is closed
-* The instance list is downloaded in the background to improve redirection speed
-* New `colorize_logs` option makes each log level a different color
-
-#### For developpers
-
-* `/api/v1/channels/{id}/shorts` now supports the `sort-by` parameter with the following values:
-  `newest`, `oldest` and `popular`
-* Older `/api/v1/channels/xyz/{id}` (tab name before UCID) were removed
-* API/Search: New video metadata available: `isNew`, `is4k`, `is8k`, `isVr180`, `isVr360`,
-  `is3d` and `hasCaptions`
-
-### Bugs fixed
-
-#### User-side
-
-* Channels: The second page of shorts now loads as expected
-* Channels: Fixed intermittent empty "playlists" tab
-* Search: Fixed `youtu.be` URLs not being properly redirected to the watch page
-* Fixed `DB::MappingException` error on the subscriptions feed (due to missing `tzdata` in docker)
-* Switching to another instance is much faster
-* Fixed an "invalid byte sequence" error when subscribing to a playlist
-* Videos: Playback URLs were sometimes broken when cached and `inv_sig_helper` was used
-
-#### For instance owners
-
-* Fix `force_resolve` being ignored in some cases
-
-#### API
-
-* API/Videos: Fixed `live_now` and `premiere_timestamp` sometimes not having the right values
-
-
-### Full list of pull requests merged since the last release (newest first)
-
-* API: Add "sort_by" parameter to channels/shorts endpoint ([#5071], thanks @iBicha)
-* Docker: Install tzdata in Dockerfile ([#5070], by @SamantazFox)
-* Videos: Stop using TVHTML5_SIMPLY_EMBEDDED_PLAYER ([#5063], thanks @unixfox)
-* Routing: Deprecate old channel API routes ([#5045], by @SamantazFox)
-* Videos: use WEB client instead of WEB CREATOR ([#4984], thanks @unixfox)
-* Parsers: Fix parsing live_now and premiere_timestamp ([#4934], thanks @absidue)
-* Stale bot updates ([#5060], thanks @syeopite)
-* Channels: Fix "Youtube API returned error 400" ([#5059], by @SamantazFox)
-* Channels: Fix for live videos ([#5027], thanks @iBicha)
-* Locales: Add Bulgarian, Welsh and Lombard to the list ([#5046], by @SamantazFox)
-* Shards: Update database dependencies ([#5034], by @SamantazFox)
-* Logger: Add color support for different log levels ([#4931], thanks @Fijxu)
-* Fix named arg syntax when passing force_resolve ([#4754], thanks @syeopite)
-* Use make_client instead of calling HTTP::Client ([#4709], thanks @syeopite)
-* Add "Filipino (auto-generated)" to the list of caption languages ([#4995], by @SamantazFox)
-* Makefile: Add MT option to enable the 'preview_mt' flag ([#4993], by @SamantazFox)
-* SigHelper: Reconnect to signature helper ([#4991], thanks @Fijxu)
-* Fix player menus hiding onHover ready ([#4750], thanks @giacomocerquone)
-* Use connection pools when requesting images from YouTube ([#4326], thanks @syeopite)
-* Add support for using Invidious through a HTTP Proxy ([#4270], thanks @syeopite)
-* Search: Fix 'youtu.be' URLs in sanitizer ([#4894], by @SamantazFox)
-* Ameba: Disable Style/RedundantNext rule ([#4888], thanks @syeopite)
-* Playlists: Fix 'invalid byte sequence' error when subscribing ([#4887], thanks @DmitrySandalov)
-* Parse more metadata badges for SearchVideos ([#4863], thanks @ChunkyProgrammer)
-* Translations update from Hosted Weblate ([#4862], thanks to our many translators)
-* Videos: Convert URL before putting result into cache ([#4850], by @SamantazFox)
-* HTML: Add error message to "search issues on GitHub" link ([#4652], thanks @tracedgod)
-* Preferences: Add option to control preloading of video data ([#4122], thanks @Nerdmind)
-* Performance: Improve speed of automatic instance redirection ([#4193], thanks @syeopite)
-* Remove myself from CODEOWNERS on the config file ([#4942], by @TheFrenchGhosty)
-* Update latest version WEB_CREATOR + fix comment web embed ([#4930], thanks @unixfox)
-* use WEB_CREATOR when po_token with WEB_EMBED as a fallback ([#4928], thanks @unixfox)
-* Revert "use web screen embed for fixing potoken functionality"
-* use web screen embed for fixing potoken functionality ([#4923], thanks @unixfox)
-
-[#4122]: https://github.com/iv-org/invidious/pull/4122
-[#4193]: https://github.com/iv-org/invidious/pull/4193
-[#4270]: https://github.com/iv-org/invidious/pull/4270
-[#4326]: https://github.com/iv-org/invidious/pull/4326
-[#4652]: https://github.com/iv-org/invidious/pull/4652
-[#4709]: https://github.com/iv-org/invidious/pull/4709
-[#4750]: https://github.com/iv-org/invidious/pull/4750
-[#4754]: https://github.com/iv-org/invidious/pull/4754
-[#4850]: https://github.com/iv-org/invidious/pull/4850
-[#4862]: https://github.com/iv-org/invidious/pull/4862
-[#4863]: https://github.com/iv-org/invidious/pull/4863
-[#4887]: https://github.com/iv-org/invidious/pull/4887
-[#4888]: https://github.com/iv-org/invidious/pull/4888
-[#4894]: https://github.com/iv-org/invidious/pull/4894
-[#4923]: https://github.com/iv-org/invidious/pull/4923
-[#4928]: https://github.com/iv-org/invidious/pull/4928
-[#4930]: https://github.com/iv-org/invidious/pull/4930
-[#4931]: https://github.com/iv-org/invidious/pull/4931
-[#4934]: https://github.com/iv-org/invidious/pull/4934
-[#4942]: https://github.com/iv-org/invidious/pull/4942
-[#4984]: https://github.com/iv-org/invidious/pull/4984
-[#4991]: https://github.com/iv-org/invidious/pull/4991
-[#4993]: https://github.com/iv-org/invidious/pull/4993
-[#4995]: https://github.com/iv-org/invidious/pull/4995
-[#5027]: https://github.com/iv-org/invidious/pull/5027
-[#5034]: https://github.com/iv-org/invidious/pull/5034
-[#5045]: https://github.com/iv-org/invidious/pull/5045
-[#5046]: https://github.com/iv-org/invidious/pull/5046
-[#5059]: https://github.com/iv-org/invidious/pull/5059
-[#5060]: https://github.com/iv-org/invidious/pull/5060
-[#5063]: https://github.com/iv-org/invidious/pull/5063
-[#5070]: https://github.com/iv-org/invidious/pull/5070
-[#5071]: https://github.com/iv-org/invidious/pull/5071
-

 ## v2.20240825.2 (2024-08-26)

--- a/9
+++ b/9
@ -7,11 +7,6 @@ STATIC   := 0

 NO_DBG_SYMBOLS := 0

-# Enable multi-threading.
-# Warning: Experimental feature!!
-# invidious is not stable when MT is enabled.
-MT := 0
-

 FLAGS ?=

@ -24,10 +19,6 @@ ifeq ($(STATIC), 1)
  FLAGS += --static
 endif

-ifeq ($(MT), 1)
-  FLAGS += -Dpreview_mt
-endif
-

 ifeq ($(NO_DBG_SYMBOLS), 1)
  FLAGS += --no-debug
--- a/assets/css/player.css
+++ b/assets/css/player.css
@ -68,7 +68,6 @@

 .video-js.player-style-youtube .vjs-menu-button-popup .vjs-menu {
  margin-bottom: 2em;
-  padding-top: 2em
 }

 .video-js.player-style-youtube .vjs-progress-control .vjs-progress-holder, .video-js.player-style-youtube .vjs-progress-control {height: 5px;
--- a/assets/js/handlers.js
+++ b/assets/js/handlers.js
@ -91,7 +91,7 @@
        var count = document.getElementById('count');
        count.textContent--;

-        var url = '/token_ajax?action=revoke_token&redirect=false' +
+        var url = '/token_ajax?action_revoke_token=1&redirect=false' +
            '&referer=' + encodeURIComponent(location.href) +
            '&session=' + target.getAttribute('data-session');

@ -111,7 +111,7 @@
        var count = document.getElementById('count');
        count.textContent--;

-        var url = '/subscription_ajax?action=remove_subscriptions&redirect=false' +
+        var url = '/subscription_ajax?action_remove_subscriptions=1&redirect=false' +
            '&referer=' + encodeURIComponent(location.href) +
            '&c=' + target.getAttribute('data-ucid');

--- a/assets/js/pagination.js
+++ b/assets/js/pagination.js
@ -1,93 +0,0 @@
-'use strict';
-
-const CURRENT_CONTINUATION = (new URL(document.location)).searchParams.get("continuation");
-const CONT_CACHE_KEY = `continuation_cache_${encodeURIComponent(window.location.pathname)}`;
-
-function get_data(){
-    return JSON.parse(sessionStorage.getItem(CONT_CACHE_KEY)) || [];
-}
-
-function save_data(){
-    const prev_data = get_data();
-    prev_data.push(CURRENT_CONTINUATION);
-
-    sessionStorage.setItem(CONT_CACHE_KEY, JSON.stringify(prev_data));
-}
-
-function button_press(){
-    let prev_data = get_data();
-    if (!prev_data.length) return null;
-
-    // Sanity check. Nowhere should the current continuation token exist in the cache 
-    // but it can happen when using the browser's back feature. As such we'd need to travel
-    // back to the point where the current continuation token first appears in order to 
-    // account for the rewind.
-    const conflict_at = prev_data.indexOf(CURRENT_CONTINUATION);
-    if (conflict_at != -1) {
-        prev_data.length = conflict_at;
-    }
-
-    const prev_ctoken = prev_data.pop();
-
-    // On the first page, the stored continuation token is null.
-    if (prev_ctoken === null) {
-        sessionStorage.removeItem(CONT_CACHE_KEY);
-        let url = set_continuation();
-        window.location.href = url;
-
-        return;
-    }
-
-    sessionStorage.setItem(CONT_CACHE_KEY, JSON.stringify(prev_data));
-    let url = set_continuation(prev_ctoken);
-
-    window.location.href = url;
-};
-
-// Method to set the current page's continuation token
-// Removes the continuation parameter when a continuation token is not given
-function set_continuation(prev_ctoken = null){
-    let url = window.location.href.split('?')[0];
-    let params = window.location.href.split('?')[1];
-    let url_params = new URLSearchParams(params);
-
-    if (prev_ctoken) {
-        url_params.set("continuation", prev_ctoken);
-    } else {
-        url_params.delete('continuation');
-    };
-
-    if(Array.from(url_params).length > 0){
-        return `${url}?${url_params.toString()}`;
-    } else {
-        return url;
-    }
-}
-
-addEventListener('DOMContentLoaded', function(){
-    const pagination_data = JSON.parse(document.getElementById('pagination-data').textContent);
-    const next_page_containers = document.getElementsByClassName("page-next-container");
-
-    for (let container of next_page_containers){
-        const next_page_button = container.getElementsByClassName("pure-button")
-
-        // exists?
-        if (next_page_button.length > 0){
-            next_page_button[0].addEventListener("click", save_data);
-        }
-    }
-
-    // Only add previous page buttons when not on the first page
-    if (CURRENT_CONTINUATION) {
-        const prev_page_containers = document.getElementsByClassName("page-prev-container")
-
-        for (let container of prev_page_containers) {
-            if (pagination_data.is_rtl) {
-                container.innerHTML = `<button class="pure-button pure-button-secondary">${pagination_data.prev_page}&nbsp;&nbsp;<i class="icon ion-ios-arrow-forward"></i></button>`
-            } else {
-                container.innerHTML = `<button class="pure-button pure-button-secondary"><i class="icon ion-ios-arrow-back"></i>&nbsp;&nbsp;${pagination_data.prev_page}</button>`
-            }
-            container.getElementsByClassName("pure-button")[0].addEventListener("click", button_press);
-        }
-    }
-});
--- a/assets/js/player.js
+++ b/assets/js/player.js
@ -3,6 +3,7 @@ var player_data = JSON.parse(document.getElementById('player_data').textContent)
 var video_data = JSON.parse(document.getElementById('video_data').textContent);

 var options = {
+    preload: 'auto',
    liveui: true,
    playbackRates: [0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0],
    controlBar: {
@ -134,32 +135,26 @@ player.on('timeupdate', function () {
    // 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);
-    }
+
+    let base_url_yt_watch = elem_yt_watch.getAttribute('data-base-url');
+    let base_url_yt_embed = elem_yt_embed.getAttribute('data-base-url');
+
+    elem_yt_watch.href = addCurrentTimeToURL(base_url_yt_watch);
+    elem_yt_embed.href = addCurrentTimeToURL(base_url_yt_embed);

    // Invidious links

    let domain = window.location.origin;

    let elem_iv_embed = document.getElementById('link-iv-embed');
-    if (elem_iv_embed) {
-        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 base_url_iv_embed = elem_iv_embed.getAttribute('data-base-url');
+    let base_url_iv_other = elem_iv_other.getAttribute('data-base-url');
+
+    elem_iv_embed.href = addCurrentTimeToURL(base_url_iv_embed, domain);
+    elem_iv_other.href = addCurrentTimeToURL(base_url_iv_other, domain);
 });


--- a/assets/js/playlist_widget.js
+++ b/assets/js/playlist_widget.js
@ -6,7 +6,7 @@ function add_playlist_video(target) {
    var select = target.parentNode.children[0].children[1];
    var option = select.children[select.selectedIndex];

-    var url = '/playlist_ajax?action=add_video&redirect=false' +
+    var url = '/playlist_ajax?action_add_video=1&redirect=false' +
        '&video_id=' + target.getAttribute('data-id') +
        '&playlist_id=' + option.getAttribute('data-plid');

@ -21,7 +21,7 @@ function add_playlist_item(target) {
    var tile = target.parentNode.parentNode.parentNode.parentNode.parentNode;
    tile.style.display = 'none';

-    var url = '/playlist_ajax?action=add_video&redirect=false' +
+    var url = '/playlist_ajax?action_add_video=1&redirect=false' +
        '&video_id=' + target.getAttribute('data-id') +
        '&playlist_id=' + target.getAttribute('data-plid');

@ -36,7 +36,7 @@ function remove_playlist_item(target) {
    var tile = target.parentNode.parentNode.parentNode.parentNode.parentNode;
    tile.style.display = 'none';

-    var url = '/playlist_ajax?action=remove_video&redirect=false' +
+    var url = '/playlist_ajax?action_remove_video=1&redirect=false' +
        '&set_video_id=' + target.getAttribute('data-index') +
        '&playlist_id=' + target.getAttribute('data-plid');

--- a/assets/js/subscribe_widget.js
+++ b/assets/js/subscribe_widget.js
@ -16,7 +16,7 @@ function subscribe() {
    subscribe_button.onclick = unsubscribe;
    subscribe_button.innerHTML = '<b>' + subscribe_data.unsubscribe_text + ' | ' + subscribe_data.sub_count_text + '</b>';

-    var url = '/subscription_ajax?action=create_subscription_to_channel&redirect=false' +
+    var url = '/subscription_ajax?action_create_subscription_to_channel=1&redirect=false' +
        '&c=' + subscribe_data.ucid;

    helpers.xhr('POST', url, {payload: payload, retries: 5, entity_name: 'subscribe request'}, {
@ -32,7 +32,7 @@ function unsubscribe() {
    subscribe_button.onclick = subscribe;
    subscribe_button.innerHTML = '<b>' + subscribe_data.subscribe_text + ' | ' + subscribe_data.sub_count_text + '</b>';

-    var url = '/subscription_ajax?action=remove_subscriptions&redirect=false' +
+    var url = '/subscription_ajax?action_remove_subscriptions=1&redirect=false' +
        '&c=' + subscribe_data.ucid;

    helpers.xhr('POST', url, {payload: payload, retries: 5, entity_name: 'unsubscribe request'}, {
--- a/assets/js/watch.js
+++ b/assets/js/watch.js
@ -67,10 +67,6 @@ function get_playlist(plid) {
            '&format=html&hl=' + video_data.preferences.locale;
    }

-    if (video_data.params.listen) {
-        plid_url += '&listen=1'
-    }
-
    helpers.xhr('GET', plid_url, {retries: 5, entity_name: 'playlist'}, {
        on200: function (response) {
            playlist.innerHTML = response.playlistHtml;
--- a/assets/js/watched_widget.js
+++ b/assets/js/watched_widget.js
@ -6,7 +6,7 @@ function mark_watched(target) {
    var tile = target.parentNode.parentNode.parentNode.parentNode.parentNode;
    tile.style.display = 'none';

-    var url = '/watch_ajax?action=mark_watched&redirect=false' +
+    var url = '/watch_ajax?action_mark_watched=1&redirect=false' +
        '&id=' + target.getAttribute('data-id');

    helpers.xhr('POST', url, {payload: payload}, {
@ -22,7 +22,7 @@ function mark_unwatched(target) {
    var count = document.getElementById('count');
    count.textContent--;

-    var url = '/watch_ajax?action=mark_unwatched&redirect=false' +
+    var url = '/watch_ajax?action_mark_unwatched=1&redirect=false' +
        '&id=' + target.getAttribute('data-id');

    helpers.xhr('POST', url, {payload: payload}, {
--- a/config/config.example.yml
+++ b/config/config.example.yml
@ -54,53 +54,6 @@ db:
 ##
 #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
-## to work. Once said cache has expired, requesting that video's data
-## again will cause a new companion URL to be picked.
-##
-## The parameter private_url needs to be configured for the internal
-## communication between the companion and Invidious.
-## And public_url is the public URL from which companion is listening
-## to the requests from the user(s).
-##
-## If you are using a reverse proxy then you will probably need to
-## configure the public_url to be the same as the domain used for Invidious.
-## Also apply when used from an external IP address (without a domain).
-## Examples: https://MYINVIDIOUSDOMAIN or http://192.168.1.100:8282
-##
-## Both parameter can have identical URL when Invidious is hosted in
-## an internal network or at home or locally (localhost).
-##
-## Accepted values: "http(s)://<IP-HOSTNAME>:<Port>"
-## Default: <none>
-##
-#invidious_companion:
-#  - private_url: "http://localhost:8282"
-#    public_url: "http://localhost:8282"
-
-##
-## API key for Invidious companion, used for securing the communication
-## between Invidious and Invidious companion.
-## The size of the key needs to be more or equal to 16.
-##
-## Note: This parameter is mandatory when Invidious companion is enabled
-## and should be a random string.
-## Such random string can be generated on linux with the following
-## command: `pwgen 16 1`
-##
-## Accepted values: a string
-## Default: <none>
-##
-#invidious_companion_key: "CHANGE_ME!!"

 #########################################
 #
@ -177,20 +130,6 @@ https_only: false
 ##
 #hsts: true

-##
-## Path and permissions of a UNIX socket to listen on for incoming connections.
-##
-## Note: Enabling socket will make invidious stop listening on the address
-## specified by 'host_binding' and 'port'.
-##
-## Accepted values: Any path to a new file (that doesn't exist yet) and its
-## permissions following the UNIX octal convention.
-## Default: <none>
-##
-#socket_binding:
-#  path: /tmp/invidious.sock
-#  permissions: 777
-

 # -----------------------------
 #  Network (outbound)
@ -234,17 +173,6 @@ https_only: false
 ##
 #force_resolve:

-##
-## Configuration for using a HTTP proxy
-##
-## If unset, then no HTTP proxy will be used.
-## 
-#http_proxy:
-#  user:
-#  password:
-#  host:
-#  port:
-

 ##
 ## Use Innertube's transcripts API instead of timedtext for closed captions
@ -294,17 +222,6 @@ https_only: false
 ##
 #log_level: Info

-##
-## Enables colors in logs. Useful for debugging purposes
-## This is overridden if "-k" or "--colorize"
-## are passed on the command line.
-## Colors are also disabled if the environment variable
-## NO_COLOR is present and has any value
-##
-## Accepted values: true, false
-## Default: true
-##
-#colorize_logs: false

 # -----------------------------
 #  Features
@ -790,22 +707,6 @@ default_user_preferences:
  #  Video player behavior
  # -----------------------------

-  ##
-  ## This option controls the value of the HTML5 <video> element's
-  ## "preload" attribute.
-  ##
-  ## If set to 'false', no video data will be loaded until the user
-  ## explicitly starts the video by clicking the "Play" button.
-  ## If set to 'true', the web browser will buffer some video data
-  ## while the page is loading.
-  ##
-  ## See: https://www.w3schools.com/tags/att_video_preload.asp
-  ##
-  ## Accepted values: true, false
-  ## Default: true
-  ##
-  #preload: true
-
  ##
  ## Automatically play videos on page load.
  ##
@ -858,9 +759,9 @@ default_user_preferences:
  ## Default video quality.
  ##
  ## Accepted values: dash, hd720, medium, small
-  ## Default: dash
+  ## Default: hd720
  ##
-  #quality: dash
+  #quality: hd720

  ##
  ## Default dash video quality.
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,4 +1,4 @@
-FROM crystallang/crystal:1.12.2-alpine AS builder
+FROM crystallang/crystal:1.12.1-alpine AS builder

 RUN apk add --no-cache sqlite-static yaml-static

@ -21,7 +21,7 @@ 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 \
+RUN if [[ "${release}" == 1 ]] ; then \
        crystal build ./src/invidious.cr \
        --release \
        --static --warnings all \
@ -32,8 +32,8 @@ RUN --mount=type=cache,target=/root/.cache/crystal if [[ "${release}" == 1 ]] ;
        --link-flags "-lxml2 -llzma"; \
    fi

-FROM alpine:3.20
-RUN apk add --no-cache rsvg-convert ttf-opensans tini tzdata
+FROM alpine:3.18
+RUN apk add --no-cache rsvg-convert ttf-opensans tini
 WORKDIR /invidious
 RUN addgroup -g 1000 -S invidious && \
    adduser -u 1000 -S invidious -G invidious
--- a/docker/Dockerfile.arm64
+++ b/docker/Dockerfile.arm64
@ -1,6 +1,5 @@
-FROM alpine:3.20 AS builder
-RUN apk add --no-cache 'crystal=1.12.2-r0' shards sqlite-static yaml-static yaml-dev libxml2-static \
-       zlib-static openssl-libs-static openssl-dev musl-dev xz-static
+FROM alpine:3.19 AS builder
+RUN apk add --no-cache 'crystal=1.10.1-r0' shards sqlite-static yaml-static yaml-dev libxml2-static zlib-static openssl-libs-static openssl-dev musl-dev xz-static

 ARG release

@ -22,7 +21,7 @@ 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 \
+RUN if [[ "${release}" == 1 ]] ; then \
        crystal build ./src/invidious.cr \
        --release \
        --static --warnings all \
@ -33,8 +32,8 @@ RUN --mount=type=cache,target=/root/.cache/crystal if [[ "${release}" == 1 ]] ;
        --link-flags "-lxml2 -llzma"; \
    fi

-FROM alpine:3.20
-RUN apk add --no-cache rsvg-convert ttf-opensans tini tzdata
+FROM alpine:3.18
+RUN apk add --no-cache rsvg-convert ttf-opensans tini
 WORKDIR /invidious
 RUN addgroup -g 1000 -S invidious && \
    adduser -u 1000 -S invidious -G invidious
--- a/locales/ar.json
+++ b/locales/ar.json
@ -483,7 +483,7 @@
    "comments_view_x_replies_3": "عرض رد {{count}}",
    "comments_view_x_replies_4": "عرض الردود {{count}}",
    "comments_view_x_replies_5": "عرض رد {{count}}",
-    "search_message_use_another_instance": "يمكنك أيضًا البحث عن <a href=\"`x`\"> في مثيل آخر </a>.",
+    "search_message_use_another_instance": " يمكنك أيضًا البحث عن <a href=\"`x`\"> في مثيل آخر </a>.",
    "comments_points_count_0": "{{count}} نقطة",
    "comments_points_count_1": "نقطة واحدة",
    "comments_points_count_2": "نقطتان",
@ -559,12 +559,10 @@
    "toggle_theme": "تبديل الموضوع",
    "Add to playlist": "أضف إلى قائمة التشغيل",
    "Add to playlist: ": "أضف إلى قائمة التشغيل: ",
-    "Answer": "اجابة",
+    "Answer": "الرد",
    "Search for videos": "ابحث عن مقاطع الفيديو",
    "The Popular feed has been disabled by the administrator.": "تم تعطيل الخلاصة الشائعة من قبل المسؤول.",
    "carousel_slide": "الشريحة {{current}} من {{total}}",
    "carousel_skip": "تخطي الكاروسيل",
-    "carousel_go_to": "انتقل إلى الشريحة `x`",
-    "preferences_preload_label": "التحميل المسبق لبيانات الفيديو: ",
-    "Filipino (auto-generated)": "الفلبينية (المولدة تلقائيًا)"
+    "carousel_go_to": "انتقل إلى الشريحة `x`"
 }
--- a/locales/cs.json
+++ b/locales/cs.json
@ -137,7 +137,7 @@
    "Family friendly? ": "Vhodné pro rodiny? ",
    "Engagement: ": "Zapojení: ",
    "English": "Angličtina",
-    "English (auto-generated)": "Angličtina (vytvořeno automaticky)",
+    "English (auto-generated)": "Angličtina (automaticky generováno)",
    "Afrikaans": "Afrikánština",
    "Albanian": "Albánština",
    "Amharic": "Amharština",
@ -294,8 +294,8 @@
    "Chinese (China)": "Čínština (Čína)",
    "Chinese (Hong Kong)": "Čínština (Hong Kong)",
    "Chinese (Taiwan)": "Čínština (Taiwan)",
-    "Portuguese (auto-generated)": "Portugalština (vytvořeno automaticky)",
-    "Spanish (auto-generated)": "Španělština (vytvořeno automaticky)",
+    "Portuguese (auto-generated)": "Portugalština (automaticky generováno)",
+    "Spanish (auto-generated)": "Španělština (automaticky generováno)",
    "Spanish (Mexico)": "Španělština (Mexiko)",
    "Spanish (Spain)": "Španělština (Španělsko)",
    "generic_count_years_0": "{{count}} rokem",
@ -352,13 +352,13 @@
    "comments_points_count_0": "{{count}} bod",
    "comments_points_count_1": "{{count}} body",
    "comments_points_count_2": "{{count}} bodů",
-    "German (auto-generated)": "Němčina (vytvořeno automaticky)",
-    "Indonesian (auto-generated)": "Indonéština (vytvořeno automaticky)",
+    "German (auto-generated)": "Němčina (automaticky generováno)",
+    "Indonesian (auto-generated)": "Indonéština (automaticky generováno)",
    "Interlingue": "Interlingue",
-    "Italian (auto-generated)": "Italština (vytvořeno automaticky)",
-    "Japanese (auto-generated)": "Japonština (vytvořeno automaticky)",
-    "Korean (auto-generated)": "Korejština (vytvořeno automaticky)",
-    "Russian (auto-generated)": "Ruština (vytvořeno automaticky)",
+    "Italian (auto-generated)": "Italština (automaticky generováno)",
+    "Japanese (auto-generated)": "Japonština (automaticky generováno)",
+    "Korean (auto-generated)": "Korejština (automaticky generováno)",
+    "Russian (auto-generated)": "Ruština (automaticky generováno)",
    "generic_count_months_0": "{{count}} měsícem",
    "generic_count_months_1": "{{count}} měsíci",
    "generic_count_months_2": "{{count}} měsíci",
@ -371,7 +371,7 @@
    "footer_documentation": "Dokumentace",
    "next_steps_error_message_refresh": "Obnovit stránku",
    "Chinese": "Čínština",
-    "Dutch (auto-generated)": "Nizozemština (vytvořeno automaticky)",
+    "Dutch (auto-generated)": "Nizozemština (automaticky generováno)",
    "Erroneous token": "Chybný token",
    "tokens_count_0": "{{count}} token",
    "tokens_count_1": "{{count}} tokeny",
@ -380,9 +380,9 @@
    "Token is expired, please try again": "Token vypršel, zkuste to prosím znovu",
    "English (United States)": "Angličtina (Spojené státy)",
    "Cantonese (Hong Kong)": "Kantonština (Hong Kong)",
-    "French (auto-generated)": "Francouzština (vytvořeno automaticky)",
-    "Turkish (auto-generated)": "Turečtina (vytvořeno automaticky)",
-    "Vietnamese (auto-generated)": "Vietnamština (vytvořeno automaticky)",
+    "French (auto-generated)": "Francouzština (automaticky generováno)",
+    "Turkish (auto-generated)": "Turečtina (automaticky generováno)",
+    "Vietnamese (auto-generated)": "Vietnamština (automaticky generováno)",
    "Current version: ": "Aktuální verze: ",
    "next_steps_error_message": "Měli byste zkusit: ",
    "footer_donate_page": "Přispět",
@ -471,7 +471,7 @@
    "search_filters_title": "Filtry",
    "search_filters_duration_option_medium": "Střední (4 - 20 minut)",
    "search_filters_duration_option_long": "Dlouhá (> 20 minut)",
-    "search_message_use_another_instance": "Můžete také <a href=\"`x`\">hledat na jiné instanci</a>.",
+    "search_message_use_another_instance": " Můžete také <a href=\"`x`\">hledat na jiné instanci</a>.",
    "search_filters_features_label": "Vlastnosti",
    "search_filters_features_option_three_sixty": "360°",
    "search_filters_features_option_vr180": "VR180",
@ -513,7 +513,5 @@
    "The Popular feed has been disabled by the administrator.": "Kategorie Populární byla zakázána administrátorem.",
    "carousel_slide": "Snímek {{current}} z {{total}}",
    "carousel_skip": "Přeskočit galerii",
-    "carousel_go_to": "Přejít na snímek `x`",
-    "preferences_preload_label": "Předem načíst data videa: ",
-    "Filipino (auto-generated)": "Filipínština (vytvořeno automaticky)"
+    "carousel_go_to": "Přejít na snímek `x`"
 }
--- a/locales/de.json
+++ b/locales/de.json
@ -11,7 +11,6 @@
    "last": "neueste",
    "Next page": "Nächste Seite",
    "Previous page": "Vorherige Seite",
-    "First page": "Erste Seite",
    "Clear watch history?": "Verlauf löschen?",
    "New password": "Neues Passwort",
    "New passwords must match": "Neue Passwörter müssen übereinstimmen",
@ -48,7 +47,6 @@
    "Preferences": "Einstellungen",
    "preferences_category_player": "Wiedergabeeinstellungen",
    "preferences_video_loop_label": "Immer wiederholen: ",
-    "preferences_preload_label": "Videodaten vorladen: ",
    "preferences_autoplay_label": "Automatisch abspielen: ",
    "preferences_continue_label": "Immer automatisch nächstes Video abspielen: ",
    "preferences_continue_autoplay_label": "Nächstes Video automatisch abspielen: ",
@ -324,7 +322,7 @@
    "channel_tab_community_label": "Gemeinschaft",
    "search_filters_sort_option_relevance": "Relevanz",
    "search_filters_sort_option_rating": "Bewertung",
-    "search_filters_sort_option_date": "Hochladedatum",
+    "search_filters_sort_option_date": "Datum",
    "search_filters_sort_option_views": "Aufrufe",
    "search_filters_type_label": "Inhaltstyp",
    "search_filters_duration_label": "Dauer",
@ -456,7 +454,7 @@
    "Portuguese (auto-generated)": "Portugiesisch (automatisch generiert)",
    "search_filters_title": "Filtern",
    "search_message_change_filters_or_query": "Versuchen Sie, Ihre Suchanfrage zu erweitern und/oder die Filter zu ändern.",
-    "search_message_use_another_instance": "Sie können auch <a href=\"`x`\">auf einer anderen Instanz suchen</a>.",
+    "search_message_use_another_instance": " Sie können auch <a href=\"`x`\">auf einer anderen Instanz suchen</a>.",
    "Popular enabled: ": "„Beliebt“-Seite aktiviert: ",
    "search_message_no_results": "Keine Ergebnisse gefunden.",
    "search_filters_duration_option_medium": "Mittel (4 - 20 Minuten)",
@ -491,13 +489,9 @@
    "generic_channels_count_plural": "{{count}} Kanäle",
    "Import YouTube watch history (.json)": "YouTube Wiedergabeverlauf importieren (.json)",
    "Answer": "Antwort",
-    "The Popular feed has been disabled by the administrator.": "Der Feed für beliebte Inhalte wurde vom Administrator deaktiviert.",
+    "The Popular feed has been disabled by the administrator.": "Der Angesagt-Feed wurde vom Administrator deaktiviert.",
    "Add to playlist": "Einer Wiedergabeliste hinzufügen",
    "Search for videos": "Nach Videos suchen",
    "toggle_theme": "Thema wechseln",
-    "Add to playlist: ": "Einer Wiedergabeliste hinzufügen: ",
-    "carousel_go_to": "Zu Element `x` springen",
-    "carousel_slide": "Seite {{current}} von {{total}}",
-    "carousel_skip": "Galerie überspringen",
-    "Filipino (auto-generated)": "Philippinisch (automatisch generiert)"
+    "Add to playlist: ": "Einer Wiedergabeliste hinzufügen: "
 }
--- a/locales/el.json
+++ b/locales/el.json
@ -21,7 +21,7 @@
    "Import and Export Data": "Εισαγωγή και Εξαγωγή Δεδομένων",
    "Import": "Εισαγωγή",
    "Import Invidious data": "Εsαγωγή δεδομένων Invidious JSON",
-    "Import YouTube subscriptions": "Εισαγωγή συνδρομών YouTube απο CVS/OPML",
+    "Import YouTube subscriptions": "Εισαγωγή συνδρομών YouTube/OPML",
    "Import FreeTube subscriptions (.db)": "Εισαγωγή συνδρομών FreeTube (.db)",
    "Import NewPipe subscriptions (.json)": "Εισαγωγή συνδρομών NewPipe (.json)",
    "Import NewPipe data (.zip)": "Εισαγωγή δεδομένων NewPipe (.zip)",
@ -455,7 +455,7 @@
    "channel_tab_streams_label": "Ζωντανή μετάδοση",
    "playlist_button_add_items": "Προσθήκη βίντεο",
    "Artist: ": "Καλλιτέχνης: ",
-    "search_message_use_another_instance": "Μπορείτε επίσης <a href=\"`x`\">να αναζητήσετε σε άλλο instance</a>.",
+    "search_message_use_another_instance": " Μπορείτε επίσης <a href=\"`x`\">να αναζητήσετε σε άλλο instance</a>.",
    "generic_button_save": "Αποθήκευση",
    "generic_button_cancel": "Ακύρωση",
    "subscriptions_unseen_notifs_count": "{{count}} μη αναγνωσμένη ειδοποίηση",
@ -489,14 +489,5 @@
    "search_filters_date_label": "Ημερομηνία αναφόρτωσης",
    "Search for videos": "Αναζήτηση βίντεο",
    "The Popular feed has been disabled by the administrator.": "Η δημοφιλής ροή έχει απενεργοποιηθεί από τον διαχειριστή.",
-    "Answer": "Απάντηση",
-    "Add to playlist": "Προσθήκη στην λίιστα αναπαραγωγής",
-    "Add to playlist: ": "Προσθήκη στην λίστα αναπαραγωγής : ",
-    "carousel_slide": "Εικόνα {{current}}απο {{total}}",
-    "carousel_go_to": "Πήγαινε στην εικόνα`x`",
-    "toggle_theme": "Αλλαγή θέματος",
-    "Import YouTube watch history (.json)": "Εισαγωγή ιστορικού προβολής YouTube (.json)",
-    "Filipino (auto-generated)": "Φιλιππινέζικα (αυτόματη παραγωγή)",
-    "preferences_preload_label": "Προφόρτιση δεδομένων βίντεο: ",
-    "carousel_skip": "Αποφυγή εμφάνισης εικόνων"
+    "Answer": "Απάντηση"
 }
--- a/locales/en-US.json
+++ b/locales/en-US.json
@ -33,7 +33,6 @@
    "last": "last",
    "Next page": "Next page",
    "Previous page": "Previous page",
-    "First page": "First page",
    "Clear watch history?": "Clear watch history?",
    "New password": "New password",
    "New passwords must match": "New passwords must match",
@ -72,7 +71,6 @@
    "Preferences": "Preferences",
    "preferences_category_player": "Player preferences",
    "preferences_video_loop_label": "Always loop: ",
-    "preferences_preload_label": "Preload video data: ",
    "preferences_autoplay_label": "Autoplay: ",
    "preferences_continue_label": "Play next by default: ",
    "preferences_continue_autoplay_label": "Autoplay next video: ",
@ -192,7 +190,7 @@
    "Switch Invidious Instance": "Switch Invidious Instance",
    "search_message_no_results": "No results found.",
    "search_message_change_filters_or_query": "Try widening your search query and/or changing the filters.",
-    "search_message_use_another_instance": "You can also <a href=\"`x`\">search on another instance</a>.",
+    "search_message_use_another_instance": " You can also <a href=\"`x`\">search on another instance</a>.",
    "Hide annotations": "Hide annotations",
    "Show annotations": "Show annotations",
    "Genre: ": "Genre: ",
@ -287,7 +285,6 @@
    "Esperanto": "Esperanto",
    "Estonian": "Estonian",
    "Filipino": "Filipino",
-    "Filipino (auto-generated)": "Filipino (auto-generated)",
    "Finnish": "Finnish",
    "French": "French",
    "French (auto-generated)": "French (auto-generated)",
@ -425,7 +422,7 @@
    "search_filters_title": "Filters",
    "search_filters_date_label": "Upload date",
    "search_filters_date_option_none": "Any date",
-    "search_filters_date_option_hour": "Last hour",
+    "search_filters_date_option_hour": "Last Hour",
    "search_filters_date_option_today": "Today",
    "search_filters_date_option_week": "This week",
    "search_filters_date_option_month": "This month",
@ -457,7 +454,7 @@
    "search_filters_sort_label": "Sort By",
    "search_filters_sort_option_relevance": "Relevance",
    "search_filters_sort_option_rating": "Rating",
-    "search_filters_sort_option_date": "Upload date",
+    "search_filters_sort_option_date": "Upload Date",
    "search_filters_sort_option_views": "View count",
    "search_filters_apply_button": "Apply selected filters",
    "Current version: ": "Current version: ",
@ -493,10 +490,8 @@
    "channel_tab_streams_label": "Livestreams",
    "channel_tab_podcasts_label": "Podcasts",
    "channel_tab_releases_label": "Releases",
-    "channel_tab_courses_label": "Courses",
    "channel_tab_playlists_label": "Playlists",
    "channel_tab_community_label": "Community",
-    "channel_tab_posts_label": "Posts",
    "channel_tab_channels_label": "Channels",
    "toggle_theme": "Toggle Theme",
    "carousel_slide": "Slide {{current}} of {{total}}",
--- a/locales/es.json
+++ b/locales/es.json
@ -478,7 +478,7 @@
    "tokens_count_0": "{{count}} token",
    "tokens_count_1": "{{count}} tokens",
    "tokens_count_2": "{{count}} tokens",
-    "search_message_use_another_instance": "También puedes <a href=\"`x`\">buscar en otra instancia</a>.",
+    "search_message_use_another_instance": " También puede <a href=\"`x`\">buscar en otra instancia</a>.",
    "Popular enabled: ": "¿Habilitar la sección popular? ",
    "error_video_not_in_playlist": "El video que solicitaste no existe en esta lista de reproducción. <a href=\"`x`\">Haz clic aquí para acceder a la página de inicio de la lista de reproducción.</a>",
    "channel_tab_streams_label": "Directos",
@ -513,7 +513,5 @@
    "The Popular feed has been disabled by the administrator.": "El feed Popular ha sido desactivado por el administrador.",
    "carousel_slide": "Diapositiva {{current}} de {{total}}",
    "carousel_skip": "Saltar el carrusel",
-    "carousel_go_to": "Ir a la diapositiva `x`",
-    "preferences_preload_label": "Precargar datos del vídeo: ",
-    "Filipino (auto-generated)": "Filipino (generado automáticamente)"
+    "carousel_go_to": "Ir a la diapositiva `x`"
 }
--- a/locales/fa.json
+++ b/locales/fa.json
@ -360,7 +360,7 @@
    "search_filters_duration_label": "مدت",
    "search_filters_features_label": "ویژگی‌ها",
    "search_filters_sort_label": "به ترتیب",
-    "search_filters_date_option_hour": "ساعت گذشته",
+    "search_filters_date_option_hour": "یک ساعت گذشته",
    "search_filters_date_option_today": "امروز",
    "search_filters_date_option_week": "این هفته",
    "search_filters_date_option_month": "این ماه",
@ -461,7 +461,7 @@
    "Song: ": "آهنگ: ",
    "Channel Sponsor": "اسپانسر کانال",
    "Standard YouTube license": "پروانه استاندارد YouTube",
-    "search_message_use_another_instance": "همچنین می‌توانید <a href=\"`x`\">در نمونه‌ای دیگر هم جست‌وجو کنید</a>.",
+    "search_message_use_another_instance": " شما همچنین می‌توانید <a href=\"`x`\">در نمونه دیگر هم جستجو کنید</a>.",
    "Download is disabled": "دریافت غیرفعال است",
    "crash_page_before_reporting": "پیش از گزارش ایراد، مطمئنید شوید که:",
    "playlist_button_add_items": "افزودن ویدیو",
@ -496,6 +496,5 @@
    "crash_page_search_issue": "دنبال <a href=\"`x`\"> گشتیم بین مشکلات در گیت هاب </a>",
    "crash_page_report_issue": "اگر هیچ یک از روش های بالا کمکی نکردند لطفا <a href=\"`x`\"> (ترجیحا به انگلیسی) یک سوال جدید در گیت هاب بپرسید و </a> طوری که سوالتون شامل متن زیر باشه:",
    "channel_tab_releases_label": "آثار",
-    "toggle_theme": "تغییر وضعیت تم",
-    "preferences_preload_label": "پیش بار کردن داده‌های ویدیو: "
+    "toggle_theme": "تغییر وضعیت تم"
 }
--- a/locales/fi.json
+++ b/locales/fi.json
@ -460,7 +460,7 @@
    "search_filters_apply_button": "Ota valitut suodattimet käyttöön",
    "search_filters_date_label": "Latausaika",
    "search_filters_duration_option_medium": "Keskipituinen (4 - 20 minuuttia)",
-    "search_message_use_another_instance": "Voit myös <a href=\"`x`\">hakea toisella instanssilla</a>.",
+    "search_message_use_another_instance": " Voit myös <a href=\"`x`\">hakea toisella instanssilla</a>.",
    "search_filters_date_option_none": "Milloin tahansa",
    "search_filters_type_option_all": "Mikä tahansa tyyppi",
    "Popular enabled: ": "Suosittu käytössä: ",
@ -496,6 +496,5 @@
    "generic_channels_count_plural": "{{count}} kanavaa",
    "The Popular feed has been disabled by the administrator.": "Järjestelmänvalvoja on poistanut Suositut-syötteen.",
    "Import YouTube watch history (.json)": "Tuo Youtube-katseluhistoria (.json)",
-    "toggle_theme": "Vaihda teemaa",
-    "preferences_preload_label": "Esilataa video data. "
+    "toggle_theme": "Vaihda teemaa"
 }
--- a/locales/fr.json
+++ b/locales/fr.json
@ -484,7 +484,7 @@
    "search_filters_duration_option_medium": "Moyenne (de 4 à 20 minutes)",
    "search_filters_apply_button": "Appliquer les filtres",
    "search_message_no_results": "Aucun résultat.",
-    "search_message_use_another_instance": "Vous pouvez également <a href=\"`x`\">effectuer votre recherche sur une autre instance</a>.",
+    "search_message_use_another_instance": " Vous pouvez également <a href=\"`x`\">effectuer votre recherche sur une autre instance</a>.",
    "search_filters_type_option_all": "Tous les types",
    "search_filters_date_label": "Date d'ajout",
    "search_filters_features_option_vr180": "VR180",
@ -505,7 +505,7 @@
    "channel_tab_releases_label": "Parutions",
    "channel_tab_podcasts_label": "Émissions audio",
    "Import YouTube watch history (.json)": "Importer l'historique de visionnement YouTube (.json)",
-    "Add to playlist: ": "Ajouter à la playlist : ",
+    "Add to playlist: ": "Ajouter à la playlist : ",
    "Add to playlist": "Ajouter à la playlist",
    "Answer": "Répondre",
    "Search for videos": "Rechercher des vidéos",
@ -513,7 +513,5 @@
    "carousel_skip": "Passez le carrousel",
    "carousel_slide": "Diapositive {{current}} sur {{total}}",
    "carousel_go_to": "Aller à la diapositive `x`",
-    "toggle_theme": "Changer le Thème",
-    "Filipino (auto-generated)": "Philippines (automatiquement générer)",
-    "preferences_preload_label": "Précharger les données de la vidéo : "
+    "toggle_theme": "Changer le Thème"
 }
--- a/locales/hr.json
+++ b/locales/hr.json
@ -449,30 +449,30 @@
    "Cantonese (Hong Kong)": "Kantonski (Hong Kong)",
    "Chinese": "Kineski",
    "Chinese (Taiwan)": "Kineski (Tajvan)",
-    "Dutch (auto-generated)": "Nizozemski (automatski generirano)",
-    "French (auto-generated)": "Francuski (automatski generirano)",
-    "Indonesian (auto-generated)": "Indonezijski (automatski generirano)",
+    "Dutch (auto-generated)": "Nizozemski (automatski generiran)",
+    "French (auto-generated)": "Francuski (automatski generiran)",
+    "Indonesian (auto-generated)": "Indonezijski (automatski generiran)",
    "Interlingue": "Interlingua",
-    "Japanese (auto-generated)": "Japanski (automatski generirano)",
-    "Russian (auto-generated)": "Ruski (automatski generirano)",
-    "Turkish (auto-generated)": "Turski (automatski generirano)",
-    "Vietnamese (auto-generated)": "Vijetnamski (automatski generirano)",
+    "Japanese (auto-generated)": "Japanski (automatski generiran)",
+    "Russian (auto-generated)": "Ruski (automatski generiran)",
+    "Turkish (auto-generated)": "Turski (automatski generiran)",
+    "Vietnamese (auto-generated)": "Vijetnamski (automatski generiran)",
    "Spanish (Spain)": "Španjolski (Španjolska)",
-    "Italian (auto-generated)": "Talijanski (automatski generirano)",
+    "Italian (auto-generated)": "Talijanski (automatski generiran)",
    "Portuguese (Brazil)": "Portugalski (Brazil)",
    "Spanish (Mexico)": "Španjolski (Meksiko)",
-    "German (auto-generated)": "Njemački (automatski generirano)",
+    "German (auto-generated)": "Njemački (automatski generiran)",
    "Chinese (China)": "Kineski (Kina)",
    "Chinese (Hong Kong)": "Kineski (Hong Kong)",
-    "Korean (auto-generated)": "Korejski (automatski generirano)",
-    "Portuguese (auto-generated)": "Portugalski (automatski generirano)",
-    "Spanish (auto-generated)": "Španjolski (automatski generirano)",
+    "Korean (auto-generated)": "Korejski (automatski generiran)",
+    "Portuguese (auto-generated)": "Portugalski (automatski generiran)",
+    "Spanish (auto-generated)": "Španjolski (automatski generiran)",
    "preferences_watch_history_label": "Aktiviraj povijest gledanja: ",
    "search_filters_title": "Filtri",
    "search_filters_date_option_none": "Bilo koji datum",
    "search_filters_date_label": "Datum prijenosa",
    "search_message_no_results": "Nema rezultata.",
-    "search_message_use_another_instance": "Također možeš <a href=\"`x`\">tražiti na jednoj drugoj instanci</a>.",
+    "search_message_use_another_instance": " Također možeš <a href=\"`x`\">tražiti na jednoj drugoj instanci</a>.",
    "search_message_change_filters_or_query": "Pokušaj proširiti upit za pretragu i/ili promijeni filtre.",
    "search_filters_features_option_vr180": "VR180",
    "search_filters_duration_option_none": "Bilo koje duljine",
@ -513,7 +513,5 @@
    "toggle_theme": "Uklj./Isklj. temu",
    "carousel_slide": "Kadar {{current}} od {{total}}",
    "carousel_go_to": "Idi na kadar `x`",
-    "carousel_skip": "Preskoči vrtuljak",
-    "Filipino (auto-generated)": "Filipinski (automatski generirano)",
-    "preferences_preload_label": "Unaprijed učitaj podatke videa: "
+    "carousel_skip": "Preskoči vrtuljak"
 }
--- a/locales/ia.json
+++ b/locales/ia.json
@ -7,7 +7,7 @@
    "invidious": "Invidious",
    "Image CAPTCHA": "Imagine CAPTCHA",
    "newest": "plus nove",
-    "generic_button_save": "Salveguardar",
+    "generic_button_save": "Salvar",
    "Dark mode: ": "Modo obscur: ",
    "preferences_dark_mode_label": "Thema: ",
    "preferences_category_subscription": "Preferentias de subscription",
@ -23,7 +23,7 @@
    "light": "clar",
    "No": "Non",
    "youtube": "YouTube",
-    "LIVE": "IN DIRECTO",
+    "LIVE": "IN DIRECTE",
    "reddit": "Reddit",
    "preferences_category_player": "Preferentias de reproductor",
    "Preferences": "Preferentias",
--- a/locales/is.json
+++ b/locales/is.json
@ -396,7 +396,7 @@
    "toggle_theme": "Víxla þema",
    "carousel_skip": "Sleppa hringekjunni",
    "preferences_quality_option_medium": "Miðlungs",
-    "search_message_use_another_instance": "Þú getur líka <a href=\"`x`\">leitað á öðrum netþjóni</a>.",
+    "search_message_use_another_instance": " Þú getur líka <a href=\"`x`\">leitað á öðrum netþjóni</a>.",
    "footer_source_code": "Grunnkóði",
    "English (United Kingdom)": "Enska (Bretland)",
    "English (United States)": "Enska (Bandarísk)",
@ -496,7 +496,5 @@
    "footer_documentation": "Leiðbeiningar",
    "channel_tab_channels_label": "Rásir",
    "Import YouTube playlist (.csv)": "Flytja inn YouTube spilunarlista (.csv)",
-    "preferences_quality_option_dash": "DASH (aðlaganleg gæði)",
-    "preferences_preload_label": "Forhlaða gögnum myndskeiðs: ",
-    "Filipino (auto-generated)": "Filippínska (sjálfvirkt útbúin)"
+    "preferences_quality_option_dash": "DASH (aðlaganleg gæði)"
 }
--- a/locales/it.json
+++ b/locales/it.json
@ -449,7 +449,7 @@
    "Portuguese (Brazil)": "Portoghese (Brasile)",
    "preferences_watch_history_label": "Attiva cronologia di riproduzione: ",
    "French (auto-generated)": "Francese (generati automaticamente)",
-    "search_message_use_another_instance": "Puoi anche <a href=\"`x`\">cercare in un'altra istanza</a>.",
+    "search_message_use_another_instance": " Puoi anche <a href=\"`x`\">cercare in un'altra istanza</a>.",
    "search_message_no_results": "Nessun risultato trovato.",
    "search_message_change_filters_or_query": "Prova ad ampliare la ricerca e/o modificare i filtri.",
    "English (United States)": "Inglese (Stati Uniti)",
@ -469,8 +469,8 @@
    "Spanish (auto-generated)": "Spagnolo (generati automaticamente)",
    "Spanish (Mexico)": "Spagnolo (Messico)",
    "Spanish (Spain)": "Spagnolo (Spagna)",
-    "Turkish (auto-generated)": "Turco (generati automaticamente)",
-    "Vietnamese (auto-generated)": "Vietnamita (generati automaticamente)",
+    "Turkish (auto-generated)": "Turco (auto-generato)",
+    "Vietnamese (auto-generated)": "Vietnamita (auto-generato)",
    "search_filters_date_label": "Data caricamento",
    "search_filters_date_option_none": "Qualunque data",
    "search_filters_type_option_all": "Qualunque tipo",
@ -513,7 +513,5 @@
    "The Popular feed has been disabled by the administrator.": "La sezione dei contenuti popolari è stata disabilitata dall'amministratore.",
    "carousel_slide": "Fotogramma {{current}} di {{total}}",
    "carousel_skip": "Salta la galleria",
-    "carousel_go_to": "Vai al fotogramma `x`",
-    "preferences_preload_label": "Precarica dati video: ",
-    "Filipino (auto-generated)": "Filippino (generati automaticamente)"
+    "carousel_go_to": "Vai al fotogramma `x`"
 }
--- a/locales/ja.json
+++ b/locales/ja.json
@ -363,7 +363,7 @@
    "search_filters_features_option_location": "場所",
    "search_filters_features_option_hdr": "HDR",
    "Current version: ": "現在のバージョン: ",
-    "next_steps_error_message": "以下をお試しください: ",
+    "next_steps_error_message": "以下をお試してください: ",
    "next_steps_error_message_refresh": "再読み込み",
    "next_steps_error_message_go_to_youtube": "YouTubeを開く",
    "search_filters_duration_option_short": "4分未満",
@ -396,7 +396,7 @@
    "download_subtitles": "字幕 - `x` (.vtt)",
    "search_filters_features_option_purchased": "購入済み",
    "preferences_quality_option_dash": "DASH (適応的画質)",
-    "preferences_quality_dash_option_worst": "最低",
+    "preferences_quality_dash_option_worst": "最悪",
    "preferences_quality_dash_option_best": "最高",
    "videoinfo_started_streaming_x_ago": "`x`前に配信を開始",
    "videoinfo_watch_on_youTube": "YouTubeで視聴",
@ -434,7 +434,7 @@
    "crash_page_switch_instance": "<a href=\"`x`\">別のインスタンスを使用</a>を試す",
    "crash_page_read_the_faq": "<a href=\"`x`\">よくある質問 (FAQ)</a> を読む",
    "Popular enabled: ": "人気動画を有効化 ",
-    "search_message_use_another_instance": "<a href=\"`x`\">別のインスタンス上での検索</a>も可能です。",
+    "search_message_use_another_instance": " <a href=\"`x`\">別のインスタンス上での検索</a>も可能です。",
    "search_filters_apply_button": "選択したフィルターを適用",
    "user_saved_playlists": "`x`個の保存済みの再生リスト",
    "crash_page_you_found_a_bug": "Invidious のバグのようです！",
@ -479,7 +479,5 @@
    "carousel_go_to": "スライド`x`を表示",
    "carousel_slide": "スライド{{current}} / 全{{total}}個中",
    "carousel_skip": "画像のスライド表示をスキップ",
-    "toggle_theme": "テーマの切り替え",
-    "preferences_preload_label": "動画データを事前に読み込む: ",
-    "Filipino (auto-generated)": "フィリピノ語 (自動生成)"
+    "toggle_theme": "テーマの切り替え"
 }
--- a/locales/ko.json
+++ b/locales/ko.json
@ -18,8 +18,8 @@
    "preferences_related_videos_label": "관련 동영상 보기: ",
    "Fallback captions: ": "대체 자막: ",
    "preferences_captions_label": "기본 자막: ",
-    "reddit": "레딧",
-    "youtube": "유튜브",
+    "reddit": "Reddit",
+    "youtube": "YouTube",
    "preferences_comments_label": "기본 댓글: ",
    "preferences_volume_label": "플레이어 볼륨: ",
    "preferences_quality_label": "선호하는 비디오 품질: ",
@ -48,7 +48,7 @@
    "An alternative front-end to YouTube": "유튜브의 프론트엔드 대안",
    "History": "시청 기록",
    "Delete account?": "계정을 삭제 하시겠습니까?",
-    "Export data as JSON": "인비디어스 데이터 내보내기 (.json)",
+    "Export data as JSON": "JSON으로 데이터 내보내기",
    "Export subscriptions as OPML (for NewPipe & FreeTube)": "OPML로 구독 내보내기 (뉴파이프 및 프리튜브)",
    "Export subscriptions as OPML": "OPML로 구독 내보내기",
    "Export": "내보내기",
@ -70,7 +70,7 @@
    "Next page": "다음 페이지",
    "last": "마지막",
    "Shared `x` ago": "`x` 전",
-    "popular": "인기순",
+    "popular": "인기",
    "oldest": "과거순",
    "newest": "최신순",
    "View playlist on YouTube": "유튜브에서 재생목록 보기",
@ -78,10 +78,10 @@
    "Subscribe": "구독",
    "Unsubscribe": "구독 취소",
    "LIVE": "실시간",
-    "generic_views_count_0": "{{count}} 조회수",
-    "generic_videos_count_0": "{{count}} 동영상",
-    "generic_playlists_count_0": "{{count}} 재생목록",
-    "generic_subscribers_count_0": "{{count}} 구독자",
+    "generic_views_count_0": "조회수 {{count}}회",
+    "generic_videos_count_0": "동영상 {{count}}개",
+    "generic_playlists_count_0": "재생목록 {{count}}개",
+    "generic_subscribers_count_0": "구독자 {{count}}명",
    "generic_subscriptions_count_0": "{{count}} 구독",
    "search_filters_type_option_playlist": "재생목록",
    "Korean": "한국어",
@ -109,14 +109,14 @@
    "This channel does not exist.": "이 채널은 존재하지 않습니다.",
    "Deleted or invalid channel": "삭제되었거나 더 이상 존재하지 않는 채널",
    "channel:`x`": "채널:`x`",
-    "Show replies": "댓글 보기",
+    "Show replies": "댓글 보이기",
    "Hide replies": "댓글 숨기기",
    "Incorrect password": "잘못된 비밀번호",
    "License: ": "라이선스: ",
    "Genre: ": "장르: ",
    "Editing playlist `x`": "재생목록 `x` 수정하기",
    "Playlist privacy": "재생목록 공개 범위",
-    "Watch on YouTube": "유튜브에서 보기",
+    "Watch on YouTube": "YouTube에서 보기",
    "Show less": "간략히",
    "Show more": "더보기",
    "Title": "제목",
@ -125,7 +125,7 @@
    "Delete playlist": "재생목록 삭제",
    "Delete playlist `x`?": "재생목록 `x` 를 삭제하시겠습니까?",
    "Updated `x` ago": "`x` 전에 업데이트됨",
-    "Released under the AGPLv3 on Github.": "깃허브에 AGPLv3 으로 배포됩니다.",
+    "Released under the AGPLv3 on Github.": "GitHub에 AGPLv3 으로 배포됩니다.",
    "View all playlists": "모든 재생목록 보기",
    "Private": "비공개",
    "Unlisted": "목록에 없음",
@ -135,12 +135,12 @@
    "Source available here.": "소스는 여기에서 사용할 수 있습니다.",
    "Log out": "로그아웃",
    "search": "검색",
-    "subscriptions_unseen_notifs_count_0": "{{count}} 읽지 않은 알림",
+    "subscriptions_unseen_notifs_count_0": "읽지 않은 알림 {{count}}개",
    "Subscriptions": "구독",
    "revoke": "철회",
    "unsubscribe": "구독 취소",
    "Import/export": "가져오기/내보내기",
-    "tokens_count_0": "{{count}} 토큰",
+    "tokens_count_0": "토큰 {{count}}개",
    "Token": "토큰",
    "Token manager": "토큰 관리자",
    "Subscription manager": "구독 관리자",
@ -163,7 +163,7 @@
    "Clear watch history": "시청 기록 지우기",
    "preferences_category_data": "데이터 설정",
    "`x` is live": "`x` 이(가) 라이브 중입니다",
-    "`x` uploaded a video": "`x` 동영상 게시됨",
+    "`x` uploaded a video": "`x` 이(가) 동영상을 게시했습니다",
    "Enable web notifications": "웹 알림 활성화",
    "preferences_notifications_only_label": "알림만 표시 (있는 경우): ",
    "preferences_unseen_only_label": "시청하지 않은 것만 표시: ",
@ -241,7 +241,7 @@
    "Could not create mix.": "믹스를 생성할 수 없습니다.",
    "`x` ago": "`x` 전",
    "comments_view_x_replies_0": "답글 {{count}}개 보기",
-    "View Reddit comments": "레딧 댓글 보기",
+    "View Reddit comments": "Reddit 댓글 보기",
    "Engagement: ": "약속: ",
    "Wilson score: ": "Wilson Score: ",
    "Family friendly? ": "전연령 영상입니까? ",
@ -267,8 +267,8 @@
    "Bulgarian": "불가리아어",
    "Bosnian": "보스니아어",
    "Belarusian": "벨라루스어",
-    "View more comments on Reddit": "레딧에서 댓글 더 보기",
-    "View YouTube comments": "유튜브 댓글 보기",
+    "View more comments on Reddit": "Reddit에서 댓글 더 보기",
+    "View YouTube comments": "YouTube 댓글 보기",
    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "자바스크립트가 꺼져 있는 것 같습니다! 댓글을 보려면 여기를 클릭하세요. 댓글을 로드하는 데 시간이 조금 더 걸릴 수 있습니다.",
    "Shared `x`": "`x` 업로드",
    "Whitelisted regions: ": "차단되지 않은 지역: ",
@ -289,7 +289,7 @@
    "Empty playlist": "재생목록 비어 있음",
    "Show annotations": "주석 보이기",
    "Hide annotations": "주석 숨기기",
-    "Switch Invidious Instance": "인비디어스 인스턴스 변경",
+    "Switch Invidious Instance": "Invidious 인스턴스 변경",
    "Spanish": "스페인어",
    "Southern Sotho": "소토어",
    "Somali": "소말리어",
@ -329,7 +329,7 @@
    "Swedish": "스웨덴어",
    "Spanish (Latin America)": "스페인어 (라틴 아메리카)",
    "comments_points_count_0": "{{count}} 포인트",
-    "Invidious Private Feed for `x`": "`x` 에 대한 인비디어스 비공개 피드",
+    "Invidious Private Feed for `x`": "`x` 에 대한 Invidious 비공개 피드",
    "Premieres `x`": "최초 공개 `x`",
    "Premieres in `x`": "`x` 후 최초 공개",
    "next_steps_error_message": "다음 방법을 시도해 보세요: ",
@ -408,7 +408,7 @@
    "preferences_quality_dash_option_1080p": "1080p",
    "preferences_quality_dash_option_worst": "최저",
    "preferences_watch_history_label": "시청 기록 저장: ",
-    "invidious": "인비디어스",
+    "invidious": "Invidious",
    "preferences_quality_option_small": "낮음",
    "preferences_quality_dash_option_auto": "자동",
    "preferences_quality_dash_option_480p": "480p",
@ -453,7 +453,7 @@
    "channel_tab_streams_label": "실시간 스트리밍",
    "channel_tab_channels_label": "채널",
    "channel_tab_playlists_label": "재생목록",
-    "Standard YouTube license": "표준 유튜브 라이선스",
+    "Standard YouTube license": "표준 YouTube 라이선스",
    "Song: ": "제목: ",
    "Channel Sponsor": "채널 스폰서",
    "Album: ": "앨범: ",
@ -479,6 +479,5 @@
    "carousel_go_to": "`x` 슬라이드로 이동",
    "Search for videos": "비디오 검색",
    "toggle_theme": "테마 전환",
-    "carousel_slide": "{{total}}의 슬라이드 {{current}}",
-    "preferences_preload_label": "비디오 데이터 사전 로드: "
+    "carousel_slide": "{{total}}의 슬라이드 {{current}}"
 }
--- a/locales/nb-NO.json
+++ b/locales/nb-NO.json
@ -322,13 +322,13 @@
    "channel_tab_community_label": "Gemenskap",
    "search_filters_sort_option_relevance": "relevans",
    "search_filters_sort_option_rating": "vurdering",
-    "search_filters_sort_option_date": "Opplastingsdato",
+    "search_filters_sort_option_date": "dato",
    "search_filters_sort_option_views": "visninger",
    "search_filters_type_label": "innholdstype",
    "search_filters_duration_label": "varighet",
    "search_filters_features_label": "funksjoner",
    "search_filters_sort_label": "sorter",
-    "search_filters_date_option_hour": "Siste time",
+    "search_filters_date_option_hour": "time",
    "search_filters_date_option_today": "i dag",
    "search_filters_date_option_week": "uke",
    "search_filters_date_option_month": "måned",
@ -459,7 +459,7 @@
    "search_message_no_results": "Resultatløst.",
    "search_filters_type_option_all": "Alle typer",
    "search_filters_duration_option_none": "Enhver varighet",
-    "search_message_use_another_instance": "Du kan også <a href=\"`x`\">søke på en annen instans</a>.",
+    "search_message_use_another_instance": " Du kan også <a href=\"`x`\">søke på en annen instans</a>.",
    "search_filters_date_label": "Opplastningsdato",
    "search_filters_apply_button": "Bruk valgte filtre",
    "search_filters_date_option_none": "Siden begynnelsen",
@ -494,8 +494,5 @@
    "carousel_slide": "Lysark {{current}} av {{total}}",
    "carousel_skip": "Hopp over karusellen",
    "Add to playlist": "Legg til i spilleliste",
-    "Add to playlist: ": "Legg til i spilleliste: ",
-    "The Popular feed has been disabled by the administrator.": "Populært-kilden er koblet ut av administratoren.",
-    "toggle_theme": "Endre utseende",
-    "preferences_preload_label": "Last videodata på forhånd: "
+    "Add to playlist: ": "Legg til i spilleliste: "
 }
--- a/locales/nl.json
+++ b/locales/nl.json
@ -317,13 +317,13 @@
    "channel_tab_community_label": "Gemeenschap",
    "search_filters_sort_option_relevance": "relevantie",
    "search_filters_sort_option_rating": "beoordeling",
-    "search_filters_sort_option_date": "Upload datum",
+    "search_filters_sort_option_date": "datum",
    "search_filters_sort_option_views": "keren bekeken",
    "search_filters_type_label": "Type inhoud",
    "search_filters_duration_label": "duur",
    "search_filters_features_label": "eigenschappen",
    "search_filters_sort_label": "sorteren",
-    "search_filters_date_option_hour": "Laatste uur",
+    "search_filters_date_option_hour": "uur",
    "search_filters_date_option_today": "vandaag",
    "search_filters_date_option_week": "week",
    "search_filters_date_option_month": "maand",
@ -357,7 +357,7 @@
    "footer_original_source_code": "Originele bron-code",
    "footer_modfied_source_code": "Gewijzigde bron-code",
    "adminprefs_modified_source_code_url_label": "URL naar gewijzigde bron-code-opslagplaats",
-    "next_steps_error_message": "Waarna u zou kunnen proberen om: ",
+    "next_steps_error_message": "Daarna moet u proberen om: ",
    "footer_source_code": "Bron-code",
    "search_filters_duration_option_long": "Lang (> 20 minuten)",
    "preferences_quality_option_dash": "DASH (adaptieve kwaliteit)",
@ -450,7 +450,7 @@
    "Chinese (Hong Kong)": "Chinees (Hongkong)",
    "Korean (auto-generated)": "Koreaans (automatisch gegenereerd)",
    "search_filters_apply_button": "Geselecteerde filters toepassen",
-    "search_message_use_another_instance": "Je kan ook <a href=\"`x`\">zoeken op een andere instantie</a>.",
+    "search_message_use_another_instance": " Je kan ook <a href=\"`x`\">zoeken op een andere instantie</a>.",
    "Cantonese (Hong Kong)": "Kantonees (Hongkong)",
    "Chinese (China)": "Chinees (China)",
    "crash_page_read_the_faq": "de <a href=\"`x`\">veelgestelde vragen (FAQ)</a> gelezen hebt",
@ -477,7 +477,7 @@
    "Song: ": "Lied: ",
    "generic_channels_count": "{{count}} kanaal",
    "generic_channels_count_plural": "{{count}} kanalen",
-    "Popular enabled: ": "Populair ingeschakeld: ",
+    "Popular enabled: ": "Populair geactiveerd: ",
    "channel_tab_playlists_label": "Afspeellijsten",
    "generic_button_edit": "Bewerken",
    "Music in this video": "Muziek in deze video",
@ -496,7 +496,5 @@
    "Answer": "Antwoorden",
    "Search for videos": "Naar video's zoeken",
    "carousel_skip": "Carousel overslaan",
-    "toggle_theme": "Thema omschakelen",
-    "preferences_preload_label": "Videogegevens vooraf laden: ",
-    "Filipino (auto-generated)": "Filipijns (automatisch gegenereerd)"
+    "toggle_theme": "Thema omschakelen"
 }
--- a/locales/pl.json
+++ b/locales/pl.json
@ -478,7 +478,7 @@
    "search_filters_date_label": "Data przesłania",
    "search_filters_features_option_vr180": "VR180",
    "search_filters_date_option_none": "Dowolna data",
-    "search_message_use_another_instance": "Możesz także <a href=\"`x`\">wyszukać w innej instancji</a>.",
+    "search_message_use_another_instance": " Możesz także <a href=\"`x`\">wyszukać w innej instancji</a>.",
    "search_filters_type_option_all": "Dowolny typ",
    "search_filters_duration_option_none": "Dowolna długość",
    "search_filters_duration_option_medium": "Średnia (4-20 minut)",
@ -513,7 +513,5 @@
    "Add to playlist: ": "Dodaj do playlisty: ",
    "carousel_slide": "Slajd {{current}} z {{total}}",
    "carousel_skip": "Pomiń karuzelę",
-    "carousel_go_to": "Przejdź do slajdu `x`",
-    "preferences_preload_label": "Wstępne ładowanie danych wideo: ",
-    "Filipino (auto-generated)": "filipiński (wygenerowany automatycznie)"
+    "carousel_go_to": "Przejdź do slajdu `x`"
 }
--- a/locales/pt-BR.json
+++ b/locales/pt-BR.json
@ -474,7 +474,7 @@
    "Spanish (auto-generated)": "Espanhol (gerado automaticamente)",
    "Spanish (Mexico)": "Espanhol (México)",
    "search_filters_duration_option_none": "Qualquer duração",
-    "search_message_use_another_instance": "Você também pode <a href=\"`x`\">pesquisar em outra instância</a>.",
+    "search_message_use_another_instance": " Você também pode <a href=\"`x`\">pesquisar em outra instância</a>.",
    "Spanish (Spain)": "Espanhol (Espanha)",
    "Turkish (auto-generated)": "Turco (gerado automaticamente)",
    "search_filters_duration_option_medium": "Médio (4 - 20 minutos)",
@ -513,7 +513,5 @@
    "Answer": "Resposta",
    "carousel_slide": "Slide {{current}} de {{total}}",
    "carousel_skip": "Ignorar carrossel",
-    "carousel_go_to": "Ir ao slide `x`",
-    "preferences_preload_label": "Pré-carregar dados do vídeo: ",
-    "Filipino (auto-generated)": "Filipino (gerado automaticamente)"
+    "carousel_go_to": "Ir ao slide `x`"
 }
--- a/locales/pt.json
+++ b/locales/pt.json
@ -448,7 +448,7 @@
    "Chinese (Taiwan)": "Chinês (Taiwan)",
    "search_message_no_results": "Nenhum resultado encontrado.",
    "search_message_change_filters_or_query": "Tente alargar os termos genéricos da pesquisa e/ou alterar os filtros.",
-    "search_message_use_another_instance": "Também pode <a href=\"`x`\">pesquisar noutra instância</a>.",
+    "search_message_use_another_instance": " Também pode <a href=\"`x`\">pesquisar noutra instância</a>.",
    "English (United Kingdom)": "Inglês (Reino Unido)",
    "English (United States)": "Inglês (Estados Unidos)",
    "Cantonese (Hong Kong)": "Cantonês (Hong Kong)",
@ -508,12 +508,10 @@
    "toggle_theme": "Trocar tema",
    "Add to playlist": "Adicionar à lista de reprodução",
    "Add to playlist: ": "Adicionar à lista de reprodução: ",
-    "Answer": "Responder",
+    "Answer": "Resposta",
    "Search for videos": "Procurar vídeos",
    "carousel_slide": "Diapositivo {{current}} de{{total}}",
    "carousel_skip": "Ignorar carrossel",
    "carousel_go_to": "Ir para o diapositivo`x`",
-    "The Popular feed has been disabled by the administrator.": "O feed Popular foi desativado por um administrador.",
-    "preferences_preload_label": "Pré-carregamento dos dados: ",
-    "Filipino (auto-generated)": "Filipino (gerado automaticamente)"
+    "The Popular feed has been disabled by the administrator.": "O feed Popular foi desativado por um administrador."
 }
--- a/locales/ru.json
+++ b/locales/ru.json
@ -11,7 +11,6 @@
    "last": "последние",
    "Next page": "Следующая страница",
    "Previous page": "Предыдущая страница",
-    "First page": "Первая страница",
    "Clear watch history?": "Очистить историю просмотров?",
    "New password": "Новый пароль",
    "New passwords must match": "Новые пароли не совпадают",
@ -49,8 +48,8 @@
    "preferences_category_player": "Настройки проигрывателя",
    "preferences_video_loop_label": "Всегда повторять: ",
    "preferences_autoplay_label": "Автовоспроизведение: ",
-    "preferences_continue_label": "Воспроизводить следующее видео: ",
-    "preferences_continue_autoplay_label": "Автовоспроизведение следующего видео: ",
+    "preferences_continue_label": "Переходить к следующему видео? ",
+    "preferences_continue_autoplay_label": "Автопроигрывание следующего видео: ",
    "preferences_listen_label": "Режим «только аудио» по умолчанию: ",
    "preferences_local_label": "Проигрывать видео через прокси? ",
    "preferences_speed_label": "Скорость видео по умолчанию: ",
@ -510,10 +509,6 @@
    "Add to playlist: ": "Добавить в плейлист: ",
    "Answer": "Ответить",
    "Search for videos": "Поиск видео",
-    "The Popular feed has been disabled by the administrator.": "Лента популярного была отключена администратором.",
-    "toggle_theme": "Переключатель тем",
-    "carousel_slide": "Пролистано {{current}} из {{total}}",
-    "carousel_skip": "Пропустить всё",
-    "carousel_go_to": "Перейти к странице `x`",
-    "preferences_preload_label": "Предзагрузка видеоданных: "
+    "The Popular feed has been disabled by the administrator.": "Популярная лента была отключена администратором.",
+    "toggle_theme": "Переключатель тем"
 }
--- a/locales/sl.json
+++ b/locales/sl.json
@ -13,7 +13,7 @@
    "Import and Export Data": "Uvoz in izvoz podatkov",
    "Import": "Uvozi",
    "Import Invidious data": "Uvozi Invidious JSON podatke",
-    "Import YouTube subscriptions": "Uvozi YouTube CSV ali OPML naročnine",
+    "Import YouTube subscriptions": "Uvozi YouTube/OPML naročnine",
    "Import FreeTube subscriptions (.db)": "Uvozi FreeTube (.db) naročnine",
    "Import NewPipe data (.zip)": "Uvozi NewPipe (.zip) podatke",
    "Export": "Izvozi",
@ -105,7 +105,7 @@
    "Show more": "Pokaži več",
    "Switch Invidious Instance": "Preklopi Invidious instanco",
    "search_message_change_filters_or_query": "Poskusi razširiti iskalno poizvedbo in/ali spremeniti filtre.",
-    "search_message_use_another_instance": "Lahko tudi <a href=\"`x`\">iščeš v drugi istanci</a>.",
+    "search_message_use_another_instance": " Lahko tudi <a href=\"`x`\">iščeš v drugi istanci</a>.",
    "Wilson score: ": "Wilsonov rezultat: ",
    "Engagement: ": "Sodelovanje: ",
    "Blacklisted regions: ": "Regije na seznamu nedovoljenih: ",
@ -462,7 +462,7 @@
    "search_filters_features_option_four_k": "4K",
    "search_filters_features_option_hdr": "HDR",
    "next_steps_error_message_refresh": "Osveži",
-    "search_filters_date_option_hour": "V zadnji uri",
+    "search_filters_date_option_hour": "Zadnja ura",
    "search_filters_features_option_purchased": "Kupljeno",
    "search_filters_sort_label": "Razvrsti po",
    "search_filters_sort_option_views": "številu ogledov",
@ -521,16 +521,5 @@
    "generic_channels_count_1": "{{count}} kanala",
    "generic_channels_count_2": "{{count}} kanali",
    "generic_channels_count_3": "{{count}} kanalov",
-    "Import YouTube watch history (.json)": "Uvozi zgodovino gledanja YouTube (.json)",
-    "Add to playlist": "Dodaj na seznam predvajanja",
-    "Add to playlist: ": "Dodaj na seznam predvajanja: ",
-    "Search for videos": "Iskanje videoposnetkov",
-    "The Popular feed has been disabled by the administrator.": "Administrator je onemogočil priljubljeni vir.",
-    "Answer": "Odgovor",
-    "Filipino (auto-generated)": "filipinščina (samodejno ustvarjeno)",
-    "toggle_theme": "Preklopi temo",
-    "carousel_slide": "Diapozitiv {{current}} od {{total}}",
-    "carousel_skip": "Preskoči galerijo",
-    "carousel_go_to": "Pojdi na diapozitiv `x`",
-    "preferences_preload_label": "Predhodno naloži video podatke: "
+    "Import YouTube watch history (.json)": "Uvozi zgodovino gledanja YouTube (.json)"
 }
--- a/locales/sq.json
+++ b/locales/sq.json
@ -257,13 +257,13 @@
    "Video mode": "Mënyrë video",
    "channel_tab_videos_label": "Video",
    "search_filters_sort_option_rating": "Vlerësim",
-    "search_filters_sort_option_date": "Datë ngarkimi",
+    "search_filters_sort_option_date": "Datë Ngarkimi",
    "search_filters_sort_option_views": "Numër parjesh",
    "search_filters_type_label": "Lloj",
    "search_filters_duration_label": "Kohëzgjatje",
    "search_filters_features_label": "Veçori",
    "search_filters_sort_label": "Renditi Sipas",
-    "search_filters_date_option_hour": "Orën e fundit",
+    "search_filters_date_option_hour": "Orën e Fundit",
    "search_filters_date_option_today": "Sot",
    "search_filters_duration_option_long": "E gjatë (> 20 minuta)",
    "search_filters_features_option_hd": "HD",
@ -435,14 +435,14 @@
    "tokens_count_plural": "{{count}} tokenë",
    "preferences_save_player_pos_label": "Mba mend pozicionin e luajtjes: ",
    "Import Invidious data": "Importoni të dhëna JSON Invidious",
-    "Import YouTube subscriptions": "Importoni pajtime YouTube CSV ose OPML",
+    "Import YouTube subscriptions": "Importoni pajtime YouTube/OPML",
    "Export data as JSON": "Eksportoji të dhënat Invidious si JSON",
    "preferences_vr_mode_label": "Video me ndërveprim 360 gradë (lyp WebGL): ",
    "Shared `x`": "Ndarë me të tjerë më `x`",
    "search_filters_title": "Filtra",
    "Popular enabled: ": "Me populloret të aktivizuara: ",
    "error_video_not_in_playlist": "Videoja e kërkuar s’ekziston në këtë luajlistë. <a href=\"`x`\">Klikoni këtu për faqen hyrëse të luajlistës.</a>",
-    "search_message_use_another_instance": "Mundeni edhe të <a href=\"`x`\">kërkoni në një instancë tjetër</a>.",
+    "search_message_use_another_instance": " Mundeni edhe të <a href=\"`x`\">kërkoni në një instancë tjetër</a>.",
    "search_filters_date_label": "Datë ngarkimi",
    "preferences_watch_history_label": "Aktivizo historik parjesh: ",
    "Top enabled: ": "Me kryesueset të aktivizuara: ",
@ -484,15 +484,5 @@
    "Import YouTube watch history (.json)": "Importo historik parjesh YouTube (.json)",
    "preferences_local_label": "Video përmes ndërmjetësi: ",
    "Fallback captions: ": "Titra nga halli: ",
-    "Erroneous challenge": "Zgjidhje e gabuar",
-    "Add to playlist: ": "Shtoje te luajlistë: ",
-    "Add to playlist": "Shtoje te luajlistë",
-    "Answer": "Përgjigje",
-    "Search for videos": "Kërko për video",
-    "The Popular feed has been disabled by the administrator.": "Prurja Popullore është çaktivizuar nga përgjegjësi.",
-    "carousel_skip": "Anashkaloje Rrotullamen",
-    "carousel_slide": "Diapozitiv {{current}} nga {{total}}",
-    "carousel_go_to": "Kalo te diapozitivi `x`",
-    "Filipino (auto-generated)": "Filipineze (të prodhuara automatikisht)",
-    "preferences_preload_label": "Parangarko të dhëna videoje: "
+    "Erroneous challenge": "Zgjidhje e gabuar"
 }
--- a/locales/sr.json
+++ b/locales/sr.json
@ -404,7 +404,7 @@
    "generic_count_months_0": "{{count}} mesec",
    "generic_count_months_1": "{{count}} meseca",
    "generic_count_months_2": "{{count}} meseci",
-    "search_message_use_another_instance": "Takođe, možete <a href=\"`x`\">pretraživati na drugoj instanci</a>.",
+    "search_message_use_another_instance": " Takođe, možete <a href=\"`x`\">pretraživati na drugoj instanci</a>.",
    "generic_subscribers_count_0": "{{count}} pratilac",
    "generic_subscribers_count_1": "{{count}} pratioca",
    "generic_subscribers_count_2": "{{count}} pratilaca",
@ -513,7 +513,5 @@
    "Answer": "Odgovor",
    "Search for videos": "Pretražite video snimke",
    "carousel_skip": "Preskoči karusel",
-    "toggle_theme": "Подеси тему",
-    "preferences_preload_label": "Unapred učitaj podatke o video snimku: ",
-    "Filipino (auto-generated)": "Filipinski (automatski generisano)"
+    "toggle_theme": "Подеси тему"
 }
--- a/locales/sr_Cyrl.json
+++ b/locales/sr_Cyrl.json
@ -404,7 +404,7 @@
    "generic_count_months_0": "{{count}} месец",
    "generic_count_months_1": "{{count}} месеца",
    "generic_count_months_2": "{{count}} месеци",
-    "search_message_use_another_instance": "Такође, можете <a href=\"`x`\">претраживати на другој инстанци</a>.",
+    "search_message_use_another_instance": " Такође, можете <a href=\"`x`\">претраживати на другој инстанци</a>.",
    "generic_subscribers_count_0": "{{count}} пратилац",
    "generic_subscribers_count_1": "{{count}} пратиоца",
    "generic_subscribers_count_2": "{{count}} пратилаца",
@ -513,7 +513,5 @@
    "Add to playlist: ": "Додајте на плејлисту: ",
    "carousel_skip": "Прескочи карусел",
    "The Popular feed has been disabled by the administrator.": "Администратор је онемогућио фид „Популарно“.",
-    "carousel_slide": "Слајд {{current}} од {{total}}",
-    "preferences_preload_label": "Унапред учитај податке о видео снимку: ",
-    "Filipino (auto-generated)": "Филипински (аутоматски генерисано)"
+    "carousel_slide": "Слајд {{current}} од {{total}}"
 }
--- a/locales/sv-SE.json
+++ b/locales/sv-SE.json
@ -320,13 +320,13 @@
    "channel_tab_community_label": "Gemenskap",
    "search_filters_sort_option_relevance": "Relevans",
    "search_filters_sort_option_rating": "Rankning",
-    "search_filters_sort_option_date": "Uppladdnings datum",
+    "search_filters_sort_option_date": "Uppladdnings Datum",
    "search_filters_sort_option_views": "Visningar",
    "search_filters_type_label": "Typ",
    "search_filters_duration_label": "Varaktighet",
    "search_filters_features_label": "Funktioner",
    "search_filters_sort_label": "Sortera efter",
-    "search_filters_date_option_hour": "Senaste timmen",
+    "search_filters_date_option_hour": "Senaste Timmen",
    "search_filters_date_option_today": "Idag",
    "search_filters_date_option_week": "Denna vecka",
    "search_filters_date_option_month": "Denna månad",
@ -393,7 +393,7 @@
    "Artist: ": "Artist: ",
    "generic_count_months": "{{count}}månad",
    "generic_count_months_plural": "{{count}}månader",
-    "search_message_use_another_instance": "Du kan också <a href=\"`x`\">söka på en annan instans</a>.",
+    "search_message_use_another_instance": " Du kan också <a href=\"`x`\">söka på en annan instans</a>.",
    "generic_subscribers_count": "{{count}} prenumerant",
    "generic_subscribers_count_plural": "{{count}} prenumeranter",
    "download_subtitles": "Undertexter - `x` (.vtt)",
@ -496,7 +496,5 @@
    "The Popular feed has been disabled by the administrator.": "Det populära flödet har inaktiverats av administratören.",
    "carousel_slide": "Bildspel {{current}} av {{total}}",
    "carousel_skip": "Hoppa över karusellen",
-    "carousel_go_to": "Gå till bildspel `x`",
-    "preferences_preload_label": "Förladda video data: ",
-    "Filipino (auto-generated)": "Filippinska (auto-genererad)"
+    "carousel_go_to": "Gå till bildspel `x`"
 }
--- a/locales/ta.json
+++ b/locales/ta.json
@ -1,502 +0,0 @@
-{
-    "Add to playlist": "பிளேலிச்ட்டில் சேர்க்கவும்",
-    "generic_channels_count": "{{count}} சேனல்",
-    "generic_channels_count_plural": "{{count}} சேனல்கள்",
-    "generic_views_count": "{{count}} பார்வை",
-    "generic_views_count_plural": "{{count}} காட்சிகள்",
-    "generic_videos_count": "{{count}} வீடியோ",
-    "generic_videos_count_plural": "{{count}} வீடியோக்கள்",
-    "generic_playlists_count": "{{count}} பிளேலிச்ட்",
-    "generic_playlists_count_plural": "{{count}} பிளேலிச்ட்கள்",
-    "generic_subscribers_count": "{{count}} சந்தாதாரர்",
-    "generic_subscribers_count_plural": "{{count}} சந்தாதாரர்கள்",
-    "generic_button_delete": "நீக்கு",
-    "generic_button_rss": "ஆர்.எச்.எச்",
-    "LIVE": "வாழ",
-    "Shared `x` ago": "`X` முன்பு பகிரப்பட்டது",
-    "Unsubscribe": "குழுவிலகவும்",
-    "View playlist on YouTube": "யூடியூப்பில் பிளேலிச்ட்டைக் காண்க",
-    "newest": "புதியது",
-    "oldest": "பழமையானது",
-    "popular": "மக்கள்",
-    "last": "கடைசி",
-    "Next page": "அடுத்த பக்கம்",
-    "Previous page": "முந்தைய பக்கம்",
-    "Clear watch history?": "தெளிவான கண்காணிப்பு வரலாறு?",
-    "New password": "புதிய கடவுச்சொல்",
-    "New passwords must match": "புதிய கடவுச்சொற்கள் பொருந்த வேண்டும்",
-    "Authorize token?": "கிள்ளாக்கை அங்கீகரிக்கவா?",
-    "Yes": "ஆம்",
-    "Import YouTube playlist (.csv)": "யூடியூப் பிளேலிச்ட்டை இறக்குமதி செய்க (.csv)",
-    "Import YouTube watch history (.json)": "YouTube வாட்ச் வரலாற்றை இறக்குமதி செய்க (.json)",
-    "Import Invidious data": "வன்கவர்வு சாதொபொகு தரவை இறக்குமதி செய்க",
-    "Import YouTube subscriptions": "YouTube காபிம அல்லது OPML சந்தாக்களை இறக்குமதி செய்க",
-    "Import FreeTube subscriptions (.db)": "ஃப்ரீட்யூப் சந்தாக்களை இறக்குமதி செய்க (.db)",
-    "Import NewPipe data (.zip)": "நியூபைப் தரவை இறக்குமதி செய்க (.zip)",
-    "Export subscriptions as OPML (for NewPipe & FreeTube)": "OPML ஆக சந்தாக்களை ஏற்றுமதி செய்யுங்கள் (நியூபைப் & ஃப்ரீட்யூப்பிற்கு)",
-    "Export subscriptions as OPML": "OPML ஆக சந்தாக்களை ஏற்றுமதி செய்யுங்கள்",
-    "Export data as JSON": "சாதொபொகு ஆக வன்கவர்வு தரவை ஏற்றுமதி செய்யுங்கள்",
-    "Delete account?": "கணக்கை நீக்கவா?",
-    "History": "வரலாறு",
-    "JavaScript license information": "சாவாச்கிரிப்ட் உரிம செய்தி",
-    "source": "மூலம்",
-    "An alternative front-end to YouTube": "YouTube க்கு ஒரு மாற்று முன் இறுதியில்",
-    "Log in": "புகுபதிகை",
-    "Log in/register": "உள்நுழைக/பதிவு செய்யுங்கள்",
-    "User ID": "பயனர் ஐடி",
-    "Password": "கடவுச்சொல்",
-    "Time (h:mm:ss):": "நேரம் (h: மிமீ: எச்எச்):",
-    "Sign In": "விடுபதிகை",
-    "Register": "பதிவு செய்யுங்கள்",
-    "E-mail": "மின்னஞ்சல்",
-    "Preferences": "விருப்பத்தேர்வுகள்",
-    "preferences_preload_label": "வீடியோ தரவை முன்பே ஏற்றவும்: ",
-    "preferences_autoplay_label": "தன்னியக்க: ",
-    "preferences_continue_label": "இயல்பாக அடுத்து விளையாடுங்கள்: ",
-    "preferences_local_label": "பதிலாள் வீடியோக்கள்: ",
-    "preferences_watch_history_label": "கண்காணிப்பு வரலாற்றை இயக்கு: ",
-    "preferences_speed_label": "இயல்புநிலை வேகம்: ",
-    "preferences_quality_label": "விருப்பமான வீடியோ தரம்: ",
-    "preferences_quality_dash_label": "விருப்பமான கோடு வீடியோ தரம்: ",
-    "preferences_quality_dash_option_auto": "தானி",
-    "preferences_quality_dash_option_best": "சிறந்த",
-    "preferences_quality_dash_option_worst": "மோசமான",
-    "preferences_quality_dash_option_4320p": "4320 ப",
-    "preferences_quality_dash_option_1080p": "1080 ப",
-    "preferences_quality_dash_option_720p": "720 ஆ",
-    "preferences_quality_dash_option_480p": "480 ப",
-    "preferences_quality_dash_option_360p": "360 ப",
-    "preferences_quality_dash_option_144p": "144 ப",
-    "preferences_volume_label": "பிளேயர் தொகுதி: ",
-    "preferences_comments_label": "இயல்புநிலை கருத்துகள்: ",
-    "Fallback captions: ": "குறைவடையும் தலைப்புகள்: ",
-    "preferences_captions_label": "இயல்புநிலை தலைப்புகள்: ",
-    "preferences_related_videos_label": "தொடர்புடைய வீடியோக்களைக் காட்டு: ",
-    "preferences_annotations_label": "முன்னிருப்பாக சிறுகுறிப்புகளைக் காட்டு: ",
-    "preferences_vr_mode_label": "ஊடாடும் 360 டிகிரி வீடியோக்கள் (வெப்சிஎல் தேவை): ",
-    "preferences_category_visual": "காட்சி விருப்பத்தேர்வுகள்",
-    "light": "ஒளி",
-    "preferences_thin_mode_label": "மெல்லிய பயன்முறை: ",
-    "preferences_category_misc": "இதர விருப்பத்தேர்வுகள்",
-    "preferences_category_subscription": "சந்தா விருப்பத்தேர்வுகள்",
-    "preferences_annotations_subscribed_label": "சந்தா சேனல்களுக்கு முன்னிருப்பாக சிறுகுறிப்புகளைக் காட்டவா? ",
-    "Redirect homepage to feed: ": "உணவளிக்க முகப்புப்பக்கத்தை திருப்பி விடுங்கள்: ",
-    "preferences_sort_label": "வீடியோக்களை வரிசைப்படுத்துங்கள்: ",
-    "published": "வெளியிடப்பட்டது",
-    "published - reverse": "வெளியிடப்பட்டது - தலைகீழ்",
-    "alphabetically": "அகரவரிசை",
-    "preferences_unseen_only_label": "கவனக்குறைவாக மட்டுமே காட்டுங்கள்: ",
-    "preferences_notifications_only_label": "அறிவிப்புகளைக் காட்டுங்கள் (ஏதேனும் இருந்தால்): ",
-    "Enable web notifications": "வலை அறிவிப்புகளை இயக்கவும்",
-    "`x` is live": "`x` நேரலையில்",
-    "preferences_category_data": "தரவு விருப்பத்தேர்வுகள்",
-    "Manage subscriptions": "சந்தாக்களை நிர்வகிக்கவும்",
-    "Watch history": "வரலாற்றைப் பாருங்கள்",
-    "Delete account": "கணக்கை நீக்கு",
-    "preferences_category_admin": "நிர்வாகி விருப்பத்தேர்வுகள்",
-    "preferences_default_home_label": "இயல்புநிலை முகப்புப்பக்கம்: ",
-    "preferences_feed_menu_label": "ஊட்ட மெனு: ",
-    "preferences_show_nick_label": "மேலே புனைப்பெயரைக் காட்டு: ",
-    "Top enabled: ": "மேலே இயக்கப்பட்டது: ",
-    "CAPTCHA enabled: ": "கேப்ட்சா இயக்கப்பட்டது: ",
-    "Login enabled: ": "உள்நுழைவு இயக்கப்பட்டது: ",
-    "Registration enabled: ": "பதிவு இயக்கப்பட்டது: ",
-    "Report statistics: ": "அறிக்கை புள்ளிவிவரங்கள்: ",
-    "Save preferences": "விருப்பங்களை சேமிக்கவும்",
-    "Subscription manager": "சந்தா மேலாளர்",
-    "Token manager": "கிள்ளாக்கு மேலாளர்",
-    "Token": "கிள்ளாக்கு",
-    "search": "தேடல்",
-    "Released under the AGPLv3 on Github.": "கிட்அப்பில் AgPlv3 இன் கீழ் வெளியிடப்பட்டது.",
-    "View JavaScript license information.": "சாவாச்கிரிப்ட் உரிமத் தகவலைக் காண்க.",
-    "View privacy policy.": "தனியுரிமைக் கொள்கையைக் காண்க.",
-    "Trending": "டிரெண்டிங்",
-    "Public": "பொது",
-    "Unlisted": "பட்டியலிடப்படாதது",
-    "Private": "தனிப்பட்ட",
-    "View all playlists": "அனைத்து பிளேலிச்ட்களையும் காண்க",
-    "Updated `x` ago": "`X` முன்பு புதுப்பிக்கப்பட்டது",
-    "Delete playlist `x`?": "பிளேலிச்ட்டை நீக்கவா?",
-    "Playlist privacy": "பிளேலிச்ட் தனியுரிமை",
-    "Watch on YouTube": "YouTube இல் பாருங்கள்",
-    "Hide annotations": "சிறுகுறிப்புகளை மறைக்கவும்",
-    "Show replies": "பதில்களைக் காட்டு",
-    "Incorrect password": "தவறான கடவுச்சொல்",
-    "Wrong answer": "தவறான பதில்",
-    "Erroneous CAPTCHA": "தவறான கேப்ட்சா",
-    "CAPTCHA is a required field": "கேப்ட்சா ஒரு தேவையான புலம்",
-    "User ID is a required field": "பயனர் ஐடி தேவையான புலம்",
-    "Password is a required field": "கடவுச்சொல் தேவையான புலம்",
-    "Password cannot be empty": "கடவுச்சொல் காலியாக இருக்க முடியாது",
-    "Please log in": "தயவுசெய்து உள்நுழைக",
-    "This channel does not exist.": "இந்த சேனல் இல்லை.",
-    "Could not get channel info.": "சேனல் தகவலைப் பெற முடியவில்லை.",
-    "Could not fetch comments": "கருத்துகளைப் பெற முடியவில்லை",
-    "comments_points_count": "{{count}} புள்ளி",
-    "comments_points_count_plural": "{{count}} புள்ளிகள்",
-    "Could not create mix.": "கலவையை உருவாக்க முடியவில்லை.",
-    "Empty playlist": "வெற்று பிளேலிச்ட்",
-    "Not a playlist.": "ஒரு பிளேலிச்ட் அல்ல.",
-    "Playlist does not exist.": "பிளேலிச்ட் இல்லை.",
-    "Could not pull trending pages.": "பிரபலமான பக்கங்களை இழுக்க முடியவில்லை.",
-    "Erroneous challenge": "தவறான அறைகூவல்",
-    "Erroneous token": "தவறான கிள்ளாக்கு",
-    "No such user": "அத்தகைய பயனர் இல்லை",
-    "Token is expired, please try again": "கிள்ளாக்கு காலாவதியானது, தயவுசெய்து மீண்டும் முயற்சிக்கவும்",
-    "English": "ஆங்கிலம்",
-    "English (United States)": "ஆங்கிலம் (ஐக்கிய அமெரிக்க)",
-    "English (United Kingdom)": "ஆங்கிலம் (ஐக்கிய முடியரசு)",
-    "English (auto-generated)": "ஆங்கிலம் (தானாக உருவாக்கப்பட்ட)",
-    "Afrikaans": "ஆப்பிரிக்கா",
-    "Albanian": "அல்பேனிய",
-    "Amharic": "அம்ஆரிக்",
-    "Arabic": "அரபு",
-    "Armenian": "ஆர்மீனியன்",
-    "Azerbaijani": "அசர்பைசானி",
-    "Bangla": "பாங்லா",
-    "Basque": "பாச்க்",
-    "Belarusian": "பெலாருசியன்",
-    "Bosnian": "போச்னிய",
-    "Bulgarian": "பல்கேரியன்",
-    "Burmese": "பர்மீச்",
-    "Cantonese (Hong Kong)": "கான்டோனீச் (ஆங்காங்)",
-    "Catalan": "கற்றலான்",
-    "Cebuano": "செபுவானோ",
-    "Chinese": "சீன",
-    "Chinese (China)": "சீன (சீனா)",
-    "Chinese (Hong Kong)": "சீன (ஆங்காங்)",
-    "Chinese (Simplified)": "சீன (எளிமைப்படுத்தப்பட்ட)",
-    "Chinese (Taiwan)": "சீன (தைவான்)",
-    "Chinese (Traditional)": "சீன (பாரம்பரிய)",
-    "Dutch": "டச்சு",
-    "Finnish": "பின்னிச்",
-    "French": "பிரஞ்சு",
-    "German (auto-generated)": "செர்மன் (தானாக உருவாக்கப்பட்ட)",
-    "Greek": "கிரேக்கம்",
-    "Gujarati": "குசராத்தி",
-    "Haitian Creole": "ஐட்டிய கிரியோல்",
-    "Hungarian": "அங்கேரியன்",
-    "Icelandic": "ஐச்லாந்திய",
-    "Igbo": "இக்போ",
-    "Korean (auto-generated)": "கொரிய (தானாக உருவாக்கப்பட்ட)",
-    "Macedonian": "மாசிடோனியன்",
-    "Malagasy": "மலகாசி",
-    "Maltese": "மால்டிச்",
-    "Maori": "மௌரி",
-    "Malayalam": "மலையாளம்",
-    "Marathi": "மராத்தி",
-    "Mongolian": "மங்கோலியன்",
-    "Nepali": "நேபாளி",
-    "Norwegian Bokmål": "நார்வேசியன் பொக்மால்",
-    "Nyanja": "நயன்சா",
-    "Russian": "ரச்ய",
-    "Russian (auto-generated)": "ரச்ய (தானாக உருவாக்கப்பட்ட)",
-    "Samoan": "சமோவான்",
-    "Scottish Gaelic": "ச்கோட்டிச் கயாலிக்",
-    "Serbian": "செர்பிய",
-    "Shona": "சோனா",
-    "Sindhi": "சிந்தி",
-    "Somali": "சோமாலி",
-    "Southern Sotho": "தெற்கத்திய சோதோ",
-    "Spanish": "ச்பானிச்",
-    "Spanish (auto-generated)": "ச்பானிச் (தானாக உருவாக்கப்பட்ட)",
-    "Sundanese": "சுந்தானியர்கள்",
-    "Swahili": "ச்வாஇலி",
-    "Swedish": "ச்வீடிச்",
-    "Tajik": "தசிக்",
-    "Tamil": "தமிழ்",
-    "Thai": "தாய்",
-    "Turkish": "துருக்கிய",
-    "Vietnamese": "வியட்நாமிய",
-    "Welsh": "வேல்ச்",
-    "Xhosa": "ஓசா",
-    "Yiddish": "யெட்டிச்",
-    "Yoruba": "யோருபா",
-    "Top": "மேலே",
-    "About": "பற்றி",
-    "View as playlist": "பிளேலிச்ட்டாக காண்க",
-    "Gaming": "கேமிங்",
-    "News": "செய்தி",
-    "Movies": "திரைப்படங்கள்",
-    "Download as: ": "என பதிவிறக்கவும்: ",
-    "Download is disabled": "பதிவிறக்கம் முடக்கப்பட்டுள்ளது",
-    "(edited)": "(திருத்தப்பட்டது)",
-    "YouTube comment permalink": "YouTube கருத்து பெர்மாலின்க்",
-    "`x` marked it with a ❤": "`x` அதை a உடன் குறித்தது",
-    "Video mode": "வீடியோ பயன்முறை",
-    "Playlists": "பிளேலிச்ட்கள்",
-    "search_filters_date_option_today": "இன்று",
-    "search_filters_date_option_week": "இந்த வாரம்",
-    "search_filters_date_option_month": "இந்த மாதம்",
-    "search_filters_type_option_channel": "வாய்க்கால்",
-    "search_filters_type_option_playlist": "பிளேலிச்ட்",
-    "search_filters_duration_label": "காலம்",
-    "search_filters_duration_option_none": "எந்த காலமும்",
-    "search_filters_duration_option_medium": "நடுத்தர (4 - 20 நிமிடங்கள்)",
-    "search_filters_duration_option_long": "நீண்ட (> 20 நிமிடங்கள்)",
-    "search_filters_features_label": "நற்பொருத்தங்கள்",
-    "search_filters_features_option_four_k": "எச்.சி.",
-    "search_filters_features_option_live": "நேரடி",
-    "search_filters_features_option_hd": "எச்டி",
-    "search_filters_features_option_subtitles": "வசன வரிகள்/சிசி",
-    "search_filters_features_option_c_commons": "கிரியேட்டிவ் காமன்ச்",
-    "search_filters_features_option_three_sixty": "360 °",
-    "search_filters_features_option_three_d": "ZD",
-    "search_filters_features_option_hdr": "எச்.டி.ஆர்",
-    "search_filters_features_option_location": "இடம்",
-    "search_filters_sort_option_relevance": "பொருத்தமானது",
-    "search_filters_sort_option_rating": "செயல்வரம்பு",
-    "Current version: ": "தற்போதைய பதிப்பு: ",
-    "next_steps_error_message": "அதன் பிறகு நீங்கள் முயற்சி செய்ய வேண்டும்: ",
-    "next_steps_error_message_refresh": "புதுப்பிப்பு",
-    "next_steps_error_message_go_to_youtube": "YouTube க்குச் செல்லுங்கள்",
-    "footer_donate_page": "நன்கொடை",
-    "footer_modfied_source_code": "மாற்றியமைக்கப்பட்ட மூலக் குறியீடு",
-    "adminprefs_modified_source_code_url_label": "மாற்றியமைக்கப்பட்ட மூலக் குறியீடு களஞ்சியத்திற்கு முகவரி",
-    "videoinfo_started_streaming_x_ago": "`X` முன்பு ச்ட்ரீமிங் செய்யத் தொடங்கியது",
-    "videoinfo_watch_on_youTube": "YouTube இல் பாருங்கள்",
-    "download_subtitles": "வசன வரிகள் - `x` (.vtt)",
-    "user_created_playlists": "`x` உருவாக்கியது பிளேலிச்ட்கள்",
-    "user_saved_playlists": "`x` சேமித்த பிளேலிச்ட்கள்",
-    "crash_page_before_reporting": "ஒரு பிழையைப் புகாரளிப்பதற்கு முன், உங்களிடம் இருப்பதை உறுதிப்படுத்திக் கொள்ளுங்கள்:",
-    "crash_page_switch_instance": "<a href = \"` x` \"> மற்றொரு நிகழ்வைப் பயன்படுத்த முயற்சித்தேன் </a>",
-    "crash_page_search_issue": "அறிவிலிமையத்தில் உள்ள <a href=\"`x`\"> தற்போதைய சிக்கல்களைத் தேடியது</a>",
-    "channel_tab_shorts_label": "குறுக்குகள்",
-    "channel_tab_streams_label": "லைவ்ச்ட்ரீம்கள்",
-    "carousel_go_to": "`X` ச்லைடு செல்லவும்",
-    "Popular": "புகழ்பெற்ற",
-    "Subscribe": "குழுசேர்",
-    "View channel on YouTube": "YouTube இல் சேனலைக் காண்க",
-    "Authorize token for `x`?": "`X` க்கு கிள்ளாக்கை அங்கீகரிக்கவா?",
-    "No": "இல்லை",
-    "Add to playlist: ": "பிளேலிச்ட்டில் சேர்க்கவும்: ",
-    "Answer": "பதில்",
-    "Search for videos": "வீடியோக்களைத் தேடுங்கள்",
-    "The Popular feed has been disabled by the administrator.": "பிரபலமான ஊட்டத்தை நிர்வாகியால் முடக்கப்பட்டுள்ளது.",
-    "generic_subscriptions_count": "{{count}} சந்தா",
-    "generic_subscriptions_count_plural": "{{count}} சந்தாக்கள்",
-    "generic_button_edit": "தொகு",
-    "generic_button_save": "சேமி",
-    "generic_button_cancel": "ரத்துசெய்",
-    "Import and Export Data": "தரவை இறக்குமதி செய்து ஏற்றுமதி செய்யுங்கள்",
-    "Import": "இறக்குமதி",
-    "Import NewPipe subscriptions (.json)": "நியூபிப்பிப் சந்தாக்களை இறக்குமதி செய்யுங்கள் (.json)",
-    "Export": "ஏற்றுமதி",
-    "Text CAPTCHA": "உரை கேப்ட்சா",
-    "Image CAPTCHA": "பட கேப்ட்சா",
-    "preferences_category_player": "பிளேயர் விருப்பத்தேர்வுகள்",
-    "preferences_video_loop_label": "எப்போதும் லூப்: ",
-    "preferences_continue_autoplay_label": "தன்னியக்க அடுத்த வீடியோ: ",
-    "preferences_listen_label": "இயல்பாக கேளுங்கள்: ",
-    "preferences_quality_option_dash": "கோடு (தகவமைப்பு தரம்)",
-    "preferences_quality_option_hd720": "HD720",
-    "preferences_quality_option_medium": "சராசரி",
-    "preferences_quality_option_small": "சிறிய",
-    "preferences_quality_dash_option_2160p": "2160 ப",
-    "preferences_quality_dash_option_1440p": "1440 ப",
-    "preferences_quality_dash_option_240p": "240 ப",
-    "youtube": "YouTube",
-    "reddit": "ரெடிட்",
-    "invidious": "வெகுவாக",
-    "preferences_extend_desc_label": "வீடியோ விளக்கத்தை தானாக நீட்டிக்கவும்: ",
-    "preferences_region_label": "உள்ளடக்க நாடு: ",
-    "preferences_player_style_label": "பிளேயர் ச்டைல்: ",
-    "Dark mode: ": "இருண்ட முறை: ",
-    "preferences_dark_mode_label": "தீம்: ",
-    "dark": "இருண்ட",
-    "preferences_automatic_instance_redirect_label": "தானியங்கி நிகழ்வு திசைதிருப்பல் (redirect.invidious.io க்கு குறைவடையும்): ",
-    "preferences_max_results_label": "ஊட்டத்தில் காட்டப்பட்டுள்ள வீடியோக்களின் எண்ணிக்கை: ",
-    "alphabetically - reverse": "அகரவரிசை - தலைகீழ்",
-    "channel name": "சேனல் பெயர்",
-    "channel name - reverse": "சேனல் பெயர் - தலைகீழ்",
-    "Only show latest video from channel: ": "சேனலில் இருந்து அண்மைக் கால வீடியோவைக் காட்டுங்கள்: ",
-    "Only show latest unwatched video from channel: ": "சேனலில் இருந்து அண்மைக் கால கவனிக்கப்படாத வீடியோவைக் காட்டுங்கள்: ",
-    "`x` uploaded a video": "`x` ஒரு வீடியோவைப் பதிவேற்றியது",
-    "Clear watch history": "தெளிவான கண்காணிப்பு வரலாறு",
-    "Log out": "விடுபதிகை",
-    "Source available here.": "சான்று இங்கே கிடைக்கிறது.",
-    "Delete playlist": "பிளேலிச்ட்டை நீக்கு",
-    "Create playlist": "பிளேலிச்ட்டை உருவாக்கவும்",
-    "Title": "தலைப்பு",
-    "Import/export data": "தரவு இறக்குமதி/ஏற்றுமதி",
-    "Change password": "கடவுச்சொல்லை மாற்றவும்",
-    "Manage tokens": "டோக்கன்களை நிர்வகிக்கவும்",
-    "Popular enabled: ": "பிரபலமான இயக்கப்பட்டது: ",
-    "tokens_count": "{{count}} கிள்ளாக்கு",
-    "tokens_count_plural": "{{count}} டோக்கன்கள்",
-    "Import/export": "இறக்குமதி/ஏற்றுமதி",
-    "unsubscribe": "குழுவிலகவும்",
-    "revoke": "ரத்து செய்யுங்கள்",
-    "Subscriptions": "சந்தாக்கள்",
-    "subscriptions_unseen_notifs_count": "{{count}} காணப்படாத அறிவிப்பு",
-    "subscriptions_unseen_notifs_count_plural": "{{count}} காணப்படாத அறிவிப்புகள்",
-    "Editing playlist `x`": "பிளேலிச்ட்டைத் திருத்துதல் `x`",
-    "playlist_button_add_items": "வீடியோக்களைச் சேர்க்கவும்",
-    "Show more": "மேலும் காட்டு",
-    "Show less": "குறைவாகக் காட்டு",
-    "Switch Invidious Instance": "அக்யோர்ட் உதாரணத்தை மாற்றவும்",
-    "search_message_no_results": "முடிவுகள் எதுவும் கிடைக்கவில்லை.",
-    "search_message_change_filters_or_query": "உங்கள் தேடல் வினவலை அகலப்படுத்த முயற்சிக்கவும்/அல்லது வடிப்பான்களை மாற்றவும்.",
-    "search_message_use_another_instance": "நீங்கள் <a href = \"` x` \"> மற்றொரு நிகழ்வில் தேடலாம் </a>.",
-    "Show annotations": "சிறுகுறிப்புகளைக் காட்டு",
-    "Genre: ": "வகை: ",
-    "License: ": "உரிமம்: ",
-    "Standard YouTube license": "நிலையான YouTube உரிமம்",
-    "Family friendly? ": "குடும்ப நட்பு? ",
-    "Wilson score: ": "வில்சன் மதிப்பெண்: ",
-    "Engagement: ": "நிச்சயதார்த்தம்: ",
-    "Whitelisted regions: ": "அனுமதிப்பட்டிய பகுதிகள்: ",
-    "Blacklisted regions: ": "தடுப்புப்பட்டியாக்கப்பட்ட பகுதிகள்: ",
-    "Music in this video": "இந்த வீடியோவில் இசை",
-    "Artist: ": "கலைஞர்: ",
-    "Song: ": "பாடல்: ",
-    "Album: ": "ஆல்பம்: ",
-    "Shared `x`": "பகிரப்பட்டது `x`",
-    "Premieres in `x`": "`X` இல் பிரீமியர்ச்",
-    "Premieres `x`": "பிரீமியர்ச் `x`",
-    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "ஆய்! நீங்கள் சாவாச்கிரிப்ட் முடக்கப்பட்டிருப்பது போல் தெரிகிறது. கருத்துகளைக் காண இங்கே சொடுக்கு செய்க, அவர்கள் ஏற்றுவதற்கு சிறிது நேரம் ஆகலாம் என்பதை நினைவில் கொள்ளுங்கள்.",
-    "View YouTube comments": "YouTube கருத்துகளைக் காண்க",
-    "View more comments on Reddit": "ரெடிட் குறித்த கூடுதல் கருத்துகளைக் காண்க",
-    "View `x` comments": {
-        "([^.,0-9]|^)1([^.,0-9]|$)": "`X` கருத்தைக் காண்க",
-        "": "`X` கருத்துகளைக் காண்க"
-    },
-    "View Reddit comments": "ரெடிட் கருத்துகளைக் காண்க",
-    "Hide replies": "பதில்களை மறைக்கவும்",
-    "Wrong username or password": "தவறான பயனர்பெயர் அல்லது கடவுச்சொல்",
-    "Password cannot be longer than 55 characters": "கடவுச்சொல் 55 எழுத்துகளை விட நீளமாக இருக்க முடியாது",
-    "Invidious Private Feed for `x`": "`X` க்கான மோசமான தனியார் ஊட்டம்",
-    "channel:`x`": "சேனல்: `x`",
-    "Deleted or invalid channel": "நீக்கப்பட்ட அல்லது தவறான சேனல்",
-    "comments_view_x_replies": "{{count}} பதிலைக் காண்க",
-    "comments_view_x_replies_plural": "{{count}} பதில்களைக் காண்க",
-    "`x` ago": "`x` முன்பு",
-    "Load more": "மேலும் ஏற்றவும்",
-    "Hidden field \"challenge\" is a required field": "மறைக்கப்பட்ட புலம் \"அறைகூவல்\" என்பது தேவையான புலம்",
-    "Hidden field \"token\" is a required field": "மறைக்கப்பட்ட புலம் \"கிள்ளாக்கு\" என்பது தேவையான புலம்",
-    "Corsican": "கார்சிகன்",
-    "Croatian": "குரோசியன்",
-    "Czech": "செக்",
-    "Danish": "டேனிச்",
-    "Dutch (auto-generated)": "டச்சு (தானாக உருவாக்கப்பட்ட)",
-    "Esperanto": "எச்பெராண்டோ",
-    "Estonian": "எச்டோனிய",
-    "Filipino": "ஃபிலிபினோ",
-    "Filipino (auto-generated)": "பிலிப்பைன்ச் (தானாக உருவாக்கிய)",
-    "French (auto-generated)": "பிரஞ்சு (தானாக உருவாக்கப்பட்ட)",
-    "Galician": "காலிசியன்",
-    "Georgian": "சார்சியன்",
-    "German": "செர்மன்",
-    "Hausa": "ஔசா",
-    "Lao": "லாவோ",
-    "Latin": "லத்தீன்",
-    "Latvian": "லாட்வியன்",
-    "Hawaiian": "அவாயியன்",
-    "Hebrew": "எபிரேய",
-    "Lithuanian": "லிதுவேனியன்",
-    "Hindi": "இந்தி",
-    "Hmong": "அமோங்",
-    "Indonesian": "இந்தோனேசிய",
-    "Indonesian (auto-generated)": "இந்தோனேசிய (தானாக உருவாக்கப்பட்ட)",
-    "Interlingue": "இன்டர்லின்குய்",
-    "Irish": "ஐரிச்",
-    "Italian": "இத்தாலிய",
-    "Italian (auto-generated)": "இத்தாலியன் (தானாக உருவாக்கப்பட்ட)",
-    "Japanese": "சப்பானியர்கள்",
-    "Japanese (auto-generated)": "சப்பானிய (தானாக உருவாக்கப்பட்ட)",
-    "Javanese": "சாவானீச்",
-    "Kannada": "கன்னடா",
-    "Kazakh": "கசாக்",
-    "Khmer": "கெமர்",
-    "Korean": "கொரிய",
-    "Kurdish": "குர்திச்",
-    "Kyrgyz": "கிர்கிச்",
-    "Luxembourgish": "லக்சம்போர்கிச்",
-    "Malay": "மலாய்",
-    "Pashto": "பச்தோ",
-    "Persian": "பெர்சியன்",
-    "Polish": "போலீச்",
-    "Portuguese": "போர்த்துகீசியம்",
-    "Portuguese (auto-generated)": "போர்த்துகீசியம் (தானாக உருவாக்கிய)",
-    "generic_count_minutes": "{{count}} மணித்துளி",
-    "generic_count_minutes_plural": "{{count}} நிமிடங்கள்",
-    "generic_count_seconds": "{{count}} இரண்டாவது",
-    "generic_count_seconds_plural": "{{count}} வினாடிகள்",
-    "Fallback comments: ": "குறைவடையும் கருத்துரைகள்: ",
-    "Portuguese (Brazil)": "போர்த்துகீசியம் (பிரேசில்)",
-    "Punjabi": "பஞ்சாபி",
-    "Romanian": "ருமேனிய",
-    "Sinhala": "சிங்களம்",
-    "Slovak": "ச்லோவாக்",
-    "Slovenian": "ச்லோவேனியன்",
-    "Spanish (Latin America)": "ச்பானிச் (லத்தீன் அமெரிக்கா)",
-    "Spanish (Mexico)": "ச்பானிச் (மெக்சிகோ)",
-    "Spanish (Spain)": "ச்பானிச் (ச்பெயின்)",
-    "Telugu": "தெலுங்கு",
-    "Turkish (auto-generated)": "துருக்கிய (தானாக உருவாக்கிய)",
-    "Ukrainian": "உக்ரேனிய",
-    "Urdu": "உருது",
-    "Uzbek": "உச்பெக்",
-    "Vietnamese (auto-generated)": "வியட்நாமிய (தானாக உருவாக்கப்பட்ட)",
-    "Western Frisian": "மேற்கு ஃபிரிசியன்",
-    "Zulu": "சுலு",
-    "generic_count_years": "{{count}}} ஆண்டு",
-    "generic_count_years_plural": "{{count}} ஆண்டுகள்",
-    "generic_count_months": "{{count}} மாதம்",
-    "generic_count_months_plural": "{{count}} மாதங்கள்",
-    "generic_count_weeks": "{{count}}} வாரம்",
-    "generic_count_weeks_plural": "{{count}} வாரங்கள்",
-    "generic_count_days": "{{count}}} நாள்",
-    "generic_count_days_plural": "{{count}} நாட்கள்",
-    "generic_count_hours": "{{count}} மணிநேரம்",
-    "generic_count_hours_plural": "{{count}} மணிநேரம்",
-    "Search": "தேடல்",
-    "Rating: ": "மதிப்பீடு: ",
-    "preferences_locale_label": "மொழி: ",
-    "Default": "இயல்புநிலை",
-    "Music": "இசை",
-    "Download": "பதிவிறக்கம்",
-    "%A %B %-d, %Y": "%A %b %-d, %y",
-    "permalink": "பெர்மாலின்க்",
-    "Channel Sponsor": "சேனல் ஒப்புரவாளர்",
-    "Audio mode": "ஆடியோ பயன்முறை",
-    "search_filters_duration_option_short": "குறுகிய (<4 நிமிடங்கள்)",
-    "search_filters_title": "வடிப்பான்கள்",
-    "search_filters_date_label": "தேதி பதிவேற்றும் தேதி",
-    "search_filters_date_option_none": "எந்த தேதி",
-    "search_filters_date_option_hour": "கடைசி மணி",
-    "search_filters_date_option_year": "இந்த ஆண்டு",
-    "search_filters_type_label": "வகை",
-    "search_filters_type_option_all": "எந்த வகை",
-    "search_filters_type_option_video": "ஒளிதோற்றம்",
-    "search_filters_type_option_movie": "படம்",
-    "search_filters_type_option_show": "காட்டு",
-    "search_filters_features_option_vr180": "VR180",
-    "search_filters_features_option_purchased": "வாங்கப்பட்டது",
-    "search_filters_sort_label": "வரிசைப்படுத்தவும்",
-    "search_filters_sort_option_date": "பதிவேற்ற தேதி",
-    "search_filters_sort_option_views": "எண்ணிக்கை காண்க",
-    "search_filters_apply_button": "தேர்ந்தெடுக்கப்பட்ட வடிப்பான்களைப் பயன்படுத்துங்கள்",
-    "footer_documentation": "ஆவணப்படுத்துதல்",
-    "footer_source_code": "மூலக் குறியீடு",
-    "footer_original_source_code": "அசல் மூலக் குறியீடு",
-    "none": "எதுவுமில்லை",
-    "videoinfo_youTube_embed_link": "உட்பொதிக்கப்பட்டது",
-    "videoinfo_invidious_embed_link": "உட்பொதிப்பு இணைப்பு",
-    "Video unavailable": "வீடியோ கிடைக்கவில்லை",
-    "preferences_save_player_pos_label": "பிளேபேக் நிலையை சேமிக்கவும்: ",
-    "crash_page_you_found_a_bug": "நீங்கள் ஒரு பிழையை கண்டுபிடித்ததாகத் தெரிகிறது!",
-    "crash_page_refresh": "<a href = \"` x` \"> பக்கத்தை புதுப்பிக்க முயற்சித்தேன் </a>",
-    "crash_page_read_the_faq": "<a href = \"` x` \"> அடிக்கடி கேட்கப்படும் கேள்விகள் (கேள்விகள்) </a> ஐப் படியுங்கள்",
-    "crash_page_report_issue": "மேலே எதுவும் உதவவில்லை என்றால், தயவுசெய்து <a href = \"` x` \"> அறிவிலிமையம் </a> (முன்னுரிமை ஆங்கிலத்தில்) ஒரு புதிய சிக்கலைத் திறந்து உங்கள் செய்தியில் பின்வரும் உரையைச் சேர்க்கவும் (அந்த உரையை மொழிபெயர்க்க வேண்டாம்):",
-    "error_video_not_in_playlist": "கோரப்பட்ட வீடியோ இந்த பிளேலிச்ட்டில் இல்லை. <a href = \"` x` \"> பிளேலிச்ட் முகப்பு பக்கத்திற்கு இங்கே சொடுக்கு செய்க. </a>",
-    "channel_tab_videos_label": "வீடியோக்கள்",
-    "channel_tab_podcasts_label": "பாட்காச்ட்கள்",
-    "channel_tab_releases_label": "வெளியீடுகள்",
-    "channel_tab_playlists_label": "பிளேலிச்ட்கள்",
-    "channel_tab_community_label": "சமூகம்",
-    "channel_tab_channels_label": "சேனல்கள்",
-    "toggle_theme": "கருப்பொருளை மாற்றவும்",
-    "carousel_slide": "{{total}} இன் ச்லைடு {{current}}",
-    "carousel_skip": "கொணர்வி தவிர்க்கவும்"
-}
--- a/locales/tok.json
+++ b/locales/tok.json
@ -1 +0,0 @@
-{}
--- a/locales/tr.json
+++ b/locales/tr.json
@ -322,13 +322,13 @@
    "channel_tab_community_label": "Topluluk",
    "search_filters_sort_option_relevance": "İlgi",
    "search_filters_sort_option_rating": "Değerlendirme",
-    "search_filters_sort_option_date": "Yükleme tarihi",
+    "search_filters_sort_option_date": "Yükleme Tarihi",
    "search_filters_sort_option_views": "Görüntüleme Sayısı",
    "search_filters_type_label": "Tür",
    "search_filters_duration_label": "Süre",
    "search_filters_features_label": "Özellikler",
    "search_filters_sort_label": "Sıralama Ölçütü",
-    "search_filters_date_option_hour": "Son saat",
+    "search_filters_date_option_hour": "Son Saat",
    "search_filters_date_option_today": "Bugün",
    "search_filters_date_option_week": "Bu Hafta",
    "search_filters_date_option_month": "Bu Ay",
@ -452,7 +452,7 @@
    "Spanish (Spain)": "İspanyolca (İspanya)",
    "Vietnamese (auto-generated)": "Vietnamca (Otomatik Oluşturuldu)",
    "preferences_watch_history_label": "İzleme Geçmişini Etkinleştir: ",
-    "search_message_use_another_instance": "Ayrıca <a href=\"`x`\">başka bir örnekte arayabilirsiniz</a>.",
+    "search_message_use_another_instance": " Ayrıca <a href=\"`x`\">başka bir örnekte arayabilirsiniz</a>.",
    "search_filters_type_option_all": "Herhangi Bir Tür",
    "search_filters_duration_option_none": "Herhangi Bir Süre",
    "search_message_no_results": "Sonuç bulunamadı.",
@ -496,6 +496,5 @@
    "carousel_slide": "Sunum {{current}} / {{total}}",
    "carousel_skip": "Kayar menüyü atla",
    "carousel_go_to": "`x` sunumuna git",
-    "The Popular feed has been disabled by the administrator.": "Popüler akışı yönetici tarafından devre dışı bırakıldı.",
-    "preferences_preload_label": "Video verilerini önceden yükle: "
+    "The Popular feed has been disabled by the administrator.": "Popüler akışı yönetici tarafından devre dışı bırakıldı."
 }
--- a/locales/uk.json
+++ b/locales/uk.json
@ -455,7 +455,7 @@
    "search_filters_date_option_week": "Цей тиждень",
    "search_filters_type_label": "Тип",
    "search_filters_type_option_channel": "Канал",
-    "search_message_use_another_instance": "Можете також <a href=\"`x`\">пошукати на іншому сервері</a>.",
+    "search_message_use_another_instance": " Можете також <a href=\"`x`\">пошукати іншим сервером</a>.",
    "search_filters_title": "Фільтри",
    "search_filters_date_option_hour": "Остання година",
    "search_filters_date_option_month": "Цей місяць",
@ -472,7 +472,7 @@
    "search_filters_features_option_three_sixty": "360°",
    "search_filters_features_option_hdr": "HDR",
    "search_filters_sort_label": "Спершу",
-    "search_filters_sort_option_date": "Дата вивантаження",
+    "search_filters_sort_option_date": "Нещодавні",
    "search_filters_apply_button": "Застосувати фільтри",
    "search_filters_features_option_vr180": "VR180",
    "search_filters_features_option_purchased": "Придбано",
@ -513,7 +513,5 @@
    "The Popular feed has been disabled by the administrator.": "Стрічка Популярні вимкнена адміністратором.",
    "carousel_slide": "Слайд {{current}} з {{total}}",
    "carousel_skip": "Пропустити карусель",
-    "carousel_go_to": "Перейти до слайда `x`",
-    "preferences_preload_label": "Попереднє завантаження відеоданих: ",
-    "Filipino (auto-generated)": "Філіппінська (згенеровано автоматично)"
+    "carousel_go_to": "Перейти до слайда `x`"
 }
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@ -436,7 +436,7 @@
    "Turkish (auto-generated)": "土耳其语 (自动生成)",
    "Spanish (Spain)": "西班牙语 (西班牙)",
    "preferences_watch_history_label": "启用观看历史： ",
-    "search_message_use_another_instance": "你也可以 <a href=\"`x`\">在另一实例上搜索</a>。",
+    "search_message_use_another_instance": " 你也可以 <a href=\"`x`\">在另一实例上搜索</a>。",
    "search_filters_title": "过滤器",
    "search_filters_date_label": "上传日期",
    "search_filters_apply_button": "应用所选过滤器",
@ -479,7 +479,5 @@
    "The Popular feed has been disabled by the administrator.": "“流行”源已被管理员禁用。",
    "carousel_slide": "当前为第 {{current}} 张图，共 {{total}} 张图",
    "carousel_skip": "跳过图集",
-    "carousel_go_to": "转到图 `x`",
-    "preferences_preload_label": "预加载视频数据： ",
-    "Filipino (auto-generated)": "菲律宾语 (自动生成)"
+    "carousel_go_to": "转到图 `x`"
 }
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@ -338,13 +338,13 @@
    "channel_tab_community_label": "社群",
    "search_filters_sort_option_relevance": "關聯",
    "search_filters_sort_option_rating": "評分",
-    "search_filters_sort_option_date": "上傳日期",
+    "search_filters_sort_option_date": "日期",
    "search_filters_sort_option_views": "檢視",
    "search_filters_type_label": "內容類型",
    "search_filters_duration_label": "時長",
    "search_filters_features_label": "特色",
    "search_filters_sort_label": "排序",
-    "search_filters_date_option_hour": "最後一小時",
+    "search_filters_date_option_hour": "小時",
    "search_filters_date_option_today": "今天",
    "search_filters_date_option_week": "週",
    "search_filters_date_option_month": "月",
@ -442,7 +442,7 @@
    "search_filters_duration_option_none": "任何時長",
    "search_filters_duration_option_medium": "中等（4到20分鐘）",
    "search_filters_features_option_vr180": "VR180",
-    "search_message_use_another_instance": "您也可以<a href=\"`x`\">在其他站台上搜尋</a>。",
+    "search_message_use_another_instance": " 您也可以<a href=\"`x`\">在其他站台上搜尋</a>。",
    "search_filters_title": "過濾條件",
    "search_filters_date_label": "上傳日期",
    "search_filters_type_option_all": "任何類型",
@ -479,7 +479,5 @@
    "carousel_slide": "第 {{current}} 張投影片，共 {{total}} 張",
    "carousel_skip": "略過輪播",
    "carousel_go_to": "跳到投影片 `x`",
-    "The Popular feed has been disabled by the administrator.": "熱門 feed 已被管理員停用。",
-    "preferences_preload_label": "預先載入影片資訊 ",
-    "Filipino (auto-generated)": "菲律賓語（自動產生）"
+    "The Popular feed has been disabled by the administrator.": "熱門 feed 已被管理員停用。"
 }
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit b55d58dea94f7144ff0205857dfa70ec14eaa872
+Subproject commit 11ec372f72747c09d48ffef04843f72be67d5b54
--- a/shard.lock
+++ b/shard.lock
@ -10,20 +10,16 @@ shards:

  backtracer:
    git: https://github.com/sija/backtracer.cr.git
-    version: 1.2.2
+    version: 1.2.1

  db:
    git: https://github.com/crystal-lang/crystal-db.git
-    version: 0.13.1
+    version: 0.10.1

  exception_page:
    git: https://github.com/crystal-loot/exception_page.git
    version: 0.2.2

-  http_proxy:
-    git: https://github.com/mamantoha/http_proxy.git
-    version: 0.10.3
-
  kemal:
    git: https://github.com/kemalcr/kemal.git
    version: 1.1.2
@ -34,7 +30,7 @@ shards:

  pg:
    git: https://github.com/will/crystal-pg.git
-    version: 0.28.0
+    version: 0.24.0

  protodec:
    git: https://github.com/iv-org/protodec.git
@ -46,9 +42,9 @@ shards:

  spectator:
    git: https://github.com/icy-arctic-fox/spectator.git
-    version: 0.10.6
+    version: 0.10.4

  sqlite3:
    git: https://github.com/crystal-lang/crystal-sqlite3.git
-    version: 0.21.0
+    version: 0.18.0

--- a/shard.yml
+++ b/shard.yml
@ -1,20 +1,21 @@
 name: invidious
-version: 2.20250314.0-dev
+version: 0.20.1

 authors:
-  - Invidious team <contact@invidious.io>
-  - Contributors!
+  - Omar Roth <omarroth@protonmail.com>
+  - Invidious team

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

 dependencies:
  pg:
    github: will/crystal-pg
-    version: ~> 0.28.0
+    version: ~> 0.24.0
  sqlite3:
    github: crystal-lang/crystal-sqlite3
-    version: ~> 0.21.0
+    version: ~> 0.18.0
  kemal:
    github: kemalcr/kemal
    version: ~> 1.1.2
@ -27,9 +28,6 @@ dependencies:
  athena-negotiation:
    github: athena-framework/negotiation
    version: ~> 0.1.1
-  http_proxy:
-    github: mamantoha/http_proxy
-    version: ~> 0.10.3

 development_dependencies:
  spectator:
@ -39,10 +37,6 @@ development_dependencies:
    github: crystal-ameba/ameba
    version: ~> 1.6.1

-crystal: ">= 1.10.0, < 2.0.0"
+crystal: ">= 1.0.0, < 2.0.0"

 license: AGPLv3
-
-repository: https://github.com/iv-org/invidious
-homepage: https://invidious.io
-documentation: https://docs.invidious.io
--- a/spec/invidious/hashtag_spec.cr
+++ b/spec/invidious/hashtag_spec.cr
@ -27,8 +27,8 @@ Spectator.describe Invidious::Hashtag do
    expect(video_11.length_seconds).to eq((56.minutes + 41.seconds).total_seconds.to_i32)
    expect(video_11.views).to eq(40_504_893)

-    expect(video_11.badges.live_now?).to be_false
-    expect(video_11.badges.premium?).to be_false
+    expect(video_11.live_now).to be_false
+    expect(video_11.premium).to be_false
    expect(video_11.premiere_timestamp).to be_nil

    #
@ -49,8 +49,8 @@ Spectator.describe Invidious::Hashtag do
    expect(video_35.length_seconds).to eq((3.minutes + 14.seconds).total_seconds.to_i32)
    expect(video_35.views).to eq(30_790_049)

-    expect(video_35.badges.live_now?).to be_false
-    expect(video_35.badges.premium?).to be_false
+    expect(video_35.live_now).to be_false
+    expect(video_35.premium).to be_false
    expect(video_35.premiere_timestamp).to be_nil
  end

@ -80,8 +80,8 @@ Spectator.describe Invidious::Hashtag do
    expect(video_41.length_seconds).to eq((1.hour).total_seconds.to_i32)
    expect(video_41.views).to eq(63_240)

-    expect(video_41.badges.live_now?).to be_false
-    expect(video_41.badges.premium?).to be_false
+    expect(video_41.live_now).to be_false
+    expect(video_41.premium).to be_false
    expect(video_41.premiere_timestamp).to be_nil

    #
@ -102,8 +102,8 @@ Spectator.describe Invidious::Hashtag do
    expect(video_48.length_seconds).to eq((35.minutes + 46.seconds).total_seconds.to_i32)
    expect(video_48.views).to eq(68_704)

-    expect(video_48.badges.live_now?).to be_false
-    expect(video_48.badges.premium?).to be_false
+    expect(video_48.live_now).to be_false
+    expect(video_48.premium).to be_false
    expect(video_48.premiere_timestamp).to be_nil
  end
 end
--- a/spec/invidious/videos/regular_videos_extract_spec.cr
+++ b/spec/invidious/videos/regular_videos_extract_spec.cr
@ -17,8 +17,8 @@ Spectator.describe "parse_video_info" do
    # Basic video infos

    expect(info["title"].as_s).to eq("I Gave My 100,000,000th Subscriber An Island")
-    expect(info["views"].as_i).to eq(220_226_287)
-    expect(info["likes"].as_i).to eq(6_870_691)
+    expect(info["views"].as_i).to eq(126_573_823)
+    expect(info["likes"].as_i).to eq(5_157_654)

    # For some reason the video length from VideoDetails and the
    # one from microformat differs by 1s...
@ -48,12 +48,12 @@ Spectator.describe "parse_video_info" do

    expect(info["relatedVideos"].as_a.size).to eq(20)

-    expect(info["relatedVideos"][0]["id"]).to eq("krsBRQbOPQ4")
-    expect(info["relatedVideos"][0]["title"]).to eq("$1 vs $250,000,000 Private Island!")
+    expect(info["relatedVideos"][0]["id"]).to eq("Hwybp38GnZw")
+    expect(info["relatedVideos"][0]["title"]).to eq("I Built Willy Wonka's Chocolate Factory!")
    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]["view_count"]).to eq("179877630")
+    expect(info["relatedVideos"][0]["short_view_count"]).to eq("179M")
    expect(info["relatedVideos"][0]["author_verified"]).to eq("true")

    # Description
@ -76,11 +76,11 @@ Spectator.describe "parse_video_info" do
    expect(info["ucid"].as_s).to eq("UCX6OQ3DkcsbYNE6H8uQQuVA")

    expect(info["authorThumbnail"].as_s).to eq(
-      "https://yt3.ggpht.com/fxGKYucJAVme-Yz4fsdCroCFCrANWqw0ql4GYuvx8Uq4l_euNJHgE-w9MTkLQA805vWCi-kE0g=s48-c-k-c0x00ffffff-no-rj"
+      "https://yt3.ggpht.com/ytc/AL5GRJVuqw82ERvHzsmBxL7avr1dpBtsVIXcEzBPZaloFg=s48-c-k-c0x00ffffff-no-rj"
    )

    expect(info["authorVerified"].as_bool).to be_true
-    expect(info["subCountText"].as_s).to eq("320M")
+    expect(info["subCountText"].as_s).to eq("143M")
  end

  it "parses a regular video with no descrition/comments" do
@ -99,8 +99,8 @@ Spectator.describe "parse_video_info" do
    # Basic video infos

    expect(info["title"].as_s).to eq("Chris Rea - Auberge")
-    expect(info["views"].as_i).to eq(14_324_584)
-    expect(info["likes"].as_i).to eq(35_870)
+    expect(info["views"].as_i).to eq(10_943_126)
+    expect(info["likes"].as_i).to eq(0)
    expect(info["lengthSeconds"].as_i).to eq(283_i64)
    expect(info["published"].as_s).to eq("2012-05-21T00:00:00Z")

@ -132,14 +132,14 @@ Spectator.describe "parse_video_info" do

    # Related videos

-    expect(info["relatedVideos"].as_a.size).to eq(20)
+    expect(info["relatedVideos"].as_a.size).to eq(19)

-    expect(info["relatedVideos"][0]["id"]).to eq("gUUdQfnshJ4")
-    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]["id"]).to eq("Ww3KeZ2_Yv4")
+    expect(info["relatedVideos"][0]["title"]).to eq("Chris Rea")
+    expect(info["relatedVideos"][0]["author"]).to eq("PanMusic")
+    expect(info["relatedVideos"][0]["ucid"]).to eq("UCsKAPSuh1iNbLWUga_igPyA")
+    expect(info["relatedVideos"][0]["view_count"]).to eq("31581")
+    expect(info["relatedVideos"][0]["short_view_count"]).to eq("31K")
    expect(info["relatedVideos"][0]["author_verified"]).to eq("false")

    # Description
@ -156,13 +156,11 @@ Spectator.describe "parse_video_info" do

    # Author infos

-    expect(info["author"].as_s).to eq("ChrisReaVideos")
+    expect(info["author"].as_s).to eq("ChrisReaOfficial")
    expect(info["ucid"].as_s).to eq("UC_5q6nWPbD30-y6oiWF_oNA")

-    expect(info["authorThumbnail"].as_s).to eq(
-      "https://yt3.ggpht.com/ytc/AIdro_n71nsegpKfjeRKwn1JJmK5IVMh_7j5m_h3_1KnUUg=s48-c-k-c0x00ffffff-no-rj"
-    )
+    expect(info["authorThumbnail"].as_s).to be_empty
    expect(info["authorVerified"].as_bool).to be_false
-    expect(info["subCountText"].as_s).to eq("3.11K")
+    expect(info["subCountText"].as_s).to eq("-")
  end
 end
--- a/src/invidious.cr
+++ b/src/invidious.cr
@ -23,7 +23,6 @@ require "kilt"
 require "./ext/kemal_content_for.cr"
 require "./ext/kemal_static_file_handler.cr"

-require "http_proxy"
 require "athena-negotiation"
 require "openssl/hmac"
 require "option_parser"
@ -93,14 +92,6 @@ SOFTWARE = {

 YT_POOL = YoutubeConnectionPool.new(YT_URL, capacity: CONFIG.pool_size)

-# Image request pool
-
-GGPHT_POOL = YoutubeConnectionPool.new(URI.parse("https://yt3.ggpht.com"), capacity: CONFIG.pool_size)
-
-COMPANION_POOL = CompanionConnectionPool.new(
-  capacity: CONFIG.pool_size
-)
-
 # CLI
 Kemal.config.extra_options do |parser|
  parser.banner = "Usage: invidious [arguments]"
@ -126,9 +117,6 @@ Kemal.config.extra_options do |parser|
  parser.on("-l LEVEL", "--log-level=LEVEL", "Log level, one of #{LogLevel.values} (default: #{CONFIG.log_level})") do |log_level|
    CONFIG.log_level = LogLevel.parse(log_level)
  end
-  parser.on("-k", "--colorize", "Colorize logs") do
-    CONFIG.colorize_logs = true
-  end
  parser.on("-v", "--version", "Print version") do
    puts SOFTWARE.to_pretty_json
    exit
@ -145,7 +133,7 @@ if CONFIG.output.upcase != "STDOUT"
  FileUtils.mkdir_p(File.dirname(CONFIG.output))
 end
 OUTPUT = CONFIG.output.upcase == "STDOUT" ? STDOUT : File.open(CONFIG.output, mode: "a")
-LOGGER = Invidious::LogHandler.new(OUTPUT, CONFIG.log_level, CONFIG.colorize_logs)
+LOGGER = Invidious::LogHandler.new(OUTPUT, CONFIG.log_level)

 # Check table integrity
 Invidious::Database.check_integrity(CONFIG)
@ -196,14 +184,11 @@ if CONFIG.popular_enabled
  Invidious::Jobs.register Invidious::Jobs::PullPopularVideosJob.new(PG_DB)
 end

-NOTIFICATION_CHANNEL = ::Channel(VideoNotification).new(32)
-CONNECTION_CHANNEL   = ::Channel({Bool, ::Channel(PQ::Notification)}).new(32)
-Invidious::Jobs.register Invidious::Jobs::NotificationJob.new(NOTIFICATION_CHANNEL, CONNECTION_CHANNEL, CONFIG.database_url)
+CONNECTION_CHANNEL = ::Channel({Bool, ::Channel(PQ::Notification)}).new(32)
+Invidious::Jobs.register Invidious::Jobs::NotificationJob.new(CONNECTION_CHANNEL, CONFIG.database_url)

 Invidious::Jobs.register Invidious::Jobs::ClearExpiredItemsJob.new

-Invidious::Jobs.register Invidious::Jobs::InstanceListRefreshJob.new
-
 Invidious::Jobs.start_all

 def popular_videos
@ -244,6 +229,8 @@ add_context_storage_type(Preferences)
 add_context_storage_type(Invidious::User)

 Kemal.config.logger = LOGGER
+Kemal.config.host_binding = Kemal.config.host_binding != "0.0.0.0" ? Kemal.config.host_binding : CONFIG.host_binding
+Kemal.config.port = Kemal.config.port != 3000 ? Kemal.config.port : CONFIG.port
 Kemal.config.app_name = "Invidious"

 # Use in kemal's production mode.
@ -252,16 +239,4 @@ Kemal.config.app_name = "Invidious"
  Kemal.config.env = "production" if !ENV.has_key?("KEMAL_ENV")
 {% end %}

-Kemal.run do |config|
-  if socket_binding = CONFIG.socket_binding
-    File.delete?(socket_binding.path)
-    # Create a socket and set its desired permissions
-    server = UNIXServer.new(socket_binding.path)
-    perms = socket_binding.permissions.to_i(base: 8)
-    File.chmod(socket_binding.path, perms)
-    config.server.not_nil!.bind server
-  else
-    Kemal.config.host_binding = Kemal.config.host_binding != "0.0.0.0" ? Kemal.config.host_binding : CONFIG.host_binding
-    Kemal.config.port = Kemal.config.port != 3000 ? Kemal.config.port : CONFIG.port
-  end
-end
+Kemal.run
--- a/src/invidious/channels/channels.cr
+++ b/src/invidious/channels/channels.cr
@ -223,7 +223,7 @@ def fetch_channel(ucid, pull_all_videos : Bool)
    length_seconds = channel_video.try &.length_seconds
    length_seconds ||= 0

-    live_now = channel_video.try &.badges.live_now?
+    live_now = channel_video.try &.live_now
    live_now ||= false

    premiere_timestamp = channel_video.try &.premiere_timestamp
@ -249,7 +249,11 @@ def fetch_channel(ucid, pull_all_videos : Bool)

    if was_insert
      LOGGER.trace("fetch_channel: #{ucid} : video #{video_id} : Inserted, updating subscriptions")
-      NOTIFICATION_CHANNEL.send(VideoNotification.from_video(video))
+      if CONFIG.enable_user_notifications
+        Invidious::Database::Users.add_notification(video)
+      else
+        Invidious::Database::Users.feed_needs_update(video)
+      end
    else
      LOGGER.trace("fetch_channel: #{ucid} : video #{video_id} : Updated")
    end
@ -271,7 +275,7 @@ def fetch_channel(ucid, pull_all_videos : Bool)
          ucid:               video.ucid,
          author:             video.author,
          length_seconds:     video.length_seconds,
-          live_now:           video.badges.live_now?,
+          live_now:           video.live_now,
          premiere_timestamp: video.premiere_timestamp,
          views:              video.views,
        })
@ -281,7 +285,11 @@ def fetch_channel(ucid, pull_all_videos : Bool)
        if Time.utc - video.published > 1.minute
          was_insert = Invidious::Database::ChannelVideos.insert(video)
          if was_insert
-            NOTIFICATION_CHANNEL.send(VideoNotification.from_video(video))
+            if CONFIG.enable_user_notifications
+              Invidious::Database::Users.add_notification(video)
+            else
+              Invidious::Database::Users.feed_needs_update(video)
+            end
          end
        end
      end
--- a/src/invidious/channels/playlists.cr
+++ b/src/invidious/channels/playlists.cr
@ -44,12 +44,3 @@ def fetch_channel_releases(ucid, author, continuation)
  end
  return extract_items(initial_data, author, ucid)
 end
-
-def fetch_channel_courses(ucid, author, continuation)
-  if continuation
-    initial_data = YoutubeAPI.browse(continuation)
-  else
-    initial_data = YoutubeAPI.browse(ucid, params: "Egdjb3Vyc2Vz8gYFCgPCAQA%3D")
-  end
-  return extract_items(initial_data, author, ucid)
-end
--- a/src/invidious/channels/videos.cr
+++ b/src/invidious/channels/videos.cr
@ -1,3 +1,78 @@
+def produce_channel_content_continuation(ucid, content_type, page = 1, auto_generated = nil, sort_by = "newest", v2 = false)
+  object_inner_2 = {
+    "2:0:embedded" => {
+      "1:0:varint" => 0_i64,
+    },
+    "5:varint"  => 50_i64,
+    "6:varint"  => 1_i64,
+    "7:varint"  => (page * 30).to_i64,
+    "9:varint"  => 1_i64,
+    "10:varint" => 0_i64,
+  }
+
+  object_inner_2_encoded = object_inner_2
+    .try { |i| Protodec::Any.cast_json(i) }
+    .try { |i| Protodec::Any.from_json(i) }
+    .try { |i| Base64.urlsafe_encode(i) }
+    .try { |i| URI.encode_www_form(i) }
+
+  content_type_numerical =
+    case content_type
+    when "videos"      then 15
+    when "livestreams" then 14
+    else                    15 # Fallback to "videos"
+    end
+
+  sort_by_numerical =
+    case sort_by
+    when "newest"  then 1_i64
+    when "popular" then 2_i64
+    when "oldest"  then 4_i64
+    else                1_i64 # Fallback to "newest"
+    end
+
+  object_inner_1 = {
+    "110:embedded" => {
+      "3:embedded" => {
+        "#{content_type_numerical}:embedded" => {
+          "1:embedded" => {
+            "1:string" => object_inner_2_encoded,
+          },
+          "2:embedded" => {
+            "1:string" => "00000000-0000-0000-0000-000000000000",
+          },
+          "3:varint" => sort_by_numerical,
+        },
+      },
+    },
+  }
+
+  object_inner_1_encoded = object_inner_1
+    .try { |i| Protodec::Any.cast_json(i) }
+    .try { |i| Protodec::Any.from_json(i) }
+    .try { |i| Base64.urlsafe_encode(i) }
+    .try { |i| URI.encode_www_form(i) }
+
+  object = {
+    "80226972:embedded" => {
+      "2:string"  => ucid,
+      "3:string"  => object_inner_1_encoded,
+      "35:string" => "browse-feed#{ucid}videos102",
+    },
+  }
+
+  continuation = object.try { |i| Protodec::Any.cast_json(i) }
+    .try { |i| Protodec::Any.from_json(i) }
+    .try { |i| Base64.urlsafe_encode(i) }
+    .try { |i| URI.encode_www_form(i) }
+
+  return continuation
+end
+
+def make_initial_content_ctoken(ucid, content_type, sort_by) : String
+  return produce_channel_content_continuation(ucid, content_type, sort_by: sort_by)
+end
+
 module Invidious::Channel::Tabs
  extend self

@ -26,7 +101,7 @@ module Invidious::Channel::Tabs
  end

  def get_videos(author : String, ucid : String, *, continuation : String? = nil, sort_by = "newest")
-    continuation ||= make_initial_videos_ctoken(ucid, sort_by)
+    continuation ||= make_initial_content_ctoken(ucid, "videos", sort_by)
    initial_data = YoutubeAPI.browse(continuation: continuation)

    return extract_items(initial_data, author, ucid)
@ -55,10 +130,14 @@ module Invidious::Channel::Tabs
  #  Shorts
  # -------------------

-  def get_shorts(channel : AboutChannel, *, continuation : String? = nil, sort_by = "newest")
-    continuation ||= make_initial_shorts_ctoken(channel.ucid, sort_by)
-    initial_data = YoutubeAPI.browse(continuation: continuation)
-
+  def get_shorts(channel : AboutChannel, continuation : String? = nil)
+    if continuation.nil?
+      # EgZzaG9ydHPyBgUKA5oBAA%3D%3D is the protobuf object to load "shorts"
+      # TODO: try to extract the continuation tokens that allows other sorting options
+      initial_data = YoutubeAPI.browse(channel.ucid, params: "EgZzaG9ydHPyBgUKA5oBAA%3D%3D")
+    else
+      initial_data = YoutubeAPI.browse(continuation: continuation)
+    end
    return extract_items(initial_data, channel.author, channel.ucid)
  end

@ -66,8 +145,9 @@ module Invidious::Channel::Tabs
  #  Livestreams
  # -------------------

-  def get_livestreams(channel : AboutChannel, *, continuation : String? = nil, sort_by = "newest")
-    continuation ||= make_initial_livestreams_ctoken(channel.ucid, sort_by)
+  def get_livestreams(channel : AboutChannel, continuation : String? = nil, sort_by = "newest")
+    continuation ||= make_initial_content_ctoken(channel.ucid, "livestreams", sort_by)
+
    initial_data = YoutubeAPI.browse(continuation: continuation)

    return extract_items(initial_data, channel.author, channel.ucid)
@ -91,102 +171,4 @@ module Invidious::Channel::Tabs

    return items, next_continuation
  end
-
-  # -------------------
-  #  C-tokens
-  # -------------------
-
-  private def sort_options_videos_short(sort_by : String)
-    case sort_by
-    when "newest"  then return 4_i64
-    when "popular" then return 2_i64
-    when "oldest"  then return 5_i64
-    else                return 4_i64 # Fallback to "newest"
-    end
-  end
-
-  # Generate the initial "continuation token" to get the first page of the
-  # "videos" tab. The following page requires the ctoken provided in that
-  # first page, and so on.
-  private def make_initial_videos_ctoken(ucid : String, sort_by = "newest")
-    object = {
-      "15:embedded" => {
-        "2:embedded" => {
-          "1:string" => "00000000-0000-0000-0000-000000000000",
-        },
-        "4:varint" => sort_options_videos_short(sort_by),
-      },
-    }
-
-    return channel_ctoken_wrap(ucid, object)
-  end
-
-  # Generate the initial "continuation token" to get the first page of the
-  # "shorts" tab. The following page requires the ctoken provided in that
-  # first page, and so on.
-  private def make_initial_shorts_ctoken(ucid : String, sort_by = "newest")
-    object = {
-      "10:embedded" => {
-        "2:embedded" => {
-          "1:string" => "00000000-0000-0000-0000-000000000000",
-        },
-        "4:varint" => sort_options_videos_short(sort_by),
-      },
-    }
-
-    return channel_ctoken_wrap(ucid, object)
-  end
-
-  # Generate the initial "continuation token" to get the first page of the
-  # "livestreams" tab. The following page requires the ctoken provided in that
-  # first page, and so on.
-  private def make_initial_livestreams_ctoken(ucid : String, sort_by = "newest")
-    sort_by_numerical =
-      case sort_by
-      when "newest"  then 12_i64
-      when "popular" then 14_i64
-      when "oldest"  then 13_i64
-      else                12_i64 # Fallback to "newest"
-      end
-
-    object = {
-      "14:embedded" => {
-        "2:embedded" => {
-          "1:string" => "00000000-0000-0000-0000-000000000000",
-        },
-        "5:varint" => sort_by_numerical,
-      },
-    }
-
-    return channel_ctoken_wrap(ucid, object)
-  end
-
-  # The protobuf structure common between videos/shorts/livestreams
-  private def channel_ctoken_wrap(ucid : String, object)
-    object_inner = {
-      "110:embedded" => {
-        "3:embedded" => object,
-      },
-    }
-
-    object_inner_encoded = object_inner
-      .try { |i| Protodec::Any.cast_json(i) }
-      .try { |i| Protodec::Any.from_json(i) }
-      .try { |i| Base64.urlsafe_encode(i) }
-      .try { |i| URI.encode_www_form(i) }
-
-    object = {
-      "80226972:embedded" => {
-        "2:string" => ucid,
-        "3:string" => object_inner_encoded,
-      },
-    }
-
-    continuation = object.try { |i| Protodec::Any.cast_json(i) }
-      .try { |i| Protodec::Any.from_json(i) }
-      .try { |i| Base64.urlsafe_encode(i) }
-      .try { |i| URI.encode_www_form(i) }
-
-    return continuation
-  end
 end
--- a/src/invidious/config.cr
+++ b/src/invidious/config.cr
@ -8,19 +8,11 @@ struct DBConfig
  property dbname : String
 end

-struct SocketBindingConfig
-  include YAML::Serializable
-
-  property path : String
-  property permissions : String
-end
-
 struct ConfigPreferences
  include YAML::Serializable

  property annotations : Bool = false
  property annotations_subscribed : Bool = false
-  property preload : Bool = true
  property autoplay : Bool = false
  property captions : Array(String) = ["", "", ""]
  property comments : Array(String) = ["youtube", ""]
@ -35,7 +27,7 @@ struct ConfigPreferences
  property max_results : Int32 = 40
  property notifications_only : Bool = false
  property player_style : String = "invidious"
-  property quality : String = "dash"
+  property quality : String = "hd720"
  property quality_dash : String = "auto"
  property default_home : String? = "Popular"
  property feed_menu : Array(String) = ["Popular", "Trending", "Subscriptions", "Playlists"]
@ -62,28 +54,9 @@ struct ConfigPreferences
  end
 end

-struct HTTPProxyConfig
-  include YAML::Serializable
-
-  property user : String
-  property password : String
-  property host : String
-  property port : Int32
-end
-
 class Config
  include YAML::Serializable

-  class CompanionConfig
-    include YAML::Serializable
-
-    @[YAML::Field(converter: Preferences::URIConverter)]
-    property private_url : URI = URI.parse("")
-
-    @[YAML::Field(converter: Preferences::URIConverter)]
-    property public_url : URI = URI.parse("")
-  end
-
  # Number of threads to use for crawling videos from channels (for updating subscriptions)
  property channel_threads : Int32 = 1
  # Time interval between two executions of the job that crawls channel videos (subscriptions update).
@ -95,8 +68,6 @@ class Config
  property output : String = "STDOUT"
  # Default log level, valid YAML values are ints and strings, see src/invidious/helpers/logger.cr
  property log_level : LogLevel = LogLevel::Info
-  # Enables colors in logs. Useful for debugging purposes
-  property colorize_logs : Bool = false
  # Database configuration with separate parameters (username, hostname, etc)
  property db : DBConfig? = nil

@ -155,12 +126,8 @@ class Config
  property port : Int32 = 3000
  # Host to bind (overridden by command line argument)
  property host_binding : String = "0.0.0.0"
-  # Path and permissions to make Invidious listen on a UNIX socket instead of a TCP port
-  property socket_binding : SocketBindingConfig? = nil
  # Pool size for HTTP requests to youtube.com and ytimg.com (each domain has a separate pool of `pool_size`)
  property pool_size : Int32 = 100
-  # HTTP Proxy configuration
-  property http_proxy : HTTPProxyConfig? = nil

  # Use Innertube's transcripts API instead of timedtext for closed captions
  property use_innertube_for_captions : Bool = false
@ -170,12 +137,6 @@ class Config
  # poToken for passing bot attestation
  property po_token : String? = nil

-  # Invidious companion
-  property invidious_companion : Array(CompanionConfig) = [] of CompanionConfig
-
-  # Invidious companion API key
-  property invidious_companion_key : String = ""
-
  # Saved cookies in "name1=value1; name2=value2..." format
  @[YAML::Field(converter: Preferences::StringToCookies)]
  property cookies : HTTP::Cookies = HTTP::Cookies.new
@ -209,9 +170,6 @@ class Config
    config = Config.from_yaml(config_yaml)

    # Update config from env vars (upcased and prefixed with "INVIDIOUS_")
-    #
-    # Also checks if any top-level config options are set to "CHANGE_ME!!"
-    # TODO: Support non-top-level config options such as the ones in DBConfig
    {% for ivar in Config.instance_vars %}
        {% env_id = "INVIDIOUS_#{ivar.id.upcase}" %}

@ -248,40 +206,16 @@ class Config
                exit(1)
            end
        end
-
-        # Warn when any config attribute is set to "CHANGE_ME!!"
-        if config.{{ivar.id}} == "CHANGE_ME!!"
-          puts "Config: The value of '#{ {{ivar.stringify}} }' needs to be changed!!"
-          exit(1)
-        end
    {% 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?
-        puts "Config: Please configure a key if you are using invidious companion."
-        exit(1)
-      elsif config.invidious_companion_key == "CHANGE_ME!!"
-        puts "Config: The value of 'invidious_companion_key' needs to be changed!!"
-        exit(1)
-      elsif config.invidious_companion_key.size != 16
-        puts "Config: The value of 'invidious_companion_key' needs to be a size of 16 characters."
-        exit(1)
-      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/")
-    end
-
    # HMAC_key is mandatory
    # See: https://github.com/iv-org/invidious/issues/3854
    if config.hmac_key.empty?
      puts "Config: 'hmac_key' is required/can't be empty"
      exit(1)
+    elsif config.hmac_key == "CHANGE_ME!!"
+      puts "Config: The value of 'hmac_key' needs to be changed!!"
+      exit(1)
    end

    # Build database_url from db.* if it's not set directly
@ -301,24 +235,6 @@ class Config
      end
    end

-    # Check if the socket configuration is valid
-    if sb = config.socket_binding
-      if sb.path.ends_with?("/") || File.directory?(sb.path)
-        puts "Config: The socket path " + sb.path + " must not be a directory!"
-        exit(1)
-      end
-      d = File.dirname(sb.path)
-      if !File.directory?(d)
-        puts "Config: Socket directory " + sb.path + " does not exist or is not a directory!"
-        exit(1)
-      end
-      p = sb.permissions.to_i?(base: 8)
-      if !p || p < 0 || p > 0o777
-        puts "Config: Socket permissions must be an octal between 0 and 777!"
-        exit(1)
-      end
-    end
-
    return config
  end
 end
--- a/src/invidious/database/users.cr
+++ b/src/invidious/database/users.cr
@ -119,15 +119,15 @@ module Invidious::Database::Users
  #  Update (notifs)
  # -------------------

-  def add_multiple_notifications(channel_id : String, video_ids : Array(String))
+  def add_notification(video : ChannelVideo)
    request = <<-SQL
      UPDATE users
-      SET notifications = array_cat(notifications, $1),
+      SET notifications = array_append(notifications, $1),
          feed_needs_update = true
      WHERE $2 = ANY(subscriptions)
    SQL

-    PG_DB.exec(request, video_ids, channel_id)
+    PG_DB.exec(request, video.id, video.ucid)
  end

  def remove_notification(user : User, vid : String)
@ -154,14 +154,14 @@ module Invidious::Database::Users
  #  Update (misc)
  # -------------------

-  def feed_needs_update(channel_id : String)
+  def feed_needs_update(video : ChannelVideo)
    request = <<-SQL
      UPDATE users
      SET feed_needs_update = true
      WHERE $1 = ANY(subscriptions)
    SQL

-    PG_DB.exec(request, channel_id)
+    PG_DB.exec(request, video.ucid)
  end

  def update_preferences(user : User)
--- a/src/invidious/frontend/channel_page.cr
+++ b/src/invidious/frontend/channel_page.cr
@ -7,9 +7,8 @@ module Invidious::Frontend::ChannelPage
    Streams
    Podcasts
    Releases
-    Courses
    Playlists
-    Posts
+    Community
    Channels
  end

--- a/src/invidious/frontend/pagination.cr
+++ b/src/invidious/frontend/pagination.cr
@ -3,24 +3,6 @@ require "uri"
 module Invidious::Frontend::Pagination
  extend self

-  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)
-      # Inverted arrow ("first" points to the right)
-      str << 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")
-    end
-
-    str << "</a>"
-  end
-
  private def previous_page(str : String::Builder, locale : String?, url : String)
    # Link
    str << %(<a href=") << url << %(" class="pure-button pure-button-secondary">)
@ -90,24 +72,18 @@ module Invidious::Frontend::Pagination
    end
  end

-  def nav_ctoken(locale : String?, *, base_url : String | URI, ctoken : String?, first_page : Bool, params : URI::Params)
+  def nav_ctoken(locale : String?, *, base_url : String | URI, ctoken : String?)
    return String.build do |str|
      str << %(<div class="h-box">\n)
      str << %(<div class="page-nav-container flexible">\n)

-      str << %(<div class="page-prev-container flex-left">)
-
-      if !first_page
-        self.first_page(str, locale, base_url.to_s)
-      end
-
-      str << %(</div>\n)
+      str << %(<div class="page-prev-container flex-left"></div>\n)

      str << %(<div class="page-next-container flex-right">)

      if !ctoken.nil?
-        params["continuation"] = ctoken
-        url_next = HttpServer::Utils.add_params_to_url(base_url, params)
+        params_next = URI::Params{"continuation" => ctoken}
+        url_next = HttpServer::Utils.add_params_to_url(base_url, params_next)

        self.next_page(str, locale, url_next.to_s)
      end
--- a/src/invidious/frontend/watch_page.cr
+++ b/src/invidious/frontend/watch_page.cr
@ -13,7 +13,7 @@ module Invidious::Frontend::WatchPage
      @full_videos,
      @video_streams,
      @audio_streams,
-      @captions,
+      @captions
    )
    end
  end
--- a/src/invidious/helpers/errors.cr
+++ b/src/invidious/helpers/errors.cr
@ -43,8 +43,6 @@ def error_template_helper(env : HTTP::Server::Context, status_code : Int32, exce
  # URLs for the error message below
  url_faq = "https://github.com/iv-org/documentation/blob/master/docs/faq.md"
  url_search_issues = "https://github.com/iv-org/invidious/issues"
-  url_search_issues += "?q=is:issue+is:open+"
-  url_search_issues += URI.encode_www_form("[Bug] #{issue_title}")

  url_switch = "https://redirect.invidious.io" + env.request.resource

@ -130,7 +128,7 @@ def error_json_helper(
  env : HTTP::Server::Context,
  status_code : Int32,
  exception : Exception,
-  additional_fields : Hash(String, Object) | Nil = nil,
+  additional_fields : Hash(String, Object) | Nil = nil
 )
  if exception.is_a?(InfoException)
    return error_json_helper(env, status_code, exception.message || "", additional_fields)
@ -152,7 +150,7 @@ def error_json_helper(
  env : HTTP::Server::Context,
  status_code : Int32,
  message : String,
-  additional_fields : Hash(String, Object) | Nil = nil,
+  additional_fields : Hash(String, Object) | Nil = nil
 )
  env.response.content_type = "application/json"
  env.response.status_code = status_code
--- a/src/invidious/helpers/handlers.cr
+++ b/src/invidious/helpers/handlers.cr
@ -27,7 +27,6 @@ class Kemal::RouteHandler
  # Processes the route if it's a match. Otherwise renders 404.
  private def process_request(context)
    raise Kemal::Exceptions::RouteNotFound.new(context) unless context.route_found?
-    return if context.response.closed?
    content = context.route.handler.call(context)

    if !Kemal.config.error_handlers.empty? && Kemal.config.error_handlers.has_key?(context.response.status_code) && exclude_match?(context)
--- a/src/invidious/helpers/i18n.cr
+++ b/src/invidious/helpers/i18n.cr
@ -1,22 +1,8 @@
-# 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
@ -37,7 +23,6 @@ LOCALES_LIST = {
  "it"      => "Italiano",              # Italian
  "ja"      => "日本語",                   # Japanese
  "ko"      => "한국어",                   # Korean
-  "lmo"     => "Lombard",               # Lombard
  "lt"      => "Lietuvių",              # Lithuanian
  "nb-NO"   => "Norsk bokmål",          # Norwegian Bokmål
  "nl"      => "Nederlands",            # Dutch
@ -54,7 +39,6 @@ LOCALES_LIST = {
  "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
--- a/src/invidious/helpers/logger.cr
+++ b/src/invidious/helpers/logger.cr
@ -1,5 +1,3 @@
-require "colorize"
-
 enum LogLevel
  All   = 0
  Trace = 1
@ -12,9 +10,7 @@ enum LogLevel
 end

 class Invidious::LogHandler < Kemal::BaseLogHandler
-  def initialize(@io : IO = STDOUT, @level = LogLevel::Debug, use_color : Bool = true)
-    Colorize.enabled = use_color
-    Colorize.on_tty_only!
+  def initialize(@io : IO = STDOUT, @level = LogLevel::Debug)
  end

  def call(context : HTTP::Server::Context)
@ -43,22 +39,10 @@ class Invidious::LogHandler < Kemal::BaseLogHandler
    @io.flush
  end

-  def color(level)
-    case level
-    when LogLevel::Trace then :cyan
-    when LogLevel::Debug then :green
-    when LogLevel::Info  then :white
-    when LogLevel::Warn  then :yellow
-    when LogLevel::Error then :red
-    when LogLevel::Fatal then :magenta
-    else                      :default
-    end
-  end
-
  {% for level in %w(trace debug info warn error fatal) %}
    def {{level.id}}(message : String)
      if LogLevel::{{level.id.capitalize}} >= @level
-        puts("#{Time.utc} [{{level.id}}] #{message}".colorize(color(LogLevel::{{level.id.capitalize}})))
+        puts("#{Time.utc} [{{level.id}}] #{message}")
      end
    end
  {% end %}
--- a/src/invidious/helpers/serialized_yt_data.cr
+++ b/src/invidious/helpers/serialized_yt_data.cr
@ -1,16 +1,3 @@
-@[Flags]
-enum VideoBadges
-  LiveNow
-  Premium
-  ThreeD
-  FourK
-  New
-  EightK
-  VR180
-  VR360
-  ClosedCaptions
-end
-
 struct SearchVideo
  include DB::Serializable

@ -22,10 +9,10 @@ struct SearchVideo
  property views : Int64
  property description_html : String
  property length_seconds : Int32
+  property live_now : Bool
+  property premium : Bool
  property premiere_timestamp : Time?
  property author_verified : Bool
-  property author_thumbnail : String?
-  property badges : VideoBadges

  def to_xml(auto_generated, query_params, xml : XML::Builder)
    query_params["v"] = self.id
@ -89,24 +76,6 @@ struct SearchVideo
      json.field "authorUrl", "/channel/#{self.ucid}"
      json.field "authorVerified", self.author_verified

-      author_thumbnail = self.author_thumbnail
-
-      if author_thumbnail
-        json.field "authorThumbnails" do
-          json.array do
-            qualities = {32, 48, 76, 100, 176, 512}
-
-            qualities.each do |quality|
-              json.object do
-                json.field "url", author_thumbnail.gsub(/=s\d+/, "=s#{quality}")
-                json.field "width", quality
-                json.field "height", quality
-              end
-            end
-          end
-        end
-      end
-
      json.field "videoThumbnails" do
        Invidious::JSONify::APIv1.thumbnails(json, self.id)
      end
@ -119,20 +88,13 @@ struct SearchVideo
      json.field "published", self.published.to_unix
      json.field "publishedText", 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?
+      json.field "liveNow", self.live_now
+      json.field "premium", self.premium
      json.field "isUpcoming", self.upcoming?

      if self.premiere_timestamp
        json.field "premiereTimestamp", self.premiere_timestamp.try &.to_unix
      end
-      json.field "isNew", self.badges.new?
-      json.field "is4k", self.badges.four_k?
-      json.field "is8k", self.badges.eight_k?
-      json.field "isVr180", self.badges.vr180?
-      json.field "isVr360", self.badges.vr360?
-      json.field "is3d", self.badges.three_d?
-      json.field "hasCaptions", self.badges.closed_captions?
    end
  end

@ -242,7 +204,7 @@ struct SearchChannel

          qualities.each do |quality|
            json.object do
-              json.field "url", self.author_thumbnail.gsub(/=s\d+/, "=s#{quality}")
+              json.field "url", self.author_thumbnail.gsub(/=\d+/, "=s#{quality}")
              json.field "width", quality
              json.field "height", quality
            end
--- a/src/invidious/helpers/sig_helper.cr
+++ b/src/invidious/helpers/sig_helper.cr
@ -175,9 +175,8 @@ module Invidious::SigHelper
    @queue = {} of TransactionID => Transaction

    @conn : Connection
-    @uri_or_path : String

-    def initialize(@uri_or_path)
+    def initialize(uri_or_path)
      @conn = Connection.new(uri_or_path)
      listen
    end
@ -187,26 +186,10 @@ module Invidious::SigHelper

      LOGGER.debug("SigHelper: Multiplexor listening")

+      # TODO: reopen socket if unexpectedly closed
      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
+          receive_data
          Fiber.yield
        end
      end
--- a/src/invidious/helpers/utils.cr
+++ b/src/invidious/helpers/utils.cr
@ -323,6 +323,68 @@ def parse_range(range)
  return 0_i64, nil
 end

+def fetch_random_instance
+  begin
+    instance_api_client = make_client(URI.parse("https://api.invidious.io"))
+
+    # Timeouts
+    instance_api_client.connect_timeout = 10.seconds
+    instance_api_client.dns_timeout = 10.seconds
+
+    instance_list = JSON.parse(instance_api_client.get("/instances.json").body).as_a
+    instance_api_client.close
+  rescue Socket::ConnectError | IO::TimeoutError | JSON::ParseException
+    instance_list = [] of JSON::Any
+  end
+
+  filtered_instance_list = [] of String
+
+  instance_list.each do |data|
+    # TODO Check if current URL is onion instance and use .onion types if so.
+    if data[1]["type"] == "https"
+      # Instances can have statistics disabled, which is an requirement of version validation.
+      # as_nil? doesn't exist. Thus we'll have to handle the error raised if as_nil fails.
+      begin
+        data[1]["stats"].as_nil
+        next
+      rescue TypeCastError
+      end
+
+      # stats endpoint could also lack the software dict.
+      next if data[1]["stats"]["software"]?.nil?
+
+      # Makes sure the instance isn't too outdated.
+      if remote_version = data[1]["stats"]?.try &.["software"]?.try &.["version"]
+        remote_commit_date = remote_version.as_s.match(/\d{4}\.\d{2}\.\d{2}/)
+        next if !remote_commit_date
+
+        remote_commit_date = Time.parse(remote_commit_date[0], "%Y.%m.%d", Time::Location::UTC)
+        local_commit_date = Time.parse(CURRENT_VERSION, "%Y.%m.%d", Time::Location::UTC)
+
+        next if (remote_commit_date - local_commit_date).abs.days > 30
+
+        begin
+          data[1]["monitor"].as_nil
+          health = data[1]["monitor"].as_h["dailyRatios"][0].as_h["ratio"]
+          filtered_instance_list << data[0].as_s if health.to_s.to_f > 90
+        rescue TypeCastError
+          # We can't check the health if the monitoring is broken. Thus we'll just add it to the list
+          # and move on. Ideally we'll ignore any instance that has broken health monitoring but due to the fact that
+          # it's an error that often occurs with all the instances at the same time, we have to just skip the check.
+          filtered_instance_list << data[0].as_s
+        end
+      end
+    end
+  end
+
+  # If for some reason no instances managed to get fetched successfully then we'll just redirect to redirect.invidious.io
+  if filtered_instance_list.size == 0
+    return "redirect.invidious.io"
+  end
+
+  return filtered_instance_list.sample(1)[0]
+end
+
 def reduce_uri(uri : URI | String, max_length : Int32 = 50, suffix : String = "…") : String
  str = uri.to_s.sub(/^https?:\/\//, "")
  if str.size > max_length
@ -383,22 +445,3 @@ def parse_link_endpoint(endpoint : JSON::Any, text : String, video_id : String)
  end
  return text
 end
-
-def encrypt_ecb_without_salt(data, key)
-  cipher = OpenSSL::Cipher.new("aes-128-ecb")
-  cipher.encrypt
-  cipher.key = key
-
-  io = IO::Memory.new
-  io.write(cipher.update(data))
-  io.write(cipher.final)
-  io.rewind
-
-  return io
-end
-
-def invidious_companion_encrypt(data)
-  timestamp = Time.utc.to_unix
-  encrypted_data = encrypt_ecb_without_salt("#{timestamp}|#{data}", CONFIG.invidious_companion_key)
-  return Base64.urlsafe_encode(encrypted_data)
-end
--- a/src/invidious/jobs/instance_refresh_job.cr
+++ b/src/invidious/jobs/instance_refresh_job.cr
@ -1,97 +0,0 @@
-class Invidious::Jobs::InstanceListRefreshJob < Invidious::Jobs::BaseJob
-  # We update the internals of a constant as so it can be accessed from anywhere
-  # within the codebase
-  #
-  # "INSTANCES" => Array(Tuple(String, String))  # region, instance
-
-  INSTANCES = {"INSTANCES" => [] of Tuple(String, String)}
-
-  def initialize
-  end
-
-  def begin
-    loop do
-      refresh_instances
-      LOGGER.info("InstanceListRefreshJob: Done, sleeping for 30 minutes")
-      sleep 30.minute
-      Fiber.yield
-    end
-  end
-
-  # Refreshes the list of instances used for redirects.
-  #
-  # Does the following three checks for each instance
-  # -  Is it a clear-net instance?
-  # -  Is it an instance with a good uptime?
-  # -  Is it an updated instance?
-  private def refresh_instances
-    raw_instance_list = self.fetch_instances
-    filtered_instance_list = [] of Tuple(String, String)
-
-    raw_instance_list.each do |instance_data|
-      # TODO allow Tor hidden service instances when the current instance
-      # is also a hidden service. Same for i2p and any other non-clearnet instances.
-      begin
-        domain = instance_data[0]
-        info = instance_data[1]
-        stats = info["stats"]
-
-        next unless info["type"] == "https"
-        next if bad_uptime?(info["monitor"])
-        next if outdated?(stats["software"]["version"])
-
-        filtered_instance_list << {info["region"].as_s, domain.as_s}
-      rescue ex
-        if domain
-          LOGGER.info("InstanceListRefreshJob: failed to parse information from '#{domain}' because \"#{ex}\"\n\"#{ex.backtrace.join('\n')}\"  ")
-        else
-          LOGGER.info("InstanceListRefreshJob: failed to parse information from an instance because \"#{ex}\"\n\"#{ex.backtrace.join('\n')}\"  ")
-        end
-      end
-    end
-
-    if !filtered_instance_list.empty?
-      INSTANCES["INSTANCES"] = filtered_instance_list
-    end
-  end
-
-  # Fetches information regarding instances from api.invidious.io or an otherwise configured URL
-  private def fetch_instances : Array(JSON::Any)
-    begin
-      # We directly call the stdlib HTTP::Client here as it allows us to negate the effects
-      # of the force_resolve config option. This is needed as api.invidious.io does not support ipv6
-      # and as such the following request raises if we were to use force_resolve with the ipv6 value.
-      instance_api_client = HTTP::Client.new(URI.parse("https://api.invidious.io"))
-
-      # Timeouts
-      instance_api_client.connect_timeout = 10.seconds
-      instance_api_client.dns_timeout = 10.seconds
-
-      raw_instance_list = JSON.parse(instance_api_client.get("/instances.json").body).as_a
-      instance_api_client.close
-    rescue ex : Socket::ConnectError | IO::TimeoutError | JSON::ParseException
-      raw_instance_list = [] of JSON::Any
-    end
-
-    return raw_instance_list
-  end
-
-  # Checks if the given target instance is outdated
-  private def outdated?(target_instance_version) : Bool
-    remote_commit_date = target_instance_version.as_s.match(/\d{4}\.\d{2}\.\d{2}/)
-    return false if !remote_commit_date
-
-    remote_commit_date = Time.parse(remote_commit_date[0], "%Y.%m.%d", Time::Location::UTC)
-    local_commit_date = Time.parse(CURRENT_VERSION, "%Y.%m.%d", Time::Location::UTC)
-
-    return (remote_commit_date - local_commit_date).abs.days > 30
-  end
-
-  # Checks if the uptime of the target instance is greater than 90% over a 30 day period
-  private def bad_uptime?(target_instance_health_monitor) : Bool
-    return true if !target_instance_health_monitor["down"].as_bool == false
-    return true if target_instance_health_monitor["uptime"].as_f < 90
-
-    return false
-  end
-end
--- a/src/invidious/jobs/notification_job.cr
+++ b/src/invidious/jobs/notification_job.cr
@ -1,32 +1,8 @@
-struct VideoNotification
-  getter video_id : String
-  getter channel_id : String
-  getter published : Time
-
-  def_hash @channel_id, @video_id
-
-  def ==(other)
-    video_id == other.video_id
-  end
-
-  def self.from_video(video : ChannelVideo) : self
-    VideoNotification.new(video.id, video.ucid, video.published)
-  end
-
-  def initialize(@video_id, @channel_id, @published)
-  end
-
-  def clone : VideoNotification
-    VideoNotification.new(video_id.clone, channel_id.clone, published.clone)
-  end
-end
-
 class Invidious::Jobs::NotificationJob < Invidious::Jobs::BaseJob
-  private getter notification_channel : ::Channel(VideoNotification)
  private getter connection_channel : ::Channel({Bool, ::Channel(PQ::Notification)})
  private getter pg_url : URI

-  def initialize(@notification_channel, @connection_channel, @pg_url)
+  def initialize(@connection_channel, @pg_url)
  end

  def begin
@ -34,70 +10,6 @@ class Invidious::Jobs::NotificationJob < Invidious::Jobs::BaseJob

    PG.connect_listen(pg_url, "notifications") { |event| connections.each(&.send(event)) }

-    # hash of channels to their videos (id+published) that need notifying
-    to_notify = Hash(String, Set(VideoNotification)).new(
-      ->(hash : Hash(String, Set(VideoNotification)), key : String) {
-        hash[key] = Set(VideoNotification).new
-      }
-    )
-    notify_mutex = Mutex.new
-
-    # fiber to locally cache all incoming notifications (from pubsub webhooks and refresh channels job)
-    spawn do
-      begin
-        loop do
-          notification = notification_channel.receive
-          notify_mutex.synchronize do
-            to_notify[notification.channel_id] << notification
-          end
-        end
-      end
-    end
-    # fiber to regularly persist all cached notifications
-    spawn do
-      loop do
-        begin
-          LOGGER.debug("NotificationJob: waking up")
-          cloned = {} of String => Set(VideoNotification)
-          notify_mutex.synchronize do
-            cloned = to_notify.clone
-            to_notify.clear
-          end
-
-          cloned.each do |channel_id, notifications|
-            if notifications.empty?
-              next
-            end
-
-            LOGGER.info("NotificationJob: updating channel #{channel_id} with #{notifications.size} notifications")
-            if CONFIG.enable_user_notifications
-              video_ids = notifications.map(&.video_id)
-              Invidious::Database::Users.add_multiple_notifications(channel_id, video_ids)
-              PG_DB.using_connection do |conn|
-                notifications.each do |n|
-                  # Deliver notifications to `/api/v1/auth/notifications`
-                  payload = {
-                    "topic"     => n.channel_id,
-                    "videoId"   => n.video_id,
-                    "published" => n.published.to_unix,
-                  }.to_json
-                  conn.exec("NOTIFY notifications, E'#{payload}'")
-                end
-              end
-            else
-              Invidious::Database::Users.feed_needs_update(channel_id)
-            end
-          end
-
-          LOGGER.trace("NotificationJob: Done, sleeping")
-        rescue ex
-          LOGGER.error("NotificationJob: #{ex.message}")
-        end
-        sleep 1.minute
-        Fiber.yield
-      end
-    end
-
    loop do
      action, connection = connection_channel.receive

--- a/src/invidious/jsonify/api_v1/video_json.cr
+++ b/src/invidious/jsonify/api_v1/video_json.cr
@ -267,12 +267,6 @@ 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))
-                else
-                  json.field "publishedText", ""
-                end
              end
            end
          end
--- a/src/invidious/mixes.cr
+++ b/src/invidious/mixes.cr
@ -81,7 +81,7 @@ def fetch_mix(rdid, video_id, cookies = nil, locale = nil)
  })
 end

-def template_mix(mix, listen)
+def template_mix(mix)
  html = <<-END_HTML
  <h3>
    <a href="/mix?list=#{mix["mixId"]}">
@ -95,7 +95,7 @@ def template_mix(mix, listen)
  mix["videos"].as_a.each do |video|
    html += <<-END_HTML
      <li class="pure-menu-item">
-        <a href="/watch?v=#{video["videoId"]}&list=#{mix["mixId"]}#{listen ? "&listen=1" : ""}">
+        <a href="/watch?v=#{video["videoId"]}&list=#{mix["mixId"]}">
          <div class="thumbnail">
              <img loading="lazy" class="thumbnail" src="/vi/#{video["videoId"]}/mqdefault.jpg" alt="" />
              <p class="length">#{recode_length_seconds(video["lengthSeconds"].as_i)}</p>
--- a/src/invidious/playlists.cr
+++ b/src/invidious/playlists.cr
@ -270,7 +270,7 @@ end

 def subscribe_playlist(user, playlist)
  playlist = InvidiousPlaylist.new({
-    title:       playlist.title[..150],
+    title:       playlist.title.byte_slice(0, 150),
    id:          playlist.id,
    author:      user.email,
    description: "", # Max 5000 characters
@ -505,7 +505,7 @@ def extract_playlist_videos(initial_data : Hash(String, JSON::Any))
  return videos
 end

-def template_playlist(playlist, listen)
+def template_playlist(playlist)
  html = <<-END_HTML
  <h3>
    <a href="/playlist?list=#{playlist["playlistId"]}">
@ -519,7 +519,7 @@ def template_playlist(playlist, listen)
  playlist["videos"].as_a.each do |video|
    html += <<-END_HTML
      <li class="pure-menu-item" id="#{video["videoId"]}">
-        <a href="/watch?v=#{video["videoId"]}&list=#{playlist["playlistId"]}&index=#{video["index"]}#{listen ? "&listen=1" : ""}">
+        <a href="/watch?v=#{video["videoId"]}&list=#{playlist["playlistId"]}&index=#{video["index"]}">
          <div class="thumbnail">
              <img loading="lazy" class="thumbnail" src="/vi/#{video["videoId"]}/mqdefault.jpg" alt="" />
              <p class="length">#{recode_length_seconds(video["lengthSeconds"].as_i)}</p>
--- a/src/invidious/routes/account.cr
+++ b/src/invidious/routes/account.cr
@ -328,9 +328,17 @@ module Invidious::Routes::Account
      end
    end

-    case action = env.params.query["action"]?
-    when "revoke_token"
-      session = env.params.query["session"]
+    if env.params.query["action_revoke_token"]?
+      action = "action_revoke_token"
+    else
+      return env.redirect referer
+    end
+
+    session = env.params.query["session"]?
+    session ||= ""
+
+    case action
+    when .starts_with? "action_revoke_token"
      Invidious::Database::SessionIDs.delete(sid: session, email: user.email)
    else
      return error_json(400, "Unsupported action #{action}")
--- a/src/invidious/routes/api/manifest.cr
+++ b/src/invidious/routes/api/manifest.cr
@ -8,11 +8,6 @@ module Invidious::Routes::API::Manifest
    id = env.params.url["id"]
    region = env.params.query["region"]?

-    if CONFIG.invidious_companion.present?
-      invidious_companion = CONFIG.invidious_companion.sample
-      return env.redirect "#{invidious_companion.public_url}/api/manifest/dash/id/#{id}?#{env.params.query}"
-    end
-
    # Since some implementations create playlists based on resolution regardless of different codecs,
    # we can opt to only add a source to a representation if it has a unique height within that representation
    unique_res = env.params.query["unique_res"]?.try { |q| (q == "true" || q == "1").to_unsafe }
@ -32,21 +27,28 @@ module Invidious::Routes::API::Manifest
        haltf env, status_code: response.status_code
      end

-      # Proxy URLs for video playback on invidious.
-      # Other API clients can get the original URLs by omiting `local=true`.
-      manifest = response.body.gsub(/<BaseURL>[^<]+<\/BaseURL>/) do |baseurl|
-        url = baseurl.lchop("<BaseURL>").rchop("</BaseURL>")
-        url = HttpServer::Utils.proxy_video_url(url, absolute: true) if local
+      manifest = response.body
+
+      manifest = manifest.gsub(/<BaseURL>[^<]+<\/BaseURL>/) do |baseurl|
+        url = baseurl.lchop("<BaseURL>")
+        url = url.rchop("</BaseURL>")
+
+        if local
+          uri = URI.parse(url)
+          url = "#{HOST_URL}#{uri.request_target}host/#{uri.host}/"
+        end
+
        "<BaseURL>#{url}</BaseURL>"
      end

      return manifest
    end

-    # Ditto, only proxify URLs if `local=true` is used
+    adaptive_fmts = video.adaptive_fmts
+
    if local
-      video.adaptive_fmts.each do |fmt|
-        fmt["url"] = JSON::Any.new(HttpServer::Utils.proxy_video_url(fmt["url"].as_s, absolute: true))
+      adaptive_fmts.each do |fmt|
+        fmt["url"] = JSON::Any.new("#{HOST_URL}#{URI.parse(fmt["url"].as_s).request_target}")
      end
    end

@ -68,23 +70,17 @@ module Invidious::Routes::API::Manifest
              # OTF streams aren't supported yet (See https://github.com/TeamNewPipe/NewPipe/issues/2415)
              next if !(fmt.has_key?("indexRange") && fmt.has_key?("initRange"))

-              audio_track = fmt["audioTrack"]?.try &.as_h? || {} of String => JSON::Any
-              lang = audio_track["id"]?.try &.as_s.split('.')[0] || "und"
-              is_default = audio_track.has_key?("audioIsDefault") ? audio_track["audioIsDefault"].as_bool : i == 0
-              displayname = audio_track["displayName"]?.try &.as_s || "Unknown"
-              bitrate = fmt["bitrate"]
-
              # Different representations of the same audio should be groupped into one AdaptationSet.
              # However, most players don't support auto quality switching, so we have to trick them
              # into providing a quality selector.
              # See https://github.com/iv-org/invidious/issues/3074 for more details.
-              xml.element("AdaptationSet", id: i, mimeType: mime_type, startWithSAP: 1, subsegmentAlignment: true, label: "#{displayname} [#{bitrate}k]", lang: lang) do
+              xml.element("AdaptationSet", id: i, mimeType: mime_type, startWithSAP: 1, subsegmentAlignment: true, label: fmt["bitrate"].to_s + "k") do
                codecs = fmt["mimeType"].as_s.split("codecs=")[1].strip('"')
                bandwidth = fmt["bitrate"].as_i
                itag = fmt["itag"].as_i
                url = fmt["url"].as_s

-                xml.element("Role", schemeIdUri: "urn:mpeg:dash:role:2011", value: is_default ? "main" : "alternate")
+                xml.element("Role", schemeIdUri: "urn:mpeg:dash:role:2011", value: i == 0 ? "main" : "alternate")

                xml.element("Representation", id: fmt["itag"], codecs: codecs, bandwidth: bandwidth) do
                  xml.element("AudioChannelConfiguration", schemeIdUri: "urn:mpeg:dash:23003:3:audio_channel_configuration:2011",
@ -181,9 +177,8 @@ module Invidious::Routes::API::Manifest
    manifest = response.body

    if local
-      manifest = manifest.gsub(/https:\/\/[^\n"]*/m) do |match|
-        uri = URI.parse(match)
-        path = uri.path
+      manifest = manifest.gsub(/^https:\/\/\w+---.{11}\.c\.youtube\.com[^\n]*/m) do |match|
+        path = URI.parse(match).path

        path = path.lchop("/videoplayback/")
        path = path.rchop("/")
@ -212,7 +207,7 @@ module Invidious::Routes::API::Manifest
          raw_params["fvip"] = fvip["fvip"]
        end

-        raw_params["host"] = uri.host.not_nil!
+        raw_params["local"] = "true"

        "#{HOST_URL}/videoplayback?#{raw_params}"
      end
--- a/src/invidious/routes/api/v1/channels.cr
+++ b/src/invidious/routes/api/v1/channels.cr
@ -197,7 +197,6 @@ module Invidious::Routes::API::V1::Channels
    get_channel()

    # Retrieve continuation from URL parameters
-    sort_by = env.params.query["sort_by"]?.try &.downcase || "newest"
    continuation = env.params.query["continuation"]?

    if channel.is_age_gated
@ -212,7 +211,7 @@ module Invidious::Routes::API::V1::Channels
    else
      begin
        videos, next_continuation = Channel::Tabs.get_shorts(
-          channel, continuation: continuation, sort_by: sort_by
+          channel, continuation: continuation
        )
      rescue ex
        return error_json(500, ex)
@ -368,35 +367,6 @@ module Invidious::Routes::API::V1::Channels
    end
  end

-  def self.courses(env)
-    locale = env.get("preferences").as(Preferences).locale
-
-    env.response.content_type = "application/json"
-
-    ucid = env.params.url["ucid"]
-    continuation = env.params.query["continuation"]?
-
-    # Use the macro defined above
-    channel = nil # Make the compiler happy
-    get_channel()
-
-    items, next_continuation = fetch_channel_courses(channel.ucid, channel.author, continuation)
-
-    JSON.build do |json|
-      json.object do
-        json.field "playlists" do
-          json.array do
-            items.each do |item|
-              item.to_json(locale, json) if item.is_a?(SearchPlaylist)
-            end
-          end
-        end
-
-        json.field "continuation", next_continuation if next_continuation
-      end
-    end
-  end
-
  def self.community(env)
    locale = env.get("preferences").as(Preferences).locale

--- a/src/invidious/routes/api/v1/misc.cr
+++ b/src/invidious/routes/api/v1/misc.cr
@ -42,9 +42,6 @@ module Invidious::Routes::API::V1::Misc
    format = env.params.query["format"]?
    format ||= "json"

-    listen_param = env.params.query["listen"]?
-    listen = (listen_param == "true" || listen_param == "1")
-
    if plid.starts_with? "RD"
      return env.redirect "/api/v1/mixes/#{plid}"
    end
@ -88,7 +85,7 @@ module Invidious::Routes::API::V1::Misc
    end

    if format == "html"
-      playlist_html = template_playlist(json_response, listen)
+      playlist_html = template_playlist(json_response)
      index, next_video = json_response["videos"].as_a.skip(1 + lookback).select { |video| !video["author"].as_s.empty? }[0]?.try { |v| {v["index"], v["videoId"]} } || {nil, nil}

      response = {
@ -114,9 +111,6 @@ module Invidious::Routes::API::V1::Misc
    format = env.params.query["format"]?
    format ||= "json"

-    listen_param = env.params.query["listen"]?
-    listen = (listen_param == "true" || listen_param == "1")
-
    begin
      mix = fetch_mix(rdid, continuation, locale: locale)

@ -147,7 +141,9 @@ module Invidious::Routes::API::V1::Misc
                json.field "authorUrl", "/channel/#{video.ucid}"

                json.field "videoThumbnails" do
-                  Invidious::JSONify::APIv1.thumbnails(json, video.id)
+                  json.array do
+                    Invidious::JSONify::APIv1.thumbnails(json, video.id)
+                  end
                end

                json.field "index", video.index
@ -161,7 +157,7 @@ module Invidious::Routes::API::V1::Misc

    if format == "html"
      response = JSON.parse(response)
-      playlist_html = template_mix(response, listen)
+      playlist_html = template_mix(response)
      next_video = response["videos"].as_a.select { |video| !video["author"].as_s.empty? }[0]?.try &.["videoId"]

      response = {
--- a/src/invidious/routes/api/v1/search.cr
+++ b/src/invidious/routes/api/v1/search.cr
@ -31,7 +31,9 @@ module Invidious::Routes::API::V1::Search
    query = env.params.query["q"]? || ""

    begin
-      client = make_client(URI.parse("https://suggestqueries-clients6.youtube.com"), force_youtube_headers: true)
+      client = HTTP::Client.new("suggestqueries-clients6.youtube.com")
+      client.before_request { |r| add_yt_headers(r) }
+
      url = "/complete/search?client=youtube&hl=en&gl=#{region}&q=#{URI.encode_www_form(query)}&gs_ri=youtube&ds=yt"

      response = client.get(url).body
--- a/src/invidious/routes/api/v1/videos.cr
+++ b/src/invidious/routes/api/v1/videos.cr
@ -429,90 +429,4 @@ module Invidious::Routes::API::V1::Videos
      end
    end
  end
-
-  # Fetches transcripts from YouTube
-  #
-  # Use the `lang` and `autogen` query parameter to select which transcript to fetch
-  # Request without any URL parameters to see all the available transcripts.
-  def self.transcripts(env)
-    env.response.content_type = "application/json"
-
-    id = env.params.url["id"]
-    lang = env.params.query["lang"]?
-    label = env.params.query["label"]?
-    auto_generated = env.params.query["autogen"]? ? true : false
-
-    # Return all available transcript options when none is given
-    if !label && !lang
-      begin
-        video = get_video(id)
-      rescue ex : NotFoundException
-        return error_json(404, ex)
-      rescue ex
-        return error_json(500, ex)
-      end
-
-      response = JSON.build do |json|
-        # The amount of transcripts available to fetch is the
-        # same as the amount of captions available.
-        available_transcripts = video.captions
-
-        json.object do
-          json.field "transcripts" do
-            json.array do
-              available_transcripts.each do |transcript|
-                json.object do
-                  json.field "label", transcript.name
-                  json.field "languageCode", transcript.language_code
-                  json.field "autoGenerated", transcript.auto_generated
-
-                  if transcript.auto_generated
-                    json.field "url", "/api/v1/transcripts/#{id}?lang=#{URI.encode_www_form(transcript.language_code)}&autogen"
-                  else
-                    json.field "url", "/api/v1/transcripts/#{id}?lang=#{URI.encode_www_form(transcript.language_code)}"
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-
-      return response
-    end
-
-    # If lang is not given then we attempt to fetch
-    # the transcript through the given label
-    if lang.nil?
-      begin
-        video = get_video(id)
-      rescue ex : NotFoundException
-        return error_json(404, ex)
-      rescue ex
-        return error_json(500, ex)
-      end
-
-      target_transcript = video.captions.select(&.name.== label)
-      if target_transcript.empty?
-        return error_json(404, NotFoundException.new("Requested transcript does not exist"))
-      else
-        target_transcript = target_transcript[0]
-        lang, auto_generated = target_transcript.language_code, target_transcript.auto_generated
-      end
-    end
-
-    params = Invidious::Videos::Transcript.generate_param(id, lang, auto_generated)
-
-    begin
-      transcript = Invidious::Videos::Transcript.from_raw(
-        YoutubeAPI.get_transcript(params), lang, auto_generated
-      )
-    rescue ex : NotFoundException
-      return error_json(404, ex)
-    rescue ex
-      return error_json(500, ex)
-    end
-
-    return transcript.to_json
-  end
 end
--- a/src/invidious/routes/channels.cr
+++ b/src/invidious/routes/channels.cr
@ -20,11 +20,10 @@ module Invidious::Routes::Channels
    sort_by = env.params.query["sort_by"]?.try &.downcase

    if channel.auto_generated
-      sort_by ||= "last"
      sort_options = {"last", "oldest", "newest"}

      items, next_continuation = fetch_channel_playlists(
-        channel.ucid, channel.author, continuation, sort_by
+        channel.ucid, channel.author, continuation, (sort_by || "last")
      )

      items.uniq! do |item|
@ -50,11 +49,9 @@ module Invidious::Routes::Channels
        end
        next_continuation = nil
      else
-        sort_by ||= "newest"
        sort_options = {"newest", "oldest", "popular"}
-
-        items, next_continuation = Channel::Tabs.get_60_videos(
-          channel, continuation: continuation, sort_by: sort_by
+        items, next_continuation = Channel::Tabs.get_videos(
+          channel, continuation: continuation, sort_by: (sort_by || "newest")
        )
      end
    end
@ -85,12 +82,13 @@ module Invidious::Routes::Channels
      end
      next_continuation = nil
    else
-      sort_by = env.params.query["sort_by"]?.try &.downcase || "newest"
-      sort_options = {"newest", "oldest", "popular"}
+      # TODO: support sort option for shorts
+      sort_by = ""
+      sort_options = [] of String

      # Fetch items and continuation token
      items, next_continuation = Channel::Tabs.get_shorts(
-        channel, continuation: continuation, sort_by: sort_by
+        channel, continuation: continuation
      )
    end

@ -197,29 +195,7 @@ module Invidious::Routes::Channels
    templated "channel"
  end

-  def self.courses(env)
-    data = self.fetch_basic_information(env)
-    return data if !data.is_a?(Tuple)
-
-    locale, user, subscriptions, continuation, ucid, channel = data
-
-    sort_by = ""
-    sort_options = [] of String
-
-    items, next_continuation = fetch_channel_courses(
-      channel.ucid, channel.author, continuation
-    )
-
-    items = items.select(SearchPlaylist)
-    items.each(&.author = "")
-
-    selected_tab = Frontend::ChannelPage::TabsAvailable::Courses
-    templated "channel"
-  end
-
  def self.community(env)
-    return env.redirect env.request.path.sub("posts", "community") if env.request.path.split("/").last == "posts"
-
    data = self.fetch_basic_information(env)
    if !data.is_a?(Tuple)
      return data
@ -236,7 +212,7 @@ module Invidious::Routes::Channels

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

-    if !channel.tabs.includes? "community" && "posts"
+    if !channel.tabs.includes? "community"
      return env.redirect "/channel/#{channel.ucid}"
    end

@ -329,8 +305,7 @@ module Invidious::Routes::Channels

  private KNOWN_TABS = {
    "home", "videos", "shorts", "streams", "podcasts",
-    "releases", "courses", "playlists", "community", "channels", "about",
-    "posts",
+    "releases", "playlists", "community", "channels", "about",
  }

  # Redirects brand url channels to a normal /channel/:ucid route
--- a/src/invidious/routes/embed.cr
+++ b/src/invidious/routes/embed.cr
@ -157,12 +157,10 @@ module Invidious::Routes::Embed
    adaptive_fmts = video.adaptive_fmts

    if params.local
-      fmt_stream.each { |fmt| fmt["url"] = JSON::Any.new(HttpServer::Utils.proxy_video_url(fmt["url"].as_s)) }
+      fmt_stream.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).request_target) }
+      adaptive_fmts.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).request_target) }
    end

-    # Always proxy DASH streams, otherwise youtube CORS headers will prevent playback
-    adaptive_fmts.each { |fmt| fmt["url"] = JSON::Any.new(HttpServer::Utils.proxy_video_url(fmt["url"].as_s)) }
-
    video_streams = video.video_streams
    audio_streams = video.audio_streams

@ -203,14 +201,6 @@ module Invidious::Routes::Embed
      return env.redirect url
    end

-    if CONFIG.invidious_companion.present?
-      invidious_companion = CONFIG.invidious_companion.sample
-      env.response.headers["Content-Security-Policy"] =
-        env.response.headers["Content-Security-Policy"]
-          .gsub("media-src", "media-src #{invidious_companion.public_url}")
-          .gsub("connect-src", "connect-src #{invidious_companion.public_url}")
-    end
-
    rendered "embed"
  end
 end
--- a/src/invidious/routes/feeds.cr
+++ b/src/invidious/routes/feeds.cr
@ -143,25 +143,32 @@ module Invidious::Routes::Feeds
  # RSS feeds

  def self.rss_channel(env)
+    locale = env.get("preferences").as(Preferences).locale
+
    env.response.headers["Content-Type"] = "application/atom+xml"
    env.response.content_type = "application/atom+xml"

-    if env.params.url["ucid"].matches?(/^[\w-]+$/)
-      ucid = env.params.url["ucid"]
-    else
-      return error_atom(400, InfoException.new("Invalid channel ucid provided."))
-    end
+    ucid = env.params.url["ucid"]

    params = HTTP::Params.parse(env.params.query["params"]? || "")

+    begin
+      channel = get_about_info(ucid, locale)
+    rescue ex : ChannelRedirect
+      return env.redirect env.request.resource.gsub(ucid, ex.channel_id)
+    rescue ex : NotFoundException
+      return error_atom(404, ex)
+    rescue ex
+      return error_atom(500, ex)
+    end
+
    namespaces = {
      "yt"      => "http://www.youtube.com/xml/schemas/2015",
      "media"   => "http://search.yahoo.com/mrss/",
      "default" => "http://www.w3.org/2005/Atom",
    }

-    response = YT_POOL.client &.get("/feeds/videos.xml?channel_id=#{ucid}")
-    return error_atom(404, NotFoundException.new("Channel does not exist.")) if response.status_code == 404
+    response = YT_POOL.client &.get("/feeds/videos.xml?channel_id=#{channel.ucid}")
    rss = XML.parse(response.body)

    videos = rss.xpath_nodes("//default:feed/default:entry", namespaces).map do |entry|
@ -172,7 +179,7 @@ module Invidious::Routes::Feeds
      updated = Time.parse_rfc3339(entry.xpath_node("default:updated", namespaces).not_nil!.content)

      author = entry.xpath_node("default:author/default:name", namespaces).not_nil!.content
-      video_ucid = entry.xpath_node("yt:channelId", namespaces).not_nil!.content
+      ucid = entry.xpath_node("yt:channelId", namespaces).not_nil!.content
      description_html = entry.xpath_node("media:group/media:description", namespaces).not_nil!.to_s
      views = entry.xpath_node("media:group/media:community/media:statistics", namespaces).not_nil!.["views"].to_i64

@ -180,44 +187,43 @@ module Invidious::Routes::Feeds
        title:              title,
        id:                 video_id,
        author:             author,
-        ucid:               video_ucid,
+        ucid:               ucid,
        published:          published,
        views:              views,
        description_html:   description_html,
        length_seconds:     0,
+        live_now:           false,
+        paid:               false,
+        premium:            false,
        premiere_timestamp: nil,
        author_verified:    false,
-        author_thumbnail:   nil,
-        badges:             VideoBadges::None,
      })
    end

-    author = ""
-    author = videos[0].author if videos.size > 0
-
    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",
        "xml:lang": "en-US") do
        xml.element("link", rel: "self", href: "#{HOST_URL}#{env.request.resource}")
-        xml.element("id") { xml.text "yt:channel:#{ucid}" }
-        xml.element("yt:channelId") { xml.text ucid }
-        xml.element("title") { author }
-        xml.element("link", rel: "alternate", href: "#{HOST_URL}/channel/#{ucid}")
+        xml.element("id") { xml.text "yt:channel:#{channel.ucid}" }
+        xml.element("yt:channelId") { xml.text channel.ucid }
+        xml.element("icon") { xml.text channel.author_thumbnail }
+        xml.element("title") { xml.text channel.author }
+        xml.element("link", rel: "alternate", href: "#{HOST_URL}/channel/#{channel.ucid}")

        xml.element("author") do
-          xml.element("name") { xml.text author }
-          xml.element("uri") { xml.text "#{HOST_URL}/channel/#{ucid}" }
+          xml.element("name") { xml.text channel.author }
+          xml.element("uri") { xml.text "#{HOST_URL}/channel/#{channel.ucid}" }
        end

        xml.element("image") do
-          xml.element("url") { xml.text "" }
-          xml.element("title") { xml.text author }
+          xml.element("url") { xml.text channel.author_thumbnail }
+          xml.element("title") { xml.text channel.author }
          xml.element("link", rel: "self", href: "#{HOST_URL}#{env.request.resource}")
        end

        videos.each do |video|
-          video.to_xml(false, params, xml)
+          video.to_xml(channel.auto_generated, params, xml)
        end
      end
    end
@ -305,9 +311,8 @@ module Invidious::Routes::Feeds
    end

    response = YT_POOL.client &.get("/feeds/videos.xml?playlist_id=#{plid}")
-    return error_atom(404, NotFoundException.new("Playlist does not exist.")) if response.status_code == 404
-
    document = XML.parse(response.body)
+
    document.xpath_nodes(%q(//*[@href]|//*[@url])).each do |node|
      node.attributes.each do |attribute|
        case attribute.name
@ -420,6 +425,16 @@ module Invidious::Routes::Feeds
          next # skip this video since it raised an exception (e.g. it is a scheduled live event)
        end

+        if CONFIG.enable_user_notifications
+          # Deliver notifications to `/api/v1/auth/notifications`
+          payload = {
+            "topic"     => video.ucid,
+            "videoId"   => video.id,
+            "published" => published.to_unix,
+          }.to_json
+          PG_DB.exec("NOTIFY notifications, E'#{payload}'")
+        end
+
        video = ChannelVideo.new({
          id:                 id,
          title:              video.title,
@ -435,7 +450,11 @@ module Invidious::Routes::Feeds

        was_insert = Invidious::Database::ChannelVideos.insert(video, with_premiere_timestamp: true)
        if was_insert
-          NOTIFICATION_CHANNEL.send(VideoNotification.from_video(video))
+          if CONFIG.enable_user_notifications
+            Invidious::Database::Users.add_notification(video)
+          else
+            Invidious::Database::Users.feed_needs_update(video)
+          end
        end
      end
    end
--- a/src/invidious/routes/images.cr
+++ b/src/invidious/routes/images.cr
@ -11,9 +11,29 @@ module Invidious::Routes::Images
      end
    end

+    # We're encapsulating this into a proc in order to easily reuse this
+    # portion of the code for each request block below.
+    request_proc = ->(response : HTTP::Client::Response) {
+      env.response.status_code = response.status_code
+      response.headers.each do |key, value|
+        if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
+          env.response.headers[key] = value
+        end
+      end
+
+      env.response.headers["Access-Control-Allow-Origin"] = "*"
+
+      if response.status_code >= 300
+        env.response.headers.delete("Transfer-Encoding")
+        return
+      end
+
+      proxy_file(response, env)
+    }
+
    begin
-      GGPHT_POOL.client &.get(url, headers) do |resp|
-        return self.proxy_image(env, resp)
+      HTTP::Client.get("https://yt3.ggpht.com#{url}") do |resp|
+        return request_proc.call(resp)
      end
    rescue ex
    end
@ -41,10 +61,27 @@ module Invidious::Routes::Images
      end
    end

+    request_proc = ->(response : HTTP::Client::Response) {
+      env.response.status_code = response.status_code
+      response.headers.each do |key, value|
+        if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
+          env.response.headers[key] = value
+        end
+      end
+
+      env.response.headers["Connection"] = "close"
+      env.response.headers["Access-Control-Allow-Origin"] = "*"
+
+      if response.status_code >= 300
+        return env.response.headers.delete("Transfer-Encoding")
+      end
+
+      proxy_file(response, env)
+    }
+
    begin
-      get_ytimg_pool(authority).client &.get(url, headers) do |resp|
-        env.response.headers["Connection"] = "close"
-        return self.proxy_image(env, resp)
+      HTTP::Client.get("https://#{authority}.ytimg.com#{url}") do |resp|
+        return request_proc.call(resp)
      end
    rescue ex
    end
@ -64,9 +101,26 @@ module Invidious::Routes::Images
      end
    end

+    request_proc = ->(response : HTTP::Client::Response) {
+      env.response.status_code = response.status_code
+      response.headers.each do |key, value|
+        if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
+          env.response.headers[key] = value
+        end
+      end
+
+      env.response.headers["Access-Control-Allow-Origin"] = "*"
+
+      if response.status_code >= 300 && response.status_code != 404
+        return env.response.headers.delete("Transfer-Encoding")
+      end
+
+      proxy_file(response, env)
+    }
+
    begin
-      get_ytimg_pool("i9").client &.get(url, headers) do |resp|
-        return self.proxy_image(env, resp)
+      HTTP::Client.get("https://i9.ytimg.com#{url}") do |resp|
+        return request_proc.call(resp)
      end
    rescue ex
    end
@ -111,7 +165,8 @@ module Invidious::Routes::Images
    if name == "maxres.jpg"
      build_thumbnails(id).each do |thumb|
        thumbnail_resource_path = "/vi/#{id}/#{thumb[:url]}.jpg"
-        if get_ytimg_pool("i").client &.head(thumbnail_resource_path, headers).status_code == 200
+        # This can likely be optimized into a (small) pool sometime in the future.
+        if HTTP::Client.head("https://i.ytimg.com#{thumbnail_resource_path}").status_code == 200
          name = thumb[:url] + ".jpg"
          break
        end
@ -126,28 +181,29 @@ module Invidious::Routes::Images
      end
    end

+    request_proc = ->(response : HTTP::Client::Response) {
+      env.response.status_code = response.status_code
+      response.headers.each do |key, value|
+        if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
+          env.response.headers[key] = value
+        end
+      end
+
+      env.response.headers["Access-Control-Allow-Origin"] = "*"
+
+      if response.status_code >= 300 && response.status_code != 404
+        return env.response.headers.delete("Transfer-Encoding")
+      end
+
+      proxy_file(response, env)
+    }
+
    begin
-      get_ytimg_pool("i").client &.get(url, headers) do |resp|
-        return self.proxy_image(env, resp)
+      # This can likely be optimized into a (small) pool sometime in the future.
+      HTTP::Client.get("https://i.ytimg.com#{url}") do |resp|
+        return request_proc.call(resp)
      end
    rescue ex
    end
  end
-
-  private def self.proxy_image(env, response)
-    env.response.status_code = response.status_code
-    response.headers.each do |key, value|
-      if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
-        env.response.headers[key] = value
-      end
-    end
-
-    env.response.headers["Access-Control-Allow-Origin"] = "*"
-
-    if response.status_code >= 300
-      return env.response.headers.delete("Transfer-Encoding")
-    end
-
-    return proxy_file(response, env)
-  end
 end
--- a/src/invidious/routes/misc.cr
+++ b/src/invidious/routes/misc.cr
@ -40,21 +40,7 @@ module Invidious::Routes::Misc

  def self.cross_instance_redirect(env)
    referer = get_referer(env)
-
-    instance_list = Invidious::Jobs::InstanceListRefreshJob::INSTANCES["INSTANCES"]
-    # Filter out the current instance
-    other_available_instances = instance_list.reject { |_, domain| domain == CONFIG.domain }
-
-    if other_available_instances.empty?
-      # If the current instance is the only one, use the redirect URL as fallback
-      instance_url = "redirect.invidious.io"
-    else
-      # Select other random instance
-      # Sample returns an array
-      # Instances are packaged as {region, domain} in the instance list
-      instance_url = other_available_instances.sample(1)[0][1]
-    end
-
+    instance_url = fetch_random_instance
    env.redirect "https://#{instance_url}#{referer}"
  end
 end
--- a/src/invidious/routes/playlists.cr
+++ b/src/invidious/routes/playlists.cr
@ -304,6 +304,23 @@ module Invidious::Routes::Playlists
      end
    end

+    if env.params.query["action_create_playlist"]?
+      action = "action_create_playlist"
+    elsif env.params.query["action_delete_playlist"]?
+      action = "action_delete_playlist"
+    elsif env.params.query["action_edit_playlist"]?
+      action = "action_edit_playlist"
+    elsif env.params.query["action_add_video"]?
+      action = "action_add_video"
+      video_id = env.params.query["video_id"]
+    elsif env.params.query["action_remove_video"]?
+      action = "action_remove_video"
+    elsif env.params.query["action_move_video_before"]?
+      action = "action_move_video_before"
+    else
+      return env.redirect referer
+    end
+
    begin
      playlist_id = env.params.query["playlist_id"]
      playlist = get_playlist(playlist_id).as(InvidiousPlaylist)
@ -318,8 +335,12 @@ module Invidious::Routes::Playlists
      end
    end

-    case action = env.params.query["action"]?
-    when "add_video"
+    email = user.email
+
+    case action
+    when "action_edit_playlist"
+      # TODO: Playlist stub
+    when "action_add_video"
      if playlist.index.size >= CONFIG.playlist_length_limit
        if redirect
          return error_template(400, "Playlist cannot have more than #{CONFIG.playlist_length_limit} videos")
@ -356,14 +377,12 @@ module Invidious::Routes::Playlists

      Invidious::Database::PlaylistVideos.insert(playlist_video)
      Invidious::Database::Playlists.update_video_added(playlist_id, playlist_video.index)
-    when "remove_video"
+    when "action_remove_video"
      index = env.params.query["set_video_id"]
      Invidious::Database::PlaylistVideos.delete(index)
      Invidious::Database::Playlists.update_video_removed(playlist_id, index)
-    when "move_video_before"
+    when "action_move_video_before"
      # TODO: Playlist stub
-    when nil
-      return error_json(400, "Missing action")
    else
      return error_json(400, "Unsupported action #{action}")
    end
--- a/src/invidious/routes/preferences.cr
+++ b/src/invidious/routes/preferences.cr
@ -27,10 +27,6 @@ module Invidious::Routes::PreferencesRoute
    annotations_subscribed ||= "off"
    annotations_subscribed = annotations_subscribed == "on"

-    preload = env.params.body["preload"]?.try &.as(String)
-    preload ||= "off"
-    preload = preload == "on"
-
    autoplay = env.params.body["autoplay"]?.try &.as(String)
    autoplay ||= "off"
    autoplay = autoplay == "on"
@ -148,7 +144,6 @@ module Invidious::Routes::PreferencesRoute
    preferences = Preferences.from_json({
      annotations:                 annotations,
      annotations_subscribed:      annotations_subscribed,
-      preload:                     preload,
      autoplay:                    autoplay,
      captions:                    captions,
      comments:                    comments,
--- a/src/invidious/routes/subscriptions.cr
+++ b/src/invidious/routes/subscriptions.cr
@ -32,16 +32,24 @@ module Invidious::Routes::Subscriptions
      end
    end

+    if env.params.query["action_create_subscription_to_channel"]?.try &.to_i?.try &.== 1
+      action = "action_create_subscription_to_channel"
+    elsif env.params.query["action_remove_subscriptions"]?.try &.to_i?.try &.== 1
+      action = "action_remove_subscriptions"
+    else
+      return env.redirect referer
+    end
+
    channel_id = env.params.query["c"]?
    channel_id ||= ""

-    case action = env.params.query["action"]?
-    when "create_subscription_to_channel"
+    case action
+    when "action_create_subscription_to_channel"
      if !user.subscriptions.includes? channel_id
        get_channel(channel_id)
        Invidious::Database::Users.subscribe_channel(user, channel_id)
      end
-    when "remove_subscriptions"
+    when "action_remove_subscriptions"
      Invidious::Database::Users.unsubscribe_channel(user, channel_id)
    else
      return error_json(400, "Unsupported action #{action}")
--- a/src/invidious/routes/video_playback.cr
+++ b/src/invidious/routes/video_playback.cr
@ -42,7 +42,7 @@ module Invidious::Routes::VideoPlayback
      headers["Range"] = "bytes=#{range_for_head}"
    end

-    client = make_client(URI.parse(host), region, force_resolve: true)
+    client = make_client(URI.parse(host), region, force_resolve = true)
    response = HTTP::Client::Response.new(500)
    error = ""
    5.times do
@ -57,7 +57,7 @@ module Invidious::Routes::VideoPlayback
          if new_host != host
            host = new_host
            client.close
-            client = make_client(URI.parse(new_host), region, force_resolve: true)
+            client = make_client(URI.parse(new_host), region, force_resolve = true)
          end

          url = "#{location.request_target}&host=#{location.host}#{region ? "&region=#{region}" : ""}"
@ -71,7 +71,7 @@ module Invidious::Routes::VideoPlayback
        fvip = "3"

        host = "https://r#{fvip}---#{mn}.googlevideo.com"
-        client = make_client(URI.parse(host), region, force_resolve: true)
+        client = make_client(URI.parse(host), region, force_resolve = true)
      rescue ex
        error = ex.message
      end
@ -164,13 +164,10 @@ module Invidious::Routes::VideoPlayback
              env.response.headers["Access-Control-Allow-Origin"] = "*"

              if location = resp.headers["Location"]?
-                url = Invidious::HttpServer::Utils.proxy_video_url(location, region: region)
+                location = URI.parse(location)
+                location = "#{location.request_target}&host=#{location.host}#{region ? "&region=#{region}" : ""}"

-                if title = query_params["title"]?
-                  url = "#{url}&title=#{URI.encode_www_form(title)}"
-                end
-
-                env.redirect url
+                env.redirect location
                break
              end

@ -199,7 +196,7 @@ module Invidious::Routes::VideoPlayback
            break
          else
            client.close
-            client = make_client(URI.parse(host), region, force_resolve: true)
+            client = make_client(URI.parse(host), region, force_resolve = true)
          end
        end

@ -256,11 +253,6 @@ module Invidious::Routes::VideoPlayback
  # YouTube /videoplayback links expire after 6 hours,
  # so we have a mechanism here to redirect to the latest version
  def self.latest_version(env)
-    if CONFIG.invidious_companion.present?
-      invidious_companion = CONFIG.invidious_companion.sample
-      return env.redirect "#{invidious_companion.public_url}/latest_version?#{env.params.query}"
-    end
-
    id = env.params.query["id"]?
    itag = env.params.query["itag"]?.try &.to_i?

--- a/src/invidious/routes/watch.cr
+++ b/src/invidious/routes/watch.cr
@ -121,12 +121,10 @@ module Invidious::Routes::Watch
    adaptive_fmts = video.adaptive_fmts

    if params.local
-      fmt_stream.each { |fmt| fmt["url"] = JSON::Any.new(HttpServer::Utils.proxy_video_url(fmt["url"].as_s)) }
+      fmt_stream.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).request_target) }
+      adaptive_fmts.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).request_target) }
    end

-    # Always proxy DASH streams, otherwise youtube CORS headers will prevent playback
-    adaptive_fmts.each { |fmt| fmt["url"] = JSON::Any.new(HttpServer::Utils.proxy_video_url(fmt["url"].as_s)) }
-
    video_streams = video.video_streams
    audio_streams = video.audio_streams

@ -192,14 +190,6 @@ module Invidious::Routes::Watch
      captions: video.captions
    )

-    if CONFIG.invidious_companion.present?
-      invidious_companion = CONFIG.invidious_companion.sample
-      env.response.headers["Content-Security-Policy"] =
-        env.response.headers["Content-Security-Policy"]
-          .gsub("media-src", "media-src #{invidious_companion.public_url}")
-          .gsub("connect-src", "connect-src #{invidious_companion.public_url}")
-    end
-
    templated "watch"
  end

@ -251,10 +241,18 @@ module Invidious::Routes::Watch
      end
    end

-    case action = env.params.query["action"]?
-    when "mark_watched"
+    if env.params.query["action_mark_watched"]?
+      action = "action_mark_watched"
+    elsif env.params.query["action_mark_unwatched"]?
+      action = "action_mark_unwatched"
+    else
+      return env.redirect referer
+    end
+
+    case action
+    when "action_mark_watched"
      Invidious::Database::Users.mark_watched(user, id)
-    when "mark_unwatched"
+    when "action_mark_unwatched"
      Invidious::Database::Users.mark_unwatched(user, id)
    else
      return error_json(400, "Unsupported action #{action}")
@ -322,19 +320,14 @@ module Invidious::Routes::Watch
      env.params.query["label"] = URI.decode_www_form(label.as_s)

      return Invidious::Routes::API::V1::Videos.captions(env)
-    elsif itag = download_widget["itag"]?.try &.as_i.to_s
+    elsif itag = download_widget["itag"]?.try &.as_i
      # URL params specific to /latest_version
      env.params.query["id"] = video_id
+      env.params.query["itag"] = itag.to_s
      env.params.query["title"] = filename
      env.params.query["local"] = "true"

-      if (CONFIG.invidious_companion.present?)
-        video = get_video(video_id)
-        invidious_companion = CONFIG.invidious_companion.sample
-        return env.redirect "#{invidious_companion.public_url}/latest_version?#{env.params.query}"
-      else
-        return Invidious::Routes::VideoPlayback.latest_version(env)
-      end
+      return Invidious::Routes::VideoPlayback.latest_version(env)
    else
      return error_template(400, "Invalid label or itag")
    end
--- a/src/invidious/routing.cr
+++ b/src/invidious/routing.cr
@ -120,10 +120,8 @@ module Invidious::Routing
    get "/channel/:ucid/streams", Routes::Channels, :streams
    get "/channel/:ucid/podcasts", Routes::Channels, :podcasts
    get "/channel/:ucid/releases", Routes::Channels, :releases
-    get "/channel/:ucid/courses", Routes::Channels, :courses
    get "/channel/:ucid/playlists", Routes::Channels, :playlists
    get "/channel/:ucid/community", Routes::Channels, :community
-    get "/channel/:ucid/posts", Routes::Channels, :community
    get "/channel/:ucid/channels", Routes::Channels, :channels
    get "/channel/:ucid/about", Routes::Channels, :about

@ -238,7 +236,6 @@ module Invidious::Routing
      get "/api/v1/annotations/:id", {{namespace}}::Videos, :annotations
      get "/api/v1/comments/:id", {{namespace}}::Videos, :comments
      get "/api/v1/clips/:id", {{namespace}}::Videos, :clips
-      get "/api/v1/transcripts/:id", {{namespace}}::Videos, :transcripts

      # Feeds
      get "/api/v1/trending", {{namespace}}::Feeds, :trending
@ -246,18 +243,17 @@ module Invidious::Routing

      # Channels
      get "/api/v1/channels/:ucid", {{namespace}}::Channels, :home
-      get "/api/v1/channels/:ucid/latest", {{namespace}}::Channels, :latest
-      get "/api/v1/channels/:ucid/videos", {{namespace}}::Channels, :videos
      get "/api/v1/channels/:ucid/shorts", {{namespace}}::Channels, :shorts
      get "/api/v1/channels/:ucid/streams", {{namespace}}::Channels, :streams
      get "/api/v1/channels/:ucid/podcasts", {{namespace}}::Channels, :podcasts
      get "/api/v1/channels/:ucid/releases", {{namespace}}::Channels, :releases
-      get "/api/v1/channels/:ucid/courses", {{namespace}}::Channels, :courses
-      get "/api/v1/channels/:ucid/playlists", {{namespace}}::Channels, :playlists
-      get "/api/v1/channels/:ucid/community", {{namespace}}::Channels, :community
-      get "/api/v1/channels/:ucid/posts", {{namespace}}::Channels, :community
+
      get "/api/v1/channels/:ucid/channels", {{namespace}}::Channels, :channels
-      get "/api/v1/channels/:ucid/search", {{namespace}}::Channels, :search
+
+      {% for route in {"videos", "latest", "playlists", "community", "search"} %}
+        get "/api/v1/channels/#{{{route}}}/:ucid", {{namespace}}::Channels, :{{route}}
+        get "/api/v1/channels/:ucid/#{{{route}}}", {{namespace}}::Channels, :{{route}}
+      {% end %}

      # Posts
      get "/api/v1/post/:id", {{namespace}}::Channels, :post
@ -275,6 +271,11 @@ module Invidious::Routing

      # Authenticated

+      # The notification APIs cannot be extracted yet! They require the *local* notifications constant defined in invidious.cr
+      #
+      # Invidious::Routing.get "/api/v1/auth/notifications", {{namespace}}::Authenticated, :notifications
+      # Invidious::Routing.post "/api/v1/auth/notifications", {{namespace}}::Authenticated, :notifications
+
      get "/api/v1/auth/preferences", {{namespace}}::Authenticated, :get_preferences
      post "/api/v1/auth/preferences", {{namespace}}::Authenticated, :set_preferences

--- a/src/invidious/search/filters.cr
+++ b/src/invidious/search/filters.cr
@ -75,7 +75,7 @@ module Invidious::Search
      @type : Type = Type::All,
      @duration : Duration = Duration::None,
      @features : Features = Features::None,
-      @sort : Sort = Sort::Relevance,
+      @sort : Sort = Sort::Relevance
    )
    end

--- a/src/invidious/search/query.cr
+++ b/src/invidious/search/query.cr
@ -47,7 +47,7 @@ module Invidious::Search
    def initialize(
      params : HTTP::Params,
      @type : Type = Type::Regular,
-      @region : String? = nil,
+      @region : String? = nil
    )
      # Get the raw search query string (common to all search types). In
      # Regular search mode, also look for the `search_query` URL parameter
--- a/src/invidious/user/imports.cr
+++ b/src/invidious/user/imports.cr
@ -290,39 +290,42 @@ struct Invidious::User
    end

    def from_newpipe(user : User, body : String) : Bool
-      Compress::Zip::File.open(IO::Memory.new(body), true) do |file|
-        entry = file.entries.find { |file_entry| file_entry.filename == "newpipe.db" }
-        return false if entry.nil?
-        entry.open do |file_io|
-          # Ensure max size of 4MB
-          io_sized = IO::Sized.new(file_io, 0x400000)
+      io = IO::Memory.new(body)

-          begin
-            temp = File.tempfile(".db") do |tempfile|
-              begin
-                File.write(tempfile.path, io_sized.gets_to_end)
-              rescue
-                return false
-              end
+      Compress::Zip::File.open(io) do |file|
+        file.entries.each do |entry|
+          entry.open do |file_io|
+            # Ensure max size of 4MB
+            io_sized = IO::Sized.new(file_io, 0x400000)

-              DB.open("sqlite3://" + tempfile.path) do |db|
-                user.watched += db.query_all("SELECT url FROM streams", as: String)
-                  .map(&.lchop("https://www.youtube.com/watch?v="))
+            next if entry.filename != "newpipe.db"

-                user.watched.uniq!
-                Invidious::Database::Users.update_watch_history(user)
+            tempfile = File.tempfile(".db")

-                user.subscriptions += db.query_all("SELECT url FROM subscriptions", as: String)
-                  .map(&.lchop("https://www.youtube.com/channel/"))
-
-                user.subscriptions.uniq!
-                user.subscriptions = get_batch_channels(user.subscriptions)
-
-                Invidious::Database::Users.update_subscriptions(user)
-              end
+            begin
+              File.write(tempfile.path, io_sized.gets_to_end)
+            rescue
+              return false
            end
-          ensure
-            temp.delete if !temp.nil?
+
+            db = DB.open("sqlite3://" + tempfile.path)
+
+            user.watched += db.query_all("SELECT url FROM streams", as: String)
+              .map(&.lchop("https://www.youtube.com/watch?v="))
+
+            user.watched.uniq!
+            Invidious::Database::Users.update_watch_history(user)
+
+            user.subscriptions += db.query_all("SELECT url FROM subscriptions", as: String)
+              .map(&.lchop("https://www.youtube.com/channel/"))
+
+            user.subscriptions.uniq!
+            user.subscriptions = get_batch_channels(user.subscriptions)
+
+            Invidious::Database::Users.update_subscriptions(user)
+
+            db.close
+            tempfile.delete
          end
        end
      end
--- a/src/invidious/user/preferences.cr
+++ b/src/invidious/user/preferences.cr
@ -4,7 +4,6 @@ struct Preferences

  property annotations : Bool = CONFIG.default_user_preferences.annotations
  property annotations_subscribed : Bool = CONFIG.default_user_preferences.annotations_subscribed
-  property preload : Bool = CONFIG.default_user_preferences.preload
  property autoplay : Bool = CONFIG.default_user_preferences.autoplay
  property automatic_instance_redirect : Bool = CONFIG.default_user_preferences.automatic_instance_redirect

--- a/src/invidious/videos.cr
+++ b/src/invidious/videos.cr
@ -15,7 +15,7 @@ struct Video
  # NOTE: don't forget to bump this number if any change is made to
  # the `params` structure in videos/parser.cr!!!
  #
-  SCHEMA_VERSION = 3
+  SCHEMA_VERSION = 2

  property id : String

@ -26,6 +26,12 @@ struct Video
  @[DB::Field(ignore: true)]
  @captions = [] of Invidious::Videos::Captions::Metadata

+  @[DB::Field(ignore: true)]
+  property adaptive_fmts : Array(Hash(String, JSON::Any))?
+
+  @[DB::Field(ignore: true)]
+  property fmt_stream : Array(Hash(String, JSON::Any))?
+
  @[DB::Field(ignore: true)]
  property description : String?

@ -92,24 +98,72 @@ struct Video

  # Methods for parsing streaming data

-  def fmt_stream : Array(Hash(String, JSON::Any))
-    if formats = info.dig?("streamingData", "formats")
-      return formats
-        .as_a.map(&.as_h)
-        .sort_by! { |f| f["width"]?.try &.as_i || 0 }
+  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
+
+      LOGGER.debug("Videos: Decoding '#{cfr}'")
+
+      unsig = DECRYPT_FUNCTION.try &.decrypt_signature(cfr["s"])
+      params[sp] = unsig if unsig
    else
-      return [] of Hash(String, JSON::Any)
+      url = URI.parse(fmt["url"].as_s)
+      params = url.query_params
    end
+
+    n = DECRYPT_FUNCTION.try &.decrypt_nsig(params["n"])
+    params["n"] = n if n
+
+    if token = CONFIG.po_token
+      params["pot"] = token
+    end
+
+    params["host"] = url.host.not_nil!
+    if region = self.info["region"]?.try &.as_s
+      params["region"] = region
+    end
+
+    url.query_params = params
+    LOGGER.trace("Videos: new url is '#{url}'")
+
+    return url.to_s
+  rescue ex
+    LOGGER.debug("Videos: Error when parsing video URL")
+    LOGGER.trace(ex.inspect_with_backtrace)
+    return ""
  end

-  def adaptive_fmts : Array(Hash(String, JSON::Any))
-    if formats = info.dig?("streamingData", "adaptiveFormats")
-      return formats
-        .as_a.map(&.as_h)
-        .sort_by! { |f| f["width"]?.try &.as_i || f["audioTrack"]?.try { |a| a["audioIsDefault"]?.try { |v| v.as_bool ? -1 : 0 } } || 0 }
-    else
-      return [] of Hash(String, JSON::Any)
+  def fmt_stream
+    return @fmt_stream.as(Array(Hash(String, JSON::Any))) if @fmt_stream
+
+    fmt_stream = info.dig?("streamingData", "formats")
+      .try &.as_a.map &.as_h || [] of Hash(String, JSON::Any)
+
+    fmt_stream.each do |fmt|
+      fmt["url"] = JSON::Any.new(self.convert_url(fmt))
    end
+
+    fmt_stream.sort_by! { |f| f["width"]?.try &.as_i || 0 }
+    @fmt_stream = fmt_stream
+    return @fmt_stream.as(Array(Hash(String, JSON::Any)))
+  end
+
+  def adaptive_fmts
+    return @adaptive_fmts.as(Array(Hash(String, JSON::Any))) if @adaptive_fmts
+
+    fmt_stream = info.dig("streamingData", "adaptiveFormats")
+      .try &.as_a.map &.as_h || [] of Hash(String, JSON::Any)
+
+    fmt_stream.each do |fmt|
+      fmt["url"] = JSON::Any.new(self.convert_url(fmt))
+    end
+
+    fmt_stream.sort_by! { |f| f["width"]?.try &.as_i || 0 }
+    @adaptive_fmts = fmt_stream
+
+    return @adaptive_fmts.as(Array(Hash(String, JSON::Any)))
  end

  def video_streams
--- a/Show More
+++ b/Show More