Defer loading videojs-share until last

Add current branch to footer

CHANGELOG.md

@@ -1,3 +1,150 @@
+# 0.14.0 (2019-02-06)
+
+## Version 0.14.0: Community
+
+This last month several contributors have made improvements specifically for the people using this project. New pages have been added to the wiki, and there is now a [Matrix Server](https://riot.im/app/#/room/#invidious:matrix.org) and IRC channel so it's easier and faster for people to ask questions or chat. There have been [101 commits](https://github.com/omarroth/invidious/compare/0.13.0...0.14.0) since the last major release from 8 contributors.
+
+It has come to my attention in the past month how many people are self-hosting, and I would like to make it easier for them to do so.
+
+With that in mind, expect future releases to have a section for For Administrators (if any relevant changes) and For Developers (if any relevant changes).
+
+## For Administrators
+
+This month the most notable change for administrators is releases. As always, there will be a major release each month. However, a new minor release will be made whenever there are any critical bugs that need to be fixed.
+
+This past month is the first time there has been a minor release - `0.13.1` - which fixes a breaking change made by YouTube. Administrators using versioning for their instances will be able to rely on the latest version, and should have a system in place to upgrade their instance as soon as a new release is available.
+
+Several new pages have been added to the [wiki](https://github.com/omarroth/invidious/wiki#for-administrators) (as mentioned below) that will help administrators better setup their own instances. Configuration, maintenance, and instructions for updating are of note, as well as several common issues that are encountered when first setting up.
+
+## For Developers
+
+There's now a `pretty=1` parameter for most endpoints so you can view data easily from the browser, which is convenient for debugging and casual use. You can see an example [here](https://invidio.us/api/v1/videos/CvFH_6DNRCY?pretty=1).
+
+Unfortunately the `/api/v1/insights/:id` endpoint is no longer functional, as YouTube removed all publicly available analytics around a month ago. The YouTube endpoint now returns a 404, so it's unlikely it will be functional again.
+
+## Wiki
+
+There have been a sizable number of changes to the Wiki, including a [list of public Invidious instances](https://github.com/omarroth/invidious/wiki/Invidious-Instances), the [list of extensions](https://github.com/omarroth/invidious/wiki/Extensions), and documentation for administrators (as mentioned above) and developers.
+
+The wiki is editable by anyone so feel free to add anything you think is useful.
+
+## Matrix & IRC
+
+Thee is now a [Matrix Server](https://riot.im/app/#/room/#invidious:matrix.org) for Invidious, so please feel free to hop on if you have any questions or want to chat. There is also a registered IRC channel: #invidious on Freenode which is bridged to Matrix.
+
+## Features
+
+Several new features have been added, including a download button, creator hearts and comment colors, and a French translation.
+
+There have been fixes for Google logins, missing text in locales, invalid links to genre channels, and better error handling in the player, among others.
+
+Several fixes and features are omitted for space, so I'd recommend taking a look at the [compare tab](https://github.com/omarroth/invidious/compare/0.13.0...0.14.0) for more information.
+
+## Annotations Update
+
+Annotations were removed January 15th, 2019 around15:00 UTC. Before they were deleted we were able to archive annotations from around 1.4 billion videos. I'd very much recommend taking a look [here](https://www.reddit.com/r/DataHoarder/comments/al7exa/youtube_annotation_archive_update_and_preview/) for more information and a list of acknowledgements. I'm extremely thankful to everyone who was able to contribute and I'm glad we were able to save such a large part of internet history.
+
+There's been large strides in supporting them in the player as well, which you can follow in [#303](https://github.com/omarroth/invidious/pull/303). You can preview the functionality at https://dev.invidio.us . Before they are added to the main site expect to see an option to disable them, both site-wide and per video.
+
+Organizing this project has unfortunately taken up quite a bit of my time, and I've been very grateful for everyone's patience.
+
+## Finances
+
+### Donations
+
+- [Patreon](https://www.patreon.com/omarroth) : \$49.42
+- [Liberapay](https://liberapay.com/omarroth) : \$27.89
+- Crypto : ~\$0.00 (converted from BCH, BTC)
+- Total : \$77.31
+
+### Expenses
+
+invidious-load1 (nyc1) : $10.00 (load balancer)
+invidious-update1 (s-1vcpu-1gb) : $5.00 (updates feeds)
+invidious-node1 (s-1vcpu-1gb) : $5.00 (web server)
+invidious-node2 (s-1vcpu-1gb) : $5.00 (web server)
+invidious-node3 (s-1vcpu-1gb) : $5.00 (web server)
+invidious-node4 (s-1vcpu-1gb) : $5.00 (web server)
+invidious-db1 (s-4vcpu-8gb) : $40.00 (database)
+Total : $75.00
+
+As always I'm grateful for everyone's contributions and support. I'll see you all in March.
+
+# 0.13.1 (2019-01-19)
+
+##
+
+# 0.13.0 (2019-01-06)
+
+## Version 0.13.0: Translations, Annotations, and Tor
+
+I hope everyone had a happy New Year! There's been a couple new additions since last release, with [44 commits](https://github.com/omarroth/invidious/compare/0.12.0...0.13.0) from 9 contributors. It's been quite a year for the project, and I hope to continue improving the project into 2019! Starting off the new year:
+
+## Translations
+
+I'm happy to announce support for translations has been added with [`a160c64`](https://github.com/omarroth/invidious/a160c64). Currently, there is support for:
+
+- Arabic (`ar`)
+- Dutch (`nl`)
+- English (`en-US`)
+- German (`de`)
+- Norwegian Bokmål (`nb_NO`)
+- Polish (`pl`)
+- Russian (`ru`)
+
+Which you can change in your preferences under `Language`. You can also add `&hl=LANGUAGE` to the end of any request to translate it to your preferred language, for example https://invidio.us/?hl=ru. I'd like to say thank you again to everyone who has helped translate the site! I've mentioned this before, but I'm delighted that so many people find the project useful.
+
+## Annotations
+
+Recently, [YouTube announced that all annotations will be deleted on January 15th, 2019](https://support.google.com/youtube/answer/7342737). I believe that annotations have a very important place in YouTube's history, and [announced a project to archive them](https://www.reddit.com/r/DataHoarder/comments/aa6czg/youtube_annotation_archive/).
+
+I expect annotations to be supported in the Invidious player once archiving is complete (see [#110](https://github.com/omarroth/invidious/issues/110) for details), and would also like to host them for other developers to use in their projects.
+
+The code is available [here](https://github.com/omarroth/archive), and contains instructions for running a worker if you would like to contribute. There's much more information available in the announcement as well for anyone who is interested.
+
+## Tor
+
+I unfortunately missed the chance to mention this in the previous release, but I'm now happy to announce that you can now view Invidious through Tor at the following links:
+
+kgg2m7yk5aybusll.onion  
+axqzx4s6s54s32yentfqojs3x5i7faxza6xo3ehd4bzzsg2ii4fv2iid.onion
+
+Invidious is well suited to use through Tor, as it does not require any JS and is fairly lightweight. I'd recommend looking [here](https://diasp.org/posts/10965196) and [here](https://www.reddit.com/r/TOR/comments/a3c1ak/you_can_now_watch_youtube_videos_anonymously_with/) for more details on how to use the onion links, and would like to say thank you to [/u/whonix-os](https://www.reddit.com/user/whonix-os) for suggesting it and providing support setting setting them up.
+
+## Popular and Trending
+
+You can now easily view videos trending on YouTube with [`a16f967`](https://github.com/omarroth/invidious/a16f967). It also provides support for viewing YouTube's various categories categories, such as `News`, `Gaming`, and `Music`. You can also change the `region` parameter to view trending in different countries, which should be made easier to use in the coming weeks.
+
+A link to `/feed/popular` has also been added, which provides a list of videos sorted using the algorithm described [here](https://github.com/omarroth/invidious/issues/217#issuecomment-436503761). I think it better reflects what users watch on the site, but I'd like to hear peoples' thoughts on this and on how it could be improved.
+
+## Finances
+
+### Donations
+
+- [Patreon](https://www.patreon.com/omarroth): \$64.63
+- [Liberapay](https://liberapay.com/omarroth) : \$30.05
+- Crypto : ~\$28.74 (converted from BCH, BTC)
+- Total : \$123.42
+
+### Expenses
+
+- invidious-load1 (nyc1) : \$10.00 (load balancer)
+- invidious-update1 (s-1vcpu-1gb) : \$5.00 (updates feeds)
+- invidious-node1 (s-1vcpu-1gb) : \$5.00 (web server)
+- invidious-node2 (s-1vcpu-1gb) : \$5.00 (web server)
+- invidious-node3 (s-1vcpu-1gb) : \$5.00 (web server)
+- invidious-node4 (s-1vcpu-1gb) : \$5.00 (web server)
+- invidious-db1 (s-4vcpu-8gb) : \$40.00 (database)
+- Total : \$75.00
+
+### What will happen with what's left over?
+
+I believe this is the first month that all expenses have been fully paid for by donations. Thank you! I expect to allocate the current amount for hardware to improve performance and for hosting annotation data, as mentioned above.
+
+Anything that is left over is kept to continue hosting the project for as long as possible. Thank you again everyone!
+
+I think that's everything for 2018. There's lots still planned, and I'm very excited for the future of this project!
+
 # 0.12.0 (2018-12-06)
 
 ## Version 0.12.0: Accessibility, Privacy, Transparency

README.md

@@ -27,8 +27,24 @@ Patreon: https://patreon.com/omarroth
 BTC: 356DpZyMXu6rYd55Yqzjs29n79kGKWcYrY  
 BCH: qq4ptclkzej5eza6a50et5ggc58hxsq5aylqut2npk
 
+Onion links:
+
+- kgg2m7yk5aybusll.onion
+- axqzx4s6s54s32yentfqojs3x5i7faxza6xo3ehd4bzzsg2ii4fv2iid.onion
+
+[Alternative Invidious instances](https://github.com/omarroth/invidious/wiki/Invidious-Instances)
+
+## Screenshots
+
+| Player                                                                                                                  | Preferences                                                                                                             | Subscriptions                                                                                                               |
+| ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
+| [<img src="screenshots/01_player.png?raw=true" height="140" width="280">](screenshots/01_player.png?raw=true)           | [<img src="screenshots/02_preferences.png?raw=true" height="140" width="280">](screenshots/02_preferences.png?raw=true) | [<img src="screenshots/03_subscriptions.png?raw=true" height="140" width="280">](screenshots/03_subscriptions.png?raw=true) |
+| [<img src="screenshots/04_description.png?raw=true" height="140" width="280">](screenshots/04_description.png?raw=true) | [<img src="screenshots/05_preferences.png?raw=true" height="140" width="280">](screenshots/05_preferences.png?raw=true) | [<img src="screenshots/06_subscriptions.png?raw=true" height="140" width="280">](screenshots/06_subscriptions.png?raw=true) |
+
 ## Installation
 
+See [Invidious-Updater](https://github.com/tmiland/Invidious-Updater) for a self-contained script that can automatically install and update Invidious.
+
 ### Docker:
 
 #### Build and start cluster:
@@ -52,71 +68,102 @@ $ docker volume rm invidious_postgresdata
 $ docker-compose build
 ```
 
-### Arch Linux:
+### Linux:
+
+#### Install dependencies
 
 ```bash
-# Install dependencies
+# Arch Linux
-$ sudo pacman -S shards crystal imagemagick librsvg
+$ sudo pacman -S shards crystal imagemagick librsvg postgresql
 
-# Setup PostgresSQL
+# Ubuntu or Debian
-$ sudo systemctl enable postgresql
+# First you have to add the repository to your APT configuration. For easy setup just run in your command line:
-$ sudo systemctl start postgresql
-$ sudo -i -u postgres
-$ createuser -s YOUR_USER_NAME
-$ createdb      YOUR_USER_NAME
-$ exit
-
-# Setup Invidious
-$ git clone https://github.com/omarroth/invidious
-$ cd invidious
-$ ./setup.sh
-$ shards
-$ crystal build src/invidious.cr --release
-```
-
-### On Ubuntu:
-
-```bash
-# Install dependencies
 $ curl -sSL https://dist.crystal-lang.org/apt/setup.sh | sudo bash
-$ sudo apt update
+# That will add the signing key and the repository configuration. If you prefer to do it manually, execute the following commands:
+$ curl -sL "https://keybase.io/crystal/pgp_keys.asc" | sudo apt-key add -
+$ echo "deb https://dist.crystal-lang.org/apt crystal main" | sudo tee /etc/apt/sources.list.d/crystal.list
+$ sudo apt-get update
 $ sudo apt install crystal libssl-dev libxml2-dev libyaml-dev libgmp-dev libreadline-dev librsvg2-dev postgresql imagemagick libsqlite3-dev
+```
 
-# Setup PostgreSQL
+#### Add invidious user and clone repository
+
+```bash
+$ useradd -m invidious
+$ sudo -i -u invidious
+$ git clone https://github.com/omarroth/invidious
+$ exit
+```
+
+#### Setup PostgresSQL
+
+```bash
 $ sudo systemctl enable postgresql
 $ sudo systemctl start postgresql
 $ sudo -i -u postgres
-$ createuser -s YOUR_USER_NAME_HERE
+$ psql -c "CREATE USER kemal WITH PASSWORD 'kemal';"
-$ createdb      YOUR_USER_NAME_HERE
+$ createdb -O kemal invidious
+$ psql invidious < /home/invidious/invidious/config/sql/channels.sql
+$ psql invidious < /home/invidious/invidious/config/sql/videos.sql
+$ psql invidious < /home/invidious/invidious/config/sql/channel_videos.sql
+$ psql invidious < /home/invidious/invidious/config/sql/users.sql
+$ psql invidious < /home/invidious/invidious/config/sql/session_ids.sql
+$ psql invidious < /home/invidious/invidious/config/sql/nonces.sql
 $ exit
-
-# Setup Invidious
-$ git clone https://github.com/omarroth/invidious
-$ cd invidious
-$ ./setup.sh
-$ shards
-$ crystal build src/invidious.cr --release
 ```
 
-### On OSX:
+#### Setup Invidious
+
+```bash
+$ sudo -i -u invidious
+$ cd invidious
+$ shards update && shards install
+$ crystal build src/invidious.cr --release
+# test compiled binary
+$ ./invidious # stop with ctrl c
+$ exit
+```
+
+#### systemd service
+
+```bash
+$ sudo cp /home/invidious/invidious/invidious.service /etc/systemd/system/invidious.service
+$ sudo systemctl enable invidious.service
+$ sudo systemctl start invidious.service
+```
+
+### OSX:
 
 ```bash
 # Install dependencies
 $ brew update
 $ brew install shards crystal-lang postgres imagemagick librsvg
 
-# Setup Invidious
+# Clone repository and setup postgres database
 $ git clone https://github.com/omarroth/invidious
 $ cd invidious
-$ ./setup.sh
+$ brew services start postgresql
-$ shards
+$ psql -c "CREATE ROLE kemal WITH LOGIN PASSWORD 'kemal';"
+$ createdb invidious -U kemal
+$ psql invidious < config/sql/channels.sql
+$ psql invidious < config/sql/videos.sql
+$ psql invidious < config/sql/channel_videos.sql
+$ psql invidious < config/sql/users.sql
+$ psql invidious < config/sql/session_ids.sql
+$ psql invidious < config/sql/nonces.sql
+
+# Setup Invidious
+$ shards update && shards install
 $ crystal build src/invidious.cr --release
 ```
 
+## Update Invidious
+
+You can see how to update Invidious [here](https://github.com/omarroth/invidious/wiki/Updating).
+
 ## Usage:
 
 ```bash
-$ crystal build src/invidious.cr --release
 $ ./invidious -h
 Usage: invidious [arguments]
     -b HOST, --bind HOST             Host to bind (defaults to 0.0.0.0)
@@ -126,13 +173,14 @@ Usage: invidious [arguments]
     --ssl-cert-file FILE             SSL certificate file
     -h, --help                       Shows this help
     -t THREADS, --crawl-threads=THREADS
-                                     Number of threads for crawling (default: 1)
+                                     Number of threads for crawling YouTube (default: 0)
     -c THREADS, --channel-threads=THREADS
                                      Number of threads for refreshing channels (default: 1)
     -f THREADS, --feed-threads=THREADS
                                      Number of threads for refreshing feeds (default: 1)
     -v THREADS, --video-threads=THREADS
-                                     Number of threads for refreshing videos (default: 1)
+                                     Number of threads for refreshing videos (default: 0)
+    -o OUTPUT, --output=OUTPUT       Redirect output (default: STDOUT)
 ```
 
 Or for development:
@@ -142,19 +190,20 @@ $ curl -fsSLo- https://raw.githubusercontent.com/samueleaton/sentry/master/insta
 $ ./sentry
 ```
 
+## Documentation
+
+[Documentation](https://github.com/omarroth/invidious/wiki) can be found in the wiki.
+
 ## Extensions
 
-- [Alternate Tube Redirector](https://addons.mozilla.org/en-US/firefox/addon/alternate-tube-redirector/): Automatically open Youtube Videos on alternate sites like Invidious or Hooktube.
+[Extensions](https://github.com/omarroth/invidious/wiki/Extensions) can be found in the wiki, as well as documentation for integrating it into other projects.
-- [Invidious Redirect](https://greasyfork.org/en/scripts/370461-invidious-redirect): Redirects Youtube URLs to Invidio.us (userscript)
-- [iPhone Redirector Shortcut](https://www.icloud.com/shortcuts/6bbf26d989cf4d07a5fe1626efbc0950): Automatically open YouTube videos in Invidious (iPhone shortcut)
-- [Youtube to Invidious](https://greasyfork.org/en/scripts/375264-youtube-to-invidious): Scan page for youtube embeds and urls and replace with Invidious (userscript)
-- [Invidious Downloader](https://github.com/erupete/InvidiousDownloader): Tampermonkey userscript for downloading videos or audio on Invidious (userscript)
 
 ## Made with Invidious
 
 - [FreeTube](https://github.com/FreeTubeApp/FreeTube): An Open Source YouTube app for privacy.
 - [CloudTube](https://github.com/cloudrac3r/cadencegq): Website featuring pastebin, image host, and YouTube player
 - [PeerTubeify](https://gitlab.com/Ealhad/peertubeify): On YouTube, displays a link to the same video on PeerTube, if it exists.
+- [MusicPiped](https://github.com/deep-gaurav/MusicPiped): A materialistic music player that streams music from YouTube.
 
 ## Contributing
 
@@ -164,6 +213,18 @@ $ ./sentry
 4.  Push to the branch (git push origin my-new-feature)
 5.  Create a new Pull Request
 
-## Contributors
+## Contact
 
-- [omarroth](https://github.com/omarroth) - creator, maintainer
+Feel free to send an email to omarroth@protonmail.com or join our [Matrix Server](https://riot.im/app/#/room/#invidious:matrix.org), or #invidious on Freenode.
+
+You can also view release notes on the [releases](https://github.com/omarroth/invidious/releases) page or in the CHANGELOG.md included in the repository.
+
+## License
+
+[![GNU AGPLv3 Image](https://www.gnu.org/graphics/agplv3-155x51.png)](http://www.gnu.org/licenses/agpl-3.0.en.html)
+
+Invidious is Free Software: You can use, study share and improve it at your
+will. Specifically you can redistribute and/or modify it under the terms of the
+[GNU Affero General Public License](https://www.gnu.org/licenses/agpl.html) as
+published by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.

assets/css/default.css

@@ -1,3 +1,43 @@
+.channel-owner {
+  background-color: #008bec;
+  color: #fff;
+  border-radius: 9px;
+  padding: 1px 6px;
+}
+
+.creator-heart-container {
+  display: inline-block;
+  padding: 0px 7px 6px 0px;
+  margin: 0px -7px -4px 0px;
+}
+
+.creator-heart {
+  position: relative;
+  width: 16px;
+  height: 16px;
+  border: 2px none;
+}
+
+.creator-heart-background-hearted {
+  width: 16px;
+  height: 16px;
+  padding: 0px;
+  position: relative;
+}
+
+.creator-heart-small-hearted {
+  position: absolute;
+  right: -7px;
+  bottom: -4px;
+}
+
+.creator-heart-small-container {
+  position: relative;
+  width: 13px;
+  height: 13px;
+  color: rgb(255, 0, 0);
+}
+
 .h-box {
   padding-left: 1em;
   padding-right: 1em;
@@ -22,11 +62,14 @@ div {
   padding-right: 10px;
 }
 
-a.pure-button-primary {
+button.pure-button-primary,
+a.pure-button-primary,
+.channel-owner:hover {
   background-color: #a0a0a0;
   color: rgba(35, 35, 35, 1);
 }
 
+button.pure-button-primary:hover,
 a.pure-button-primary:hover {
   background-color: rgba(0, 182, 240, 1);
   color: #fff;
@@ -107,6 +150,7 @@ img.thumbnail {
   box-shadow: none;
 
   transition: 0.1s border-bottom;
+  -webkit-appearance: none;
 }
 
 .navbar > .searchbar .pure-form fieldset {
@@ -186,6 +230,13 @@ img.thumbnail {
 }
 
 /* Control Bar */
+@media screen and (max-width: 480px) {
+  .video-js .vjs-control-bar,
+  .vjs-menu-button-popup .vjs-menu .vjs-menu-content {
+    overflow: -webkit-paged-x;
+  }
+}
+
 .video-js .vjs-control-bar,
 .vjs-menu-button-popup .vjs-menu .vjs-menu-content {
   background-color: rgba(35, 35, 35, 0.75);
@@ -260,10 +311,31 @@ img.thumbnail {
   height: 100%;
 }
 
+.player-dimensions.vjs-fluid {
+  padding-top: 46.86%;
+}
+
 #player-container {
   position: relative;
-  padding-bottom: 56.25%;
+  padding-bottom: 46.86%;
   margin-left: 1em;
   margin-right: 1em;
   height: 0;
 }
+
+#progress-container {
+  width: 100%;
+  border-radius: 2px;
+  background-color: #a0a0a0;
+  color: rgba(35, 35, 35, 1);
+}
+
+#download-progress {
+  width: 0%;
+  border-radius: 2px;
+  height: 10px;
+  background-color: rgba(0, 182, 240, 1);
+  color: #fff;
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}

assets/css/lighttheme.css

@@ -1,9 +1,16 @@
 a:hover,
 a:active {
-  color: #167ac6;
+  color: #167ac6 !important;
 }
 
 a {
-  color: #303030;
+  color: #61809b;
   text-decoration: none;
 }
+
+/* All links that do not fit with the default color goes here */
+a > .icon,
+.pure-u-md-1-5 > .h-box > a[href^="/watch?"],
+.playlist-restricted > ol > li > a {
+  color: #303030;
+}

assets/js/watch.js

@@ -35,18 +35,18 @@ String.prototype.supplant = function(o) {
   });
 };
 
-function show_youtube_replies(target) {
+function show_youtube_replies(target, inner_text, sub_text) {
   body = target.parentNode.parentNode.children[1];
   body.style.display = "";
 
-  target.innerHTML = "Hide replies";
+  target.innerHTML = inner_text;
-  target.setAttribute("onclick", "hide_youtube_replies(this)");
+  target.setAttribute("onclick", "hide_youtube_replies(this, \'" + inner_text + "\', \'" + sub_text + "\')");
 }
 
-function hide_youtube_replies(target) {
+function hide_youtube_replies(target, inner_text, sub_text) {
   body = target.parentNode.parentNode.children[1];
   body.style.display = "none";
 
-  target.innerHTML = "Show replies";
+  target.innerHTML = sub_text;
-  target.setAttribute("onclick", "show_youtube_replies(this)");
+  target.setAttribute("onclick", "show_youtube_replies(this, \'" + inner_text + "\', \'" + sub_text + "\')");
 }

config/config.yml

@@ -10,3 +10,4 @@ db:
   dbname: invidious
 full_refresh: false
 https_only: false
+domain:

config/migrate-scripts/migrate-db-17cf077.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+psql invidious -c "ALTER TABLE channels ADD COLUMN subscribed bool;"
+psql invidious -c "UPDATE channels SET subscribed = false;"

config/migrate-scripts/migrate-db-30e6d29.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+psql invidious -c "ALTER TABLE channels ADD COLUMN deleted bool;"
+psql invidious -c "UPDATE channels SET deleted = false;"

config/migrate-scripts/migrate-db-3646395.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+psql invidious < config/sql/session_ids.sql
+psql invidious -c "INSERT INTO session_ids (SELECT unnest(id), email, CURRENT_TIMESTAMP FROM users) ON CONFLICT (id) DO NOTHING"
+psql invidious -c "ALTER TABLE users DROP COLUMN id"

config/migrate-scripts/migrate-db-8e884fe1.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+psql invidious -c "ALTER TABLE channels DROP COLUMN subscribed"
+psql invidious -c "ALTER TABLE channels ADD COLUMN subscribed timestamptz"
+psql invidious -c "UPDATE channels SET subscribed = '2019-01-01 00:00:00+00'"

config/sql/channel_videos.sql

@@ -31,6 +31,6 @@ CREATE INDEX channel_videos_published_idx
 
 CREATE INDEX channel_videos_ucid_idx
   ON public.channel_videos
-  USING hash
+  USING btree
   (ucid COLLATE pg_catalog."default");
 

config/sql/channels.sql

@@ -7,6 +7,8 @@ CREATE TABLE public.channels
   id text NOT NULL,
   author text,
   updated timestamp with time zone,
+  deleted boolean,
+  subscribed timestamp with time zone,
   CONSTRAINT channels_id_key UNIQUE (id)
 );
 

config/sql/nonces.sql

@@ -5,10 +5,18 @@
 CREATE TABLE public.nonces
 (
   nonce text,
-  expire timestamp with time zone
+  expire timestamp with time zone,
-)
+  CONSTRAINT nonces_id_key UNIQUE (nonce)
-WITH (
-  OIDS=FALSE
 );
 
-GRANT ALL ON TABLE public.nonces TO kemal;
+GRANT ALL ON TABLE public.nonces TO kemal;
+
+-- Index: public.nonces_nonce_idx
+
+-- DROP INDEX public.nonces_nonce_idx;
+
+CREATE INDEX nonces_nonce_idx
+  ON public.nonces
+  USING btree
+  (nonce COLLATE pg_catalog."default");
+

config/sql/session_ids.sql

@@ -0,0 +1,23 @@
+-- Table: public.session_ids
+
+-- DROP TABLE public.session_ids;
+
+CREATE TABLE public.session_ids
+(
+  id text NOT NULL,
+  email text,
+  issued timestamp with time zone,
+  CONSTRAINT session_ids_pkey PRIMARY KEY (id)
+);
+
+GRANT ALL ON TABLE public.session_ids TO kemal;
+
+-- Index: public.session_ids_id_idx
+
+-- DROP INDEX public.session_ids_id_idx;
+
+CREATE INDEX session_ids_id_idx
+  ON public.session_ids
+  USING btree
+  (id COLLATE pg_catalog."default");
+

config/sql/users.sql

@@ -4,7 +4,6 @@
 
 CREATE TABLE public.users
 (
-  id text[] NOT NULL,
   updated timestamp with time zone,
   notifications text[],
   subscriptions text[],

docker/Dockerfile

@@ -9,7 +9,7 @@ ADD . /invidious
 WORKDIR /invidious
 
 RUN sed -i 's/host: localhost/host: postgres/' config/config.yml && \
-    shards && \
+    shards update && shards install && \
     crystal build src/invidious.cr
 
 CMD [ "/invidious/invidious" ]

docker/Dockerfile.postgres

@@ -2,7 +2,6 @@ FROM postgres:10
 
 ENV POSTGRES_USER postgres
 
-ADD ./setup.sh /setup.sh
 ADD ./config/sql /config/sql
 ADD ./docker/entrypoint.postgres.sh /entrypoint.sh
 

docker/entrypoint.postgres.sh

@@ -10,7 +10,15 @@ if [ ! -f /var/lib/postgresql/data/setupFinished ]; then
         sleep 5
     done
     >&2 echo "### importing table schemas"
-    su postgres -c "/setup.sh" && touch /var/lib/postgresql/data/setupFinished
+    su postgres -c 'createdb invidious'
+    su postgres -c 'psql -c "CREATE USER kemal WITH PASSWORD '"'kemal'"'"'
+    su postgres -c 'psql invidious < config/sql/channels.sql'
+    su postgres -c 'psql invidious < config/sql/videos.sql'
+    su postgres -c 'psql invidious < config/sql/channel_videos.sql'
+    su postgres -c 'psql invidious < config/sql/users.sql'
+    su postgres -c 'psql invidious < config/sql/session_ids.sql'
+    su postgres -c 'psql invidious < config/sql/nonces.sql'
+    touch /var/lib/postgresql/data/setupFinished
     echo "### invidious database setup finished"
     exit
 fi

invidious.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=Invidious (An alternative YouTube front-end)
+After=syslog.target
+After=network.target
+
+[Service]
+RestartSec=2s
+Type=simple
+
+User=invidious
+Group=invidious
+
+WorkingDirectory=/home/invidious/invidious
+ExecStart=/home/invidious/invidious/invidious -o invidious.log
+
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

locales/ar.json

@@ -82,6 +82,14 @@
   "Manage subscriptions": "إدارة المشتركين",
   "Watch history": "سجل المشاهدة",
   "Delete account": "حذف الحساب",
+  "Administrator preferences": "",
+  "Default homepage: ": "",
+  "Feed menu: ": "",
+  "Top enabled? ": "",
+  "CAPTCHA enabled? ": "",
+  "Login enabled? ": "",
+  "Registration enabled? ": "",
+  "Report statistics? ": "",
   "Save preferences": "حفظ التفضيلات",
   "Subscription manager": "مدير الإشتراكات",
   "`x` subscriptions": "`x` مشتركين",
@@ -265,9 +273,22 @@
   "`x` minutes": "`x` دقائق",
   "`x` seconds": "`x` ثوانى",
   "Fallback comments: ": "التعليقات المصاحبة",
-  "Popular": "الشائع",
+  "Popular": "لاكثر شعبية",
   "Top": "الأفضل",
   "About": "حول",
   "Rating: ": "التقييم",
-  "Language: ": "اللغة"
+  "Language: ": "اللغة",
+  "Default": "الكل",
+  "Music": "الاغانى",
+  "Gaming": "الألعاب",
+  "News": "الأخبار",
+  "Movies": "الأفلام",
+  "Download as: ": "تحميل كـ",
+  "Download": "تحميل",
+  "%A %B %-d, %Y": "",
+  "(edited)": "",
+  "Youtube permalink of the comment": "",
+  "`x` marked it with a ❤": "",
+  "Audio mode": "",
+  "Video mode": ""
 }

locales/de.json

@@ -1,273 +1,294 @@
 {
-    "`x` subscribers": "`x` Abonnenten",
+  "`x` subscribers": "`x` Abonnenten",
-    "`x` videos": "`x` Videos",
+  "`x` videos": "`x` Videos",
-    "LIVE": "LIVE",
+  "LIVE": "LIVE",
-    "Shared `x` ago": "Vor `x` geteilt",
+  "Shared `x` ago": "Vor `x` geteilt",
-    "Unsubscribe": "Abbestellen",
+  "Unsubscribe": "Abbestellen",
-    "Subscribe": "Abonnieren",
+  "Subscribe": "Abonnieren",
-    "Login to subscribe to `x`": "Einloggen um `x` zu abonnieren",
+  "Login to subscribe to `x`": "Einloggen um `x` zu abonnieren",
-    "View channel on YouTube": "Kanal auf YouTube anzeigen",
+  "View channel on YouTube": "Kanal auf YouTube anzeigen",
-    "newest": "neueste",
+  "newest": "neueste",
-    "oldest": "älteste",
+  "oldest": "älteste",
-    "popular": "beliebt",
+  "popular": "beliebt",
-    "Preview page": "Vorschau Seite",
+  "Preview page": "Vorschau Seite",
-    "Next page": "Nächste Seite",
+  "Next page": "Nächste Seite",
-    "Clear watch history?": "Verlauf löschen?",
+  "Clear watch history?": "Verlauf löschen?",
-    "Yes": "Ja",
+  "Yes": "Ja",
-    "No": "Nein",
+  "No": "Nein",
-    "Import and Export Data": "Import und Export Daten",
+  "Import and Export Data": "Import und Export Daten",
-    "Import": "Importieren",
+  "Import": "Importieren",
-    "Import Invidious data": "Invidious Daten importieren",
+  "Import Invidious data": "Invidious Daten importieren",
-    "Import YouTube subscriptions": "YouTube Abonnements importieren",
+  "Import YouTube subscriptions": "YouTube Abonnements importieren",
-    "Import FreeTube subscriptions (.db)": "FreeTube Abonnements importieren (.db)",
+  "Import FreeTube subscriptions (.db)": "FreeTube Abonnements importieren (.db)",
-    "Import NewPipe subscriptions (.json)": "NewPipe Abonnements importieren (.json)",
+  "Import NewPipe subscriptions (.json)": "NewPipe Abonnements importieren (.json)",
-    "Import NewPipe data (.zip)": "NewPipe Daten importieren (.zip)",
+  "Import NewPipe data (.zip)": "NewPipe Daten importieren (.zip)",
-    "Export": "Exportieren",
+  "Export": "Exportieren",
-    "Export subscriptions as OPML": "Abonnements als OPML exportieren",
+  "Export subscriptions as OPML": "Abonnements als OPML exportieren",
-    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Abonnements als OPML exportieren (für NewPipe & FreeTube)",
+  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Abonnements als OPML exportieren (für NewPipe & FreeTube)",
-    "Export data as JSON": "Daten als JSON exportieren",
+  "Export data as JSON": "Daten als JSON exportieren",
-    "Delete account?": "Account löschen?",
+  "Delete account?": "Account löschen?",
-    "History": "Verlauf",
+  "History": "Verlauf",
-    "Previous page": "Vorherige Seite",
+  "Previous page": "Vorherige Seite",
-    "An alternative front-end to YouTube": "Eine alternative Oberfläche für YouTube",
+  "An alternative front-end to YouTube": "Eine alternative Oberfläche für YouTube",
-    "JavaScript license information": "JavaScript Lizenzinformationen",
+  "JavaScript license information": "JavaScript Lizenzinformationen",
-    "source": "Quelle",
+  "source": "Quelle",
-    "Login": "Einloggen",
+  "Login": "Einloggen",
-    "Login/Register": "Einloggen/Registrieren",
+  "Login/Register": "Einloggen/Registrieren",
-    "Login to Google": "In Google einloggen",
+  "Login to Google": "In Google einloggen",
-    "User ID:": "Benutzer ID:",
+  "User ID:": "Benutzer ID:",
-    "Password:": "Passwort:",
+  "Password:": "Passwort:",
-    "Time (h:mm:ss):": "Zeit (h:mm:ss):",
+  "Time (h:mm:ss):": "Zeit (h:mm:ss):",
-    "Text CAPTCHA": "Text CAPTCHA",
+  "Text CAPTCHA": "Text CAPTCHA",
-    "Image CAPTCHA": "Image CAPTCHA",
+  "Image CAPTCHA": "Image CAPTCHA",
-    "Sign In": "Einloggen",
+  "Sign In": "Einloggen",
-    "Register": "Registrieren",
+  "Register": "Registrieren",
-    "Email:": "Email:",
+  "Email:": "Email:",
-    "Google verification code:": "Google Bestätigungscode:",
+  "Google verification code:": "Google Bestätigungscode:",
-    "Preferences": "Einstellungen",
+  "Preferences": "Einstellungen",
-    "Player preferences": "Playereinstellungen",
+  "Player preferences": "Playereinstellungen",
-    "Always loop: ": "Immer wiederholen: ",
+  "Always loop: ": "Immer wiederholen: ",
-    "Autoplay: ": "Automatisch abspielen: ",
+  "Autoplay: ": "Automatisch abspielen: ",
-    "Autoplay next video: ": "nächstes Video automatisch abspielen: ",
+  "Autoplay next video: ": "nächstes Video automatisch abspielen: ",
-    "Listen by default: ": "Nur Ton als Standard: ",
+  "Listen by default: ": "Nur Ton als Standard: ",
-    "Default speed: ": "Standardgeschwindigkeit: ",
+  "Default speed: ": "Standardgeschwindigkeit: ",
-    "Preferred video quality: ": "Bevorzugte Videoqualität: ",
+  "Preferred video quality: ": "Bevorzugte Videoqualität: ",
-    "Player volume: ": "Playerlautstärke: ",
+  "Player volume: ": "Playerlautstärke: ",
-    "Default comments: ": "Standardkommentare: ",
+  "Default comments: ": "Standardkommentare: ",
-    "youtube": "youtube",
+  "youtube": "youtube",
-    "reddit": "reddit",
+  "reddit": "reddit",
-    "Default captions: ": "Standarduntertitel: ",
+  "Default captions: ": "Standarduntertitel: ",
-    "Fallback captions: ": "Ersatzuntertitel: ",
+  "Fallback captions: ": "Ersatzuntertitel: ",
-    "Show related videos? ": "Ähnliche Videos anzeigen? ",
+  "Show related videos? ": "Ähnliche Videos anzeigen? ",
-    "Visual preferences": "Anzeigeeinstellungen",
+  "Visual preferences": "Anzeigeeinstellungen",
-    "Dark mode: ": "Nachtmodus: ",
+  "Dark mode: ": "Nachtmodus: ",
-    "Thin mode: ": "Schlanker Modus: ",
+  "Thin mode: ": "Schlanker Modus: ",
-    "Subscription preferences": "Abonnementeinstellungen",
+  "Subscription preferences": "Abonnementeinstellungen",
-    "Redirect homepage to feed: ": "Startseite zu Feed umleiten: ",
+  "Redirect homepage to feed: ": "Startseite zu Feed umleiten: ",
-    "Number of videos shown in feed: ": "Anzahl von Videos die im Feed angezeigt werden: ",
+  "Number of videos shown in feed: ": "Anzahl von Videos die im Feed angezeigt werden: ",
-    "Sort videos by: ": "Videos sortieren nach: ",
+  "Sort videos by: ": "Videos sortieren nach: ",
-    "published": "veröffentlicht",
+  "published": "veröffentlicht",
-    "published - reverse": "veröffentlicht - invertiert",
+  "published - reverse": "veröffentlicht - invertiert",
-    "alphabetically": "alphabetisch",
+  "alphabetically": "alphabetisch",
-    "alphabetically - reverse": "alphabetisch - invertiert",
+  "alphabetically - reverse": "alphabetisch - invertiert",
-    "channel name": "Kanalname",
+  "channel name": "Kanalname",
-    "channel name - reverse": "Kanalname - invertiert",
+  "channel name - reverse": "Kanalname - invertiert",
-    "Only show latest video from channel: ": "Nur neueste Videos des Kanals anzeigen: ",
+  "Only show latest video from channel: ": "Nur neueste Videos des Kanals anzeigen: ",
-    "Only show latest unwatched video from channel: ": "Nur neueste ungesehene Videos des Kanals anzeigen: ",
+  "Only show latest unwatched video from channel: ": "Nur neueste ungesehene Videos des Kanals anzeigen: ",
-    "Only show unwatched: ": "Nur ungesehene anzeigen: ",
+  "Only show unwatched: ": "Nur ungesehene anzeigen: ",
-    "Only show notifications (if there are any): ": "Nur Benachrichtigungen anzeigen (wenn es welche gibt): ",
+  "Only show notifications (if there are any): ": "Nur Benachrichtigungen anzeigen (wenn es welche gibt): ",
-    "Data preferences": "Dateneinstellungen",
+  "Data preferences": "Dateneinstellungen",
-    "Clear watch history": "Verlauf löschen",
+  "Clear watch history": "Verlauf löschen",
-    "Import/Export data": "Daten im- exportieren",
+  "Import/Export data": "Daten im- exportieren",
-    "Manage subscriptions": "Abonnements verwalten",
+  "Manage subscriptions": "Abonnements verwalten",
-    "Watch history": "Verlauf",
+  "Watch history": "Verlauf",
-    "Delete account": "Account löschen",
+  "Delete account": "Account löschen",
-    "Save preferences": "Einstellungen speichern",
+  "Administrator preferences": "",
-    "Subscription manager": "Abonnementverwaltung",
+  "Default homepage: ": "",
-    "`x` subscriptions": "`x` Abonnements",
+  "Feed menu: ": "",
-    "Import/Export": "Importieren/Exportieren",
+  "Top enabled? ": "",
-    "unsubscribe": "abbestellen",
+  "CAPTCHA enabled? ": "",
-    "Subscriptions": "Abonnements",
+  "Login enabled? ": "",
-    "`x` unseen notifications": "`x` ungesehene Benachrichtigungen",
+  "Registration enabled? ": "",
-    "search": "Suchen",
+  "Report statistics? ": "",
-    "Sign out": "Abmelden",
+  "Save preferences": "Einstellungen speichern",
-    "Released under the AGPLv3 by Omar Roth.": "Veröffentlicht unter AGPLv3 von Omar Roth.",
+  "Subscription manager": "Abonnementverwaltung",
-    "Source available here.": "Quellcode verfügbar hier.",
+  "`x` subscriptions": "`x` Abonnements",
-    "Liberapay: ": "Liberapay: ",
+  "Import/Export": "Importieren/Exportieren",
-    "Patreon: ": "Patreon: ",
+  "unsubscribe": "abbestellen",
-    "BTC: ": "BTC: ",
+  "Subscriptions": "Abonnements",
-    "BCH: ": "BCH: ",
+  "`x` unseen notifications": "`x` ungesehene Benachrichtigungen",
-    "View JavaScript license information.": "Javascript Lizenzinformationen anzeigen.",
+  "search": "Suchen",
-    "Trending": "Trending",
+  "Sign out": "Abmelden",
-    "Watch video on Youtube": "Video auf YouTube ansehen",
+  "Released under the AGPLv3 by Omar Roth.": "Veröffentlicht unter AGPLv3 von Omar Roth.",
-    "Genre: ": "Genre: ",
+  "Source available here.": "Quellcode verfügbar hier.",
-    "License: ": "Lizenz: ",
+  "Liberapay: ": "Liberapay: ",
-    "Family friendly? ": "Familienfreundlich? ",
+  "Patreon: ": "Patreon: ",
-    "Wilson score: ": "Wilson-Score: ",
+  "BTC: ": "BTC: ",
-    "Engagement: ": "Engagement: ",
+  "BCH: ": "BCH: ",
-    "Whitelisted regions: ": "Erlaubte Regionen: ",
+  "View JavaScript license information.": "Javascript Lizenzinformationen anzeigen.",
-    "Blacklisted regions: ": "Unerlaubte Regionen: ",
+  "Trending": "Trending",
-    "Shared `x`": "Geteilt `x`",
+  "Watch video on Youtube": "Video auf YouTube ansehen",
-    "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hallo! Anscheinend haben Sie JavaScript deaktiviert. Klicken Sie hier um Kommentare anzuzeigen, beachten sie dass es etwas länger dauern kann um sie zu laden.",
+  "Genre: ": "Genre: ",
-    "View YouTube comments": "YouTube Kommentare anzeigen",
+  "License: ": "Lizenz: ",
-    "View more comments on Reddit": "Mehr Kommentare auf Reddit anzeigen",
+  "Family friendly? ": "Familienfreundlich? ",
-    "View `x` comments": "`x` Kommentare anzeigen",
+  "Wilson score: ": "Wilson-Score: ",
-    "View Reddit comments": "Reddit Kommentare anzeigen",
+  "Engagement: ": "Engagement: ",
-    "Hide replies": "Antworten verstecken",
+  "Whitelisted regions: ": "Erlaubte Regionen: ",
-    "Show replies": "Antworten anzeigen",
+  "Blacklisted regions: ": "Unerlaubte Regionen: ",
-    "Incorrect password": "Falsches Passwort",
+  "Shared `x`": "Geteilt `x`",
-    "Quota exceeded, try again in a few hours": "Kontingent überschritten, versuche es in ein paar Stunden erneut",
+  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hallo! Anscheinend haben Sie JavaScript deaktiviert. Klicken Sie hier um Kommentare anzuzeigen, beachten sie dass es etwas länger dauern kann um sie zu laden.",
-    "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Login nicht möglich, stellen Sie sicher dass two-factor Authentifikation (Authentifizierung oder SMS) aktiviert ist.",
+  "View YouTube comments": "YouTube Kommentare anzeigen",
-    "Invalid TFA code": "Ungültiger TFA Code",
+  "View more comments on Reddit": "Mehr Kommentare auf Reddit anzeigen",
-    "Login failed. This may be because two-factor authentication is not enabled on your account.": "Login fehlgeschlagen. Das kann daran liegen dass two-factor Authentifizierung in ihrem Account nicht aktiviert ist.",
+  "View `x` comments": "`x` Kommentare anzeigen",
-    "Invalid answer": "Ungültige Antwort",
+  "View Reddit comments": "Reddit Kommentare anzeigen",
-    "Invalid CAPTCHA": "Ungültiges CAPTCHA",
+  "Hide replies": "Antworten verstecken",
-    "CAPTCHA is a required field": "CAPTCHA ist eine erforderliche Eingabe",
+  "Show replies": "Antworten anzeigen",
-    "User ID is a required field": "Benutzer ID ist eine erforderliche Eingabe",
+  "Incorrect password": "Falsches Passwort",
-    "Password is a required field": "Passwort ist eine erforderliche Eingabe",
+  "Quota exceeded, try again in a few hours": "Kontingent überschritten, versuche es in ein paar Stunden erneut",
-    "Invalid username or password": "Ungültiger Benutzername oder Passwort",
+  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Login nicht möglich, stellen Sie sicher dass two-factor Authentifikation (Authentifizierung oder SMS) aktiviert ist.",
-    "Please sign in using 'Sign in with Google'": "Bitte melden sie sich mit 'Mit Google anmelden' an",
+  "Invalid TFA code": "Ungültiger TFA Code",
-    "Password cannot be empty": "Passwort darf nicht leer sein",
+  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Login fehlgeschlagen. Das kann daran liegen dass two-factor Authentifizierung in ihrem Account nicht aktiviert ist.",
-    "Password cannot be longer than 55 characters": "Passwort darf nicht länger als 55 Zeichen sein",
+  "Invalid answer": "Ungültige Antwort",
-    "Please sign in": "Bitte anmelden",
+  "Invalid CAPTCHA": "Ungültiges CAPTCHA",
-    "Invidious Private Feed for `x`": "Invidious Persönlicher Feed für `x`",
+  "CAPTCHA is a required field": "CAPTCHA ist eine erforderliche Eingabe",
-    "channel:`x`": "Kanal:`x`",
+  "User ID is a required field": "Benutzer ID ist eine erforderliche Eingabe",
-    "Deleted or invalid channel": "Gelöschter oder ungültiger Kanal",
+  "Password is a required field": "Passwort ist eine erforderliche Eingabe",
-    "This channel does not exist.": "Dieser Kanal existiert nicht.",
+  "Invalid username or password": "Ungültiger Benutzername oder Passwort",
-    "Could not get channel info.": "Kanalinformationen konnten nicht geladen werden.",
+  "Please sign in using 'Sign in with Google'": "Bitte melden sie sich mit 'Mit Google anmelden' an",
-    "Could not fetch comments": "Kommentare konnten nicht geladen werden",
+  "Password cannot be empty": "Passwort darf nicht leer sein",
-    "View `x` replies": "Zeige `x` Antworten",
+  "Password cannot be longer than 55 characters": "Passwort darf nicht länger als 55 Zeichen sein",
-    "`x` ago": "vor `x`",
+  "Please sign in": "Bitte anmelden",
-    "Load more": "Mehr laden",
+  "Invidious Private Feed for `x`": "Invidious Persönlicher Feed für `x`",
-    "`x` points": "`x` Punkte",
+  "channel:`x`": "Kanal:`x`",
-    "Could not create mix.": "Mix konnte nicht erstellt werden.",
+  "Deleted or invalid channel": "Gelöschter oder ungültiger Kanal",
-    "Playlist is empty": "Playlist ist leer",
+  "This channel does not exist.": "Dieser Kanal existiert nicht.",
-    "Invalid playlist.": "Ungültige Playlist.",
+  "Could not get channel info.": "Kanalinformationen konnten nicht geladen werden.",
-    "Playlist does not exist.": "Playlist existiert nicht.",
+  "Could not fetch comments": "Kommentare konnten nicht geladen werden",
-    "Could not pull trending pages.": "Trending Seiten konnten nicht geladen werden.",
+  "View `x` replies": "Zeige `x` Antworten",
-    "Hidden field \"challenge\" is a required field": "Verstecktes Feld \"challenge\" ist eine erforderliche Eingabe",
+  "`x` ago": "vor `x`",
-    "Hidden field \"token\" is a required field": "Verstecktes Feld \"token\" ist eine erforderliche Eingabe",
+  "Load more": "Mehr laden",
-    "Invalid challenge": "Ungültiger Test",
+  "`x` points": "`x` Punkte",
-    "Invalid token": "Ungöltige Marke",
+  "Could not create mix.": "Mix konnte nicht erstellt werden.",
-    "Invalid user": "Ungültiger Benutzer",
+  "Playlist is empty": "Playlist ist leer",
-    "Token is expired, please try again": "Marke ist abgelaufen, bitte erneut versuchen",
+  "Invalid playlist.": "Ungültige Playlist.",
-    "English": "Englisch",
+  "Playlist does not exist.": "Playlist existiert nicht.",
-    "English (auto-generated)": "Englisch (automatisch erzeugt)",
+  "Could not pull trending pages.": "Trending Seiten konnten nicht geladen werden.",
-    "Afrikaans": "Afrikaans",
+  "Hidden field \"challenge\" is a required field": "Verstecktes Feld \"challenge\" ist eine erforderliche Eingabe",
-    "Albanian": "Albanisch",
+  "Hidden field \"token\" is a required field": "Verstecktes Feld \"token\" ist eine erforderliche Eingabe",
-    "Amharic": "Amharisch",
+  "Invalid challenge": "Ungültiger Test",
-    "Arabic": "Arabisch",
+  "Invalid token": "Ungöltige Marke",
-    "Armenian": "Armenisch",
+  "Invalid user": "Ungültiger Benutzer",
-    "Azerbaijani": "Aserbaidschanisch",
+  "Token is expired, please try again": "Marke ist abgelaufen, bitte erneut versuchen",
-    "Bangla": "Bengalisch",
+  "English": "Englisch",
-    "Basque": "Baskisch",
+  "English (auto-generated)": "Englisch (automatisch erzeugt)",
-    "Belarusian": "Weißrussisch",
+  "Afrikaans": "Afrikaans",
-    "Bosnian": "Bosnisch",
+  "Albanian": "Albanisch",
-    "Bulgarian": "Bulgarisch",
+  "Amharic": "Amharisch",
-    "Burmese": "Burmesisch",
+  "Arabic": "Arabisch",
-    "Catalan": "Katalanisch",
+  "Armenian": "Armenisch",
-    "Cebuano": "Cebuano",
+  "Azerbaijani": "Aserbaidschanisch",
-    "Chinese (Simplified)": "Chinesisch (vereinfacht)",
+  "Bangla": "Bengalisch",
-    "Chinese (Traditional)": "Chinesisch (traditionell)",
+  "Basque": "Baskisch",
-    "Corsican": "Korsisch",
+  "Belarusian": "Weißrussisch",
-    "Croatian": "Kroatisch",
+  "Bosnian": "Bosnisch",
-    "Czech": "Tschechisch",
+  "Bulgarian": "Bulgarisch",
-    "Danish": "Dänisch",
+  "Burmese": "Burmesisch",
-    "Dutch": "Niederländisch",
+  "Catalan": "Katalanisch",
-    "Esperanto": "Esperanto",
+  "Cebuano": "Cebuano",
-    "Estonian": "Estnisch",
+  "Chinese (Simplified)": "Chinesisch (vereinfacht)",
-    "Filipino": "Philippinisch",
+  "Chinese (Traditional)": "Chinesisch (traditionell)",
-    "Finnish": "Finnisch",
+  "Corsican": "Korsisch",
-    "French": "Französisch",
+  "Croatian": "Kroatisch",
-    "Galician": "Galizisch",
+  "Czech": "Tschechisch",
-    "Georgian": "Georgisch",
+  "Danish": "Dänisch",
-    "German": "Deutsch",
+  "Dutch": "Niederländisch",
-    "Greek": "Griechisch",
+  "Esperanto": "Esperanto",
-    "Gujarati": "Gujarati",
+  "Estonian": "Estnisch",
-    "Haitian Creole": "Haitianisches Kreolisch",
+  "Filipino": "Philippinisch",
-    "Hausa": "Hausa",
+  "Finnish": "Finnisch",
-    "Hawaiian": "Hawaiianisch",
+  "French": "Französisch",
-    "Hebrew": "Hebräisch",
+  "Galician": "Galizisch",
-    "Hindi": "Hindi",
+  "Georgian": "Georgisch",
-    "Hmong": "Hmong",
+  "German": "Deutsch",
-    "Hungarian": "Ungarisch",
+  "Greek": "Griechisch",
-    "Icelandic": "Isländisch",
+  "Gujarati": "Gujarati",
-    "Igbo": "Igbo",
+  "Haitian Creole": "Haitianisches Kreolisch",
-    "Indonesian": "Indonesisch",
+  "Hausa": "Hausa",
-    "Irish": "Irisch",
+  "Hawaiian": "Hawaiianisch",
-    "Italian": "Italienisch",
+  "Hebrew": "Hebräisch",
-    "Japanese": "Japanisch",
+  "Hindi": "Hindi",
-    "Javanese": "Javanisch",
+  "Hmong": "Hmong",
-    "Kannada": "Kannada",
+  "Hungarian": "Ungarisch",
-    "Kazakh": "Kasachisch",
+  "Icelandic": "Isländisch",
-    "Khmer": "Khmer",
+  "Igbo": "Igbo",
-    "Korean": "Koreanisch",
+  "Indonesian": "Indonesisch",
-    "Kurdish": "Kurdisch",
+  "Irish": "Irisch",
-    "Kyrgyz": "Kirgisisch",
+  "Italian": "Italienisch",
-    "Lao": "Laotisch",
+  "Japanese": "Japanisch",
-    "Latin": "Lateinisch",
+  "Javanese": "Javanisch",
-    "Latvian": "Lettisch",
+  "Kannada": "Kannada",
-    "Lithuanian": "Litauisch",
+  "Kazakh": "Kasachisch",
-    "Luxembourgish": "Luxemburgisch",
+  "Khmer": "Khmer",
-    "Macedonian": "Mazedonisch",
+  "Korean": "Koreanisch",
-    "Malagasy": "Madagassisch",
+  "Kurdish": "Kurdisch",
-    "Malay": "Malaiisch",
+  "Kyrgyz": "Kirgisisch",
-    "Malayalam": "Malayalam",
+  "Lao": "Laotisch",
-    "Maltese": "Maltesisch",
+  "Latin": "Lateinisch",
-    "Maori": "Maori",
+  "Latvian": "Lettisch",
-    "Marathi": "Marathi",
+  "Lithuanian": "Litauisch",
-    "Mongolian": "Mongolisch",
+  "Luxembourgish": "Luxemburgisch",
-    "Nepali": "Nepalesisch",
+  "Macedonian": "Mazedonisch",
-    "Norwegian": "Norwegisch",
+  "Malagasy": "Madagassisch",
-    "Nyanja": "Nyanja",
+  "Malay": "Malaiisch",
-    "Pashto": "Paschtunisch",
+  "Malayalam": "Malayalam",
-    "Persian": "Persisch",
+  "Maltese": "Maltesisch",
-    "Polish": "Polnisch",
+  "Maori": "Maori",
-    "Portuguese": "Portugiesisch",
+  "Marathi": "Marathi",
-    "Punjabi": "Pandschabi",
+  "Mongolian": "Mongolisch",
-    "Romanian": "Rumänisch",
+  "Nepali": "Nepalesisch",
-    "Russian": "Russisch",
+  "Norwegian": "Norwegisch",
-    "Samoan": "Samoanisch",
+  "Nyanja": "Nyanja",
-    "Scottish Gaelic": "Schottisches Gälisch",
+  "Pashto": "Paschtunisch",
-    "Serbian": "Serbisch",
+  "Persian": "Persisch",
-    "Shona": "Schona",
+  "Polish": "Polnisch",
-    "Sindhi": "Sindhi",
+  "Portuguese": "Portugiesisch",
-    "Sinhala": "Singhalesisch",
+  "Punjabi": "Pandschabi",
-    "Slovak": "Slowakisch",
+  "Romanian": "Rumänisch",
-    "Slovenian": "Slowenisch",
+  "Russian": "Russisch",
-    "Somali": "Somali",
+  "Samoan": "Samoanisch",
-    "Southern Sotho": "Südliches Sotho",
+  "Scottish Gaelic": "Schottisches Gälisch",
-    "Spanish": "Spanisch",
+  "Serbian": "Serbisch",
-    "Spanish (Latin America)": "Spanisch (Lateinamerika)",
+  "Shona": "Schona",
-    "Sundanese": "Sundanesisch",
+  "Sindhi": "Sindhi",
-    "Swahili": "Suaheli",
+  "Sinhala": "Singhalesisch",
-    "Swedish": "Schwedisch",
+  "Slovak": "Slowakisch",
-    "Tajik": "Tadschikisch",
+  "Slovenian": "Slowenisch",
-    "Tamil": "Tamilisch",
+  "Somali": "Somali",
-    "Telugu": "Telugu",
+  "Southern Sotho": "Südliches Sotho",
-    "Thai": "Thailändisch",
+  "Spanish": "Spanisch",
-    "Turkish": "Türkisch",
+  "Spanish (Latin America)": "Spanisch (Lateinamerika)",
-    "Ukrainian": "Ukrainisch",
+  "Sundanese": "Sundanesisch",
-    "Urdu": "Urdu",
+  "Swahili": "Suaheli",
-    "Uzbek": "Usbekisch",
+  "Swedish": "Schwedisch",
-    "Vietnamese": "Vietnamesisch",
+  "Tajik": "Tadschikisch",
-    "Welsh": "Walisisch",
+  "Tamil": "Tamilisch",
-    "Western Frisian": "Westfriesisch",
+  "Telugu": "Telugu",
-    "Xhosa": "Xhosa",
+  "Thai": "Thailändisch",
-    "Yiddish": "Jiddisch",
+  "Turkish": "Türkisch",
-    "Yoruba": "Joruba",
+  "Ukrainian": "Ukrainisch",
-    "Zulu": "Zulu",
+  "Urdu": "Urdu",
-    "`x` years": "`x` Jahre",
+  "Uzbek": "Usbekisch",
-    "`x` months": "`x` Monate",
+  "Vietnamese": "Vietnamesisch",
-    "`x` weeks": "`x` Wochen",
+  "Welsh": "Walisisch",
-    "`x` days": "`x` Tage",
+  "Western Frisian": "Westfriesisch",
-    "`x` hours": "`x` Stunden",
+  "Xhosa": "Xhosa",
-    "`x` minutes": "`x` Minuten",
+  "Yiddish": "Jiddisch",
-    "`x` seconds": "`x` Sekunden",
+  "Yoruba": "Joruba",
-    "Fallback comments: ": "",
+  "Zulu": "Zulu",
-    "Popular": "Populär",
+  "`x` years": "`x` Jahre",
-    "Top": "",
+  "`x` months": "`x` Monate",
-    "About": "Über",
+  "`x` weeks": "`x` Wochen",
-    "Rating: ": "Bewertung: ",
+  "`x` days": "`x` Tage",
-    "Language: ": "Sprache: "
+  "`x` hours": "`x` Stunden",
+  "`x` minutes": "`x` Minuten",
+  "`x` seconds": "`x` Sekunden",
+  "Fallback comments: ": "Alternative Kommentare: ",
+  "Popular": "Populär",
+  "Top": "Top",
+  "About": "Über",
+  "Rating: ": "Bewertung: ",
+  "Language: ": "Sprache: ",
+  "Default": "",
+  "Music": "",
+  "Gaming": "",
+  "News": "",
+  "Movies": "",
+  "Download": "",
+  "Download as: ": "",
+  "%A %B %-d, %Y": "",
+  "(edited)": "",
+  "Youtube permalink of the comment": "",
+  "`x` marked it with a ❤": "",
+  "Audio mode": "",
+  "Video mode": ""
 }

locales/en-US.json

@@ -80,6 +80,14 @@
   "Manage subscriptions": "Manage subscriptions",
   "Watch history": "Watch history",
   "Delete account": "Delete account",
+  "Administrator preferences": "Administrator preferences",
+  "Default homepage: ": "Default homepage: ",
+  "Feed menu: ": "Feed menu: ",
+  "Top enabled? ": "Top enabled? ",
+  "CAPTCHA enabled? ": "CAPTCHA enabled? ",
+  "Login enabled? ": "Login enabled? ",
+  "Registration enabled? ": "Registration enabled? ",
+  "Report statistics? ": "Report statistics? ",
   "Save preferences": "Save preferences",
   "Subscription manager": "Subscription manager",
   "`x` subscriptions": "`x` subscriptions",
@@ -263,5 +271,18 @@
   "Top": "Top",
   "About": "About",
   "Rating: ": "Rating: ",
-  "Language: ": "Language: "
+  "Language: ": "Language: ",
+  "Default": "Default",
+  "Music": "Music",
+  "Gaming": "Gaming",
+  "News": "News",
+  "Movies": "Movies",
+  "Download": "Download",
+  "Download as: ": "Download as: ",
+  "%A %B %-d, %Y": "%A %B %-d, %Y",
+  "(edited)": "(edited)",
+  "Youtube permalink of the comment": "Youtube permalink of the comment",
+  "`x` marked it with a ❤": "`x` marked it with a ❤",
+  "Audio mode": "Audio mode",
+  "Video mode": "Video mode"
 }

locales/eu.json

@@ -0,0 +1,288 @@
+{
+  "`x` subscribers": "`x` harpidedun",
+  "`x` videos": "`x` bideo",
+  "LIVE": "ZUZENEAN",
+  "Shared `x` ago": "Duela `x` partekatua",
+  "Unsubscribe": "Harpidetza kendu",
+  "Subscribe": "Harpidetu",
+  "Login to subscribe to `x`": "Saioa hasi `x`(e)ra harpidetzeko",
+  "View channel on YouTube": "Ikusi kanala YouTuben",
+  "newest": "berrienak",
+  "oldest": "zaharrenak",
+  "popular": "ospetsuenak",
+  "Preview page": "Aurrebista orria",
+  "Next page": "Hurrengo orria",
+  "Clear watch history?": "Garbitu ikusitakoen historia?",
+  "Yes": "Bai",
+  "No": "Ez",
+  "Import and Export Data": "Datuak inportatu eta esportatu",
+  "Import": "Inportatu",
+  "Import Invidious data": "Invidiouseko datuak inportatu",
+  "Import YouTube subscriptions": "YouTubeko harpidetzak inportatu",
+  "Import FreeTube subscriptions (.db)": "FreeTubeko harpidetzak inportatu (.db)",
+  "Import NewPipe subscriptions (.json)": "NewPipeko harpidetzak inportatu (.json)",
+  "Import NewPipe data (.zip)": "NewPipeko datuak inportatu (.zip)",
+  "Export": "Esportatu",
+  "Export subscriptions as OPML": "Esportatu harpidetzak OPML bezala",
+  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Harpidetzak OPML bezala esportatu (NewPipe eta FreeTuberako)",
+  "Export data as JSON": "Datuak JSON bezala esportatu",
+  "Delete account?": "Kontua ezabatu?",
+  "History": "Historia",
+  "Previous page": "Aurreko orria",
+  "An alternative front-end to YouTube": "YouTuberako interfaze alternatibo bat",
+  "JavaScript license information": "JavaScript lizentzia informazioa",
+  "source": "iturburua",
+  "Login": "Saioa hasi",
+  "Login/Register": "Saioa hasi/Izena eman",
+  "Login to Google": "Googlekin hasi saioa",
+  "User ID:": "Erabiltzaile IDa:",
+  "Password:": "Pasahitza:",
+  "Time (h:mm:ss):": "Denbora (o:mm:ss):",
+  "Text CAPTCHA": "Testu CAPTCHA",
+  "Image CAPTCHA": "Irudi CAPTCHA",
+  "Sign In": "",
+  "Register": "",
+  "Email:": "",
+  "Google verification code:": "",
+  "Preferences": "",
+  "Player preferences": "",
+  "Always loop: ": "",
+  "Autoplay: ": "",
+  "Autoplay next video: ": "",
+  "Listen by default: ": "",
+  "Default speed: ": "",
+  "Preferred video quality: ": "",
+  "Player volume: ": "",
+  "Default comments: ": "",
+  "Default captions: ": "",
+  "Fallback captions: ": "",
+  "Show related videos? ": "",
+  "Visual preferences": "",
+  "Dark mode: ": "",
+  "Thin mode: ": "",
+  "Subscription preferences": "",
+  "Redirect homepage to feed: ": "",
+  "Number of videos shown in feed: ": "",
+  "Sort videos by: ": "",
+  "published": "",
+  "published - reverse": "",
+  "alphabetically": "",
+  "alphabetically - reverse": "",
+  "channel name": "",
+  "channel name - reverse": "",
+  "Only show latest video from channel: ": "",
+  "Only show latest unwatched video from channel: ": "",
+  "Only show unwatched: ": "",
+  "Only show notifications (if there are any): ": "",
+  "Data preferences": "",
+  "Clear watch history": "",
+  "Import/Export data": "",
+  "Manage subscriptions": "",
+  "Watch history": "",
+  "Delete account": "",
+  "Administrator preferences": "",
+  "Default homepage: ": "",
+  "Feed menu: ": "",
+  "Top enabled? ": "",
+  "CAPTCHA enabled? ": "",
+  "Login enabled? ": "",
+  "Registration enabled? ": "",
+  "Report statistics? ": "",
+  "Save preferences": "",
+  "Subscription manager": "",
+  "`x` subscriptions": "",
+  "Import/Export": "",
+  "unsubscribe": "",
+  "Subscriptions": "",
+  "`x` unseen notifications": "",
+  "search": "",
+  "Sign out": "",
+  "Released under the AGPLv3 by Omar Roth.": "",
+  "Source available here.": "",
+  "View JavaScript license information.": "",
+  "Trending": "",
+  "Watch video on Youtube": "",
+  "Genre: ": "",
+  "License: ": "",
+  "Family friendly? ": "",
+  "Wilson score: ": "",
+  "Engagement: ": "",
+  "Whitelisted regions: ": "",
+  "Blacklisted regions: ": "",
+  "Shared `x`": "",
+  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "",
+  "View YouTube comments": "",
+  "View more comments on Reddit": "",
+  "View `x` comments": "",
+  "View Reddit comments": "",
+  "Hide replies": "",
+  "Show replies": "",
+  "Incorrect password": "",
+  "Quota exceeded, try again in a few hours": "",
+  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "",
+  "Invalid TFA code": "",
+  "Login failed. This may be because two-factor authentication is not enabled on your account.": "",
+  "Invalid answer": "",
+  "Invalid CAPTCHA": "",
+  "CAPTCHA is a required field": "",
+  "User ID is a required field": "",
+  "Password is a required field": "",
+  "Invalid username or password": "",
+  "Please sign in using 'Sign in with Google'": "",
+  "Password cannot be empty": "",
+  "Password cannot be longer than 55 characters": "",
+  "Please sign in": "",
+  "Invidious Private Feed for `x`": "",
+  "channel:`x`": "",
+  "Deleted or invalid channel": "",
+  "This channel does not exist.": "",
+  "Could not get channel info.": "",
+  "Could not fetch comments": "",
+  "View `x` replies": "",
+  "`x` ago": "",
+  "Load more": "",
+  "`x` points": "",
+  "Could not create mix.": "",
+  "Playlist is empty": "",
+  "Invalid playlist.": "",
+  "Playlist does not exist.": "",
+  "Could not pull trending pages.": "",
+  "Hidden field \"challenge\" is a required field": "",
+  "Hidden field \"token\" is a required field": "",
+  "Invalid challenge": "",
+  "Invalid token": "",
+  "Invalid user": "",
+  "Token is expired, please try again": "",
+  "English": "",
+  "English (auto-generated)": "",
+  "Afrikaans": "",
+  "Albanian": "",
+  "Amharic": "",
+  "Arabic": "",
+  "Armenian": "",
+  "Azerbaijani": "",
+  "Bangla": "",
+  "Basque": "",
+  "Belarusian": "",
+  "Bosnian": "",
+  "Bulgarian": "",
+  "Burmese": "",
+  "Catalan": "",
+  "Cebuano": "",
+  "Chinese (Simplified)": "",
+  "Chinese (Traditional)": "",
+  "Corsican": "",
+  "Croatian": "",
+  "Czech": "",
+  "Danish": "",
+  "Dutch": "",
+  "Esperanto": "",
+  "Estonian": "",
+  "Filipino": "",
+  "Finnish": "",
+  "French": "",
+  "Galician": "",
+  "Georgian": "",
+  "German": "",
+  "Greek": "",
+  "Gujarati": "",
+  "Haitian Creole": "",
+  "Hausa": "",
+  "Hawaiian": "",
+  "Hebrew": "",
+  "Hindi": "",
+  "Hmong": "",
+  "Hungarian": "",
+  "Icelandic": "",
+  "Igbo": "",
+  "Indonesian": "",
+  "Irish": "",
+  "Italian": "",
+  "Japanese": "",
+  "Javanese": "",
+  "Kannada": "",
+  "Kazakh": "",
+  "Khmer": "",
+  "Korean": "",
+  "Kurdish": "",
+  "Kyrgyz": "",
+  "Lao": "",
+  "Latin": "",
+  "Latvian": "",
+  "Lithuanian": "",
+  "Luxembourgish": "",
+  "Macedonian": "",
+  "Malagasy": "",
+  "Malay": "",
+  "Malayalam": "",
+  "Maltese": "",
+  "Maori": "",
+  "Marathi": "",
+  "Mongolian": "",
+  "Nepali": "",
+  "Norwegian": "",
+  "Nyanja": "",
+  "Pashto": "",
+  "Persian": "",
+  "Polish": "",
+  "Portuguese": "",
+  "Punjabi": "",
+  "Romanian": "",
+  "Russian": "",
+  "Samoan": "",
+  "Scottish Gaelic": "",
+  "Serbian": "",
+  "Shona": "",
+  "Sindhi": "",
+  "Sinhala": "",
+  "Slovak": "",
+  "Slovenian": "",
+  "Somali": "",
+  "Southern Sotho": "",
+  "Spanish": "",
+  "Spanish (Latin America)": "",
+  "Sundanese": "",
+  "Swahili": "",
+  "Swedish": "",
+  "Tajik": "",
+  "Tamil": "",
+  "Telugu": "",
+  "Thai": "",
+  "Turkish": "",
+  "Ukrainian": "",
+  "Urdu": "",
+  "Uzbek": "",
+  "Vietnamese": "",
+  "Welsh": "",
+  "Western Frisian": "",
+  "Xhosa": "",
+  "Yiddish": "",
+  "Yoruba": "",
+  "Zulu": "",
+  "`x` years": "",
+  "`x` months": "",
+  "`x` weeks": "",
+  "`x` days": "",
+  "`x` hours": "",
+  "`x` minutes": "",
+  "`x` seconds": "",
+  "Fallback comments: ": "",
+  "Popular": "",
+  "Top": "",
+  "About": "",
+  "Rating: ": "",
+  "Language: ": "",
+  "Default": "",
+  "Music": "",
+  "Gaming": "",
+  "News": "",
+  "Movies": "",
+  "Download": "",
+  "Download as: ": "",
+  "%A %B %-d, %Y": "",
+  "(edited)": "",
+  "Youtube permalink of the comment": "",
+  "`x` marked it with a ❤": "",
+  "Audio mode": "",
+  "Video mode": ""
+}

locales/fr.json

@@ -0,0 +1,287 @@
+{
+  "`x` subscribers": "`x` abonnés",
+  "`x` videos": "`x` vidéos",
+  "LIVE": "EN DIRECT",
+  "Shared `x` ago": "Partagé il y a `x`",
+  "Unsubscribe": "Se désabonner",
+  "Subscribe": "S'abonner",
+  "Login to subscribe to `x`": "Vous devez vous connecter pour vous abonner à `x`",
+  "View channel on YouTube": "Voir la chaîne sur YouTube",
+  "newest": "Date d'ajout (la plus récente)",
+  "oldest": "Date d'ajout (la plus ancienne)",
+  "popular": "Les plus populaires",
+  "Next page": "Page suivante",
+  "Clear watch history?": "Êtes-vous sûr de vouloir supprimer l'historique des vidéos regardées ?",
+  "Yes": "Oui",
+  "No": "Non",
+  "Import and Export Data": "Importer et Exporter les Données",
+  "Import": "Importer",
+  "Import Invidious data": "Importer des données Invidious",
+  "Import YouTube subscriptions": "Importer des abonnements YouTube",
+  "Import FreeTube subscriptions (.db)": "Importer des abonnements FreeTube (.db)",
+  "Import NewPipe subscriptions (.json)": "Importer des abonnements NewPipe (.json)",
+  "Import NewPipe data (.zip)": "Importer des données NewPipe (.zip)",
+  "Export": "Exporter",
+  "Export subscriptions as OPML": "Exporter les abonnements en OPML",
+  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exporter les abonnements en OPML (pour NewPipe & FreeTube)",
+  "Export data as JSON": "Exporter les données au format JSON",
+  "Delete account?": "Supprimer votre compte ?",
+  "History": "Historique",
+  "Previous page": "Page précédente",
+  "An alternative front-end to YouTube": "Un front-end alternatif à YouTube",
+  "JavaScript license information": "Informations sur les licences JavaScript",
+  "source": "source",
+  "Login": "Connexion",
+  "Login/Register": "Connexion/S'inscrire",
+  "Login to Google": "Se connecter à Google",
+  "User ID:": "ID utilisateur :",
+  "Password:": "Mot de passe :",
+  "Time (h:mm:ss):": "Heure (h:mm:ss) :",
+  "Text CAPTCHA": "CAPTCHA Texte",
+  "Image CAPTCHA": "CAPTCHA Image",
+  "Sign In": "S'identifier",
+  "Register": "S'inscrire",
+  "Email:": "Email :",
+  "Google verification code:": "Code de vérification Google :",
+  "Preferences": "Préférences",
+  "Player preferences": "Préférences du Lecteur",
+  "Always loop: ": "Lire en boucle : ",
+  "Autoplay: ": "Lire Automatiquement : ",
+  "Autoplay next video: ": "Lire automatiquement la vidéo suivante : ",
+  "Listen by default: ": "Audio Uniquement par défaut : ",
+  "Default speed: ": "Vitesse par défaut : ",
+  "Preferred video quality: ": "Qualité vidéo souhaitée : ",
+  "Player volume: ": "Volume du lecteur : ",
+  "Default comments: ": "Source des Commentaires : ",
+  "Default captions: ": "Sous-titres principal : ",
+  "Fallback captions: ": "Sous-titres secondaire : ",
+  "Show related videos? ": "Voir les vidéos liées à ce sujet ? ",
+  "Visual preferences": "Préférences visuelles",
+  "Dark mode: ": "Mode Sombre : ",
+  "Thin mode: ": "Mode Simplifié : ",
+  "Subscription preferences": "Préférences de la page d'abonnements",
+  "Redirect homepage to feed: ": "Rediriger la page d'accueil vers la page d'abonnements : ",
+  "Number of videos shown in feed: ": "Nombre de vidéos montrées dans la page d'abonnements : ",
+  "Sort videos by: ": "Trier les vidéos par : ",
+  "published": "publication",
+  "published - reverse": "publication - inversé",
+  "alphabetically": "alphabétiquement",
+  "alphabetically - reverse": "alphabétiquement - inversé",
+  "channel name": "nom de la chaîne",
+  "channel name - reverse": "nom de la chaîne - inversé",
+  "Only show latest video from channel: ": "Afficher uniquement la dernière vidéo de la chaîne : ",
+  "Only show latest unwatched video from channel: ": "Afficher uniquement la dernière vidéo de la chaîne non regardée : ",
+  "Only show unwatched: ": "Afficher uniquement les vidéos non regardées : ",
+  "Only show notifications (if there are any): ": "Afficher uniquement les notifications (s'il y en a) : ",
+  "Data preferences": "Préférences liées aux données",
+  "Clear watch history": "Supprimer l'historique des vidéos regardées",
+  "Import/Export data": "Importer/exporter les données",
+  "Manage subscriptions": "Gérer les abonnements",
+  "Watch history": "Historique de visionnage",
+  "Delete account": "Supprimer votre compte",
+  "Administrator preferences": "",
+  "Default homepage: ": "",
+  "Feed menu: ": "",
+  "Top enabled? ": "",
+  "CAPTCHA enabled? ": "",
+  "Login enabled? ": "",
+  "Registration enabled? ": "",
+  "Report statistics? ": "",
+  "Save preferences": "Enregistrer les préférences",
+  "Subscription manager": "Gestionnaire d'abonnement",
+  "`x` subscriptions": "`x` abonnements",
+  "Import/Export": "Importer/Exporter",
+  "unsubscribe": "se désabonner",
+  "Subscriptions": "Abonnements",
+  "`x` unseen notifications": "`x` notifications non vues",
+  "search": "Rechercher",
+  "Sign out": "Déconnexion",
+  "Released under the AGPLv3 by Omar Roth.": "Publié sous licence AGPLv3 par Omar Roth.",
+  "Source available here.": "Code Source.",
+  "View JavaScript license information.": "Voir les informations des licences JavaScript.",
+  "Trending": "Tendances",
+  "Watch video on Youtube": "Voir la vidéo sur Youtube",
+  "Genre: ": "Genre : ",
+  "License: ": "Licence : ",
+  "Family friendly? ": "Tout Public ? ",
+  "Wilson score: ": "Score de Wilson : ",
+  "Engagement: ": "Poucentage de spectateur aillant aimé Liker ou Disliker la vidéo : ",
+  "Whitelisted regions: ": "Régions en liste blanche : ",
+  "Blacklisted regions: ": "Régions sur liste noire : ",
+  "Shared `x`": "Partagée `x`",
+  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Il semblerait que JavaScript sois désactivé. Cliquez ici pour voir les commentaires. Gardez à l'esprit que le chargement peut prendre plus de temps.",
+  "View YouTube comments": "Voir les commentaires YouTube",
+  "View more comments on Reddit": "Voir plus de commentaires sur Reddit",
+  "View `x` comments": "Voir `x` commentaires",
+  "View Reddit comments": "Voir les commentaires Reddit",
+  "Hide replies": "Masquer les réponses",
+  "Show replies": "Afficher les réponses",
+  "Incorrect password": "Mot de passe incorrect",
+  "Quota exceeded, try again in a few hours": "Nombre de tentative de connexion dépassé, réessayez dans quelques heures",
+  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Si vous ne parvenez pas à vous connecter, assurez-vous que l'authentification à deux facteurs (Authenticator ou SMS) est activée.",
+  "Invalid TFA code": "Code d'authentification à deux facteurs invalide",
+  "Login failed. This may be because two-factor authentication is not enabled on your account.": "La connexion a échoué. Cela peut être dû au fait que l'authentification à deux facteurs n'est pas activée sur votre compte.",
+  "Invalid answer": "Réponse non valide",
+  "Invalid CAPTCHA": "CAPTCHA invalide",
+  "CAPTCHA is a required field": "Veuillez rentrez un CAPTCHA",
+  "User ID is a required field": "Veuillez rentrez un Identifiant Utilisateur",
+  "Password is a required field": "Veuillez rentrez un Mot de passe",
+  "Invalid username or password": "Nom d'utilisateur ou mot de passe invalide",
+  "Please sign in using 'Sign in with Google'": "Veuillez vous connecter en utilisant \"S'identifier avec Google\"",
+  "Password cannot be empty": "Le mot de passe ne peut pas être vide",
+  "Password cannot be longer than 55 characters": "Le mot de passe ne doit pas comporter plus de 55 caractères",
+  "Please sign in": "Veuillez vous connecter",
+  "Invidious Private Feed for `x`": "Flux RSS privé pour `x`",
+  "channel:`x`": "chaîne:`x`",
+  "Deleted or invalid channel": "Chaîne supprimée ou invalide",
+  "This channel does not exist.": "Cette chaine n'existe pas.",
+  "Could not get channel info.": "Impossible de charger les informations de cette chaîne.",
+  "Could not fetch comments": "Impossible de charger les commentaires",
+  "View `x` replies": "Voir `x` réponses",
+  "`x` ago": "il y a `x`",
+  "Load more": "Charger plus",
+  "`x` points": "`x` points",
+  "Could not create mix.": "Impossible de charger cette liste de lecture.",
+  "Playlist is empty": "La liste de lecture est vide",
+  "Invalid playlist.": "Liste de lecture invalide.",
+  "Playlist does not exist.": "La liste de lecture n'existe pas.",
+  "Could not pull trending pages.": "Impossible de charger les pages de tendances.",
+  "Hidden field \"challenge\" is a required field": "Hidden field \"challenge\" is a required field",
+  "Hidden field \"token\" is a required field": "Hidden field \"token\" is a required field",
+  "Invalid challenge": "Invalid challenge",
+  "Invalid token": "Invalid token",
+  "Invalid user": "Invalid user",
+  "Token is expired, please try again": "Token is expired, please try again",
+  "English": "Anglais",
+  "English (auto-generated)": "Anglais (générés automatiquement)",
+  "Afrikaans": "Afrikaans",
+  "Albanian": "Albanais",
+  "Amharic": "Amharique",
+  "Arabic": "Arabe",
+  "Armenian": "Arménien",
+  "Azerbaijani": "Azerbaïdjanais",
+  "Bangla": "Bangla",
+  "Basque": "Basque",
+  "Belarusian": "Belarusian",
+  "Bosnian": "Bosnian",
+  "Bulgarian": "Bulgarian",
+  "Burmese": "Birman",
+  "Catalan": "Catalan",
+  "Cebuano": "Cebuano",
+  "Chinese (Simplified)": "Chinois (Simplifié)",
+  "Chinese (Traditional)": "Chinois (Traditionnel)",
+  "Corsican": "Corse",
+  "Croatian": "Croate",
+  "Czech": "Tchèque",
+  "Danish": "Danois",
+  "Dutch": "Hollandais",
+  "Esperanto": "Espéranto",
+  "Estonian": "Estonien",
+  "Filipino": "Philippin",
+  "Finnish": "Finlandais",
+  "French": "Français",
+  "Galician": "Galicien",
+  "Georgian": "Géorgien",
+  "German": "Allemand",
+  "Greek": "Grec",
+  "Gujarati": "Gujarati",
+  "Haitian Creole": "Créole Haïtien",
+  "Hausa": "Haoussa",
+  "Hawaiian": "Hawaïen",
+  "Hebrew": "Hébraïque",
+  "Hindi": "Hindi",
+  "Hmong": "Hmong",
+  "Hungarian": "Hongrois",
+  "Icelandic": "Islandais",
+  "Igbo": "Igbo",
+  "Indonesian": "Indonésien",
+  "Irish": "Irlandais",
+  "Italian": "Italien",
+  "Japanese": "Japonais",
+  "Javanese": "Javanais",
+  "Kannada": "Kannada",
+  "Kazakh": "Kazakh",
+  "Khmer": "Khmer",
+  "Korean": "Coréen",
+  "Kurdish": "Kurde",
+  "Kyrgyz": "Kirghize",
+  "Lao": "Lao",
+  "Latin": "Latin",
+  "Latvian": "Letton",
+  "Lithuanian": "Lituanien",
+  "Luxembourgish": "Luxembourgeois",
+  "Macedonian": "Macédonien",
+  "Malagasy": "Malgache",
+  "Malay": "Malais",
+  "Malayalam": "Malayalam",
+  "Maltese": "Maltais",
+  "Maori": "Maori",
+  "Marathi": "Marathi",
+  "Mongolian": "Mongol",
+  "Nepali": "Népalais",
+  "Norwegian": "Norvégien",
+  "Nyanja": "Nyanja",
+  "Pashto": "Pachtou",
+  "Persian": "Persan",
+  "Polish": "Polonais",
+  "Portuguese": "Portugais",
+  "Punjabi": "Punjabi",
+  "Romanian": "Roumain",
+  "Russian": "Russe",
+  "Samoan": "Samoan",
+  "Scottish Gaelic": "Eaélique Ècossais",
+  "Serbian": "Serbe",
+  "Shona": "Shona",
+  "Sindhi": "Sindhi",
+  "Sinhala": "Cinghalais",
+  "Slovak": "Slovaque",
+  "Slovenian": "Slovène",
+  "Somali": "Somalien",
+  "Southern Sotho": "Sotho du Sud",
+  "Spanish": "Espagnol",
+  "Spanish (Latin America)": "Espagnol (Amérique latine)",
+  "Sundanese": "Sundanais",
+  "Swahili": "Swahili",
+  "Swedish": "Suédois",
+  "Tajik": "Tajik",
+  "Tamil": "Tamil",
+  "Telugu": "Telugu",
+  "Thai": "Thaï",
+  "Turkish": "Turc",
+  "Ukrainian": "Ukrainien",
+  "Urdu": "Ourdou",
+  "Uzbek": "Ouzbek",
+  "Vietnamese": "Vietnamien",
+  "Welsh": "Gallois",
+  "Western Frisian": "Frison occidental",
+  "Xhosa": "Xhosa",
+  "Yiddish": "Yiddish",
+  "Yoruba": "Yoruba",
+  "Zulu": "Zoulou",
+  "`x` years": "`x` ans",
+  "`x` months": "`x` mois",
+  "`x` weeks": "`x` semaines",
+  "`x` days": "`x` jours",
+  "`x` hours": "`x` heures",
+  "`x` minutes": "`x` minutes",
+  "`x` seconds": "`x` secondes",
+  "Fallback comments: ": "Commentaires secondaires : ",
+  "Popular": "Populaire",
+  "Top": "Top",
+  "About": "A Propos",
+  "Rating: ": "Évaluation : ",
+  "Language: ": "Langue : ",
+  "Default": "Défaut",
+  "Music": "Musique",
+  "Gaming": "Jeux Vidéo",
+  "News": "Actualités",
+  "Movies": "Films",
+  "Download": "Télécharger",
+  "Download as: ": "Télécharger en : ",
+  "%A %B %-d, %Y": "%A %-d %B %Y",
+  "(edited)": "(modifié)",
+  "Youtube permalink of the comment": "Lien YouTube permanent vers le commentaire",
+  "`x` marked it with a ❤": "`x` l'a marqué d'un ❤",
+  "Audio mode": "Mode Audio",
+  "Video mode": "Mode Vidéo"
+}

locales/it.json

@@ -0,0 +1,287 @@
+{
+  "`x` subscribers": "`x` iscritti",
+  "`x` videos": "`x` video",
+  "LIVE": "IN DIRETTA",
+  "Shared `x` ago": "Condiviso `x` fa",
+  "Unsubscribe": "Disiscriviti",
+  "Subscribe": "Iscriviti",
+  "Login to subscribe to `x`": "Accedi per iscriverti a `x`",
+  "View channel on YouTube": "Vedi canale su YouTube",
+  "newest": "Data di aggiunta (più recente)",
+  "oldest": "Data di aggiunta (più vecchia)",
+  "popular": "Tendenze",
+  "Next page": "Pagina successiva",
+  "Clear watch history?": "Sei sicuro di voler cancellare la cronologia dei video guardati?",
+  "Yes": "Si",
+  "No": "No",
+  "Import and Export Data": "Importazione ed esportazione dati",
+  "Import": "Importa",
+  "Import Invidious data": "Importa dati Invidious",
+  "Import YouTube subscriptions": "Importa le iscrizioni da YouTube",
+  "Import FreeTube subscriptions (.db)": "Importa le iscrizioni da FreeTube (.db)",
+  "Import NewPipe subscriptions (.json)": "Importa le iscrizioni da NewPipe (.json)",
+  "Import NewPipe data (.zip)": "Importa i dati di NewPipe (.zip)",
+  "Export": "Esporta",
+  "Export subscriptions as OPML": "Esporta gli abbonamenti come OPML",
+  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Esporta gli abbonamenti come OPML (per NewPipe e FreeTube)",
+  "Export data as JSON": "Esporta i dati in formato JSON",
+  "Delete account?": "Sei sicuro di voler cancellare l'account?",
+  "History": "Cronologia",
+  "Previous page": "Pagina precedente",
+  "An alternative front-end to YouTube": "Un'interfaccia alternativa per YouTube",
+  "JavaScript license information": "Info licenze JavaScript",
+  "source": "sorgente",
+  "Login": "Entra",
+  "Login/Register": "Entra/Registrati",
+  "Login to Google": "Entra con Google",
+  "User ID:": "ID utente:",
+  "Password:": "Password:",
+  "Time (h:mm:ss):": "Orario (h:mm:ss):",
+  "Text CAPTCHA": "Testo del CAPTCHA",
+  "Image CAPTCHA": "Immagine CAPTCHA",
+  "Sign In": "Entra",
+  "Register": "Registrati",
+  "Email:": "Email:",
+  "Google verification code:": "Codice di verifica Google:",
+  "Preferences": "Preferenze",
+  "Player preferences": "Preferenze del riproduttore",
+  "Always loop: ": "Ripeti sempre: ",
+  "Autoplay: ": "Riproduzione automatica: ",
+  "Autoplay next video: ": "Riproduci automaticamente il prossimo video: ",
+  "Listen by default: ": "Modalità solo audio come predefinita: ",
+  "Default speed: ": "Velocità di riproduzione predefinita: ",
+  "Preferred video quality: ": "Preferenza sulla qualità video: ",
+  "Player volume: ": "Volume di riproduzione: ",
+  "Default comments: ": "Origine dei commenti: ",
+  "Default captions: ": "Sottotitoli predefiniti: ",
+  "Fallback captions: ": "Sottotitoli alternativi: ",
+  "Show related videos? ": "Mostra video correlati? ",
+  "Visual preferences": "Preferenze grafiche",
+  "Dark mode: ": "Tema scuro: ",
+  "Thin mode: ": "Modalità per connessioni lente: ",
+  "Subscription preferences": "Preferenze iscrizioni",
+  "Redirect homepage to feed: ": "Reindirizza la pagina principale a quella delle iscrizioni: ",
+  "Number of videos shown in feed: ": "Numero di video da mostrare nelle iscrizioni: ",
+  "Sort videos by: ": "Ordinare i video per: ",
+  "published": "data di pubblicazione",
+  "published - reverse": "data di pubblicazione - decrescente",
+  "alphabetically": "ordine alfabetico",
+  "alphabetically - reverse": "ordine alfabetico - decrescente",
+  "channel name": "nome del canale",
+  "channel name - reverse": "nome del canale - decrescente",
+  "Only show latest video from channel: ": "Mostra solo il video più recente del canale: ",
+  "Only show latest unwatched video from channel: ": "Mostra solo il video più recente non guardato del canale: ",
+  "Only show unwatched: ": "Mostra solo i video non guardati: ",
+  "Only show notifications (if there are any): ": "Mostra solo le notifiche (se presenti): ",
+  "Data preferences": "Preferenze dati",
+  "Clear watch history": "Cancella la cronologia dei video guardati",
+  "Import/Export data": "Importazione/esportazione dati",
+  "Manage subscriptions": "Gestisci le iscrizioni",
+  "Watch history": "Cronologia dei video",
+  "Delete account": "Elimina l'account",
+  "Administrator preferences": "",
+  "Default homepage: ": "",
+  "Feed menu: ": "",
+  "Top enabled? ": "",
+  "CAPTCHA enabled? ": "",
+  "Login enabled? ": "",
+  "Registration enabled? ": "",
+  "Report statistics? ": "",
+  "Save preferences": "Salva le preferenze",
+  "Subscription manager": "Gestisci le iscrizioni",
+  "`x` subscriptions": "`x` iscrizioni",
+  "Import/Export": "Importa/esporta",
+  "unsubscribe": "disiscriviti",
+  "Subscriptions": "Iscrizioni",
+  "`x` unseen notifications": "`x` notifiche non visualizzate",
+  "search": "Cerca",
+  "Sign out": "Esci",
+  "Released under the AGPLv3 by Omar Roth.": "Pubblicato con licenza AGPLv3 da Omar Roth.",
+  "Source available here.": "Codice sorgente.",
+  "View JavaScript license information.": "Guarda le informazioni di licenza del codice JavaScript.",
+  "Trending": "Tendenze",
+  "Watch video on Youtube": "Guarda il video su YouTube",
+  "Genre: ": "Genere: ",
+  "License: ": "Licenza: ",
+  "Family friendly? ": "Per tutti? ",
+  "Wilson score: ": "Punteggio di Wilson: ",
+  "Engagement: ": "Tasso di coinvolgimento: ",
+  "Whitelisted regions: ": "Regioni nella lista bianca: ",
+  "Blacklisted regions: ": "Regioni nella lista nera: ",
+  "Shared `x`": "Condiviso `x`",
+  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Ciao! Sembra che tu abbia disattivato JavaScript. Clicca qui per visualizzare i commenti. Considera che potrebbe volerci più tempo.",
+  "View YouTube comments": "Visualizza i commenti da YouTube",
+  "View more comments on Reddit": "Visualizza più commenti su Reddit",
+  "View `x` comments": "Visualizza `x` commenti",
+  "View Reddit comments": "Visualizza i commenti da Reddit",
+  "Hide replies": "Nascondi le risposte",
+  "Show replies": "Mostra le risposte",
+  "Incorrect password": "Password sbagliata",
+  "Quota exceeded, try again in a few hours": "Limite superato, prova di nuovo fra qualche ora",
+  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Impossibile autenticarsi, controlla che l'autenticazione in due passaggi (Authenticator o SMS) sia attiva.",
+  "Invalid TFA code": "Codice di autenticazione a due fattori non valido",
+  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Login fallito. L'errore potrebbe essere causato dal fatto che la verifica in due passaggi non è attiva sul tuo account.",
+  "Invalid answer": "Risposta errata",
+  "Invalid CAPTCHA": "CAPTCHA errato",
+  "CAPTCHA is a required field": "Il CAPTCHA è un campo obbligatorio",
+  "User ID is a required field": "L'ID utente è obbligatorio",
+  "Password is a required field": "La password è un campo obbligatorio",
+  "Invalid username or password": "Nome utente o password errati",
+  "Please sign in using 'Sign in with Google'": "Per favore accedi con \"Entra con Google\"",
+  "Password cannot be empty": "La password non può essere vuota",
+  "Password cannot be longer than 55 characters": "La password non può contenere più di 55 caratteri",
+  "Please sign in": "Per favore, entra",
+  "Invidious Private Feed for `x`": "Feed privato Invidious per `x`",
+  "channel:`x`": "canale:`x`",
+  "Deleted or invalid channel": "Canale cancellato o invalido",
+  "This channel does not exist.": "Canale inesistente.",
+  "Could not get channel info.": "Impossibile ottenere le informazioni del canale.",
+  "Could not fetch comments": "Impossibile recuperare i commenti",
+  "View `x` replies": "Visualizza `x` risposte",
+  "`x` ago": "`x` fa",
+  "Load more": "Carica altro",
+  "`x` points": "`x` punti",
+  "Could not create mix.": "Impossibile creare il mix.",
+  "Playlist is empty": "Playlist vuota",
+  "Invalid playlist.": "Playlist invalida.",
+  "Playlist does not exist.": "Playlist inesistente.",
+  "Could not pull trending pages.": "Impossibile recuperare le tendenze.",
+  "Hidden field \"challenge\" is a required field": "Il campo nascosto \"challenge\" è obbligatorio",
+  "Hidden field \"token\" is a required field": "Il campo nascosto \"token\" è obbligatorio",
+  "Invalid challenge": "Campo \"challenge\" invalido",
+  "Invalid token": "Campo \"token\" invalido",
+  "Invalid user": "Utente invalido",
+  "Token is expired, please try again": "Token scaduto, riprova",
+  "English": "Inglese",
+  "English (auto-generated)": "Inglese (generati automaticamente)",
+  "Afrikaans": "Afrikaans",
+  "Albanian": "Albanese",
+  "Amharic": "Amarico",
+  "Arabic": "Arabo",
+  "Armenian": "Armeno",
+  "Azerbaijani": "Azero",
+  "Bangla": "Bengalese",
+  "Basque": "Basco",
+  "Belarusian": "Biellorusso",
+  "Bosnian": "Bosniaco",
+  "Bulgarian": "Bulgaro",
+  "Burmese": "Birmano",
+  "Catalan": "Catalano",
+  "Cebuano": "Sugbuanon",
+  "Chinese (Simplified)": "Cinese semplifiato",
+  "Chinese (Traditional)": "Cinese tradizionale",
+  "Corsican": "Corso",
+  "Croatian": "Croato",
+  "Czech": "Ceco",
+  "Danish": "Danese",
+  "Dutch": "Olandese",
+  "Esperanto": "Esperanto",
+  "Estonian": "Estone",
+  "Filipino": "Filippino",
+  "Finnish": "Finlandese",
+  "French": "Francese",
+  "Galician": "Galiziano",
+  "Georgian": "Georgiano",
+  "German": "Tedesco",
+  "Greek": "Greco",
+  "Gujarati": "Gujarati",
+  "Haitian Creole": "Creolo haitiano",
+  "Hausa": "Lingua hausa",
+  "Hawaiian": "Hawaiano",
+  "Hebrew": "Ebreo",
+  "Hindi": "Hindi",
+  "Hmong": "Hmong",
+  "Hungarian": "Ungarese",
+  "Icelandic": "Islandese",
+  "Igbo": "Igbo",
+  "Indonesian": "Indonesiano",
+  "Irish": "Irlandese",
+  "Italian": "Italiano",
+  "Japanese": "Giapponese",
+  "Javanese": "Giavanese",
+  "Kannada": "Kannada",
+  "Kazakh": "Kazaco",
+  "Khmer": "Khmer",
+  "Korean": "Coreano",
+  "Kurdish": "Curdo",
+  "Kyrgyz": "Kirghize",
+  "Lao": "Lao",
+  "Latin": "Latino",
+  "Latvian": "Lettone",
+  "Lithuanian": "Lituano",
+  "Luxembourgish": "Lussemburghese",
+  "Macedonian": "Macedone",
+  "Malagasy": "Malgascio",
+  "Malay": "Malese",
+  "Malayalam": "Lingua malayalam",
+  "Maltese": "Maltese",
+  "Maori": "Maori",
+  "Marathi": "Marathi",
+  "Mongolian": "Mongolo",
+  "Nepali": "Nepalese",
+  "Norwegian": "Norvegese",
+  "Nyanja": "Nyanja",
+  "Pashto": "Lingua pashtu",
+  "Persian": "Persiano",
+  "Polish": "Polacco",
+  "Portuguese": "Portoghese",
+  "Punjabi": "Punjabi",
+  "Romanian": "Rumeno",
+  "Russian": "Russo",
+  "Samoan": "Samoan",
+  "Scottish Gaelic": "Gaelico scozzese",
+  "Serbian": "Serbo",
+  "Shona": "Shona",
+  "Sindhi": "Sindhi",
+  "Sinhala": "Cingalese",
+  "Slovak": "Slovacco",
+  "Slovenian": "Sloveno",
+  "Somali": "Somalo",
+  "Southern Sotho": "Sotho del Sud",
+  "Spanish": "Spagnolo",
+  "Spanish (Latin America)": "Spagnolo (America latina)",
+  "Sundanese": "Sudanese",
+  "Swahili": "Swahili",
+  "Swedish": "Svedese",
+  "Tajik": "Tajik",
+  "Tamil": "Tamil",
+  "Telugu": "Telugu",
+  "Thai": "Thaï",
+  "Turkish": "Turco",
+  "Ukrainian": "Ucraino",
+  "Urdu": "Urdu",
+  "Uzbek": "Uzbeco",
+  "Vietnamese": "Vietnamese",
+  "Welsh": "Gallese",
+  "Western Frisian": "Frisone occidentale",
+  "Xhosa": "Xhosa",
+  "Yiddish": "Yiddish",
+  "Yoruba": "Yoruba",
+  "Zulu": "Zulu",
+  "`x` years": "`x` anni",
+  "`x` months": "`x` mesi",
+  "`x` weeks": "`x` settimane",
+  "`x` days": "`x` giorni",
+  "`x` hours": "`x` ore",
+  "`x` minutes": "`x` minuti",
+  "`x` seconds": "`x` secondi",
+  "Fallback comments: ": "Commenti alternativi: ",
+  "Popular": "Popolare",
+  "Top": "Top",
+  "About": "A proposito",
+  "Rating: ": "Punteggio: ",
+  "Language: ": "Lingua: ",
+  "Default": "Predefinito",
+  "Music": "Musica",
+  "Gaming": "Videogiochi",
+  "News": "Notizie",
+  "Movies": "Film",
+  "Download": "Scarica",
+  "Download as: ": "Scarica come: ",
+  "%A %B %-d, %Y": "%A %-d %B %Y",
+  "(edited)": "(modificato)",
+  "Youtube permalink of the comment": "Link permanente al commento di YouTube",
+  "`x` marked it with a ❤": "`x` l'ha contrassegnato con un ❤",
+  "Audio mode": "Modalità audio",
+  "Video mode": "Modalità video"
+}

locales/nb_NO.json

@@ -1,267 +1,288 @@
 {
-    "`x` subscribers": "`x` abonnenter",
+  "`x` subscribers": "`x` abonnenter",
-    "`x` videos": "`x` videoer",
+  "`x` videos": "`x` videoer",
-    "LIVE": "SANNTIDSVISNING",
+  "LIVE": "SANNTIDSVISNING",
-    "Shared `x` ago": "Delt for `x` siden",
+  "Shared `x` ago": "Delt for `x` siden",
-    "Unsubscribe": "Opphev abonnement",
+  "Unsubscribe": "Opphev abonnement",
-    "Subscribe": "Abonner",
+  "Subscribe": "Abonner",
-    "Login to subscribe to `x`": "Logg inn for å abonnere på `x`",
+  "Login to subscribe to `x`": "Logg inn for å abonnere på `x`",
-    "View channel on YouTube": "Vis kanal på YouTube",
+  "View channel on YouTube": "Vis kanal på YouTube",
-    "newest": "nyeste",
+  "newest": "nyeste",
-    "oldest": "eldste",
+  "oldest": "eldste",
-    "popular": "populært",
+  "popular": "populært",
-    "Preview page": "Forhåndsvis side",
+  "Preview page": "Forhåndsvis side",
-    "Next page": "Neste side",
+  "Next page": "Neste side",
-    "Clear watch history?": "Tøm visningshistorikk?",
+  "Clear watch history?": "Tøm visningshistorikk?",
-    "Yes": "Ja",
+  "Yes": "Ja",
-    "No": "Nei",
+  "No": "Nei",
-    "Import and Export Data": "Importer- og eksporter data",
+  "Import and Export Data": "Importer- og eksporter data",
-    "Import": "Importer",
+  "Import": "Importer",
-    "Import Invidious data": "Importer Invidious-data",
+  "Import Invidious data": "Importer Invidious-data",
-    "Import YouTube subscriptions": "Importer YouTube-abonnenter",
+  "Import YouTube subscriptions": "Importer YouTube-abonnenter",
-    "Import FreeTube subscriptions (.db)": "Importer FreeTube-abonnenter (.db)",
+  "Import FreeTube subscriptions (.db)": "Importer FreeTube-abonnenter (.db)",
-    "Import NewPipe subscriptions (.json)": "Importer NewPipe-abonnenter (.json)",
+  "Import NewPipe subscriptions (.json)": "Importer NewPipe-abonnenter (.json)",
-    "Import NewPipe data (.zip)": "Importer NewPipe-data (.zip)",
+  "Import NewPipe data (.zip)": "Importer NewPipe-data (.zip)",
-    "Export": "Eksporter",
+  "Export": "Eksporter",
-    "Export subscriptions as OPML": "Eksporter abonnenter som OPML",
+  "Export subscriptions as OPML": "Eksporter abonnenter som OPML",
-    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Eksporter abonnenter som OPML (for NewPipe og FreeTube)",
+  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Eksporter abonnenter som OPML (for NewPipe og FreeTube)",
-    "Export data as JSON": "Eksporter data som JSON",
+  "Export data as JSON": "Eksporter data som JSON",
-    "Delete account?": "Slett konto?",
+  "Delete account?": "Slett konto?",
-    "History": "Historikk",
+  "History": "Historikk",
-    "Previous page": "Forrige side",
+  "Previous page": "Forrige side",
-    "An alternative front-end to YouTube": "En alternativ grenseflate for YouTube",
+  "An alternative front-end to YouTube": "En alternativ grenseflate for YouTube",
-    "JavaScript license information": "JavaScript-lisensinformasjon",
+  "JavaScript license information": "JavaScript-lisensinformasjon",
-    "source": "kilde",
+  "source": "kilde",
-    "Login": "Logg inn",
+  "Login": "Logg inn",
-    "Login/Register": "Logg inn/registrer",
+  "Login/Register": "Logg inn/registrer",
-    "Login to Google": "Logg inn med Google",
+  "Login to Google": "Logg inn med Google",
-    "User ID:": "Bruker-ID:",
+  "User ID:": "Bruker-ID:",
-    "Password:": "Passord:",
+  "Password:": "Passord:",
-    "Time (h:mm:ss):": "Tid (h:mm:ss):",
+  "Time (h:mm:ss):": "Tid (h:mm:ss):",
-    "Text CAPTCHA": "Tekst-CAPTCHA",
+  "Text CAPTCHA": "Tekst-CAPTCHA",
-    "Image CAPTCHA": "Bilde-CAPTCHA",
+  "Image CAPTCHA": "Bilde-CAPTCHA",
-    "Sign In": "Innlogging",
+  "Sign In": "Innlogging",
-    "Register": "Registrer",
+  "Register": "Registrer",
-    "Email:": "E-post:",
+  "Email:": "E-post:",
-    "Google verification code:": "Google-bekreftelseskode:",
+  "Google verification code:": "Google-bekreftelseskode:",
-    "Preferences": "Innstillinger",
+  "Preferences": "Innstillinger",
-    "Player preferences": "Avspillerinnstillinger",
+  "Player preferences": "Avspillerinnstillinger",
-    "Always loop: ": "Alltid gjenta: ",
+  "Always loop: ": "Alltid gjenta: ",
-    "Autoplay: ": "Autoavspilling: ",
+  "Autoplay: ": "Autoavspilling: ",
-    "Autoplay next video: ": "Autospill neste video: ",
+  "Autoplay next video: ": "Autospill neste video: ",
-    "Listen by default: ": "Lytt som forvalg: ",
+  "Listen by default: ": "Lytt som forvalg: ",
-    "Default speed: ": "Forvalgt hastighet: ",
+  "Default speed: ": "Forvalgt hastighet: ",
-    "Preferred video quality: ": "Foretrukket videokvalitet: ",
+  "Preferred video quality: ": "Foretrukket videokvalitet: ",
-    "Player volume: ": "Avspillerlydstyrke: ",
+  "Player volume: ": "Avspillerlydstyrke: ",
-    "Default comments: ": "Forvalgte kommentarer: ",
+  "Default comments: ": "Forvalgte kommentarer: ",
-    "Default captions: ": "Forvalgte undertitler: ",
+  "Default captions: ": "Forvalgte undertitler: ",
-    "Fallback captions: ": "Tilbakefallsundertitler: ",
+  "Fallback captions: ": "Tilbakefallsundertitler: ",
-    "Show related videos? ": "Vis relaterte videoer? ",
+  "Show related videos? ": "Vis relaterte videoer? ",
-    "Visual preferences": "Visuelle innstillinger",
+  "Visual preferences": "Visuelle innstillinger",
-    "Dark mode: ": "Mørk drakt: ",
+  "Dark mode: ": "Mørk drakt: ",
-    "Thin mode: ": "Tynt modus: ",
+  "Thin mode: ": "Tynt modus: ",
-    "Subscription preferences": "Abonnementsinnstillinger",
+  "Subscription preferences": "Abonnementsinnstillinger",
-    "Redirect homepage to feed: ": "Videresend hjemmeside til flyt: ",
+  "Redirect homepage to feed: ": "Videresend hjemmeside til flyt: ",
-    "Number of videos shown in feed: ": "Antall videoer å vise i flyt: ",
+  "Number of videos shown in feed: ": "Antall videoer å vise i flyt: ",
-    "Sort videos by: ": "Sorter videoer etter: ",
+  "Sort videos by: ": "Sorter videoer etter: ",
-    "published": "publisert",
+  "published": "publisert",
-    "published - reverse": "publisert - motsatt",
+  "published - reverse": "publisert - motsatt",
-    "alphabetically": "alfabetisk",
+  "alphabetically": "alfabetisk",
-    "alphabetically - reverse": "alfabetisk - motsatt",
+  "alphabetically - reverse": "alfabetisk - motsatt",
-    "channel name": "kanalnavn",
+  "channel name": "kanalnavn",
-    "channel name - reverse": "kanalnavn - motsatt",
+  "channel name - reverse": "kanalnavn - motsatt",
-    "Only show latest video from channel: ": "Kun vis siste video fra kanal: ",
+  "Only show latest video from channel: ": "Kun vis siste video fra kanal: ",
-    "Only show latest unwatched video from channel: ": "Kun vis siste usette video fra kanal: ",
+  "Only show latest unwatched video from channel: ": "Kun vis siste usette video fra kanal: ",
-    "Only show unwatched: ": "Kun vis usette: ",
+  "Only show unwatched: ": "Kun vis usette: ",
-    "Only show notifications (if there are any): ": "Kun vis merknader (hvis det er noen): ",
+  "Only show notifications (if there are any): ": "Kun vis merknader (hvis det er noen): ",
-    "Data preferences": "Datainnstillinger",
+  "Data preferences": "Datainnstillinger",
-    "Clear watch history": "Tøm visningshistorikk",
+  "Clear watch history": "Tøm visningshistorikk",
-    "Import/Export data": "Importer/eksporter data",
+  "Import/Export data": "Importer/eksporter data",
-    "Manage subscriptions": "Behandle abonnementer",
+  "Manage subscriptions": "Behandle abonnementer",
-    "Watch history": "Visningshistorikk",
+  "Watch history": "Visningshistorikk",
-    "Delete account": "Slett konto",
+  "Delete account": "Slett konto",
-    "Save preferences": "Lagre innstillinger",
+  "Administrator preferences": "Administratorinnstillinger",
-    "Subscription manager": "Abonnementsbehandler",
+  "Default homepage: ": "Forvalgt hjemmeside: ",
-    "`x` subscriptions": "`x` abonnementer",
+  "Feed menu: ": "Flyt-meny: ",
-    "Import/Export": "Importer/eksporter",
+  "Top enabled? ": "",
-    "unsubscribe": "opphev abonnement",
+  "CAPTCHA enabled? ": "CAPTCHA påskrudd? ",
-    "Subscriptions": "Abonnement",
+  "Login enabled? ": "Innlogging påskrudd? ",
-    "`x` unseen notifications": "`x` usette merknader",
+  "Registration enabled? ": "Registrering påskrudd? ",
-    "search": "søk",
+  "Report statistics? ": "",
-    "Sign out": "Logg ut",
+  "Save preferences": "Lagre innstillinger",
-    "Released under the AGPLv3 by Omar Roth.": "Utgitt med AGPLv3+lisens av Omar Roth.",
+  "Subscription manager": "Abonnementsbehandler",
-    "Source available here.": "Kildekode tilgjengelig her.",
+  "`x` subscriptions": "`x` abonnementer",
-    "View JavaScript license information.": "Vis JavaScript-lisensinfo.",
+  "Import/Export": "Importer/eksporter",
-    "Trending": "Trendsettende",
+  "unsubscribe": "opphev abonnement",
-    "Watch video on Youtube": "Vis video på YouTube",
+  "Subscriptions": "Abonnement",
-    "Genre: ": "Sjanger: ",
+  "`x` unseen notifications": "`x` usette merknader",
-    "License: ": "Lisens: ",
+  "search": "søk",
-    "Family friendly? ": "Familievennlig? ",
+  "Sign out": "Logg ut",
-    "Wilson score: ": "Wilson-poengsum: ",
+  "Released under the AGPLv3 by Omar Roth.": "Utgitt med AGPLv3+lisens av Omar Roth.",
-    "Engagement: ": "Engasjement: ",
+  "Source available here.": "Kildekode tilgjengelig her.",
-    "Whitelisted regions: ": "Hvitlistede regioner: ",
+  "View JavaScript license information.": "Vis JavaScript-lisensinfo.",
-    "Blacklisted regions: ": "Svartelistede regioner: ",
+  "Trending": "Trendsettende",
-    "Shared `x`": "Delt `x`",
+  "Watch video on Youtube": "Vis video på YouTube",
-    "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hei. Det ser ut til at du har JavaScript avslått. Klikk her for å vise kommentarer, ha i minnet at innlasting tar lengre tid.",
+  "Genre: ": "Sjanger: ",
-    "View YouTube comments": "Vis YouTube-kommentarer",
+  "License: ": "Lisens: ",
-    "View more comments on Reddit": "Vis flere kommenterer på Reddit",
+  "Family friendly? ": "Familievennlig? ",
-    "View `x` comments": "Vis `x` kommentarer",
+  "Wilson score: ": "Wilson-poengsum: ",
-    "View Reddit comments": "Vis Reddit-kommentarer",
+  "Engagement: ": "Engasjement: ",
-    "Hide replies": "Skjul svar",
+  "Whitelisted regions: ": "Hvitlistede regioner: ",
-    "Show replies": "Vis svar",
+  "Blacklisted regions: ": "Svartelistede regioner: ",
-    "Incorrect password": "Feil passord",
+  "Shared `x`": "Delt `x`",
-    "Quota exceeded, try again in a few hours": "Kvote overskredet, prøv igjen om et par timer",
+  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hei. Det ser ut til at du har JavaScript avslått. Klikk her for å vise kommentarer, ha i minnet at innlasting tar lengre tid.",
-    "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Kunne ikke logge inn, forsikre deg om at tofaktor-identitetsbekreftelse (Authenticator eller SMS) er skrudd på.",
+  "View YouTube comments": "Vis YouTube-kommentarer",
-    "Invalid TFA code": "Ugyldig tofaktorkode",
+  "View more comments on Reddit": "Vis flere kommenterer på Reddit",
-    "Login failed. This may be because two-factor authentication is not enabled on your account.": "Innlogging mislyktes. Dette kan være fordi tofaktor-identitetsbekreftelse er skrudd av på kontoen din.",
+  "View `x` comments": "Vis `x` kommentarer",
-    "Invalid answer": "Ugyldig svar",
+  "View Reddit comments": "Vis Reddit-kommentarer",
-    "Invalid CAPTCHA": "Ugyldig CAPTCHA",
+  "Hide replies": "Skjul svar",
-    "CAPTCHA is a required field": "CAPTCHA er et påkrevd felt",
+  "Show replies": "Vis svar",
-    "User ID is a required field": "Bruker-ID er et påkrevd felt",
+  "Incorrect password": "Feil passord",
-    "Password is a required field": "Passord er et påkrevd felt",
+  "Quota exceeded, try again in a few hours": "Kvote overskredet, prøv igjen om et par timer",
-    "Invalid username or password": "Ugyldig brukernavn eller passord",
+  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Kunne ikke logge inn, forsikre deg om at tofaktor-identitetsbekreftelse (Authenticator eller SMS) er skrudd på.",
-    "Please sign in using 'Sign in with Google'": "Logg inn ved bruk av \"Google-innlogging\"",
+  "Invalid TFA code": "Ugyldig tofaktorkode",
-    "Password cannot be empty": "Passordet kan ikke være tomt",
+  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Innlogging mislyktes. Dette kan være fordi tofaktor-identitetsbekreftelse er skrudd av på kontoen din.",
-    "Password cannot be longer than 55 characters": "Passordet kan ikke være lengre enn 55 tegn",
+  "Invalid answer": "Ugyldig svar",
-    "Please sign in": "Logg inn",
+  "Invalid CAPTCHA": "Ugyldig CAPTCHA",
-    "Invidious Private Feed for `x`": "Ugyldig privat flyt for `x`",
+  "CAPTCHA is a required field": "CAPTCHA er et påkrevd felt",
-    "channel:`x`": "kanal `x`",
+  "User ID is a required field": "Bruker-ID er et påkrevd felt",
-    "Deleted or invalid channel": "Slettet eller ugyldig kanal",
+  "Password is a required field": "Passord er et påkrevd felt",
-    "This channel does not exist.": "Denne kanalen finnes ikke.",
+  "Invalid username or password": "Ugyldig brukernavn eller passord",
-    "Could not get channel info.": "Kunne ikke innhente kanalinfo.",
+  "Please sign in using 'Sign in with Google'": "Logg inn ved bruk av \"Google-innlogging\"",
-    "Could not fetch comments": "Kunne ikke hente kommentarer",
+  "Password cannot be empty": "Passordet kan ikke være tomt",
-    "View `x` replies": "Vis `x` svar",
+  "Password cannot be longer than 55 characters": "Passordet kan ikke være lengre enn 55 tegn",
-    "`x` ago": "`x` siden",
+  "Please sign in": "Logg inn",
-    "Load more": "Last inn flere",
+  "Invidious Private Feed for `x`": "Ugyldig privat flyt for `x`",
-    "`x` points": "`x` poeng",
+  "channel:`x`": "kanal `x`",
-    "Could not create mix.": "Kunne ikke opprette miks.",
+  "Deleted or invalid channel": "Slettet eller ugyldig kanal",
-    "Playlist is empty": "Spillelisten er tom",
+  "This channel does not exist.": "Denne kanalen finnes ikke.",
-    "Invalid playlist.": "Ugyldig spilleliste.",
+  "Could not get channel info.": "Kunne ikke innhente kanalinfo.",
-    "Playlist does not exist.": "Spillelisten finnes ikke.",
+  "Could not fetch comments": "Kunne ikke hente kommentarer",
-    "Could not pull trending pages.": "Kunne ikke hente trendsettende sider.",
+  "View `x` replies": "Vis `x` svar",
-    "Hidden field \"challenge\" is a required field": "Skjult felt \"utfordring\" er et påkrevd felt",
+  "`x` ago": "`x` siden",
-    "Hidden field \"token\" is a required field": "Skjult felt \"symbol\" er et påkrevd felt",
+  "Load more": "Last inn flere",
-    "Invalid challenge": "Ugyldig utfordring",
+  "`x` points": "`x` poeng",
-    "Invalid token": "Ugyldig symbol",
+  "Could not create mix.": "Kunne ikke opprette miks.",
-    "Invalid user": "Ugyldig bruker",
+  "Playlist is empty": "Spillelisten er tom",
-    "Token is expired, please try again": "Symbol utløpt, prøv igjen",
+  "Invalid playlist.": "Ugyldig spilleliste.",
-    "English": "Engelsk",
+  "Playlist does not exist.": "Spillelisten finnes ikke.",
-    "English (auto-generated)": "Engelsk (auto-generert)",
+  "Could not pull trending pages.": "Kunne ikke hente trendsettende sider.",
-    "Afrikaans": "",
+  "Hidden field \"challenge\" is a required field": "Skjult felt \"utfordring\" er et påkrevd felt",
-    "Albanian": "Albansk",
+  "Hidden field \"token\" is a required field": "Skjult felt \"symbol\" er et påkrevd felt",
-    "Amharic": "",
+  "Invalid challenge": "Ugyldig utfordring",
-    "Arabic": "Arabisk",
+  "Invalid token": "Ugyldig symbol",
-    "Armenian": "Armensk",
+  "Invalid user": "Ugyldig bruker",
-    "Azerbaijani": "",
+  "Token is expired, please try again": "Symbol utløpt, prøv igjen",
-    "Bangla": "",
+  "English": "Engelsk",
-    "Basque": "",
+  "English (auto-generated)": "Engelsk (auto-generert)",
-    "Belarusian": "Hviterussisk",
+  "Afrikaans": "",
-    "Bosnian": "Bosnisk",
+  "Albanian": "Albansk",
-    "Bulgarian": "Bulgarsk",
+  "Amharic": "",
-    "Burmese": "Burmesisk",
+  "Arabic": "Arabisk",
-    "Catalan": "Katalansk",
+  "Armenian": "Armensk",
-    "Cebuano": "",
+  "Azerbaijani": "",
-    "Chinese (Simplified)": "",
+  "Bangla": "",
-    "Chinese (Traditional)": "",
+  "Basque": "",
-    "Corsican": "",
+  "Belarusian": "Hviterussisk",
-    "Croatian": "",
+  "Bosnian": "Bosnisk",
-    "Czech": "Tsjekkisk",
+  "Bulgarian": "Bulgarsk",
-    "Danish": "Dansk",
+  "Burmese": "Burmesisk",
-    "Dutch": "",
+  "Catalan": "Katalansk",
-    "Esperanto": "Esperanto",
+  "Cebuano": "",
-    "Estonian": "",
+  "Chinese (Simplified)": "",
-    "Filipino": "",
+  "Chinese (Traditional)": "",
-    "Finnish": "Finsk",
+  "Corsican": "",
-    "French": "Fransk",
+  "Croatian": "",
-    "Galician": "",
+  "Czech": "Tsjekkisk",
-    "Georgian": "",
+  "Danish": "Dansk",
-    "German": "",
+  "Dutch": "",
-    "Greek": "",
+  "Esperanto": "Esperanto",
-    "Gujarati": "",
+  "Estonian": "",
-    "Haitian Creole": "",
+  "Filipino": "",
-    "Hausa": "",
+  "Finnish": "Finsk",
-    "Hawaiian": "",
+  "French": "Fransk",
-    "Hebrew": "",
+  "Galician": "",
-    "Hindi": "",
+  "Georgian": "",
-    "Hmong": "",
+  "German": "",
-    "Hungarian": "Ungarsk",
+  "Greek": "",
-    "Icelandic": "Islandsk",
+  "Gujarati": "",
-    "Igbo": "",
+  "Haitian Creole": "",
-    "Indonesian": "Indonesisk",
+  "Hausa": "",
-    "Irish": "Irsk",
+  "Hawaiian": "",
-    "Italian": "Italiensk",
+  "Hebrew": "",
-    "Japanese": "Japansk",
+  "Hindi": "",
-    "Javanese": "",
+  "Hmong": "",
-    "Kannada": "",
+  "Hungarian": "Ungarsk",
-    "Kazakh": "",
+  "Icelandic": "Islandsk",
-    "Khmer": "",
+  "Igbo": "",
-    "Korean": "",
+  "Indonesian": "Indonesisk",
-    "Kurdish": "",
+  "Irish": "Irsk",
-    "Kyrgyz": "",
+  "Italian": "Italiensk",
-    "Lao": "",
+  "Japanese": "Japansk",
-    "Latin": "",
+  "Javanese": "",
-    "Latvian": "",
+  "Kannada": "",
-    "Lithuanian": "",
+  "Kazakh": "",
-    "Luxembourgish": "",
+  "Khmer": "",
-    "Macedonian": "",
+  "Korean": "",
-    "Malagasy": "",
+  "Kurdish": "",
-    "Malay": "",
+  "Kyrgyz": "",
-    "Malayalam": "",
+  "Lao": "",
-    "Maltese": "",
+  "Latin": "",
-    "Maori": "",
+  "Latvian": "",
-    "Marathi": "",
+  "Lithuanian": "",
-    "Mongolian": "",
+  "Luxembourgish": "",
-    "Nepali": "",
+  "Macedonian": "",
-    "Norwegian": "Norsk bokmål",
+  "Malagasy": "",
-    "Nyanja": "",
+  "Malay": "",
-    "Pashto": "",
+  "Malayalam": "",
-    "Persian": "",
+  "Maltese": "",
-    "Polish": "",
+  "Maori": "",
-    "Portuguese": "",
+  "Marathi": "",
-    "Punjabi": "",
+  "Mongolian": "",
-    "Romanian": "",
+  "Nepali": "",
-    "Russian": "Russisk",
+  "Norwegian": "Norsk bokmål",
-    "Samoan": "",
+  "Nyanja": "",
-    "Scottish Gaelic": "",
+  "Pashto": "",
-    "Serbian": "Serbisk",
+  "Persian": "",
-    "Shona": "",
+  "Polish": "",
-    "Sindhi": "",
+  "Portuguese": "",
-    "Sinhala": "",
+  "Punjabi": "",
-    "Slovak": "Slovakisk",
+  "Romanian": "",
-    "Slovenian": "Slovensk",
+  "Russian": "Russisk",
-    "Somali": "Somali",
+  "Samoan": "",
-    "Southern Sotho": "",
+  "Scottish Gaelic": "",
-    "Spanish": "Spansk",
+  "Serbian": "Serbisk",
-    "Spanish (Latin America)": "",
+  "Shona": "",
-    "Sundanese": "",
+  "Sindhi": "",
-    "Swahili": "",
+  "Sinhala": "",
-    "Swedish": "Svensk",
+  "Slovak": "Slovakisk",
-    "Tajik": "",
+  "Slovenian": "Slovensk",
-    "Tamil": "",
+  "Somali": "Somali",
-    "Telugu": "",
+  "Southern Sotho": "",
-    "Thai": "",
+  "Spanish": "Spansk",
-    "Turkish": "Tyrkisk",
+  "Spanish (Latin America)": "",
-    "Ukrainian": "Ukrainsk",
+  "Sundanese": "",
-    "Urdu": "",
+  "Swahili": "",
-    "Uzbek": "",
+  "Swedish": "Svensk",
-    "Vietnamese": "Vietnamesisk",
+  "Tajik": "",
-    "Welsh": "",
+  "Tamil": "",
-    "Western Frisian": "",
+  "Telugu": "",
-    "Xhosa": "",
+  "Thai": "",
-    "Yiddish": "",
+  "Turkish": "Tyrkisk",
-    "Yoruba": "",
+  "Ukrainian": "Ukrainsk",
-    "Zulu": "",
+  "Urdu": "",
-    "`x` years": "`x` år",
+  "Uzbek": "",
-    "`x` months": "`x` måneder",
+  "Vietnamese": "Vietnamesisk",
-    "`x` weeks": "`x` uker",
+  "Welsh": "",
-    "`x` days": "`x` dager",
+  "Western Frisian": "",
-    "`x` hours": "`x` timer",
+  "Xhosa": "",
-    "`x` minutes": "`x` minutter",
+  "Yiddish": "",
-    "`x` seconds": "`x` sekunder",
+  "Yoruba": "",
-    "Fallback comments: ": "Tilbakefallskommentarer: ",
+  "Zulu": "",
-    "Popular": "Pupulært",
+  "`x` years": "`x` år",
-    "Top": "Topp",
+  "`x` months": "`x` måneder",
-    "About": "Om",
+  "`x` weeks": "`x` uker",
-    "Rating: ": "Vurdering: ",
+  "`x` days": "`x` dager",
-    "Language: ": "Språk: "
+  "`x` hours": "`x` timer",
+  "`x` minutes": "`x` minutter",
+  "`x` seconds": "`x` sekunder",
+  "Fallback comments: ": "Tilbakefallskommentarer: ",
+  "Popular": "Pupulært",
+  "Top": "Topp",
+  "About": "Om",
+  "Rating: ": "Vurdering: ",
+  "Language: ": "Språk: ",
+  "Default": "Forvalg",
+  "Music": "Musikk",
+  "Gaming": "Spill",
+  "News": "Nyheter",
+  "Movies": "Filmer",
+  "Download": "Last ned",
+  "Download as: ": "Last ned som: ",
+  "%A %B %-d, %Y": "",
+  "(edited)": "(redigert)",
+  "Youtube permalink of the comment": "Permanent YouTube-lenke til innholdet",
+  "`x` marked it with a ❤": "`x` levnet et ❤",
+  "Audio mode": "Lydmodus",
+  "Video mode": "Video-modus"
 }

locales/nl.json

@@ -80,6 +80,14 @@
   "Manage subscriptions": "Abonnees beheren",
   "Watch history": "Kijkgeschiedenis",
   "Delete account": "Account verwijderen",
+  "Administrator preferences": "",
+  "Default homepage: ": "",
+  "Feed menu: ": "",
+  "Top enabled? ": "",
+  "CAPTCHA enabled? ": "",
+  "Login enabled? ": "",
+  "Registration enabled? ": "",
+  "Report statistics? ": "",
   "Save preferences": "Opslaan voorkeuren",
   "Subscription manager": "Abonnees beheerder",
   "`x` subscriptions": "`x` abonnees",
@@ -263,5 +271,18 @@
   "Top": "",
   "About": "",
   "Rating: ": "",
-  "Language: ": ""
+  "Language: ": "",
+  "Default": "",
+  "Music": "",
+  "Gaming": "",
+  "News": "",
+  "Movies": "",
+  "Download": "",
+  "Download as: ": "",
+  "%A %B %-d, %Y": "",
+  "(edited)": "",
+  "Youtube permalink of the comment": "",
+  "`x` marked it with a ❤": "",
+  "Audio mode": "",
+  "Video mode": ""
 }

locales/pl.json

@@ -29,7 +29,7 @@
   "Delete account?": "Usunąć konto?",
   "History": "Historia",
   "Previous page": "Poprzednia strona",
-  "An alternative front-end to YouTube": "",
+  "An alternative front-end to YouTube": "Alternatywny front-end dla YouTube",
   "JavaScript license information": "Informacja o licencji JavaScript",
   "source": "źródło",
   "Login": "Zaloguj",
@@ -80,6 +80,14 @@
   "Manage subscriptions": "Organizuj subskrybcje",
   "Watch history": "Historia",
   "Delete account": "Usuń konto",
+  "Administrator preferences": "",
+  "Default homepage: ": "",
+  "Feed menu: ": "",
+  "Top enabled? ": "",
+  "CAPTCHA enabled? ": "",
+  "Login enabled? ": "",
+  "Registration enabled? ": "",
+  "Report statistics? ": "",
   "Save preferences": "Zapisz preferencje",
   "Subscription manager": "Manager subskrybcji",
   "`x` subscriptions": "`x` subskrybcji",
@@ -145,107 +153,107 @@
   "Invalid token": "Niepoprawny token",
   "Invalid user": "Niepoprawny użytkownik",
   "Token is expired, please try again": "Token wygasł, spróbuj ponownie",
-  "English": "",
+  "English": "angielski",
-  "English (auto-generated)": "",
+  "English (auto-generated)": "angielski (automatycznie generowane)",
   "Afrikaans": "",
-  "Albanian": "",
+  "Albanian": "albański",
   "Amharic": "",
-  "Arabic": "",
+  "Arabic": "arabski",
   "Armenian": "",
   "Azerbaijani": "",
   "Bangla": "",
   "Basque": "",
-  "Belarusian": "",
+  "Belarusian": "białoruski",
-  "Bosnian": "",
+  "Bosnian": "bośniacki",
-  "Bulgarian": "",
+  "Bulgarian": "bułgarski",
-  "Burmese": "",
+  "Burmese": "birmański",
-  "Catalan": "",
+  "Catalan": "kataloński",
   "Cebuano": "",
-  "Chinese (Simplified)": "",
+  "Chinese (Simplified)": "chiński (uproszczony)",
-  "Chinese (Traditional)": "",
+  "Chinese (Traditional)": "chiński (tradycyjny)",
-  "Corsican": "",
+  "Corsican": "korsykański",
-  "Croatian": "",
+  "Croatian": "chorwacki",
-  "Czech": "",
+  "Czech": "czeski",
-  "Danish": "",
+  "Danish": "duński",
-  "Dutch": "",
+  "Dutch": "holenderski",
-  "Esperanto": "",
+  "Esperanto": "esperanto",
-  "Estonian": "",
+  "Estonian": "estoński",
-  "Filipino": "",
+  "Filipino": "filipiński",
-  "Finnish": "",
+  "Finnish": "fiński",
-  "French": "",
+  "French": "francuski",
-  "Galician": "",
+  "Galician": "galicyjski",
-  "Georgian": "",
+  "Georgian": "gruziński",
-  "German": "",
+  "German": "niemiecki",
-  "Greek": "",
+  "Greek": "grecki",
   "Gujarati": "",
   "Haitian Creole": "",
   "Hausa": "",
-  "Hawaiian": "",
+  "Hawaiian": "hawajski",
-  "Hebrew": "",
+  "Hebrew": "hebrajski",
-  "Hindi": "",
+  "Hindi": "hindi",
   "Hmong": "",
-  "Hungarian": "",
+  "Hungarian": "węgierski",
-  "Icelandic": "",
+  "Icelandic": "islandzki",
   "Igbo": "",
-  "Indonesian": "",
+  "Indonesian": "indonezyjski",
-  "Irish": "",
+  "Irish": "irlandzki",
-  "Italian": "",
+  "Italian": "włoski",
-  "Japanese": "",
+  "Japanese": "japoński",
-  "Javanese": "",
+  "Javanese": "jawajski",
   "Kannada": "",
-  "Kazakh": "",
+  "Kazakh": "kazachski",
   "Khmer": "",
-  "Korean": "",
+  "Korean": "koreański",
-  "Kurdish": "",
+  "Kurdish": "kurdyjski",
-  "Kyrgyz": "",
+  "Kyrgyz": "kirgiski",
   "Lao": "",
-  "Latin": "",
+  "Latin": "łaciński",
-  "Latvian": "",
+  "Latvian": "łotewski",
-  "Lithuanian": "",
+  "Lithuanian": "litewski",
-  "Luxembourgish": "",
+  "Luxembourgish": "luksemburski",
-  "Macedonian": "",
+  "Macedonian": "macedoński",
-  "Malagasy": "",
+  "Malagasy": "malgaski",
-  "Malay": "",
+  "Malay": "malajski",
   "Malayalam": "",
-  "Maltese": "",
+  "Maltese": "maltański",
   "Maori": "",
   "Marathi": "",
-  "Mongolian": "",
+  "Mongolian": "mongolski",
-  "Nepali": "",
+  "Nepali": "nepalski",
-  "Norwegian": "",
+  "Norwegian": "norweski",
   "Nyanja": "",
   "Pashto": "",
-  "Persian": "",
+  "Persian": "perski",
-  "Polish": "",
+  "Polish": "polski",
-  "Portuguese": "",
+  "Portuguese": "portugalski",
   "Punjabi": "",
-  "Romanian": "",
+  "Romanian": "rumuński",
-  "Russian": "",
+  "Russian": "rosyjski",
   "Samoan": "",
   "Scottish Gaelic": "",
-  "Serbian": "",
+  "Serbian": "serbski",
   "Shona": "",
   "Sindhi": "",
   "Sinhala": "",
-  "Slovak": "",
+  "Slovak": "słowacki",
-  "Slovenian": "",
+  "Slovenian": "słoweński",
-  "Somali": "",
+  "Somali": "somalijski",
   "Southern Sotho": "",
-  "Spanish": "",
+  "Spanish": "hiszpański",
-  "Spanish (Latin America)": "",
+  "Spanish (Latin America)": "hiszpański (ameryka łacińska)",
   "Sundanese": "",
   "Swahili": "",
-  "Swedish": "",
+  "Swedish": "szwedzki",
   "Tajik": "",
   "Tamil": "",
   "Telugu": "",
-  "Thai": "",
+  "Thai": "tajski",
-  "Turkish": "",
+  "Turkish": "turecki",
-  "Ukrainian": "",
+  "Ukrainian": "ukraiński",
   "Urdu": "",
-  "Uzbek": "",
+  "Uzbek": "uzbecki",
-  "Vietnamese": "",
+  "Vietnamese": "wietnamski",
-  "Welsh": "",
+  "Welsh": "walijski",
   "Western Frisian": "",
   "Xhosa": "",
   "Yiddish": "",
@@ -258,10 +266,23 @@
   "`x` hours": "`x` godzin",
   "`x` minutes": "`x` minut",
   "`x` seconds": "`x` sekund",
-  "Fallback comments: ": "",
+  "Fallback comments: ": "Zastępcze komentarze: ",
-  "Popular": "",
+  "Popular": "Popularne",
-  "Top": "",
+  "Top": "Na czasie",
-  "About": "",
+  "About": "Informacje",
-  "Rating: ": "",
+  "Rating: ": "Ocena: ",
-  "Language: ": ""
+  "Language: ": "Język: ",
+  "Default": "",
+  "Music": "Muzyka",
+  "Gaming": "Gry",
+  "News": "Wiadomości",
+  "Movies": "Filmy",
+  "Download": "Pobierz",
+  "Download as: ": "Pobierz jako: ",
+  "%A %B %-d, %Y": "",
+  "(edited)": "(edytowany)",
+  "Youtube permalink of the comment": "Odnośnik bezpośredni do komentarza na YouTube",
+  "`x` marked it with a ❤": "",
+  "Audio mode": "Tryb audio",
+  "Video mode": "Tryb wideo"
 }

locales/ru.json

@@ -1,273 +1,294 @@
 {
-    "`x` subscribers": "`x` подписчиков",
+  "`x` subscribers": "`x` подписчиков",
-    "`x` videos": "`x` видео",
+  "`x` videos": "`x` видео",
-    "LIVE": "ПРЯМОЙ ЭФИР",
+  "LIVE": "ПРЯМОЙ ЭФИР",
-    "Shared `x` ago": "Опубликовано `x` назад",
+  "Shared `x` ago": "Опубликовано `x` назад",
-    "Unsubscribe": "Отписаться",
+  "Unsubscribe": "Отписаться",
-    "Subscribe": "Подписаться",
+  "Subscribe": "Подписаться",
-    "Login to subscribe to `x`": "Войти, чтобы подписаться на `x`",
+  "Login to subscribe to `x`": "Войти, чтобы подписаться на `x`",
-    "View channel on YouTube": "Канал на YouTube",
+  "View channel on YouTube": "Канал на YouTube",
-    "newest": "новые",
+  "newest": "новые",
-    "oldest": "старые",
+  "oldest": "старые",
-    "popular": "популярные",
+  "popular": "популярные",
-    "Preview page": "Предварительный просмотр",
+  "Preview page": "Предварительный просмотр",
-    "Next page": "Следующая страница",
+  "Next page": "Следующая страница",
-    "Clear watch history?": "Очистить историю просмотров?",
+  "Clear watch history?": "Очистить историю просмотров?",
-    "Yes": "Да",
+  "Yes": "Да",
-    "No": "Нет",
+  "No": "Нет",
-    "Import and Export Data": "Импорт и экспорт данных",
+  "Import and Export Data": "Импорт и экспорт данных",
-    "Import": "Импорт",
+  "Import": "Импорт",
-    "Import Invidious data": "Импортировать данные Invidious",
+  "Import Invidious data": "Импортировать данные Invidious",
-    "Import YouTube subscriptions": "Импортировать YouTube подписки",
+  "Import YouTube subscriptions": "Импортировать YouTube подписки",
-    "Import FreeTube subscriptions (.db)": "Импортировать FreeTube подписки (.db)",
+  "Import FreeTube subscriptions (.db)": "Импортировать FreeTube подписки (.db)",
-    "Import NewPipe subscriptions (.json)": "Импортировать NewPipe подписки (.json)",
+  "Import NewPipe subscriptions (.json)": "Импортировать NewPipe подписки (.json)",
-    "Import NewPipe data (.zip)": "Импортировать данные NewPipe (.zip)",
+  "Import NewPipe data (.zip)": "Импортировать данные NewPipe (.zip)",
-    "Export": "Экспорт",
+  "Export": "Экспорт",
-    "Export subscriptions as OPML": "Экспортировать подписки в OPML",
+  "Export subscriptions as OPML": "Экспортировать подписки в OPML",
-    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Экспортировать подписки в OPML (для NewPipe и FreeTube)",
+  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Экспортировать подписки в OPML (для NewPipe и FreeTube)",
-    "Export data as JSON": "Экспортировать данные в JSON",
+  "Export data as JSON": "Экспортировать данные в JSON",
-    "Delete account?": "Удалить аккаунт?",
+  "Delete account?": "Удалить аккаунт?",
-    "History": "История",
+  "History": "История",
-    "Previous page": "Предыдущая страница",
+  "Previous page": "Предыдущая страница",
-    "An alternative front-end to YouTube": "Альтернативный фронтенд для YouTube",
+  "An alternative front-end to YouTube": "Альтернативный фронтенд для YouTube",
-    "JavaScript license information": "Лицензии JavaScript",
+  "JavaScript license information": "Лицензии JavaScript",
-    "source": "источник",
+  "source": "источник",
-    "Login": "Войти",
+  "Login": "Войти",
-    "Login/Register": "Войти/Регистрация",
+  "Login/Register": "Войти/Регистрация",
-    "Login to Google": "Войти через Google",
+  "Login to Google": "Войти через Google",
-    "User ID:": "ID пользователя:",
+  "User ID:": "ID пользователя:",
-    "Password:": "Пароль:",
+  "Password:": "Пароль:",
-    "Time (h:mm:ss):": "Время (ч:мм:сс):",
+  "Time (h:mm:ss):": "Время (ч:мм:сс):",
-    "Text CAPTCHA": "Текст капчи",
+  "Text CAPTCHA": "Текст капчи",
-    "Image CAPTCHA": "Изображение капчи",
+  "Image CAPTCHA": "Изображение капчи",
-    "Sign In": "Войти",
+  "Sign In": "Войти",
-    "Register": "Регистрация",
+  "Register": "Регистрация",
-    "Email:": "Эл. почта:",
+  "Email:": "Эл. почта:",
-    "Google verification code:": "Код подтверждения Google:",
+  "Google verification code:": "Код подтверждения Google:",
-    "Preferences": "Настройки",
+  "Preferences": "Настройки",
-    "Player preferences": "Настройки проигрывателя",
+  "Player preferences": "Настройки проигрывателя",
-    "Always loop: ": "Всегда повторять: ",
+  "Always loop: ": "Всегда повторять: ",
-    "Autoplay: ": "Автовоспроизведение: ",
+  "Autoplay: ": "Автовоспроизведение: ",
-    "Autoplay next video: ": "Автовоспроизведение следующего видео: ",
+  "Autoplay next video: ": "Автовоспроизведение следующего видео: ",
-    "Listen by default: ": "Режим \"только аудио\" по-умолчанию: ",
+  "Listen by default: ": "Режим \"только аудио\" по-умолчанию: ",
-    "Default speed: ": "Скорость по-умолчанию: ",
+  "Default speed: ": "Скорость по-умолчанию: ",
-    "Preferred video quality: ": "Предпочтительное качество видео: ",
+  "Preferred video quality: ": "Предпочтительное качество видео: ",
-    "Player volume: ": "Громкость воспроизведения: ",
+  "Player volume: ": "Громкость воспроизведения: ",
-    "Default comments: ": "Источник комментариев: ",
+  "Default comments: ": "Источник комментариев: ",
-    "youtube": "YouTube",
+  "youtube": "YouTube",
-    "reddit": "Reddit",
+  "reddit": "Reddit",
-    "Default captions: ": "Субтитры по-умолчанию: ",
+  "Default captions: ": "Субтитры по-умолчанию: ",
-    "Fallback captions: ": "Резервные субтитры: ",
+  "Fallback captions: ": "Резервные субтитры: ",
-    "Show related videos? ": "Показывать похожие видео? ",
+  "Show related videos? ": "Показывать похожие видео? ",
-    "Visual preferences": "Визуальные настройки",
+  "Visual preferences": "Визуальные настройки",
-    "Dark mode: ": "Темная тема: ",
+  "Dark mode: ": "Темная тема: ",
-    "Thin mode: ": "Облегченный режим: ",
+  "Thin mode: ": "Облегченный режим: ",
-    "Subscription preferences": "Настройки подписок",
+  "Subscription preferences": "Настройки подписок",
-    "Redirect homepage to feed: ": "Отображать ленту вместо главной страницы: ",
+  "Redirect homepage to feed: ": "Отображать ленту вместо главной страницы: ",
-    "Number of videos shown in feed: ": "Число видео в ленте: ",
+  "Number of videos shown in feed: ": "Число видео в ленте: ",
-    "Sort videos by: ": "Сортировать видео по: ",
+  "Sort videos by: ": "Сортировать видео по: ",
-    "published": "дате публикации",
+  "published": "дате публикации",
-    "published - reverse": "дате - обратный порядок",
+  "published - reverse": "дате - обратный порядок",
-    "alphabetically": "алфавиту",
+  "alphabetically": "алфавиту",
-    "alphabetically - reverse": "алфавиту - обратный порядок",
+  "alphabetically - reverse": "алфавиту - обратный порядок",
-    "channel name": "имени канала",
+  "channel name": "имени канала",
-    "channel name - reverse": "имени канала - обратный порядок",
+  "channel name - reverse": "имени канала - обратный порядок",
-    "Only show latest video from channel: ": "Отображать только последние видео с каждого канала: ",
+  "Only show latest video from channel: ": "Отображать только последние видео с каждого канала: ",
-    "Only show latest unwatched video from channel: ": "Отображать только непросмотренные видео с каждого канала: ",
+  "Only show latest unwatched video from channel: ": "Отображать только непросмотренные видео с каждого канала: ",
-    "Only show unwatched: ": "Отображать только непросмотренные видео: ",
+  "Only show unwatched: ": "Отображать только непросмотренные видео: ",
-    "Only show notifications (if there are any): ": "Отображать только оповещения (если есть): ",
+  "Only show notifications (if there are any): ": "Отображать только оповещения (если есть): ",
-    "Data preferences": "Настройки данных",
+  "Data preferences": "Настройки данных",
-    "Clear watch history": "Очистить историю просмотра",
+  "Clear watch history": "Очистить историю просмотра",
-    "Import/Export data": "Импорт/Экспорт данных",
+  "Import/Export data": "Импорт/Экспорт данных",
-    "Manage subscriptions": "Управление подписками",
+  "Manage subscriptions": "Управление подписками",
-    "Watch history": "История просмотров",
+  "Watch history": "История просмотров",
-    "Delete account": "Удалить аккаунт",
+  "Delete account": "Удалить аккаунт",
-    "Save preferences": "Сохранить настройки",
+  "Administrator preferences": "",
-    "Subscription manager": "Менеджер подписок",
+  "Default homepage: ": "",
-    "`x` subscriptions": "`x` подписок",
+  "Feed menu: ": "",
-    "Import/Export": "Импорт/Экспорт",
+  "Top enabled? ": "",
-    "unsubscribe": "отписаться",
+  "CAPTCHA enabled? ": "",
-    "Subscriptions": "Подписки",
+  "Login enabled? ": "",
-    "`x` unseen notifications": "`x` новых оповещений",
+  "Registration enabled? ": "",
-    "search": "поиск",
+  "Report statistics? ": "",
-    "Sign out": "Выйти",
+  "Save preferences": "Сохранить настройки",
-    "Released under the AGPLv3 by Omar Roth.": "Распространяется Omar Roth по AGPLv3.",
+  "Subscription manager": "Менеджер подписок",
-    "Source available here.": "Исходный код доступен здесь.",
+  "`x` subscriptions": "`x` подписок",
-    "Liberapay: ": "Liberapay: ",
+  "Import/Export": "Импорт/Экспорт",
-    "Patreon: ": "Patreon: ",
+  "unsubscribe": "отписаться",
-    "BTC: ": "BTC: ",
+  "Subscriptions": "Подписки",
-    "BCH: ": "BCH: ",
+  "`x` unseen notifications": "`x` новых оповещений",
-    "View JavaScript license information.": "Посмотреть лицензии JavaScript кода.",
+  "search": "поиск",
-    "Trending": "В тренде",
+  "Sign out": "Выйти",
-    "Watch video on Youtube": "Смотреть на YouTube",
+  "Released under the AGPLv3 by Omar Roth.": "Распространяется Omar Roth по AGPLv3.",
-    "Genre: ": "Жанр: ",
+  "Source available here.": "Исходный код доступен здесь.",
-    "License: ": "Лицензия: ",
+  "Liberapay: ": "Liberapay: ",
-    "Family friendly? ": "Семейный просмотр: ",
+  "Patreon: ": "Patreon: ",
-    "Wilson score: ": "Рейтинг Вильсона: ",
+  "BTC: ": "BTC: ",
-    "Engagement: ": "Вовлеченность: ",
+  "BCH: ": "BCH: ",
-    "Whitelisted regions: ": "Доступно для: ",
+  "View JavaScript license information.": "Посмотреть лицензии JavaScript кода.",
-    "Blacklisted regions: ": "Недоступно для: ",
+  "Trending": "В тренде",
-    "Shared `x`": "Опубликовано `x`",
+  "Watch video on Youtube": "Смотреть на YouTube",
-    "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Похоже, что у Вас отключен JavaScript. Нажмите сюда, чтобы увидеть комментарии (учтите, что они могут загружаться дольше).",
+  "Genre: ": "Жанр: ",
-    "View YouTube comments": "Смотреть комментарии с YouTube",
+  "License: ": "Лицензия: ",
-    "View more comments on Reddit": "Больше комментариев на Reddit",
+  "Family friendly? ": "Семейный просмотр: ",
-    "View `x` comments": "Показать `x` комментариев",
+  "Wilson score: ": "Рейтинг Вильсона: ",
-    "View Reddit comments": "Смотреть комментарии с Reddit",
+  "Engagement: ": "Вовлеченность: ",
-    "Hide replies": "Скрыть ответы",
+  "Whitelisted regions: ": "Доступно для: ",
-    "Show replies": "Показать ответы",
+  "Blacklisted regions: ": "Недоступно для: ",
-    "Incorrect password": "Неправильный пароль",
+  "Shared `x`": "Опубликовано `x`",
-    "Quota exceeded, try again in a few hours": "Превышена квота, попробуйте снова через несколько часов",
+  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Похоже, что у Вас отключен JavaScript. Нажмите сюда, чтобы увидеть комментарии (учтите, что они могут загружаться дольше).",
-    "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Вход не выполнен, проверьте, не включена ли двухфакторная аутентификация.",
+  "View YouTube comments": "Смотреть комментарии с YouTube",
-    "Invalid TFA code": "Неправильный TFA код",
+  "View more comments on Reddit": "Больше комментариев на Reddit",
-    "Login failed. This may be because two-factor authentication is not enabled on your account.": "Не удалось войти. Это может быть из-за того, что в вашем аккаунте не включена двухфакторная аутентификация.",
+  "View `x` comments": "Показать `x` комментариев",
-    "Invalid answer": "Неверный ответ",
+  "View Reddit comments": "Смотреть комментарии с Reddit",
-    "Invalid CAPTCHA": "Неверная капча",
+  "Hide replies": "Скрыть ответы",
-    "CAPTCHA is a required field": "Необходимо ввести капчу",
+  "Show replies": "Показать ответы",
-    "User ID is a required field": "Необходимо ввести идентификатор пользователя",
+  "Incorrect password": "Неправильный пароль",
-    "Password is a required field": "Необходимо ввести пароль",
+  "Quota exceeded, try again in a few hours": "Превышена квота, попробуйте снова через несколько часов",
-    "Invalid username or password": "Недопустимый пароль или имя пользователя",
+  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Вход не выполнен, проверьте, не включена ли двухфакторная аутентификация.",
-    "Please sign in using 'Sign in with Google'": "Пожалуйста войдите через Google",
+  "Invalid TFA code": "Неправильный TFA код",
-    "Password cannot be empty": "Пароль не может быть пустым",
+  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Не удалось войти. Это может быть из-за того, что в вашем аккаунте не включена двухфакторная аутентификация.",
-    "Password cannot be longer than 55 characters": "Пароль не может быть длиннее 55 символов",
+  "Invalid answer": "Неверный ответ",
-    "Please sign in": "Пожалуйста, войдите",
+  "Invalid CAPTCHA": "Неверная капча",
-    "Invidious Private Feed for `x`": "Приватная лента Invidious для `x`",
+  "CAPTCHA is a required field": "Необходимо ввести капчу",
-    "channel:`x`": "канал: `x`",
+  "User ID is a required field": "Необходимо ввести идентификатор пользователя",
-    "Deleted or invalid channel": "Канал удален или не найден",
+  "Password is a required field": "Необходимо ввести пароль",
-    "This channel does not exist.": "Такой канал не существует.",
+  "Invalid username or password": "Недопустимый пароль или имя пользователя",
-    "Could not get channel info.": "Невозможно получить информацию о канале.",
+  "Please sign in using 'Sign in with Google'": "Пожалуйста войдите через Google",
-    "Could not fetch comments": "Невозможно получить комментарии",
+  "Password cannot be empty": "Пароль не может быть пустым",
-    "View `x` replies": "Показать `x` ответов",
+  "Password cannot be longer than 55 characters": "Пароль не может быть длиннее 55 символов",
-    "`x` ago": "`x` назад",
+  "Please sign in": "Пожалуйста, войдите",
-    "Load more": "Загрузить больше",
+  "Invidious Private Feed for `x`": "Приватная лента Invidious для `x`",
-    "`x` points": "`x` очков",
+  "channel:`x`": "канал: `x`",
-    "Could not create mix.": "Невозможно создать \"микс\".",
+  "Deleted or invalid channel": "Канал удален или не найден",
-    "Playlist is empty": "Плейлист пуст",
+  "This channel does not exist.": "Такой канал не существует.",
-    "Invalid playlist.": "Некорректный плейлист.",
+  "Could not get channel info.": "Невозможно получить информацию о канале.",
-    "Playlist does not exist.": "Плейлист не существует.",
+  "Could not fetch comments": "Невозможно получить комментарии",
-    "Could not pull trending pages.": "Невозможно получить страницы \"в тренде\".",
+  "View `x` replies": "Показать `x` ответов",
-    "Hidden field \"challenge\" is a required field": "Необходимо заполнить скрытое поле \"challenge\"",
+  "`x` ago": "`x` назад",
-    "Hidden field \"token\" is a required field": "Необходимо заполнить скрытое поле \"токен\"",
+  "Load more": "Загрузить больше",
-    "Invalid challenge": "Неправильный ответ в \"challenge\"",
+  "`x` points": "`x` очков",
-    "Invalid token": "Неправильный токен",
+  "Could not create mix.": "Невозможно создать \"микс\".",
-    "Invalid user": "Недопустимое имя пользователя",
+  "Playlist is empty": "Плейлист пуст",
-    "Token is expired, please try again": "Срок действия токена истек, попробуйте позже",
+  "Invalid playlist.": "Некорректный плейлист.",
-    "English": "Английский",
+  "Playlist does not exist.": "Плейлист не существует.",
-    "English (auto-generated)": "Английский (созданы автоматически)",
+  "Could not pull trending pages.": "Невозможно получить страницы \"в тренде\".",
-    "Afrikaans": "",
+  "Hidden field \"challenge\" is a required field": "Необходимо заполнить скрытое поле \"challenge\"",
-    "Albanian": "",
+  "Hidden field \"token\" is a required field": "Необходимо заполнить скрытое поле \"токен\"",
-    "Amharic": "",
+  "Invalid challenge": "Неправильный ответ в \"challenge\"",
-    "Arabic": "",
+  "Invalid token": "Неправильный токен",
-    "Armenian": "",
+  "Invalid user": "Недопустимое имя пользователя",
-    "Azerbaijani": "",
+  "Token is expired, please try again": "Срок действия токена истек, попробуйте позже",
-    "Bangla": "",
+  "English": "Английский",
-    "Basque": "",
+  "English (auto-generated)": "Английский (созданы автоматически)",
-    "Belarusian": "",
+  "Afrikaans": "Африкаанс",
-    "Bosnian": "",
+  "Albanian": "Албанский",
-    "Bulgarian": "",
+  "Amharic": "Амхарский",
-    "Burmese": "",
+  "Arabic": "Арабский",
-    "Catalan": "",
+  "Armenian": "Армянский",
-    "Cebuano": "",
+  "Azerbaijani": "Азербайджанский",
-    "Chinese (Simplified)": "",
+  "Bangla": "Бенгальский",
-    "Chinese (Traditional)": "",
+  "Basque": "Баскский",
-    "Corsican": "",
+  "Belarusian": "Белорусский",
-    "Croatian": "",
+  "Bosnian": "Боснийский",
-    "Czech": "",
+  "Bulgarian": "Болгарский",
-    "Danish": "",
+  "Burmese": "Бирманский",
-    "Dutch": "",
+  "Catalan": "Каталонский",
-    "Esperanto": "",
+  "Cebuano": "Себуанский",
-    "Estonian": "",
+  "Chinese (Simplified)": "Китайский (упрощенный)",
-    "Filipino": "",
+  "Chinese (Traditional)": "Китайский (традиционный)",
-    "Finnish": "",
+  "Corsican": "Корсиканский",
-    "French": "",
+  "Croatian": "Хорватский",
-    "Galician": "",
+  "Czech": "Чешский",
-    "Georgian": "",
+  "Danish": "Датский",
-    "German": "",
+  "Dutch": "Нидерландский",
-    "Greek": "",
+  "Esperanto": "Эсперанто",
-    "Gujarati": "",
+  "Estonian": "Эстонский",
-    "Haitian Creole": "",
+  "Filipino": "Филиппинский",
-    "Hausa": "",
+  "Finnish": "Финский",
-    "Hawaiian": "",
+  "French": "Французский",
-    "Hebrew": "",
+  "Galician": "Галисийский",
-    "Hindi": "",
+  "Georgian": "Грузинский",
-    "Hmong": "",
+  "German": "Немецкий",
-    "Hungarian": "",
+  "Greek": "Греческий",
-    "Icelandic": "",
+  "Gujarati": "Гуджаратский",
-    "Igbo": "",
+  "Haitian Creole": "Гаит. креольский",
-    "Indonesian": "",
+  "Hausa": "Хауса",
-    "Irish": "",
+  "Hawaiian": "Гавайский",
-    "Italian": "",
+  "Hebrew": "Иврит",
-    "Japanese": "",
+  "Hindi": "Хинди",
-    "Javanese": "",
+  "Hmong": "Хмонг (мяо)",
-    "Kannada": "",
+  "Hungarian": "Венгерский",
-    "Kazakh": "",
+  "Icelandic": "Исландский",
-    "Khmer": "",
+  "Igbo": "Игбо",
-    "Korean": "",
+  "Indonesian": "Индонезийский",
-    "Kurdish": "",
+  "Irish": "Ирландский",
-    "Kyrgyz": "",
+  "Italian": "Итальянский",
-    "Lao": "",
+  "Japanese": "Японский",
-    "Latin": "",
+  "Javanese": "Яванский",
-    "Latvian": "",
+  "Kannada": "Каннада",
-    "Lithuanian": "",
+  "Kazakh": "Казахский",
-    "Luxembourgish": "",
+  "Khmer": "Кхмерский",
-    "Macedonian": "",
+  "Korean": "Корейский",
-    "Malagasy": "",
+  "Kurdish": "Курдский",
-    "Malay": "",
+  "Kyrgyz": "Киргизский",
-    "Malayalam": "",
+  "Lao": "Лаосский",
-    "Maltese": "",
+  "Latin": "Латинский",
-    "Maori": "",
+  "Latvian": "Латышский",
-    "Marathi": "",
+  "Lithuanian": "Литовский",
-    "Mongolian": "",
+  "Luxembourgish": "Люксембургский",
-    "Nepali": "",
+  "Macedonian": "Македонский",
-    "Norwegian": "",
+  "Malagasy": "Малагасийский",
-    "Nyanja": "",
+  "Malay": "Малайский",
-    "Pashto": "",
+  "Malayalam": "Малаялам",
-    "Persian": "",
+  "Maltese": "Мальтийский",
-    "Polish": "",
+  "Maori": "Маори",
-    "Portuguese": "",
+  "Marathi": "Маратхи",
-    "Punjabi": "",
+  "Mongolian": "Монгольская",
-    "Romanian": "",
+  "Nepali": "Непальский",
-    "Russian": "",
+  "Norwegian": "Норвежский",
-    "Samoan": "",
+  "Nyanja": "Ньянджа",
-    "Scottish Gaelic": "",
+  "Pashto": "Пушту",
-    "Serbian": "",
+  "Persian": "Персидский",
-    "Shona": "",
+  "Polish": "Польский",
-    "Sindhi": "",
+  "Portuguese": "Португальский",
-    "Sinhala": "",
+  "Punjabi": "Панджаби",
-    "Slovak": "",
+  "Romanian": "Румынский",
-    "Slovenian": "",
+  "Russian": "Русский",
-    "Somali": "",
+  "Samoan": "Самоанский",
-    "Southern Sotho": "",
+  "Scottish Gaelic": "Шотландский (гэльский)",
-    "Spanish": "",
+  "Serbian": "Сербский",
-    "Spanish (Latin America)": "",
+  "Shona": "Шона",
-    "Sundanese": "",
+  "Sindhi": "Синдхи",
-    "Swahili": "",
+  "Sinhala": "Сингальский",
-    "Swedish": "",
+  "Slovak": "Словацкий",
-    "Tajik": "",
+  "Slovenian": "Словенский",
-    "Tamil": "",
+  "Somali": "Сомалийский",
-    "Telugu": "",
+  "Southern Sotho": "Сесото (южный сото)",
-    "Thai": "",
+  "Spanish": "Испанский",
-    "Turkish": "",
+  "Spanish (Latin America)": "Испанский (Латинская Америка)",
-    "Ukrainian": "",
+  "Sundanese": "Сунданский",
-    "Urdu": "",
+  "Swahili": "Суахили",
-    "Uzbek": "",
+  "Swedish": "Шведский",
-    "Vietnamese": "",
+  "Tajik": "Таджикский",
-    "Welsh": "",
+  "Tamil": "Тамильский",
-    "Western Frisian": "",
+  "Telugu": "Телугу",
-    "Xhosa": "",
+  "Thai": "Тайский",
-    "Yiddish": "",
+  "Turkish": "Турецкий",
-    "Yoruba": "",
+  "Ukrainian": "Украинский",
-    "Zulu": "",
+  "Urdu": "Урду",
-    "`x` years": "`x` лет",
+  "Uzbek": "Узбекский",
-    "`x` months": "`x` месяцев",
+  "Vietnamese": "Вьетнамский",
-    "`x` weeks": "`x` недель",
+  "Welsh": "Валлийский",
-    "`x` days": "`x` дней",
+  "Western Frisian": "Западнофризский",
-    "`x` hours": "`x` часов",
+  "Xhosa": "Коса",
-    "`x` minutes": "`x` минут",
+  "Yiddish": "Идиш",
-    "`x` seconds": "`x` секунд",
+  "Yoruba": "Йоруба",
-    "Fallback comments: ": "Резервные комментарии: ",
+  "Zulu": "Зулусский",
-    "Popular": "Популярное",
+  "`x` years": "`x` лет",
-    "Top": "Топ",
+  "`x` months": "`x` месяцев",
-    "About": "О сайте",
+  "`x` weeks": "`x` недель",
-    "Rating: ": "Рейтинг: ",
+  "`x` days": "`x` дней",
-    "Language: ": "Язык: "
+  "`x` hours": "`x` часов",
+  "`x` minutes": "`x` минут",
+  "`x` seconds": "`x` секунд",
+  "Fallback comments: ": "Резервные комментарии: ",
+  "Popular": "Популярное",
+  "Top": "Топ",
+  "About": "О сайте",
+  "Rating: ": "Рейтинг: ",
+  "Language: ": "Язык: ",
+  "Default": "По-умолчанию",
+  "Music": "Музыка",
+  "Gaming": "Игры",
+  "News": "Новости",
+  "Movies": "Фильмы",
+  "Download": "Скачать",
+  "Download as: ": "Скачать как: ",
+  "%A %B %-d, %Y": "%-d %B %Y, %A",
+  "(edited)": "(изменено)",
+  "Youtube permalink of the comment": "Прямая ссылка на YouTube",
+  "`x` marked it with a ❤": "❤ от автора канала \"`x`\"",
+  "Audio mode": "Аудио режим",
+  "Video mode": "Видео режим"
 }

setup.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-createdb invidious
-#createuser kemal
-psql -c "CREATE USER kemal WITH PASSWORD 'kemal';"
-psql invidious < config/sql/channels.sql
-psql invidious < config/sql/videos.sql
-psql invidious < config/sql/channel_videos.sql
-psql invidious < config/sql/users.sql
-psql invidious < config/sql/nonces.sql

shard.yml

@@ -1,5 +1,5 @@
 name: invidious
-version: 0.12.0
+version: 0.14.1
 
 authors:
   - Omar Roth <omarroth@hotmail.com>
@@ -9,16 +9,13 @@ targets:
     main: src/invidious.cr
 
 dependencies:
-  detect_language:
-    github: detectlanguage/detectlanguage-crystal
   kemal:
     github: kemalcr/kemal
-    commit: afd17fc
   pg:
     github: will/crystal-pg
   sqlite3:
     github: crystal-lang/crystal-sqlite3
 
-crystal: 0.27.0
+crystal: 0.27.2
 
 license: AGPLv3

spec/helpers_spec.cr

@@ -0,0 +1,62 @@
+require "kemal"
+require "pg"
+require "spec"
+require "yaml"
+require "../src/invidious/helpers/*"
+require "../src/invidious/channels"
+require "../src/invidious/playlists"
+require "../src/invidious/search"
+
+describe "Helpers" do
+  describe "#produce_channel_videos_url" do
+    it "correctly produces url for requesting page `x` of a channel's videos" do
+      produce_channel_videos_url(ucid: "UCXuqSBlHAE6Xw-yeJA0Tunw").should eq("/browse_ajax?continuation=4qmFsgI8EhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaIEVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQUFlZ0V4&gl=US&hl=en")
+
+      produce_channel_videos_url(ucid: "UCXuqSBlHAE6Xw-yeJA0Tunw", sort_by: "popular").should eq("/browse_ajax?continuation=4qmFsgJCEhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaJkVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQUFlZ0V4R0FFJTNE&gl=US&hl=en")
+
+      produce_channel_videos_url(ucid: "UCXuqSBlHAE6Xw-yeJA0Tunw", page: 20).should eq("/browse_ajax?continuation=4qmFsgJEEhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaKEVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQUFlZ0l5TUElM0QlM0Q%3D&gl=US&hl=en")
+
+      produce_channel_videos_url(ucid: "UC-9-kyTW8ZkZNDHQJ6FgpwQ", auto_generated: true).should eq("/browse_ajax?continuation=4qmFsgJIEhhVQy05LWt5VFc4WmtaTkRIUUo2Rmdwd1EaLEVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQTJlZ294TlRVeU1ESXlPVFE1&gl=US&hl=en")
+
+      produce_channel_videos_url(ucid: "UC-9-kyTW8ZkZNDHQJ6FgpwQ", page: 20, auto_generated: true, sort_by: "popular").should eq("/browse_ajax?continuation=4qmFsgJOEhhVQy05LWt5VFc4WmtaTkRIUUo2Rmdwd1EaMkVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQTJlZ294TlRBeU1UY3dNVFE1R0FFJTNE&gl=US&hl=en")
+    end
+  end
+
+  describe "#produce_channel_search_url" do
+    it "correctly produces token for searching a specific channel" do
+      produce_channel_search_url("UCXuqSBlHAE6Xw-yeJA0Tunw", "", 100).should eq("/browse_ajax?continuation=4qmFsgI-EhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaIEVnWnpaV0Z5WTJnd0FqZ0JZQUZxQUxnQkFIb0RNVEF3WgA%3D&gl=US&hl=en")
+
+      produce_channel_search_url("UCXuqSBlHAE6Xw-yeJA0Tunw", "По ожиशुपतिरपि子而時ஸ்றீனி", 0).should eq("/browse_ajax?continuation=4qmFsgJZEhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaJEVnWnpaV0Z5WTJnd0FqZ0JZQUZxQUxnQkFIb0JNQSUzRCUzRFoX0J_QviDQvtC20LjgpLbgpYHgpKrgpKTgpL_gpLDgpKrgpL_lrZDogIzmmYLgrrjgr43grrHgr4Dgrqngrr8%3D&gl=US&hl=en")
+    end
+  end
+
+  describe "#produce_playlist_url" do
+    it "correctly produces url for requesting index `x` of a playlist" do
+      produce_playlist_url("UUCla9fZca4I7KagBtgRGnOw", 0).should eq("/browse_ajax?continuation=4qmFsgIsEhpWTFVVQ2xhOWZaY2E0STdLYWdCdGdSR25PdxoOZWdaUVZEcERRVUUlM0Q%3D&gl=US&hl=en")
+
+      produce_playlist_url("UCCla9fZca4I7KagBtgRGnOw", 0).should eq("/browse_ajax?continuation=4qmFsgIsEhpWTFVVQ2xhOWZaY2E0STdLYWdCdGdSR25PdxoOZWdaUVZEcERRVUUlM0Q%3D&gl=US&hl=en")
+
+      produce_playlist_url("PLt5AfwLFPxWLNVixpe1w3fi6lE2OTq0ET", 0).should eq("/browse_ajax?continuation=4qmFsgI2EiRWTFBMdDVBZndMRlB4V0xOVml4cGUxdzNmaTZsRTJPVHEwRVQaDmVnWlFWRHBEUVVFJTNE&gl=US&hl=en")
+
+      produce_playlist_url("PLt5AfwLFPxWLNVixpe1w3fi6lE2OTq0ET", 10000).should eq("/browse_ajax?continuation=4qmFsgI0EiRWTFBMdDVBZndMRlB4V0xOVml4cGUxdzNmaTZsRTJPVHEwRVQaDGVnZFFWRHBEU2tKUA%3D%3D&gl=US&hl=en")
+
+      produce_playlist_url("PL55713C70BA91BD6E", 0).should eq("/browse_ajax?continuation=4qmFsgImEhRWTFBMNTU3MTNDNzBCQTkxQkQ2RRoOZWdaUVZEcERRVUUlM0Q%3D&gl=US&hl=en")
+
+      produce_playlist_url("PL55713C70BA91BD6E", 10000).should eq("/browse_ajax?continuation=4qmFsgIkEhRWTFBMNTU3MTNDNzBCQTkxQkQ2RRoMZWdkUVZEcERTa0pQ&gl=US&hl=en")
+    end
+  end
+
+  describe "#produce_search_params" do
+    it "correctly produces token for searching with specified filters" do
+      produce_search_params.should eq("CAASAhAB")
+
+      produce_search_params(sort: "upload_date", content_type: "video").should eq("CAISAhAB")
+
+      produce_search_params(content_type: "playlist").should eq("CAASAhAD")
+
+      produce_search_params(sort: "date", content_type: "video", features: ["hd", "cc", "purchased", "hdr"]).should eq("CAISCxABIAEwAUgByAEB")
+
+      produce_search_params(content_type: "channel").should eq("CAASAhAC")
+    end
+  end
+end

src/invidious/channels.cr

@@ -1,8 +1,10 @@
 class InvidiousChannel
   add_mapping({
-    id:      String,
+    id:         String,
-    author:  String,
+    author:     String,
-    updated: Time,
+    updated:    Time,
+    deleted:    Bool,
+    subscribed: Time?,
   })
 end
 
@@ -14,10 +16,7 @@ class ChannelVideo
     updated:        Time,
     ucid:           String,
     author:         String,
-    length_seconds: {
+    length_seconds: {type: Int32, default: 0},
-      type:    Int32,
-      default: 0,
-    },
   })
 end
 
@@ -49,13 +48,11 @@ def get_batch_channels(channels, db, refresh = false, pull_all_videos = true, ma
 end
 
 def get_channel(id, db, refresh = true, pull_all_videos = true)
-  client = make_client(YT_URL)
-
   if db.query_one?("SELECT EXISTS (SELECT true FROM channels WHERE id = $1)", id, as: Bool)
     channel = db.query_one("SELECT * FROM channels WHERE id = $1", id, as: InvidiousChannel)
 
     if refresh && Time.now - channel.updated > 10.minutes
-      channel = fetch_channel(id, client, db, pull_all_videos: pull_all_videos)
+      channel = fetch_channel(id, db, pull_all_videos: pull_all_videos)
       channel_array = channel.to_a
       args = arg_array(channel_array)
 
@@ -63,7 +60,7 @@ def get_channel(id, db, refresh = true, pull_all_videos = true)
         ON CONFLICT (id) DO UPDATE SET author = $2, updated = $3", channel_array)
     end
   else
-    channel = fetch_channel(id, client, db, pull_all_videos: pull_all_videos)
+    channel = fetch_channel(id, db, pull_all_videos: pull_all_videos)
     channel_array = channel.to_a
     args = arg_array(channel_array)
 
@@ -73,7 +70,9 @@ def get_channel(id, db, refresh = true, pull_all_videos = true)
   return channel
 end
 
-def fetch_channel(ucid, client, db, pull_all_videos = true, locale = nil)
+def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
+  client = make_client(YT_URL)
+
   rss = client.get("/feeds/videos.xml?channel_id=#{ucid}").body
   rss = XML.parse_html(rss)
 
@@ -187,11 +186,90 @@ def fetch_channel(ucid, client, db, pull_all_videos = true, locale = nil)
     db.exec("DELETE FROM channel_videos * WHERE NOT id = ANY ('{#{ids.map { |id| %("#{id}") }.join(",")}}') AND ucid = $1", ucid)
   end
 
-  channel = InvidiousChannel.new(ucid, author, Time.now)
+  channel = InvidiousChannel.new(ucid, author, Time.now, false, nil)
 
   return channel
 end
 
+def subscribe_pubsub(ucid, key, config)
+  client = make_client(PUBSUB_URL)
+  time = Time.now.to_unix.to_s
+  nonce = Random::Secure.hex(4)
+  signature = "#{time}:#{nonce}"
+
+  host_url = make_host_url(config, Kemal.config)
+
+  body = {
+    "hub.callback"      => "#{host_url}/feed/webhook/v1:#{time}:#{nonce}:#{OpenSSL::HMAC.hexdigest(:sha1, key, signature)}",
+    "hub.topic"         => "https://www.youtube.com/xml/feeds/videos.xml?channel_id=#{ucid}",
+    "hub.verify"        => "async",
+    "hub.mode"          => "subscribe",
+    "hub.lease_seconds" => "432000",
+    "hub.secret"        => key.to_s,
+  }
+
+  return client.post("/subscribe", form: body)
+end
+
+def fetch_channel_playlists(ucid, author, auto_generated, continuation, sort_by)
+  client = make_client(YT_URL)
+
+  if continuation
+    url = produce_channel_playlists_url(ucid, continuation, sort_by, auto_generated)
+
+    response = client.get(url)
+    json = JSON.parse(response.body)
+
+    if json["load_more_widget_html"].as_s.empty?
+      return [] of SearchItem, nil
+    end
+
+    continuation = XML.parse_html(json["load_more_widget_html"].as_s)
+    continuation = continuation.xpath_node(%q(//button[@data-uix-load-more-href]))
+    if continuation
+      continuation = extract_channel_playlists_cursor(continuation["data-uix-load-more-href"], auto_generated)
+    end
+
+    html = XML.parse_html(json["content_html"].as_s)
+    nodeset = html.xpath_nodes(%q(//li[contains(@class, "feed-item-container")]))
+  else
+    url = "/channel/#{ucid}/playlists?disable_polymer=1&flow=list"
+
+    if auto_generated
+      url += "&view=50"
+    else
+      url += "&view=1"
+    end
+
+    case sort_by
+    when "last", "last_added"
+      #
+    when "oldest", "oldest_created"
+      url += "&sort=da"
+    when "newest", "newest_created"
+      url += "&sort=dd"
+    end
+
+    response = client.get(url)
+    html = XML.parse_html(response.body)
+
+    continuation = html.xpath_node(%q(//button[@data-uix-load-more-href]))
+    if continuation
+      continuation = extract_channel_playlists_cursor(continuation["data-uix-load-more-href"], auto_generated)
+    end
+
+    nodeset = html.xpath_nodes(%q(//ul[@id="browse-items-primary"]/li[contains(@class, "feed-item-container")]))
+  end
+
+  if auto_generated
+    items = extract_shelf_items(nodeset, ucid, author)
+  else
+    items = extract_items(nodeset, ucid, author)
+  end
+
+  return items, continuation
+end
+
 def produce_channel_videos_url(ucid, page = 1, auto_generated = nil, sort_by = "newest")
   if auto_generated
     seed = Time.unix(1525757349)
@@ -202,54 +280,189 @@ def produce_channel_videos_url(ucid, page = 1, auto_generated = nil, sort_by = "
     timestamp = seed - (page - 1).months
 
     page = "#{timestamp.to_unix}"
-    switch = "\x36"
+    switch = 0x36
   else
     page = "#{page}"
-    switch = "\x00"
+    switch = 0x00
   end
 
-  meta = "\x12\x06videos"
+  meta = IO::Memory.new
-  meta += "\x30\x02"
+  meta.write(Bytes[0x12, 0x06])
-  meta += "\x38\x01"
+  meta.print("videos")
-  meta += "\x60\x01"
+
-  meta += "\x6a\x00"
+  meta.write(Bytes[0x30, 0x02])
-  meta += "\xb8\x01\x00"
+  meta.write(Bytes[0x38, 0x01])
-  meta += "\x20#{switch}"
+  meta.write(Bytes[0x60, 0x01])
-  meta += "\x7a"
+  meta.write(Bytes[0x6a, 0x00])
-  meta += page.size.to_u8.unsafe_chr
+  meta.write(Bytes[0xb8, 0x01, 0x00])
-  meta += page
+
+  meta.write(Bytes[0x20, switch])
+  meta.write(Bytes[0x7a, page.size])
+  meta.print(page)
 
   case sort_by
   when "newest"
     # Empty tags can be omitted
-    # meta += "\x18\x00"
+    # meta.write(Bytes[0x18,0x00])
   when "popular"
-    meta += "\x18\x01"
+    meta.write(Bytes[0x18, 0x01])
   when "oldest"
-    meta += "\x18\x02"
+    meta.write(Bytes[0x18, 0x02])
   end
 
-  meta = Base64.urlsafe_encode(meta)
+  meta.rewind
+  meta = Base64.urlsafe_encode(meta.to_slice)
   meta = URI.escape(meta)
 
-  continuation = "\x12"
+  continuation = IO::Memory.new
-  continuation += ucid.size.to_u8.unsafe_chr
+  continuation.write(Bytes[0x12, ucid.size])
-  continuation += ucid
+  continuation.print(ucid)
-  continuation += "\x1a"
-  continuation += meta.size.to_u8.unsafe_chr
-  continuation += meta
 
-  continuation = continuation.size.to_u8.unsafe_chr + continuation
+  continuation.write(Bytes[0x1a, meta.size])
-  continuation = "\xe2\xa9\x85\xb2\x02" + continuation
+  continuation.print(meta)
 
-  continuation = Base64.urlsafe_encode(continuation)
+  continuation.rewind
-  continuation = URI.escape(continuation)
+  continuation = continuation.gets_to_end
 
-  url = "/browse_ajax?continuation=#{continuation}&gl=US&hl=en"
+  wrapper = IO::Memory.new
+  wrapper.write(Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02, continuation.size])
+  wrapper.print(continuation)
+  wrapper.rewind
+
+  wrapper = Base64.urlsafe_encode(wrapper.to_slice)
+  wrapper = URI.escape(wrapper)
+
+  url = "/browse_ajax?continuation=#{wrapper}&gl=US&hl=en"
 
   return url
 end
 
+def produce_channel_playlists_url(ucid, cursor, sort = "newest", auto_generated = false)
+  if !auto_generated
+    cursor = Base64.urlsafe_encode(cursor, false)
+  end
+
+  meta = IO::Memory.new
+
+  if auto_generated
+    meta.write(Bytes[0x08, 0x0a])
+  end
+
+  meta.write(Bytes[0x12, 0x09])
+  meta.print("playlists")
+
+  if auto_generated
+    meta.write(Bytes[0x20, 0x32])
+  else
+    # TODO: Look at 0x01, 0x00
+    case sort
+    when "oldest", "oldest_created"
+      meta.write(Bytes[0x18, 0x02])
+    when "newest", "newest_created"
+      meta.write(Bytes[0x18, 0x03])
+    when "last", "last_added"
+      meta.write(Bytes[0x18, 0x04])
+    end
+
+    meta.write(Bytes[0x20, 0x01])
+  end
+
+  meta.write(Bytes[0x30, 0x02])
+  meta.write(Bytes[0x38, 0x01])
+  meta.write(Bytes[0x60, 0x01])
+  meta.write(Bytes[0x6a, 0x00])
+
+  meta.write(Bytes[0x7a, cursor.size])
+  meta.print(cursor)
+
+  meta.write(Bytes[0xb8, 0x01, 0x00])
+
+  meta.rewind
+  meta = Base64.urlsafe_encode(meta.to_slice)
+  meta = URI.escape(meta)
+
+  continuation = IO::Memory.new
+  continuation.write(Bytes[0x12, ucid.size])
+  continuation.print(ucid)
+
+  continuation.write(Bytes[0x1a])
+  continuation.write(write_var_int(meta.size))
+  continuation.print(meta)
+
+  continuation.rewind
+  continuation = continuation.gets_to_end
+
+  wrapper = IO::Memory.new
+  wrapper.write(Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02])
+  wrapper.write(write_var_int(continuation.size))
+  wrapper.print(continuation)
+  wrapper.rewind
+
+  wrapper = Base64.urlsafe_encode(wrapper.to_slice)
+  wrapper = URI.escape(wrapper)
+
+  url = "/browse_ajax?continuation=#{wrapper}&gl=US&hl=en"
+
+  return url
+end
+
+def extract_channel_playlists_cursor(url, auto_generated)
+  wrapper = HTTP::Params.parse(URI.parse(url).query.not_nil!)["continuation"]
+
+  wrapper = URI.unescape(wrapper)
+  wrapper = Base64.decode(wrapper)
+
+  # 0xe2 0xa9 0x85 0xb2 0x02
+  wrapper += 5
+
+  continuation_size = read_var_int(wrapper[0, 4])
+  wrapper += write_var_int(continuation_size).size
+  continuation = wrapper[0, continuation_size]
+
+  # 0x12
+  continuation += 1
+  ucid_size = continuation[0]
+  continuation += 1
+  ucid = continuation[0, ucid_size]
+  continuation += ucid_size
+
+  # 0x1a
+  continuation += 1
+  meta_size = read_var_int(continuation[0, 4])
+  continuation += write_var_int(meta_size).size
+  meta = continuation[0, meta_size]
+  continuation += meta_size
+
+  meta = String.new(meta)
+  meta = URI.unescape(meta)
+  meta = Base64.decode(meta)
+
+  # 0x12 0x09 playlists
+  meta += 11
+
+  until meta[0] == 0x7a
+    tag = read_var_int(meta[0, 4])
+    meta += write_var_int(tag).size
+    value = meta[0]
+    meta += 1
+  end
+
+  # 0x7a
+  meta += 1
+  cursor_size = meta[0]
+  meta += 1
+  cursor = meta[0, cursor_size]
+
+  cursor = String.new(cursor)
+
+  if !auto_generated
+    cursor = URI.unescape(cursor)
+    cursor = Base64.decode_string(cursor)
+  end
+
+  return cursor
+end
+
 def get_about_info(ucid, locale)
   client = make_client(YT_URL)
 
@@ -280,7 +493,7 @@ def get_about_info(ucid, locale)
   sub_count ||= 0
 
   author = about.xpath_node(%q(//span[contains(@class,"qualified-channel-title-text")]/a)).not_nil!.content
-  ucid = about.xpath_node(%q(//link[@rel="canonical"])).not_nil!["href"].split("/")[-1]
+  ucid = about.xpath_node(%q(//meta[@itemprop="channelId"])).not_nil!["content"]
 
   # Auto-generated channels
   # https://support.google.com/youtube/answer/2579942
@@ -324,3 +537,21 @@ def get_60_videos(ucid, page, auto_generated, sort_by = "newest")
 
   return videos, count
 end
+
+def get_latest_videos(ucid)
+  client = make_client(YT_URL)
+  videos = [] of SearchVideo
+
+  url = produce_channel_videos_url(ucid, 0)
+  response = client.get(url)
+  json = JSON.parse(response.body)
+
+  if json["content_html"]? && !json["content_html"].as_s.empty?
+    document = XML.parse_html(json["content_html"].as_s)
+    nodeset = document.xpath_nodes(%q(//li[contains(@class, "feed-item-container")]))
+
+    videos = extract_videos(nodeset, ucid)
+  end
+
+  return videos
+end

src/invidious/comments.cr

@@ -56,72 +56,32 @@ class RedditListing
   })
 end
 
-def fetch_youtube_comments(id, continuation, proxies, format, locale)
+def fetch_youtube_comments(id, db, continuation, proxies, format, locale, region)
-  client = make_client(YT_URL)
+  video = get_video(id, db, proxies, region: region)
-  html = client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
-  headers = HTTP::Headers.new
-  headers["cookie"] = html.cookies.add_request_headers(headers)["cookie"]
-  body = html.body
 
-  session_token = body.match(/'XSRF_TOKEN': "(?<session_token>[A-Za-z0-9\_\-\=]+)"/).not_nil!["session_token"]
+  session_token = video.info["session_token"]?
-  itct = body.match(/itct=(?<itct>[^"]+)"/).not_nil!["itct"]
+  itct = video.info["itct"]?
-  ctoken = body.match(/'COMMENTS_TOKEN': "(?<ctoken>[^"]+)"/)
+  ctoken = video.info["ctoken"]?
+  continuation ||= ctoken
 
-  if body.match(/<meta itemprop="regionsAllowed" content="">/)
+  if !continuation || !itct || !session_token
-    bypass_channel = Channel({String, HTTPClient, HTTP::Headers} | Nil).new
-
-    proxies.each do |proxy_region, list|
-      spawn do
-        proxy_client = make_client(YT_URL, proxies, proxy_region)
-
-        response = proxy_client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
-        proxy_headers = HTTP::Headers.new
-        proxy_headers["Cookie"] = response.cookies.add_request_headers(headers)["cookie"]
-        proxy_html = response.body
-
-        if !proxy_html.match(/<meta itemprop="regionsAllowed" content="">/)
-          bypass_channel.send({proxy_html, proxy_client, proxy_headers})
-        else
-          bypass_channel.send(nil)
-        end
-      end
-    end
-
-    proxies.size.times do
-      response = bypass_channel.receive
-      if response
-        html, client, headers = response
-
-        session_token = html.match(/'XSRF_TOKEN': "(?<session_token>[A-Za-z0-9\_\-\=]+)"/).not_nil!["session_token"]
-        itct = html.match(/itct=(?<itct>[^"]+)"/).not_nil!["itct"]
-        ctoken = html.match(/'COMMENTS_TOKEN': "(?<ctoken>[^"]+)"/)
-
-        break
-      end
-    end
-  end
-
-  if !ctoken
     if format == "json"
       return {"comments" => [] of String}.to_json
     else
       return {"contentHtml" => "", "commentCount" => 0}.to_json
     end
   end
-  ctoken = ctoken["ctoken"]
-
-  if !continuation.empty?
-    ctoken = continuation
-  else
-    continuation = ctoken
-  end
 
   post_req = {
-    "session_token" => session_token,
+    "session_token" => session_token.not_nil!,
   }
   post_req = HTTP::Params.encode(post_req)
 
+  client = make_client(YT_URL, proxies, video.info["region"]?)
+  headers = HTTP::Headers.new
+
   headers["content-type"] = "application/x-www-form-urlencoded"
+  headers["cookie"] = video.info["cookie"]
 
   headers["x-client-data"] = "CIi2yQEIpbbJAQipncoBCNedygEIqKPKAQ=="
   headers["x-spf-previous"] = "https://www.youtube.com/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999"
@@ -129,7 +89,8 @@ def fetch_youtube_comments(id, continuation, proxies, format, locale)
 
   headers["x-youtube-client-name"] = "1"
   headers["x-youtube-client-version"] = "2.20180719"
-  response = client.post("/comment_service_ajax?action_get_comments=1&pbj=1&ctoken=#{ctoken}&continuation=#{continuation}&itct=#{itct}&hl=en&gl=US", headers, post_req)
+
+  response = client.post("/comment_service_ajax?action_get_comments=1&pbj=1&ctoken=#{continuation}&continuation=#{continuation}&itct=#{itct}&hl=en&gl=US", headers, post_req)
   response = JSON.parse(response.body)
 
   if !response["response"]["continuationContents"]?
@@ -159,6 +120,8 @@ def fetch_youtube_comments(id, continuation, proxies, format, locale)
         json.field "commentCount", comment_count
       end
 
+      json.field "videoId", id
+
       json.field "comments" do
         json.array do
           contents.as_a.each do |node|
@@ -209,14 +172,32 @@ def fetch_youtube_comments(id, continuation, proxies, format, locale)
                 json.field "authorUrl", ""
               end
 
-              published = decode_date(node_comment["publishedTimeText"]["runs"][0]["text"].as_s.rchop(" (edited)"))
+              published_text = node_comment["publishedTimeText"]["runs"][0]["text"].as_s
+              published = decode_date(published_text.rchop(" (edited)"))
+
+              if published_text.includes?(" (edited)")
+                json.field "isEdited", true
+              else
+                json.field "isEdited", false
+              end
 
               json.field "content", content
               json.field "contentHtml", content_html
               json.field "published", published.to_unix
-              json.field "publishedText", translate(locale, "`x` ago", recode_date(published))
+              json.field "publishedText", translate(locale, "`x` ago", recode_date(published, locale))
               json.field "likeCount", node_comment["likeCount"]
               json.field "commentId", node_comment["commentId"]
+              json.field "authorIsChannelOwner", node_comment["authorIsChannelOwner"]
+
+              if node_comment["actionButtons"]["commentActionButtonsRenderer"]["creatorHeart"]?
+                hearth_data = node_comment["actionButtons"]["commentActionButtonsRenderer"]["creatorHeart"]["creatorHeartRenderer"]["creatorThumbnail"]
+                json.field "creatorHeart" do
+                  json.object do
+                    json.field "creatorThumbnail", hearth_data["thumbnails"][-1]["url"]
+                    json.field "creatorName", hearth_data["accessibility"]["accessibilityData"]["label"]
+                  end
+                end
+              end
 
               if node_replies && !response["commentRepliesContinuation"]?
                 reply_count = node_replies["moreText"]["simpleText"].as_s.delete("View all reply replies,")
@@ -227,7 +208,8 @@ def fetch_youtube_comments(id, continuation, proxies, format, locale)
                   reply_count ||= 1
                 end
 
-                continuation = node_replies["continuations"].as_a[0]["nextContinuationData"]["continuation"].as_s
+                continuation = node_replies["continuations"]?.try &.as_a[0]["nextContinuationData"]["continuation"].as_s
+                continuation ||= ""
 
                 json.field "replies" do
                   json.object do
@@ -270,7 +252,7 @@ end
 
 def fetch_reddit_comments(id)
   client = make_client(REDDIT_URL)
-  headers = HTTP::Headers{"User-Agent" => "web:invidio.us:v0.12.0 (by /u/omarroth)"}
+  headers = HTTP::Headers{"User-Agent" => "web:invidious:v#{CURRENT_VERSION} (by /u/omarroth)"}
 
   query = "(url:3D#{id}%20OR%20url:#{id})%20(site:youtube.com%20OR%20site:youtu.be)"
   search_results = client.get("/search.json?q=#{query}", headers)
@@ -325,12 +307,31 @@ def template_youtube_comments(comments, locale)
       <div class="pure-u-20-24 pure-u-md-22-24">
         <p>
           <b>
-            <a href="#{child["authorUrl"]}">#{child["author"]}</a>
+            <a class="#{child["authorIsChannelOwner"] == true ? "channel-owner" : ""}" href="#{child["authorUrl"]}">#{child["author"]}</a>
           </b> 
           <p style="white-space:pre-wrap">#{child["contentHtml"]}</p>
-          #{translate(locale, "`x` ago", recode_date(Time.unix(child["published"].as_i64)))}
+          <span title="#{Time.unix(child["published"].as_i64).to_s(translate(locale, "%A %B %-d, %Y"))}">#{translate(locale, "`x` ago", recode_date(Time.unix(child["published"].as_i64), locale))} #{child["isEdited"] == true ? translate(locale, "(edited)") : ""}</span>
+          |
+          <a href="https://www.youtube.com/watch?v=#{comments["videoId"]}&lc=#{child["commentId"]}" title="#{translate(locale, "Youtube permalink of the comment")}">[YT]</a>
           | 
           <i class="icon ion-ios-thumbs-up"></i> #{number_with_separator(child["likeCount"])} 
+    END_HTML
+
+    if child["creatorHeart"]?
+      creator_thumbnail = "/ggpht#{URI.parse(child["creatorHeart"]["creatorThumbnail"].as_s).full_path}"
+      html += <<-END_HTML
+          <span class="creator-heart-container" title="#{translate(locale, "`x` marked it with a ❤", child["creatorHeart"]["creatorName"].as_s)}">
+              <div class="creator-heart">
+                  <img class="creator-heart-background-hearted" src="#{creator_thumbnail}"></img>
+                  <div class="creator-heart-small-hearted">
+                      <div class="icon ion-ios-heart creator-heart-small-container"></div>
+                  </div>
+              </div>
+          </span>
+      END_HTML
+    end
+
+    html += <<-END_HTML
         </p>
         #{replies_html}
       </div>
@@ -374,7 +375,7 @@ def template_reddit_comments(root, locale)
         <a href="javascript:void(0)" onclick="toggle_parent(this)">[ - ]</a> 
         <b><a href="https://www.reddit.com/user/#{author}">#{author}</a></b> 
         #{translate(locale, "`x` points", number_with_separator(score))}
-        #{translate(locale, "`x` ago", recode_date(child.created_utc))}
+        #{translate(locale, "`x` ago", recode_date(child.created_utc, locale))}
       </p>
       <div>
       #{body_html}
@@ -488,10 +489,14 @@ def content_to_comment_html(content)
 
         text = %(<a href="#{url}">#{text}</a>)
       elsif watch_endpoint = run["navigationEndpoint"]["watchEndpoint"]?
-        length_seconds = watch_endpoint["startTimeSeconds"].as_i
+        length_seconds = watch_endpoint["startTimeSeconds"]?
         video_id = watch_endpoint["videoId"].as_s
 
-        text = %(<a href="javascript:void(0)" onclick="player.currentTime(#{length_seconds})">#{text}</a>)
+        if length_seconds
+          text = %(<a href="javascript:void(0)" onclick="player.currentTime(#{length_seconds})">#{text}</a>)
+        else
+          text = %(<a href="/watch?v=#{video_id}">#{text}</a>)
+        end
       elsif url = run["navigationEndpoint"]["commandMetadata"]?.try &.["webCommandMetadata"]["url"].as_s
         text = %(<a href="#{url}">#{text}</a>)
       end

src/invidious/helpers/helpers.cr

@@ -1,21 +1,29 @@
 class Config
   YAML.mapping({
-    crawl_threads:   Int32,
+    video_threads:   Int32,      # Number of threads to use for updating videos in cache (mostly non-functional)
-    channel_threads: Int32,
+    crawl_threads:   Int32,      # Number of threads to use for finding new videos from YouTube (used to populate "top" page)
-    feed_threads:    Int32,
+    channel_threads: Int32,      # Number of threads to use for crawling videos from channels (for updating subscriptions)
-    video_threads:   Int32,
+    feed_threads:    Int32,      # Number of threads to use for updating feeds
-    db:              NamedTuple(
+    db:              NamedTuple( # Database configuration
-      user: String,
+user: String,
       password: String,
       host: String,
       port: Int32,
       dbname: String,
     ),
-    dl_api_key:   String?,
+    full_refresh:         Bool,                         # Used for crawling channels: threads should check all videos uploaded by a channel
-    https_only:   Bool?,
+    https_only:           Bool?,                        # Used to tell Invidious it is behind a proxy, so links to resources should be https://
-    hmac_key:     String?,
+    hmac_key:             String?,                      # HMAC signing key for CSRF tokens and verifying pubsub subscriptions
-    full_refresh: Bool,
+    domain:               String?,                      # Domain to be used for links to resources on the site where an absolute URL is required
-    domain:       String?,
+    use_pubsub_feeds:     {type: Bool, default: false}, # Subscribe to channels using PubSubHubbub (requires domain, hmac_key)
+    default_home:         {type: String, default: "Top"},
+    feed_menu:            {type: Array(String), default: ["Popular", "Top", "Trending", "Subscriptions"]},
+    top_enabled:          {type: Bool, default: true},
+    captcha_enabled:      {type: Bool, default: true},
+    login_enabled:        {type: Bool, default: true},
+    registration_enabled: {type: Bool, default: true},
+    statistics_enabled:   {type: Bool, default: false},
+    admins:               {type: Array(String), default: [] of String},
   })
 end
 
@@ -43,6 +51,18 @@ class FilteredCompressHandler < Kemal::Handler
   end
 end
 
+class APIHandler < Kemal::Handler
+  only ["/api/v1/*"]
+
+  def call(env)
+    return call_next env unless only_match? env
+
+    env.response.headers["Access-Control-Allow-Origin"] = "*"
+
+    call_next env
+  end
+end
+
 class DenyFrame < Kemal::Handler
   exclude ["/embed/*"]
 
@@ -54,7 +74,7 @@ class DenyFrame < Kemal::Handler
   end
 end
 
-def rank_videos(db, n, filter, url)
+def rank_videos(db, n)
   top = [] of {Float64, String}
 
   db.query("SELECT id, wilson_score, published FROM videos WHERE views > 5000 ORDER BY published DESC LIMIT 1000") do |rs|
@@ -75,41 +95,7 @@ def rank_videos(db, n, filter, url)
   top.reverse!
   top = top.map { |a, b| b }
 
-  if filter
+  return top[0..n - 1]
-    language_list = [] of String
-    top.each do |id|
-      if language_list.size == n
-        break
-      else
-        client = make_client(url)
-        begin
-          video = get_video(id, db)
-        rescue ex
-          next
-        end
-
-        if video.language
-          language = video.language
-        else
-          description = XML.parse(video.description)
-          content = [video.title, description.content].join(" ")
-          content = content[0, 10000]
-
-          results = DetectLanguage.detect(content)
-          language = results[0].language
-
-          db.exec("UPDATE videos SET language = $1 WHERE id = $2", language, id)
-        end
-
-        if language == "en"
-          language_list << id
-        end
-      end
-    end
-    return language_list
-  else
-    return top[0..n - 1]
-  end
 end
 
 def login_req(login_form, f_req)
@@ -154,29 +140,11 @@ def extract_videos(nodeset, ucid = nil)
   videos.map { |video| video.as(SearchVideo) }
 end
 
-def extract_items(nodeset, ucid = nil)
+def extract_items(nodeset, ucid = nil, author_name = nil)
   # TODO: Make this a 'common', so it makes more sense to be used here
   items = [] of SearchItem
 
   nodeset.each do |node|
-    anchor = node.xpath_node(%q(.//h3[contains(@class,"yt-lockup-title")]/a))
-    if !anchor
-      next
-    end
-
-    if anchor["href"].starts_with? "https://www.googleadservices.com"
-      next
-    end
-
-    anchor = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-byline")]/a))
-    if !anchor
-      author = ""
-      author_id = ""
-    else
-      author = anchor.content.strip
-      author_id = anchor["href"].split("/")[-1]
-    end
-
     anchor = node.xpath_node(%q(.//h3[contains(@class, "yt-lockup-title")]/a))
     if !anchor
       next
@@ -184,6 +152,22 @@ def extract_items(nodeset, ucid = nil)
     title = anchor.content.strip
     id = anchor["href"]
 
+    if anchor["href"].starts_with? "https://www.googleadservices.com"
+      next
+    end
+
+    anchor = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-byline")]/a))
+    if anchor
+      author = anchor.content.strip
+      author_id = anchor["href"].split("/")[-1]
+    end
+
+    author ||= author_name
+    author_id ||= ucid
+
+    author ||= ""
+    author_id ||= ""
+
     description_html = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-description")]))
     description_html, description = html_to_content(description_html)
 
@@ -342,3 +326,94 @@ def extract_items(nodeset, ucid = nil)
 
   return items
 end
+
+def extract_shelf_items(nodeset, ucid = nil, author_name = nil)
+  items = [] of SearchPlaylist
+
+  nodeset.each do |shelf|
+    shelf_anchor = shelf.xpath_node(%q(.//h2[contains(@class, "branded-page-module-title")]))
+
+    if !shelf_anchor
+      next
+    end
+
+    title = shelf_anchor.xpath_node(%q(.//span[contains(@class, "branded-page-module-title-text")]))
+    if title
+      title = title.content.strip
+    end
+    title ||= ""
+
+    id = shelf_anchor.xpath_node(%q(.//a)).try &.["href"]
+    if !id
+      next
+    end
+
+    is_playlist = false
+    videos = [] of SearchPlaylistVideo
+
+    shelf.xpath_nodes(%q(.//ul[contains(@class, "yt-uix-shelfslider-list")]/li)).each do |child_node|
+      type = child_node.xpath_node(%q(./div))
+      if !type
+        next
+      end
+
+      case type["class"]
+      when .includes? "yt-lockup-video"
+        is_playlist = true
+
+        anchor = child_node.xpath_node(%q(.//h3[contains(@class, "yt-lockup-title")]/a))
+        if anchor
+          video_title = anchor.content.strip
+          video_id = HTTP::Params.parse(URI.parse(anchor["href"]).query.not_nil!)["v"]
+        end
+        video_title ||= ""
+        video_id ||= ""
+
+        anchor = child_node.xpath_node(%q(.//span[@class="video-time"]))
+        if anchor
+          length_seconds = decode_length_seconds(anchor.content)
+        end
+        length_seconds ||= 0
+
+        videos << SearchPlaylistVideo.new(
+          video_title,
+          video_id,
+          length_seconds
+        )
+      when .includes? "yt-lockup-playlist"
+        anchor = child_node.xpath_node(%q(.//h3[contains(@class, "yt-lockup-title")]/a))
+        if anchor
+          playlist_title = anchor.content.strip
+          params = HTTP::Params.parse(URI.parse(anchor["href"]).query.not_nil!)
+          plid = params["list"]
+        end
+        playlist_title ||= ""
+        plid ||= ""
+
+        items << SearchPlaylist.new(
+          playlist_title,
+          plid,
+          author_name,
+          ucid,
+          50,
+          Array(SearchPlaylistVideo).new
+        )
+      end
+    end
+
+    if is_playlist
+      plid = HTTP::Params.parse(URI.parse(id).query.not_nil!)["list"]
+
+      items << SearchPlaylist.new(
+        title,
+        plid,
+        author_name,
+        ucid,
+        videos.size,
+        videos
+      )
+    end
+  end
+
+  return items
+end

src/invidious/helpers/logger.cr

@@ -0,0 +1,35 @@
+require "logger"
+
+class Invidious::LogHandler < Kemal::BaseLogHandler
+  def initialize(@io : IO = STDOUT)
+  end
+
+  def call(context : HTTP::Server::Context)
+    time = Time.now
+    call_next(context)
+    elapsed_text = elapsed_text(Time.now - time)
+
+    @io << time << ' ' << context.response.status_code << ' ' << context.request.method << ' ' << context.request.resource << ' ' << elapsed_text << '\n'
+
+    if @io.is_a? File
+      @io.flush
+    end
+
+    context
+  end
+
+  def write(message : String)
+    @io << message
+
+    if @io.is_a? File
+      @io.flush
+    end
+  end
+
+  private def elapsed_text(elapsed)
+    millis = elapsed.total_milliseconds
+    return "#{millis.round(2)}ms" if millis >= 1
+
+    "#{(millis * 1000).round(2)}µs"
+  end
+end

src/invidious/helpers/utils.cr

@@ -136,31 +136,26 @@ def decode_date(string : String)
   return Time.now - delta
 end
 
-def recode_date(time : Time)
+def recode_date(time : Time, locale)
   span = Time.now - time
 
   if span.total_days > 365.0
-    span = {span.total_days / 365, "year"}
+    span = translate(locale, "`x` years", (span.total_days.to_i / 365).to_s)
   elsif span.total_days > 30.0
-    span = {span.total_days / 30, "month"}
+    span = translate(locale, "`x` months", (span.total_days.to_i / 30).to_s)
   elsif span.total_days > 7.0
-    span = {span.total_days / 7, "week"}
+    span = translate(locale, "`x` weeks", (span.total_days.to_i / 7).to_s)
   elsif span.total_hours > 24.0
-    span = {span.total_days, "day"}
+    span = translate(locale, "`x` days", (span.total_days.to_i).to_s)
   elsif span.total_minutes > 60.0
-    span = {span.total_hours, "hour"}
+    span = translate(locale, "`x` hours", (span.total_hours.to_i).to_s)
   elsif span.total_seconds > 60.0
-    span = {span.total_minutes, "minute"}
+    span = translate(locale, "`x` minutes", (span.total_minutes.to_i).to_s)
   else
-    span = {span.total_seconds, "second"}
+    span = translate(locale, "`x` seconds", (span.total_seconds.to_i).to_s)
   end
 
-  span = {span[0].to_i, span[1]}
+  return span
-  if span[0] > 1
-    span = {span[0], span[1] + "s"}
-  end
-
-  return span.join(" ")
 end
 
 def number_with_separator(number)
@@ -198,16 +193,28 @@ def arg_array(array, start = 1)
   return args
 end
 
-def make_host_url(ssl, host)
+def make_host_url(config, kemal_config)
+  ssl = config.https_only || kemal_config.ssl
+
   if ssl
     scheme = "https://"
   else
     scheme = "http://"
   end
 
-  host ||= "invidio.us"
+  if kemal_config.port != 80 && kemal_config.port != 443
+    port = ":#{kemal_config.port}"
+  else
+    port = ""
+  end
 
-  return "#{scheme}#{host}"
+  if !config.domain
+    return ""
+  end
+
+  host = config.domain.not_nil!.lchop(".")
+
+  return "#{scheme}#{host}#{port}"
 end
 
 def get_referer(env, fallback = "/")
@@ -242,21 +249,21 @@ def get_referer(env, fallback = "/")
 end
 
 def read_var_int(bytes)
-  numRead = 0
+  num_read = 0
   result = 0
 
-  read = bytes[numRead]
+  read = bytes[num_read]
 
   if bytes.size == 1
     result = bytes[0].to_i32
   else
     while ((read & 0b10000000) != 0)
-      read = bytes[numRead].to_u64
+      read = bytes[num_read].to_u64
       value = (read & 0b01111111)
-      result |= (value << (7 * numRead))
+      result |= (value << (7 * num_read))
 
-      numRead += 1
+      num_read += 1
-      if numRead > 5
+      if num_read > 5
         raise "VarInt is too big"
       end
     end
@@ -284,7 +291,7 @@ def write_var_int(value : Int)
     end
   end
 
-  return bytes
+  return Slice.new(bytes.to_unsafe, bytes.size)
 end
 
 def sha256(text)

src/invidious/jobs.cr

@@ -1,4 +1,4 @@
-def crawl_videos(db)
+def crawl_videos(db, logger)
   ids = Deque(String).new
   random = Random.new
 
@@ -21,7 +21,7 @@ def crawl_videos(db)
       id = ids[0]
       video = get_video(id, db)
     rescue ex
-      STDOUT << id << " : " << ex.message << "\n"
+      logger.write("#{id} : #{ex.message}\n")
       next
     ensure
       ids.delete(id)
@@ -46,7 +46,7 @@ def crawl_videos(db)
   end
 end
 
-def refresh_channels(db, max_threads = 1, full_refresh = false)
+def refresh_channels(db, logger, max_threads = 1, full_refresh = false)
   max_channel = Channel(Int32).new
 
   spawn do
@@ -68,12 +68,14 @@ def refresh_channels(db, max_threads = 1, full_refresh = false)
           active_threads += 1
           spawn do
             begin
-              client = make_client(YT_URL)
+              channel = fetch_channel(id, db, full_refresh)
-              channel = fetch_channel(id, client, db, full_refresh)
 
-              db.exec("UPDATE channels SET updated = $1, author = $2 WHERE id = $3", Time.now, channel.author, id)
+              db.exec("UPDATE channels SET updated = $1, author = $2, deleted = false WHERE id = $3", Time.now, channel.author, id)
             rescue ex
-              STDOUT << id << " : " << ex.message << "\n"
+              if ex.message == "Deleted or invalid channel"
+                db.exec("UPDATE channels SET updated = $1, deleted = true WHERE id = $2", Time.now, id)
+              end
+              logger.write("#{id} : #{ex.message}\n")
             end
 
             active_channel.send(true)
@@ -86,7 +88,7 @@ def refresh_channels(db, max_threads = 1, full_refresh = false)
   max_channel.send(max_threads)
 end
 
-def refresh_videos(db)
+def refresh_videos(db, logger)
   loop do
     db.query("SELECT id FROM videos ORDER BY updated") do |rs|
       rs.each do
@@ -94,7 +96,7 @@ def refresh_videos(db)
           id = rs.read(String)
           video = get_video(id, db)
         rescue ex
-          STDOUT << id << " : " << ex.message << "\n"
+          logger.write("#{id} : #{ex.message}\n")
           next
         end
       end
@@ -104,7 +106,7 @@ def refresh_videos(db)
   end
 end
 
-def refresh_feeds(db, max_threads = 1)
+def refresh_feeds(db, logger, max_threads = 1)
   max_channel = Channel(Int32).new
 
   spawn do
@@ -129,7 +131,16 @@ def refresh_feeds(db, max_threads = 1)
             begin
               db.exec("REFRESH MATERIALIZED VIEW #{view_name}")
             rescue ex
-              STDOUT << "REFRESH " << email << " : " << ex.message << "\n"
+              # Create view if it doesn't exist
+              if ex.message.try &.ends_with? "does not exist"
+                db.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
+                SELECT * FROM channel_videos WHERE \
+                ucid = ANY ((SELECT subscriptions FROM users WHERE email = E'#{email.gsub("'", "\\'")}')::text[]) \
+                ORDER BY published DESC;")
+                logger.write("CREATE #{view_name}")
+              else
+                logger.write("REFRESH #{email} : #{ex.message}\n")
+              end
             end
 
             active_channel.send(true)
@@ -142,19 +153,32 @@ def refresh_feeds(db, max_threads = 1)
   max_channel.send(max_threads)
 end
 
-def pull_top_videos(config, db)
+def subscribe_to_feeds(db, logger, key, config)
-  if config.dl_api_key
+  if config.use_pubsub_feeds
-    DetectLanguage.configure do |dl_config|
+    spawn do
-      dl_config.api_key = config.dl_api_key.not_nil!
+      loop do
+        db.query_all("SELECT id FROM channels WHERE CURRENT_TIMESTAMP - subscribed > '4 days'") do |rs|
+          rs.each do
+            ucid = rs.read(String)
+            response = subscribe_pubsub(ucid, key, config)
+
+            if response.status_code >= 400
+              logger.write("#{ucid} : #{response.body}\n")
+            end
+          end
+        end
+
+        sleep 1.minute
+        Fiber.yield
+      end
     end
-    filter = true
   end
+end
 
-  filter ||= false
+def pull_top_videos(config, db)
-
   loop do
     begin
-      top = rank_videos(db, 40, filter, YT_URL)
+      top = rank_videos(db, 40)
     rescue ex
       next
     end
@@ -182,11 +206,11 @@ end
 
 def pull_popular_videos(db)
   loop do
-    subscriptions = PG_DB.query_all("SELECT channel FROM \
+    subscriptions = db.query_all("SELECT channel FROM \
       (SELECT UNNEST(subscriptions) AS channel FROM users) AS d \
     GROUP BY channel ORDER BY COUNT(channel) DESC LIMIT 40", as: String)
 
-    videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM \
+    videos = db.query_all("SELECT DISTINCT ON (ucid) * FROM \
       channel_videos WHERE ucid IN (#{arg_array(subscriptions)}) \
     ORDER BY ucid, published DESC", subscriptions, as: ChannelVideo).sort_by { |video| video.published }.reverse
 

src/invidious/mixes.cr

@@ -43,8 +43,10 @@ def fetch_mix(rdid, video_id, cookies = nil, locale = nil)
   mix_title = playlist["title"].as_s
 
   contents = playlist["contents"].as_a
-  until contents[0]["playlistPanelVideoRenderer"]["videoId"].as_s == video_id
+  if contents.map { |video| video["playlistPanelVideoRenderer"]["videoId"] }.includes? video_id
-    contents.shift
+    until contents[0]["playlistPanelVideoRenderer"]["videoId"].as_s == video_id
+      contents.shift
+    end
   end
 
   videos = [] of MixVideo
@@ -52,7 +54,10 @@ def fetch_mix(rdid, video_id, cookies = nil, locale = nil)
     item = item["playlistPanelVideoRenderer"]
 
     id = item["videoId"].as_s
-    title = item["title"]["simpleText"].as_s
+    title = item["title"]?.try &.["simpleText"].as_s
+    if !title
+      next
+    end
     author = item["longBylineText"]["runs"][0]["text"].as_s
     ucid = item["longBylineText"]["runs"][0]["navigationEndpoint"]["browseEndpoint"]["browseId"].as_s
     length_seconds = decode_length_seconds(item["lengthText"]["simpleText"].as_s)
@@ -94,7 +99,10 @@ def template_mix(mix)
     html += <<-END_HTML
       <li class="pure-menu-item">
         <a href="/watch?v=#{video["videoId"]}&list=#{mix["mixId"]}">
-          <img style="width:100%;" src="/vi/#{video["videoId"]}/mqdefault.jpg">
+          <div class="thumbnail">
+              <img class="thumbnail" src="/vi/#{video["videoId"]}/mqdefault.jpg">
+              <p class="length">#{recode_length_seconds(video["lengthSeconds"].as_i)}</p>
+          </div>
           <p style="width:100%">#{video["title"]}</p>
           <p>
               <b style="width: 100%">#{video["author"]}</b>

src/invidious/playlists.cr

@@ -126,32 +126,37 @@ def produce_playlist_url(id, index)
   end
   ucid = "VL" + id
 
-  meta = [0x08_u8] + write_var_int(index)
+  meta = IO::Memory.new
-  meta = Slice.new(meta.to_unsafe, meta.size)
+  meta.write(Bytes[0x08])
-  meta = Base64.urlsafe_encode(meta, false)
+  meta.write(write_var_int(index))
+
+  meta.rewind
+  meta = Base64.urlsafe_encode(meta.to_slice, false)
   meta = "PT:#{meta}"
 
-  wrapped = "\x7a"
+  continuation = IO::Memory.new
-  wrapped += meta.bytes.size.unsafe_chr
+  continuation.write(Bytes[0x7a, meta.size])
-  wrapped += meta
+  continuation.print(meta)
 
-  wrapped = Base64.urlsafe_encode(wrapped)
+  continuation.rewind
-  meta = URI.escape(wrapped)
+  meta = Base64.urlsafe_encode(continuation.to_slice)
+  meta = URI.escape(meta)
 
-  continuation = "\x12"
+  continuation = IO::Memory.new
-  continuation += ucid.size.unsafe_chr
+  continuation.write(Bytes[0x12, ucid.size])
-  continuation += ucid
+  continuation.print(ucid)
-  continuation += "\x1a"
+  continuation.write(Bytes[0x1a, meta.size])
-  continuation += meta.bytes.size.unsafe_chr
+  continuation.print(meta)
-  continuation += meta
 
-  continuation = continuation.size.to_u8.unsafe_chr + continuation
+  wrapper = IO::Memory.new
-  continuation = "\xe2\xa9\x85\xb2\x02" + continuation
+  wrapper.write(Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02, continuation.size])
+  wrapper.print(continuation)
+  wrapper.rewind
 
-  continuation = Base64.urlsafe_encode(continuation)
+  wrapper = Base64.urlsafe_encode(wrapper.to_slice)
-  continuation = URI.escape(continuation)
+  wrapper = URI.escape(wrapper)
 
-  url = "/browse_ajax?continuation=#{continuation}"
+  url = "/browse_ajax?continuation=#{wrapper}&gl=US&hl=en"
 
   return url
 end
@@ -229,7 +234,10 @@ def template_playlist(playlist)
     html += <<-END_HTML
       <li class="pure-menu-item">
         <a href="/watch?v=#{video["videoId"]}&list=#{playlist["playlistId"]}">
-          <img style="width:100%;" src="/vi/#{video["videoId"]}/mqdefault.jpg">
+          <div class="thumbnail">
+              <img class="thumbnail" src="/vi/#{video["videoId"]}/mqdefault.jpg">
+              <p class="length">#{recode_length_seconds(video["lengthSeconds"].as_i)}</p>
+          </div>
           <p style="width:100%">#{video["title"]}</p>
           <p>
               <b style="width: 100%">#{video["author"]}</b>

src/invidious/search.cr

@@ -85,8 +85,8 @@ def channel_search(query, page, channel)
   return count, items
 end
 
-def search(query, page = 1, search_params = produce_search_params(content_type: "all"))
+def search(query, page = 1, search_params = produce_search_params(content_type: "all"), proxies = nil, region = nil)
-  client = make_client(YT_URL)
+  client = make_client(YT_URL, proxies, region)
   if query.empty?
     return {0, [] of SearchItem}
   end
@@ -188,7 +188,7 @@ def produce_search_params(sort : String = "relevance", date : String = "", conte
             end
   end
 
-  if body.size > 0
+  if !body.empty?
     token = head + "\x12" + body.size.unsafe_chr + body
   else
     token = head
@@ -203,36 +203,45 @@ end
 def produce_channel_search_url(ucid, query, page)
   page = "#{page}"
 
-  meta = "\x12\x06search"
+  meta = IO::Memory.new
-  meta += "\x30\x02"
+  meta.write(Bytes[0x12, 0x06])
-  meta += "\x38\x01"
+  meta.print("search")
-  meta += "\x60\x01"
-  meta += "\x6a\x00"
-  meta += "\xb8\x01\x00"
-  meta += "\x7a"
-  meta += page.size.unsafe_chr
-  meta += page
 
-  meta = Base64.urlsafe_encode(meta)
+  meta.write(Bytes[0x30, 0x02])
+  meta.write(Bytes[0x38, 0x01])
+  meta.write(Bytes[0x60, 0x01])
+  meta.write(Bytes[0x6a, 0x00])
+  meta.write(Bytes[0xb8, 0x01, 0x00])
+
+  meta.write(Bytes[0x7a, page.size])
+  meta.print(page)
+
+  meta.rewind
+  meta = Base64.urlsafe_encode(meta.to_slice)
   meta = URI.escape(meta)
 
-  continuation = "\x12"
+  continuation = IO::Memory.new
-  continuation += ucid.size.unsafe_chr
+  continuation.write(Bytes[0x12, ucid.size])
-  continuation += ucid
+  continuation.print(ucid)
-  continuation += "\x1a"
-  continuation += meta.size.unsafe_chr
-  continuation += meta
-  continuation += "\x5a"
-  continuation += query.size.unsafe_chr
-  continuation += query
 
-  continuation = continuation.size.unsafe_chr + continuation
+  continuation.write(Bytes[0x1a, meta.size])
-  continuation = "\xe2\xa9\x85\xb2\x02" + continuation
+  continuation.print(meta)
 
-  continuation = Base64.urlsafe_encode(continuation)
+  continuation.write(Bytes[0x5a, query.size])
-  continuation = URI.escape(continuation)
+  continuation.print(query)
 
-  url = "/browse_ajax?continuation=#{continuation}"
+  continuation.rewind
+  continuation = continuation.gets_to_end
+
+  wrapper = IO::Memory.new
+  wrapper.write(Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02, continuation.size])
+  wrapper.print(continuation)
+  wrapper.rewind
+
+  wrapper = Base64.urlsafe_encode(wrapper.to_slice)
+  wrapper = URI.escape(wrapper)
+
+  url = "/browse_ajax?continuation=#{wrapper}&gl=US&hl=en"
 
   return url
 end

src/invidious/signatures.cr

@@ -39,7 +39,12 @@ def fetch_decrypt_function(id = "CvFH_6DNRCY")
   return decrypt_function
 end
 
-def decrypt_signature(a, code)
+def decrypt_signature(fmt, code)
+  if !fmt["s"]?
+    return ""
+  end
+
+  a = fmt["s"]
   a = a.split("")
 
   code.each do |item|
@@ -53,7 +58,8 @@ def decrypt_signature(a, code)
     end
   end
 
-  return a.join("")
+  signature = a.join("")
+  return "&#{fmt["sp"]?}=#{signature}"
 end
 
 def splice(a, b)

src/invidious/users.cr

@@ -12,7 +12,6 @@ class User
   end
 
   add_mapping({
-    id:            Array(String),
     updated:       Time,
     notifications: Array(String),
     subscriptions: Array(String),
@@ -79,36 +78,36 @@ class Preferences
     autoplay:   Bool,
     continue:   {
       type:    Bool,
-      default: false,
+      default: DEFAULT_USER_PREFERENCES.continue,
     },
     listen: {
       type:    Bool,
-      default: false,
+      default: DEFAULT_USER_PREFERENCES.listen,
     },
     speed:    Float32,
     quality:  String,
     volume:   Int32,
     comments: {
       type:      Array(String),
-      default:   ["youtube", ""],
+      default:   DEFAULT_USER_PREFERENCES.comments,
       converter: StringToArray,
     },
     captions: {
       type:    Array(String),
-      default: ["", "", ""],
+      default: DEFAULT_USER_PREFERENCES.captions,
     },
     redirect_feed: {
       type:    Bool,
-      default: false,
+      default: DEFAULT_USER_PREFERENCES.redirect_feed,
     },
     related_videos: {
       type:    Bool,
-      default: true,
+      default: DEFAULT_USER_PREFERENCES.related_videos,
     },
     dark_mode: Bool,
     thin_mode: {
       type:    Bool,
-      default: false,
+      default: DEFAULT_USER_PREFERENCES.thin_mode,
     },
     max_results:        Int32,
     sort:               String,
@@ -116,59 +115,65 @@ class Preferences
     unseen_only:        Bool,
     notifications_only: {
       type:    Bool,
-      default: false,
+      default: DEFAULT_USER_PREFERENCES.notifications_only,
     },
     locale: {
       type:    String,
-      default: "en-US",
+      default: DEFAULT_USER_PREFERENCES.locale,
     },
   })
 end
 
 def get_user(sid, headers, db, refresh = true)
-  if db.query_one?("SELECT EXISTS (SELECT true FROM users WHERE $1 = ANY(id))", sid, as: Bool)
+  if email = db.query_one?("SELECT email FROM session_ids WHERE id = $1", sid, as: String)
-    user = db.query_one("SELECT * FROM users WHERE $1 = ANY(id)", sid, as: User)
+    user = db.query_one("SELECT * FROM users WHERE email = $1", email, as: User)
 
     if refresh && Time.now - user.updated > 1.minute
-      user = fetch_user(sid, headers, db)
+      user, sid = fetch_user(sid, headers, db)
       user_array = user.to_a
 
-      user_array[5] = user_array[5].to_json
+      user_array[4] = user_array[4].to_json
       args = arg_array(user_array)
 
       db.exec("INSERT INTO users VALUES (#{args}) \
-      ON CONFLICT (email) DO UPDATE SET id = users.id || $1, updated = $2, subscriptions = $4", user_array)
+      ON CONFLICT (email) DO UPDATE SET updated = $1, subscriptions = $3", user_array)
+
+      db.exec("INSERT INTO session_ids VALUES ($1,$2,$3) \
+      ON CONFLICT (id) DO NOTHING", sid, user.email, Time.now)
 
       begin
         view_name = "subscriptions_#{sha256(user.email)[0..7]}"
-        PG_DB.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
+        db.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
         SELECT * FROM channel_videos WHERE \
-        ucid = ANY ((SELECT subscriptions FROM users WHERE email = '#{user.email}')::text[]) \
+        ucid = ANY ((SELECT subscriptions FROM users WHERE email = E'#{user.email.gsub("'", "\\'")}')::text[]) \
         ORDER BY published DESC;")
       rescue ex
       end
     end
   else
-    user = fetch_user(sid, headers, db)
+    user, sid = fetch_user(sid, headers, db)
     user_array = user.to_a
 
-    user_array[5] = user_array[5].to_json
+    user_array[4] = user_array[4].to_json
     args = arg_array(user.to_a)
 
     db.exec("INSERT INTO users VALUES (#{args}) \
-    ON CONFLICT (email) DO UPDATE SET id = users.id || $1, updated = $2, subscriptions = $4", user_array)
+    ON CONFLICT (email) DO UPDATE SET updated = $1, subscriptions = $3", user_array)
+
+    db.exec("INSERT INTO session_ids VALUES ($1,$2,$3) \
+    ON CONFLICT (id) DO NOTHING", sid, user.email, Time.now)
 
     begin
       view_name = "subscriptions_#{sha256(user.email)[0..7]}"
-      PG_DB.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
+      db.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
       SELECT * FROM channel_videos WHERE \
-      ucid = ANY ((SELECT subscriptions FROM users WHERE email = '#{user.email}')::text[]) \
+      ucid = ANY ((SELECT subscriptions FROM users WHERE email = E'#{user.email.gsub("'", "\\'")}')::text[]) \
       ORDER BY published DESC;")
     rescue ex
     end
   end
 
-  return user
+  return user, sid
 end
 
 def fetch_user(sid, headers, db)
@@ -196,17 +201,17 @@ def fetch_user(sid, headers, db)
 
   token = Base64.urlsafe_encode(Random::Secure.random_bytes(32))
 
-  user = User.new([sid], Time.now, [] of String, channels, email, DEFAULT_USER_PREFERENCES, nil, token, [] of String)
+  user = User.new(Time.now, [] of String, channels, email, DEFAULT_USER_PREFERENCES, nil, token, [] of String)
-  return user
+  return user, sid
 end
 
 def create_user(sid, email, password)
   password = Crypto::Bcrypt::Password.create(password, cost: 10)
   token = Base64.urlsafe_encode(Random::Secure.random_bytes(32))
 
-  user = User.new([sid], Time.now, [] of String, [] of String, email, DEFAULT_USER_PREFERENCES, password.to_s, token, [] of String)
+  user = User.new(Time.now, [] of String, [] of String, email, DEFAULT_USER_PREFERENCES, password.to_s, token, [] of String)
 
-  return user
+  return user, sid
 end
 
 def create_response(user_id, operation, key, db, expire = 6.hours)
@@ -242,7 +247,7 @@ def validate_response(challenge, token, user_id, operation, key, db, locale)
     raise translate(locale, "Invalid challenge")
   end
 
-  challenge = OpenSSL::HMAC.digest(:sha256, HMAC_KEY, challenge)
+  challenge = OpenSSL::HMAC.digest(:sha256, key, challenge)
   challenge = Base64.urlsafe_encode(challenge)
 
   if db.query_one?("SELECT EXISTS (SELECT true FROM nonces WHERE nonce = $1)", nonce, as: Bool)

src/invidious/videos.cr

@@ -137,7 +137,7 @@ BYPASS_REGIONS = {
 }
 
 VIDEO_THUMBNAILS = {
-  {name: "maxres", host: "invidio.us", url: "maxres", height: 720, width: 1280},
+  {name: "maxres", host: "#{CONFIG.domain}", url: "maxres", height: 720, width: 1280},
   {name: "maxresdefault", host: "i.ytimg.com", url: "maxresdefault", height: 720, width: 1280},
   {name: "sddefault", host: "i.ytimg.com", url: "sddefault", height: 480, width: 640},
   {name: "high", host: "i.ytimg.com", url: "hqdefault", height: 360, width: 480},
@@ -263,7 +263,7 @@ class Video
   end
 
   def keywords
-    keywords = self.player_response["videoDetails"]["keywords"]?.try &.as_a
+    keywords = self.player_response["videoDetails"]?.try &.["keywords"]?.try &.as_a
     keywords ||= [] of String
 
     return keywords
@@ -271,9 +271,51 @@ class Video
 
   def fmt_stream(decrypt_function)
     streams = [] of HTTP::Params
-    self.info["url_encoded_fmt_stream_map"].split(",") do |string|
+
-      if !string.empty?
+    if fmt_streams = self.player_response["streamingData"]?.try &.["formats"]?
-        streams << HTTP::Params.parse(string)
+      fmt_streams.as_a.each do |fmt_stream|
+        if !fmt_stream.as_h?
+          next
+        end
+
+        fmt = {} of String => String
+
+        fmt["lmt"] = fmt_stream["lastModified"]?.try &.as_s || "0"
+        fmt["projection_type"] = "1"
+        fmt["type"] = fmt_stream["mimeType"].as_s
+        fmt["clen"] = fmt_stream["contentLength"]?.try &.as_s || "0"
+        fmt["bitrate"] = fmt_stream["bitrate"]?.try &.as_i.to_s || "0"
+        fmt["itag"] = fmt_stream["itag"].as_i.to_s
+        fmt["url"] = fmt_stream["url"].as_s
+        fmt["quality"] = fmt_stream["quality"].as_s
+
+        if fmt_stream["width"]?
+          fmt["size"] = "#{fmt_stream["width"]}x#{fmt_stream["height"]}"
+          fmt["height"] = fmt_stream["height"].as_i.to_s
+        end
+
+        if fmt_stream["fps"]?
+          fmt["fps"] = fmt_stream["fps"].as_i.to_s
+        end
+
+        if fmt_stream["qualityLabel"]?
+          fmt["quality_label"] = fmt_stream["qualityLabel"].as_s
+        end
+
+        params = HTTP::Params.new
+        fmt.each do |key, value|
+          params[key] = value
+        end
+
+        streams << params
+      end
+
+      streams.sort_by! { |stream| stream["height"].to_i }.reverse!
+    elsif fmt_stream = self.info["url_encoded_fmt_stream_map"]?
+      fmt_stream.split(",").each do |string|
+        if !string.empty?
+          streams << HTTP::Params.parse(string)
+        end
       end
     end
 
@@ -286,10 +328,8 @@ class Video
       end
     end
 
-    if streams[0]? && streams[0]["s"]?
+    streams.each do |fmt|
-      streams.each do |fmt|
+      fmt["url"] += decrypt_signature(fmt, decrypt_function)
-        fmt["url"] += "&signature=" + decrypt_signature(fmt["s"], decrypt_function)
-      end
     end
 
     return streams
@@ -298,80 +338,54 @@ class Video
   def adaptive_fmts(decrypt_function)
     adaptive_fmts = [] of HTTP::Params
 
-    if self.info.has_key?("adaptive_fmts")
+    if fmts = self.player_response["streamingData"]?.try &.["adaptiveFormats"]?
-      self.info["adaptive_fmts"].split(",") do |string|
+      fmts.as_a.each do |adaptive_fmt|
-        adaptive_fmts << HTTP::Params.parse(string)
+        if !adaptive_fmt.as_h?
-      end
+          next
-    elsif self.info.has_key?("dashmpd")
-      client = make_client(YT_URL)
-      response = client.get(self.info["dashmpd"])
-      document = XML.parse_html(response.body)
-
-      document.xpath_nodes(%q(//adaptationset)).each do |adaptation_set|
-        mime_type = adaptation_set["mimetype"]
-
-        document.xpath_nodes(%q(.//representation)).each do |representation|
-          codecs = representation["codecs"]
-          itag = representation["id"]
-          bandwidth = representation["bandwidth"]
-          url = representation.xpath_node(%q(.//baseurl)).not_nil!.content
-
-          clen = url.match(/clen\/(?<clen>\d+)/).try &.["clen"]
-          clen ||= "0"
-          lmt = url.match(/lmt\/(?<lmt>\d+)/).try &.["lmt"]
-          lmt ||= "#{((Time.now + 1.hour).to_unix_f.to_f64 * 1000000).to_i64}"
-
-          segment_list = representation.xpath_node(%q(.//segmentlist)).not_nil!
-          init = segment_list.xpath_node(%q(.//initialization))
-
-          # TODO: Replace with sane defaults when byteranges are absent
-          if init && !init["sourceurl"].starts_with? "sq"
-            init = init["sourceurl"].lchop("range/")
-
-            index = segment_list.xpath_node(%q(.//segmenturl)).not_nil!["media"]
-            index = index.lchop("range/")
-            index = "#{init.split("-")[1].to_i + 1}-#{index.split("-")[0].to_i}"
-          else
-            init = "0-0"
-            index = "1-1"
-          end
-
-          params = {
-            "type"            => ["#{mime_type}; codecs=\"#{codecs}\""],
-            "url"             => [url],
-            "projection_type" => ["1"],
-            "index"           => [index],
-            "init"            => [init],
-            "xtags"           => [] of String,
-            "lmt"             => [lmt],
-            "clen"            => [clen],
-            "bitrate"         => [bandwidth],
-            "itag"            => [itag],
-          }
-
-          if mime_type == "video/mp4"
-            width = representation["width"]?
-            height = representation["height"]?
-            fps = representation["framerate"]?
-
-            metadata = itag_to_metadata?(itag)
-            if metadata
-              width ||= metadata["width"]?
-              height ||= metadata["height"]?
-              fps ||= metadata["fps"]?
-            end
-
-            if width && height
-              params["size"] = ["#{width}x#{height}"]
-            end
-
-            if width
-              params["quality_label"] = ["#{height}p"]
-            end
-          end
-
-          adaptive_fmts << HTTP::Params.new(params)
         end
+
+        fmt = {} of String => String
+
+        if init = adaptive_fmt["initRange"]?
+          fmt["init"] = "#{init["start"]}-#{init["end"]}"
+        end
+        fmt["init"] ||= "0-0"
+
+        fmt["lmt"] = adaptive_fmt["lastModified"]?.try &.as_s || "0"
+        fmt["projection_type"] = "1"
+        fmt["type"] = adaptive_fmt["mimeType"].as_s
+        fmt["clen"] = adaptive_fmt["contentLength"]?.try &.as_s || "0"
+        fmt["bitrate"] = adaptive_fmt["bitrate"]?.try &.as_i.to_s || "0"
+        fmt["itag"] = adaptive_fmt["itag"].as_i.to_s
+        fmt["url"] = adaptive_fmt["url"].as_s
+
+        if index = adaptive_fmt["indexRange"]?
+          fmt["index"] = "#{index["start"]}-#{index["end"]}"
+        end
+        fmt["index"] ||= "0-0"
+
+        if adaptive_fmt["width"]?
+          fmt["size"] = "#{adaptive_fmt["width"]}x#{adaptive_fmt["height"]}"
+        end
+
+        if adaptive_fmt["fps"]?
+          fmt["fps"] = adaptive_fmt["fps"].as_i.to_s
+        end
+
+        if adaptive_fmt["qualityLabel"]?
+          fmt["quality_label"] = adaptive_fmt["qualityLabel"].as_s
+        end
+
+        params = HTTP::Params.new
+        fmt.each do |key, value|
+          params[key] = value
+        end
+
+        adaptive_fmts << params
+      end
+    elsif fmts = self.info["adaptive_fmts"]?
+      fmts.split(",") do |string|
+        adaptive_fmts << HTTP::Params.parse(string)
       end
     end
 
@@ -381,23 +395,21 @@ class Video
       end
     end
 
-    if adaptive_fmts[0]? && adaptive_fmts[0]["s"]?
+    adaptive_fmts.each do |fmt|
-      adaptive_fmts.each do |fmt|
+      fmt["url"] += decrypt_signature(fmt, decrypt_function)
-        fmt["url"] += "&signature=" + decrypt_signature(fmt["s"], decrypt_function)
-      end
     end
 
     return adaptive_fmts
   end
 
   def video_streams(adaptive_fmts)
-    video_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("video") ? s : nil }
+    video_streams = adaptive_fmts.select { |s| s["type"].starts_with? "video" }
 
     return video_streams
   end
 
   def audio_streams(adaptive_fmts)
-    audio_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("audio") ? s : nil }
+    audio_streams = adaptive_fmts.select { |s| s["type"].starts_with? "audio" }
     audio_streams.sort_by! { |s| s["bitrate"].to_i }.reverse!
     audio_streams.each do |stream|
       stream["bitrate"] = (stream["bitrate"].to_f64/1000).to_i.to_s
@@ -542,53 +554,71 @@ def get_video(id, db, proxies = {} of String => Array({ip: String, port: Int32})
   return video
 end
 
+def extract_player_config(body, html)
+  params = HTTP::Params.new
+
+  if md = body.match(/'XSRF_TOKEN': "(?<session_token>[A-Za-z0-9\_\-\=]+)"/)
+    params["session_token"] = md["session_token"]
+  end
+
+  if md = body.match(/itct=(?<itct>[^"]+)"/)
+    params["itct"] = md["itct"]
+  end
+
+  if md = body.match(/'COMMENTS_TOKEN': "(?<ctoken>[^"]+)"/)
+    params["ctoken"] = md["ctoken"]
+  end
+
+  if md = body.match(/'RELATED_PLAYER_ARGS': (?<rvs>{"rvs":"[^"]+"})/)
+    params["rvs"] = JSON.parse(md["rvs"])["rvs"].as_s
+  end
+
+  html_info = body.match(/ytplayer\.config = (?<info>.*?);ytplayer\.load/).try &.["info"]
+
+  if html_info
+    JSON.parse(html_info)["args"].as_h.each do |key, value|
+      params[key] = value.to_s
+    end
+  else
+    error_message = html.xpath_node(%q(//h1[@id="unavailable-message"]))
+    if error_message
+      params["reason"] = error_message.content.strip
+    else
+      params["reason"] = "Could not extract video info."
+    end
+  end
+
+  return params
+end
+
 def fetch_video(id, proxies, region)
-  html_channel = Channel(XML::Node | String).new
+  client = make_client(YT_URL, proxies, region)
-  info_channel = Channel(HTTP::Params).new
+  response = client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
 
-  spawn do
+  if md = response.headers["location"]?.try &.match(/v=(?<id>[a-zA-Z0-9_-]{11})/)
-    client = make_client(YT_URL, proxies, region)
+    raise VideoRedirect.new(md["id"])
-    html = client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
-
-    if md = html.headers["location"]?.try &.match(/v=(?<id>[a-zA-Z0-9_-]{11})/)
-      next html_channel.send(md["id"])
-    end
-
-    html = XML.parse_html(html.body)
-    html_channel.send(html)
   end
 
-  spawn do
+  html = XML.parse_html(response.body)
-    client = make_client(YT_URL, proxies, region)
+  info = extract_player_config(response.body, html)
-    info = client.get("/get_video_info?video_id=#{id}&el=detailpage&ps=default&eurl=&gl=US&hl=en&disable_polymer=1")
+  info["cookie"] = response.cookies.to_h.map { |name, cookie| "#{name}=#{cookie.value}" }.join("; ")
-    info = HTTP::Params.parse(info.body)
-
-    if info["reason"]?
-      info = client.get("/get_video_info?video_id=#{id}&ps=default&eurl=&gl=US&hl=en&disable_polymer=1")
-      info = HTTP::Params.parse(info.body)
-    end
-
-    info_channel.send(info)
-  end
-
-  html = html_channel.receive
-  if html.as?(String)
-    raise VideoRedirect.new("#{html.as(String)}")
-  end
-  html = html.as(XML::Node)
-
-  info = info_channel.receive
 
+  # Try to use proxies for region-blocked videos
   if info["reason"]? && info["reason"].includes? "your country"
-    bypass_channel = Channel({HTTPClient, String} | Nil).new
+    bypass_channel = Channel({XML::Node, HTTP::Params} | Nil).new
 
     proxies.each do |proxy_region, list|
       spawn do
         client = make_client(YT_URL, proxies, proxy_region)
+        proxy_response = client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
 
-        info = HTTP::Params.parse(client.get("/get_video_info?video_id=#{id}&ps=default&eurl=&gl=US&hl=en&disable_polymer=1").body)
+        proxy_html = XML.parse_html(proxy_response.body)
-        if !info["reason"]?
+        proxy_info = extract_player_config(proxy_response.body, proxy_html)
-          bypass_channel.send({client, proxy_region})
+
+        if !proxy_info["reason"]?
+          proxy_info["region"] = proxy_region
+          proxy_info["cookie"] = proxy_response.cookies.to_h.map { |name, cookie| "#{name}=#{cookie.value}" }.join("; ")
+          bypass_channel.send({proxy_html, proxy_info})
         else
           bypass_channel.send(nil)
         end
@@ -598,41 +628,32 @@ def fetch_video(id, proxies, region)
     proxies.size.times do
       response = bypass_channel.receive
       if response
-        begin
+        html, info = response
-          client, proxy_region = response
+        break
-
-          html = XML.parse_html(client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999").body)
-          info = HTTP::Params.parse(client.get("/get_video_info?video_id=#{id}&el=detailpage&ps=default&eurl=&gl=US&hl=en&disable_polymer=1").body)
-
-          if info["reason"]?
-            info = HTTP::Params.parse(client.get("/get_video_info?video_id=#{id}&ps=default&eurl=&gl=US&hl=en&disable_polymer=1").body)
-          end
-
-          info["region"] = proxy_region
-
-          break
-        rescue ex
-        end
       end
     end
   end
 
+  # Try to pull streams from embed URL
   if info["reason"]?
-    html_info = html.to_s.match(/ytplayer\.config = (?<info>.*?);ytplayer\.load/).try &.["info"]
+    embed_page = client.get("/embed/#{id}").body
-    if html_info
+    sts = embed_page.match(/"sts"\s*:\s*(?<sts>\d+)/).try &.["sts"]?
-      html_info = JSON.parse(html_info)["args"].as_h
+    sts ||= ""
-      info.delete("reason")
+    embed_info = HTTP::Params.parse(client.get("/get_video_info?video_id=#{id}&eurl=https://youtube.googleapis.com/v/#{id}&gl=US&hl=en&disable_polymer=1&sts=#{sts}").body)
 
-      html_info.each do |k, v|
+    if !embed_info["reason"]?
-        info[k] = v.to_s
+      embed_info.each do |key, value|
+        info[key] = value.to_s
       end
-    end
+    else
-
-    if info["reason"]?
       raise info["reason"]
     end
   end
 
+  if info["errorcode"]?.try &.== "2"
+    raise "Video unavailable."
+  end
+
   title = info["title"]
   author = info["author"]
   ucid = info["ucid"]
@@ -649,6 +670,10 @@ def fetch_video(id, proxies, region)
   dislikes = dislikes.try &.content.delete(",").try &.to_i?
   dislikes ||= 0
 
+  avg_rating = (likes.to_f/(likes.to_f + dislikes.to_f) * 4 + 1)
+  avg_rating = avg_rating.nan? ? 0.0 : avg_rating
+  info["avg_rating"] = "#{avg_rating}"
+
   description = html.xpath_node(%q(//p[@id="eow-description"]))
   description = description ? description.to_xml : ""
 
@@ -660,19 +685,27 @@ def fetch_video(id, proxies, region)
 
   allowed_regions = html.xpath_node(%q(//meta[@itemprop="regionsAllowed"])).try &.["content"].split(",")
   allowed_regions ||= [] of String
+
   is_family_friendly = html.xpath_node(%q(//meta[@itemprop="isFamilyFriendly"])).try &.["content"] == "True"
   is_family_friendly ||= true
 
   genre = html.xpath_node(%q(//meta[@itemprop="genre"])).try &.["content"]
   genre ||= ""
 
-  genre_url = html.xpath_node(%(//a[text()="#{genre}"])).try &.["href"]
+  genre_url = html.xpath_node(%(//ul[contains(@class, "watch-info-tag-list")]/li/a[text()="#{genre}"])).try &.["href"]
+
+  # Sometimes YouTube tries to link to invalid/missing channels, so we fix that here
   case genre
+  when "Education"
+    genre_url = "/channel/UCdxpofrI-dO6oYfsqHDHphw"
+  when "Gaming"
+    genre_url = "/channel/UCOpNcN46UbXVtpKMrmU4Abg"
   when "Movies"
     genre_url = "/channel/UClgRkhTL3_hImCAmdLfDE4g"
-  when "Education"
+  when "Nonprofits & Activism"
-    # Education channel is linked but does not exist
+    genre_url = "/channel/UCfFyYRYslvuhwMDnx6KjUvw"
-    genre_url = "/channel/UC3yA8nDwraeOfnYfBWun83g"
+  when "Trailers"
+    genre_url = "/channel/UClgRkhTL3_hImCAmdLfDE4g"
   end
   genre_url ||= ""
 
@@ -710,6 +743,7 @@ end
 def process_video_params(query, preferences)
   autoplay = query["autoplay"]?.try &.to_i?
   continue = query["continue"]?.try &.to_i?
+  related_videos = query["related_videos"]?
   listen = query["listen"]? && (query["listen"] == "true" || query["listen"] == "1").to_unsafe
   preferred_captions = query["subtitles"]?.try &.split(",").map { |a| a.downcase }
   quality = query["quality"]?
@@ -722,6 +756,7 @@ def process_video_params(query, preferences)
     # region ||= preferences.region
     autoplay ||= preferences.autoplay.to_unsafe
     continue ||= preferences.continue.to_unsafe
+    related_videos ||= preferences.related_videos.to_unsafe
     listen ||= preferences.listen.to_unsafe
     preferred_captions ||= preferences.captions
     quality ||= preferences.quality
@@ -730,17 +765,19 @@ def process_video_params(query, preferences)
     volume ||= preferences.volume
   end
 
-  autoplay ||= 0
+  autoplay ||= DEFAULT_USER_PREFERENCES.autoplay.to_unsafe
-  continue ||= 0
+  continue ||= DEFAULT_USER_PREFERENCES.continue.to_unsafe
-  listen ||= 0
+  related_videos ||= DEFAULT_USER_PREFERENCES.related_videos.to_unsafe
-  preferred_captions ||= [] of String
+  listen ||= DEFAULT_USER_PREFERENCES.listen.to_unsafe
-  quality ||= "hd720"
+  preferred_captions ||= DEFAULT_USER_PREFERENCES.captions
-  speed ||= 1
+  quality ||= DEFAULT_USER_PREFERENCES.quality
-  video_loop ||= 0
+  speed ||= DEFAULT_USER_PREFERENCES.speed
-  volume ||= 100
+  video_loop ||= DEFAULT_USER_PREFERENCES.video_loop.to_unsafe
+  volume ||= DEFAULT_USER_PREFERENCES.volume
 
   autoplay = autoplay == 1
   continue = continue == 1
+  related_videos = related_videos == 1
   listen = listen == 1
   video_loop = video_loop == 1
 
@@ -778,6 +815,7 @@ def process_video_params(query, preferences)
     quality:            quality,
     raw:                raw,
     region:             region,
+    related_videos:     related_videos,
     speed:              speed,
     video_end:          video_end,
     video_loop:         video_loop,

src/invidious/views/channel.ecr

@@ -14,41 +14,27 @@
 </div>
 
 <div class="h-box">
-<% if user %>
+<% sub_count_text = number_to_short_text(sub_count) %>
-    <% if subscriptions.includes? ucid %>
+<%= rendered "components/subscribe_widget" %>
-    <p>
-        <a id="subscribe" onclick="unsubscribe()" class="pure-button pure-button-primary" 
-            href="/subscription_ajax?action_remove_subscriptions=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>">
-            <b><%= translate(locale, "Unsubscribe") %> | <%= number_to_short_text(sub_count) %></b>
-        </a>
-    </p>
-    <% else %>
-    <p>
-        <a id="subscribe" onclick="subscribe()" class="pure-button pure-button-primary" 
-            href="/subscription_ajax?action_create_subscription_to_channel=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>">
-            <b><%= translate(locale, "Subscribe") %> | <%= number_to_short_text(sub_count) %></b>
-        </a>
-    </p>
-    <% end %>
-<% else %>
-    <p>
-        <a id="subscribe" class="pure-button pure-button-primary" 
-            href="/login?referer=<%= env.get("current_page") %>">
-            <b><%= translate(locale, "Login to subscribe to `x`", author) %></b>
-        </a>
-    </p>
-<% end %>
 </div>
 
 <div class="pure-g h-box">
     <div class="pure-u-1-3">
         <a href="https://www.youtube.com/channel/<%= ucid %>"><%= translate(locale, "View channel on YouTube") %></a>
+        <div class="pure-u-1 pure-md-1-3">
+            <b><%= translate(locale, "Videos") %></b>
+        </div>
+        <div class="pure-u-1 pure-md-1-3">
+            <% if !auto_generated %>
+                <a href="/channel/<%= ucid %>/playlists"><%= translate(locale, "Playlists") %></a>
+            <% end %>
+        </div>
     </div>
     <div class="pure-u-1-3">
     </div>
     <div class="pure-u-1-3">
         <div class="pure-g" style="text-align:right;">
-        <% {"newest", "oldest", "popular"}.each do |sort| %>
+        <% sort_options.each do |sort| %>
             <div class="pure-u-1 pure-md-1-3">
                 <% if sort_by == sort %>
                 <b><%= translate(locale, sort) %></b>
@@ -68,7 +54,7 @@
 </div>
 
 <div class="pure-g">
-<% videos.each_slice(4) do |slice| %>
+<% items.each_slice(4) do |slice| %>
     <% slice.each do |item| %>
         <%= rendered "components/item" %>
     <% end %>
@@ -94,43 +80,6 @@
 </div>
 
 <script>
-document.getElementById("subscribe")["href"] = "javascript:void(0)"
+<% sub_count_text = number_to_short_text(sub_count) %>
-
+<%= rendered "components/subscribe_widget_script" %>
-function subscribe() {
-    var url = "/subscription_ajax?action_create_subscription_to_channel=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>";
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = "json";
-    xhr.timeout = 20000;
-    xhr.open("GET", url, true);
-    xhr.send();
-
-    xhr.onreadystatechange = function() {
-        if (xhr.readyState == 4) {
-            if (xhr.status == 200) {
-                subscribe_button = document.getElementById("subscribe");
-                subscribe_button.onclick = unsubscribe;
-                subscribe_button.innerHTML = '<b><%= translate(locale, "Unsubscribe") %> | <%= number_to_short_text(sub_count) %></b>'
-            }
-        }
-    }
-}
-
-function unsubscribe() {
-    var url = "/subscription_ajax?action_remove_subscriptions=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>";
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = "json";
-    xhr.timeout = 20000;
-    xhr.open("GET", url, true);
-    xhr.send();
-
-    xhr.onreadystatechange = function() {
-        if (xhr.readyState == 4) {
-            if (xhr.status == 200) {
-                subscribe_button = document.getElementById("subscribe");
-                subscribe_button.onclick = subscribe;
-                subscribe_button.innerHTML = '<b><%= translate(locale, "Subscribe") %> | <%= number_to_short_text(sub_count) %></b>'
-            }
-        }
-    }
-}
 </script>

src/invidious/views/components/feed_menu.ecr

@@ -0,0 +1,19 @@
+<div class="h-box pure-g">
+    <div class="pure-u-1 pure-u-md-1-4"></div>
+    <div class="pure-u-1 pure-u-md-1-2">
+        <div class="pure-g">
+            <% feed_menu = config.feed_menu.dup %>
+            <% if !env.get?("user") %>
+            <% feed_menu.reject! {|feed| feed == "Subscriptions"} %>
+            <% end %>
+            <% feed_menu.each do |feed| %>
+            <div class="pure-u-1-2 pure-u-md-1-<%= feed_menu.size %>">
+                <a href="/feed/<%= feed.downcase %>" style="text-align:center;" class="pure-menu-heading">
+                    <%= translate(locale, feed) %>
+                </a>
+            </div>
+            <% end %>
+        </div>
+    </div>
+    <div class="pure-u-1 pure-u-md-1-4"></div>
+</div>

src/invidious/views/components/item.ecr

@@ -53,20 +53,21 @@
             <% else %>
             <div class="thumbnail">
                 <img class="thumbnail" src="/vi/<%= item.id %>/mqdefault.jpg"/>
+                <% if item.responds_to?(:live_now) && item.live_now %>
+                <p class="length"><i class="icon ion-ios-play-circle"></i> <%= translate(locale, "LIVE") %></p>
+                <% else %>
                 <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
+                <% end %>
             </div>
             <% end %>
             <p><%= item.title %></p>
         </a>
-        <% if item.responds_to?(:live_now) && item.live_now %>
-        <p><%= translate(locale, "LIVE") %></p>
-        <% end %>
         <p>
             <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
         </p>
         
         <% if Time.now - item.published > 1.minute %>
-        <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published)) %></h5>
+        <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></h5>
         <% end %>
     <% else %>
         <% if env.get?("user") && env.get("user").as(User).preferences.thin_mode %>
@@ -81,26 +82,27 @@
                         onmouseenter='this["href"]="javascript:void(0)"'
                         href="/mark_watched?id=<%= item.id %>">
                         <i onmouseenter='this.setAttribute("class", "icon ion-ios-eye-off")'
-                            onmouseleave='this.setAttribute("class", "icon ion-ios-eye")'
+                           onmouseleave='this.setAttribute("class", "icon ion-ios-eye")'
-                            class="icon ion-ios-eye">
+                           class="icon ion-ios-eye">
                         </i>
                     </a>
                 </p>
                 <% end %>
+                <% if item.responds_to?(:live_now) && item.live_now %>
+                <p class="length"><i class="icon ion-ios-play-circle"></i> <%= translate(locale, "LIVE") %></p>
+                <% else %>
                 <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
+                <% end %>
             </div>
         </a>
         <% end %>
         <p><a href="/watch?v=<%= item.id %>"><%= item.title %></a></p>
-        <% if item.responds_to?(:live_now) && item.live_now %>
-        <p><%= translate(locale, "LIVE") %></p>
-        <% end %>
         <p>
             <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
         </p>
         
         <% if Time.now - item.published > 1.minute %>
-        <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published)) %></h5>
+        <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></h5>
         <% end %>
     <% end %>
     </div>

src/invidious/views/components/player.ecr

@@ -11,7 +11,7 @@
     <% else %>
         <% if params[:listen] %>
             <% audio_streams.each_with_index do |fmt, i| %>
-                <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
+                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
             <% end %>
         <% else %>
             <% if params[:quality] == "dash" %>
@@ -19,9 +19,9 @@
             <% end %>
             <% fmt_stream.each_with_index do |fmt, i| %>
                 <% if params[:quality] %>
-                <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= params[:quality] == fmt["label"].split(" - ")[0] %>">
+                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= params[:quality] == fmt["label"].split(" - ")[0] %>">
                 <% else %>
-                <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>">
+                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>">
                 <% end %>
             <% end %>
         <% end %>
@@ -114,7 +114,28 @@ var player = videojs("player", options, function() {
   });
 });
 
-player.share(shareOptions);
+player.on('error', function(event) {
+  if (player.error().code === 2 || player.error().code === 4) {
+    setInterval(setTimeout(function (event) {
+      console.log("An error occured in the player, reloading...");
+
+      var currentTime = player.currentTime();
+      var playbackRate = player.playbackRate();
+      var paused = player.paused();
+
+      player.load();
+      if (currentTime > 0.5) {
+        currentTime -= 0.5;
+      }
+      player.currentTime(currentTime);
+      player.playbackRate(playbackRate);
+      
+      if (!paused) {
+        player.play();
+      }
+    }, 5000), 5000);
+  }
+});
 
 <% if params[:video_start] > 0 || params[:video_end] > 0 %>
 player.markers({
@@ -165,4 +186,7 @@ if (bpb) {
   });
 }
 <% end %>
+
+// Since videojs-share can sometimes be blocked, we try to load it last
+player.share(shareOptions);
 </script>

src/invidious/views/components/player_sources.ecr

@@ -8,7 +8,7 @@
 <script src="/js/videojs-markers.min.js"></script>
 <script src="/js/videojs-share.min.js"></script>
 <script src="/js/videojs-http-streaming.min.js"></script>
-<% if env.get?("user") && env.get("user").as(User).preferences.quality == "dash" %>
+<% if params[:quality] == "dash" %>
 <script src="/js/dash.mediaplayer.min.js"></script>
 <script src="/js/videojs-dash.min.js"></script>
 <script src="/js/videojs-contrib-quality-levels.min.js"></script>

src/invidious/views/components/subscribe_widget.ecr

@@ -0,0 +1,24 @@
+<% if user %>
+    <% if subscriptions.includes? ucid %>
+    <p>
+        <a id="subscribe" onclick="unsubscribe()" class="pure-button pure-button-primary" 
+            href="/subscription_ajax?action_remove_subscriptions=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>">
+            <b><%= translate(locale, "Unsubscribe") %> | <%= sub_count_text %></b>
+        </a>
+    </p>
+    <% else %>
+    <p>
+        <a id="subscribe" onclick="subscribe()" class="pure-button pure-button-primary" 
+            href="/subscription_ajax?action_create_subscription_to_channel=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>">
+            <b><%= translate(locale, "Subscribe") %> | <%= sub_count_text %></b>
+        </a>
+    </p>
+    <% end %>
+<% else %>
+    <p>
+        <a id="subscribe" class="pure-button pure-button-primary" 
+            href="/login?referer=<%= env.get("current_page") %>">
+            <b><%= translate(locale, "Login to subscribe to `x`", author) %></b>
+        </a>
+    </p>
+<% end %>

src/invidious/views/components/subscribe_widget_script.ecr

@@ -0,0 +1,74 @@
+subscribe_button = document.getElementById("subscribe");
+if (subscribe_button.getAttribute('onclick')) {
+    subscribe_button["href"] = "javascript:void(0)";
+}
+
+function subscribe(timeouts = 0) {
+    subscribe_button = document.getElementById("subscribe");    
+
+    if (timeouts > 10) {
+        console.log("Failed to subscribe.");
+        return;
+    }
+    
+    var url = "/subscription_ajax?action_create_subscription_to_channel=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>";
+    var xhr = new XMLHttpRequest();
+    xhr.responseType = "json";
+    xhr.timeout = 20000;
+    xhr.open("GET", url, true);
+    xhr.send();
+
+    var fallback = subscribe_button.innerHTML;
+    subscribe_button.onclick = unsubscribe;
+    subscribe_button.innerHTML = '<b><%= translate(locale, "Unsubscribe").gsub("'", "\\'") %> | <%= sub_count_text %></b>'
+    
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+            if (xhr.status != 200) {
+                subscribe_button.onclick = subscribe;
+                subscribe_button.innerHTML = fallback;
+            }
+        }
+    }
+    
+    xhr.ontimeout = function() {
+        console.log("Subscribing timed out.");
+
+        subscribe(timeouts + 1);
+    };
+}
+
+function unsubscribe(timeouts = 0) {
+    subscribe_button = document.getElementById("subscribe");    
+    
+    if (timeouts > 10) {
+        console.log("Failed to subscribe");
+        return;
+    }
+
+    var url = "/subscription_ajax?action_remove_subscriptions=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>";
+    var xhr = new XMLHttpRequest();
+    xhr.responseType = "json";
+    xhr.timeout = 20000;
+    xhr.open("GET", url, true);
+    xhr.send();
+
+    var fallback = subscribe_button.innerHTML;
+    subscribe_button.onclick = subscribe;
+    subscribe_button.innerHTML = '<b><%= translate(locale, "Subscribe").gsub("'", "\\'") %> | <%= sub_count_text %></b>'
+
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+            if (xhr.status != 200) {
+                subscribe_button.onclick = unsubscribe;
+                subscribe_button.innerHTML = fallback;
+            }
+        }
+    }
+
+    xhr.ontimeout = function() {
+        console.log("Unsubscribing timed out.");
+
+        unsubscribe(timeouts + 1);
+    };
+}

src/invidious/views/index.ecr

@@ -1,36 +0,0 @@
-<% content_for "header" do %>
-<meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
-<title>Invidious</title>
-<% end %>
-
-<div class="h-box pure-g">
-    <div class="pure-u-1-4"></div>
-    <div class="pure-u-1 pure-u-md-1-2">
-        <div class="pure-g">
-            <div class="pure-u-1-3">
-                <a href="/feed/popular" style="text-align:center;" class="pure-menu-heading">
-                    <%= translate(locale, "Popular") %>
-                </a>
-            </div>
-            <div class="pure-u-1-3">
-                <a href="/feed/top" style="text-align:center;" class="pure-menu-heading">
-                    <%= translate(locale, "Top") %>
-                </a>
-            </div>
-            <div class="pure-u-1-3">
-                <a href="/feed/trending" style="text-align:center;" class="pure-menu-heading">
-                    <%= translate(locale, "Trending") %>
-                </a>
-            </div>
-        </div>
-    </div>
-    <div class="pure-u-1-4"></div>
-</div>
-
-<div class="pure-g">
-<% top_videos.each_slice(4) do |slice| %>
-        <% slice.each do |item| %>
-            <%= rendered "components/item" %>
-        <% end %>
-<% end %>
-</div>

src/invidious/views/login.ecr

@@ -27,36 +27,40 @@
 
                     <label for="password"><%= translate(locale, "Password:") %></label>
                     <input required class="pure-input-1" name="password" type="password" placeholder="Password">
-                
-                <% if captcha_type == "image" %>
-                    <img style="width:100%" src='<%= captcha.not_nil![:image] %>'/>
-                    <input type="hidden" name="token" value="<%= captcha.not_nil![:token] %>">
-                    <input type="hidden" name="challenge" value="<%= captcha.not_nil![:challenge] %>">
-                    <label for="answer"><%= translate(locale, "Time (h:mm:ss):") %></label>
-                    <input required type="text" name="answer" type="text" placeholder="h:mm:ss">
-                    
-                    <label>
-                        <a href="/login?referer=<%= URI.escape(referer) %>&type=invidious&captcha=text">
-                            <%= translate(locale, "Text CAPTCHA") %>
-                        </a>
-                    </label>
-                <% else %>
-                    <% text_captcha.not_nil![:tokens].each_with_index do |token, i| %>
-                        <input type="hidden" name="text_challenge<%= i %>" value="<%= token[0] %>">
-                        <input type="hidden" name="text_token<%= i %>" value="<%= token[1] %>">
-                    <% end %>
-                    <label for="text_answer"><%= text_captcha.not_nil![:question] %></label>
-                    <input required type="text" name="text_answer" type="text" placeholder="Answer">
 
-                    <label>
+                <% if config.captcha_enabled %>
-                        <a href="/login?referer=<%= URI.escape(referer) %>&type=invidious">
+                    <% if captcha_type == "image" %>
-                            <%= translate(locale, "Image CAPTCHA") %>
+                        <img style="width:100%" src='<%= captcha.not_nil![:image] %>'/>
-                        </a>
+                        <input type="hidden" name="token" value="<%= captcha.not_nil![:token] %>">
-                    </label>
+                        <input type="hidden" name="challenge" value="<%= captcha.not_nil![:challenge] %>">
+                        <label for="answer"><%= translate(locale, "Time (h:mm:ss):") %></label>
+                        <input required type="text" name="answer" type="text" placeholder="h:mm:ss">
+
+                        <label>
+                            <a href="/login?referer=<%= URI.escape(referer) %>&type=invidious&captcha=text">
+                                <%= translate(locale, "Text CAPTCHA") %>
+                            </a>
+                        </label>
+                    <% else %>
+                        <% text_captcha.not_nil![:tokens].each_with_index do |token, i| %>
+                            <input type="hidden" name="text_challenge<%= i %>" value="<%= token[0] %>">
+                            <input type="hidden" name="text_token<%= i %>" value="<%= token[1] %>">
+                        <% end %>
+                        <label for="text_answer"><%= text_captcha.not_nil![:question] %></label>
+                        <input required type="text" name="text_answer" type="text" placeholder="Answer">
+
+                        <label>
+                            <a href="/login?referer=<%= URI.escape(referer) %>&type=invidious">
+                                <%= translate(locale, "Image CAPTCHA") %>
+                            </a>
+                        </label>
+                    <% end %>
                 <% end %>
 
                     <button type="submit" name="action" value="signin" class="pure-button pure-button-primary"><%= translate(locale, "Sign In") %></button>
+                    <% if config.registration_enabled %>
                     <button type="submit" name="action" value="register" class="pure-button pure-button-primary"><%= translate(locale, "Register") %></button>
+                    <% end %>
                 </fieldset>
             </form>
             <% elsif account_type == "google" %>
@@ -67,7 +71,7 @@
 
                     <label for="password"><%= translate(locale, "Password:") %></label>
                     <input required class="pure-input-1" name="password" type="password" placeholder="Password">
-                    
+
                     <% if tfa %>
                     <label for="tfa"><%= translate(locale, "Google verification code:") %></label>
                     <input required class="pure-input-1" name="tfa" type="text" placeholder="Google verification code">

src/invidious/views/playlists.ecr

@@ -0,0 +1,80 @@
+<% content_for "header" do %>
+<title><%= author %> - Invidious</title>
+<% end %>
+
+<div class="pure-g h-box">
+    <div class="pure-u-2-3">
+        <h3><%= author %></h3>
+    </div>
+    <div class="pure-u-1-3" style="text-align:right;">
+        <h3>
+            <a href="/feed/channel/<%= ucid %>"><i class="icon ion-logo-rss"></i></a>
+        </h3>
+    </div>
+</div>
+
+<div class="h-box">
+<% sub_count_text = number_to_short_text(sub_count) %>
+<%= rendered "components/subscribe_widget" %>
+</div>
+
+<div class="pure-g h-box">
+    <div class="pure-g pure-u-1-3">
+        <div class="pure-u-1 pure-md-1-3">
+            <a href="https://www.youtube.com/channel/<%= ucid %>"><%= translate(locale, "View channel on YouTube") %></a>
+        </div>
+        <div class="pure-u-1 pure-md-1-3">
+            <a href="/channel/<%= ucid %>"><%= translate(locale, "Videos") %></a>
+        </div>
+        <div class="pure-u-1 pure-md-1-3">
+            <% if !auto_generated %>
+            <b><%= translate(locale, "Playlists") %></b>
+            <% end %>
+        </div>
+    </div>
+    <div class="pure-u-1-3">
+    </div>
+    <div class="pure-u-1-3">
+        <div class="pure-g" style="text-align:right;">
+        <% {"last", "oldest", "newest"}.each do |sort| %>
+            <div class="pure-u-1 pure-md-1-3">
+                <% if sort_by == sort %>
+                <b><%= translate(locale, sort) %></b>
+                <% else %>
+                <a href="/channel/<%= ucid %>/playlists?sort_by=<%= sort %>">
+                <%= translate(locale, sort) %>
+                </a>
+                <% end %>
+            </div>
+        <% end %>
+        </div>
+    </div>
+</div>
+
+<div class="h-box">
+    <hr>
+</div>
+
+<div class="pure-g">
+<% items.each_slice(4) do |slice| %>
+    <% slice.each do |item| %>
+        <%= rendered "components/item" %>
+    <% end %>
+<% end %>
+</div>
+
+<div class="pure-g h-box">
+    <div class="pure-u-1 pure-u-md-4-5"></div>
+    <div style="text-align:right;" class="pure-u-1 pure-u-md-1-5">
+    <% if items.size >= 28 %>
+        <a href="/channel/<%= ucid %>/playlists?continuation=<%= continuation %><% if sort_by != "last" %>&sort_by=<%= sort_by %><% end %>">
+            <%= translate(locale, "Next page") %>
+        </a>
+    <% end %>
+    </div>
+</div>
+
+<script>
+<% sub_count_text = number_to_short_text(sub_count) %>
+<%= rendered "components/subscribe_widget_script" %>
+</script>

src/invidious/views/popular.ecr

@@ -1,7 +1,10 @@
 <% content_for "header" do %>
-<title><%= translate(locale, "Popular") %> - Invidious</title>
+<meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
+<title><% if config.default_home != "Popular" %><%= translate(locale, "Popular") %> - <% end %>Invidious</title>
 <% end %>
 
+<%= rendered "components/feed_menu" %>
+
 <div class="pure-g">
 <% popular_videos.each_slice(4) do |slice| %>
         <% slice.each do |item| %>

src/invidious/views/preferences.ecr

@@ -15,29 +15,29 @@ function update_value(element) {
 
             <div class="pure-control-group">
                 <label for="video_loop"><%= translate(locale, "Always loop: ") %></label>
-                <input name="video_loop" id="video_loop" type="checkbox" <% if user.preferences.video_loop %>checked<% end %>>
+                <input name="video_loop" id="video_loop" type="checkbox" <% if preferences.video_loop %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="autoplay"><%= translate(locale, "Autoplay: ") %></label>
-                <input name="autoplay" id="autoplay" type="checkbox" <% if user.preferences.autoplay %>checked<% end %>>
+                <input name="autoplay" id="autoplay" type="checkbox" <% if preferences.autoplay %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="continue"><%= translate(locale, "Autoplay next video: ") %></label>
-                <input name="continue" id="continue" type="checkbox" <% if user.preferences.continue %>checked<% end %>>
+                <input name="continue" id="continue" type="checkbox" <% if preferences.continue %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="listen"><%= translate(locale, "Listen by default: ") %></label>
-                <input name="listen" id="listen" type="checkbox" <% if user.preferences.listen %>checked<% end %>>
+                <input name="listen" id="listen" type="checkbox" <% if preferences.listen %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="speed"><%= translate(locale, "Default speed: ") %></label>
                 <select name="speed" id="speed">
                 <% {2.0, 1.5, 1.0, 0.5}.each do |option| %>
-                    <option <% if user.preferences.speed == option %> selected <% end %>><%= option %></option>
+                    <option <% if preferences.speed == option %> selected <% end %>><%= option %></option>
                 <% end %>
                 </select>
             </div>
@@ -46,62 +46,42 @@ function update_value(element) {
                 <label for="quality"><%= translate(locale, "Preferred video quality: ") %></label>
                 <select name="quality" id="quality">
                 <% {"dash", "hd720", "medium", "small"}.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.quality == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.quality == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
             </div>
 
             <div class="pure-control-group">
                 <label for="volume"><%= translate(locale, "Player volume: ") %></label>
-                <input name="volume" id="volume" oninput="update_value(this);" type="range" min="0" max="100" step="5" value="<%= user.preferences.volume %>">
+                <input name="volume" id="volume" oninput="update_value(this);" type="range" min="0" max="100" step="5" value="<%= preferences.volume %>">
-                <span class="pure-form-message-inline" id="volume-value"><%= user.preferences.volume %></span>
+                <span class="pure-form-message-inline" id="volume-value"><%= preferences.volume %></span>
             </div>
 
             <div class="pure-control-group">
-                <label for="comments_0"><%= translate(locale, "Default comments: ") %></label>
+                <label for="comments[0]"><%= translate(locale, "Default comments: ") %></label>
-                <select name="comments_0" id="comments_0">
+                <% preferences.comments.each_with_index do |comments, index| %>
+                <select name="comments[<%= index %>]" id="comments[<%= index %>]">
                 <% {"", "youtube", "reddit"}.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.comments[0] == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.comments[index] == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
+                <% end %>
             </div>
 
             <div class="pure-control-group">
-                <label for="comments_1"><%= translate(locale, "Fallback comments: ") %></label>
+                <label for="captions[0]"><%= translate(locale, "Default captions: ") %></label>
-                <select name="comments_1" id="comments_1">
+                <% preferences.captions.each_with_index do |caption, index| %>
-                <% {"", "youtube", "reddit"}.each do |option| %>
+                <select class="pure-u-1-6" name="captions[<%= index %>]" id="captions[<%= index %>]">
-                    <option value="<%= option %>" <% if user.preferences.comments[1] == option %> selected <% end %>><%= translate(locale, option) %></option>
-                <% end %>
-                </select>
-            </div>
-
-            <div class="pure-control-group">
-                <label for="captions_0"><%= translate(locale, "Default captions: ") %></label>
-                <select class="pure-u-1-5" name="captions_0" id="captions_0">
                 <% CAPTION_LANGUAGES.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.captions[0] == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.captions[index] == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
-            </div>
-
-            <div class="pure-control-group">
-                <label for="captions_fallback"><%= translate(locale, "Fallback captions: ") %></label>
-                <select class="pure-u-1-5" name="captions_1" id="captions_1">
-                <% CAPTION_LANGUAGES.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.captions[1] == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
-                </select>
-
-                <select class="pure-u-1-5" name="captions_2" id="captions_2">
-                <% CAPTION_LANGUAGES.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.captions[2] == option %> selected <% end %>><%= translate(locale, option) %></option>
-                <% end %>
-                </select>
             </div>
 
             <div class="pure-control-group">
                 <label for="related_videos"><%= translate(locale, "Show related videos? ") %></label>
-                <input name="related_videos" id="related_videos" type="checkbox" <% if user.preferences.related_videos %>checked<% end %>>
+                <input name="related_videos" id="related_videos" type="checkbox" <% if preferences.related_videos %>checked<% end %>>
             </div>
 
             <legend><%= translate(locale, "Visual preferences") %></legend>
@@ -110,63 +90,119 @@ function update_value(element) {
                 <label for="locale"><%= translate(locale, "Language: ") %></label>
                 <select name="locale" id="locale">
                 <% LOCALES.each_key do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.locale == option %> selected <% end %>><%= option %></option>
+                    <option value="<%= option %>" <% if preferences.locale == option %> selected <% end %>><%= option %></option>
                 <% end %>
                 </select>
             </div>
 
             <div class="pure-control-group">
                 <label for="dark_mode"><%= translate(locale, "Dark mode: ") %></label>
-                <input name="dark_mode" id="dark_mode" type="checkbox" <% if user.preferences.dark_mode %>checked<% end %>>
+                <input name="dark_mode" id="dark_mode" type="checkbox" <% if preferences.dark_mode %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="thin_mode"><%= translate(locale, "Thin mode: ") %></label>
-                <input name="thin_mode" id="thin_mode" type="checkbox" <% if user.preferences.thin_mode %>checked<% end %>>
+                <input name="thin_mode" id="thin_mode" type="checkbox" <% if preferences.thin_mode %>checked<% end %>>
             </div>
 
+            <% if env.get? "user" %>
             <legend><%= translate(locale, "Subscription preferences") %></legend>
 
             <div class="pure-control-group">
                 <label for="redirect_feed"><%= translate(locale, "Redirect homepage to feed: ") %></label>
-                <input name="redirect_feed" id="redirect_feed" type="checkbox" <% if user.preferences.redirect_feed %>checked<% end %>>
+                <input name="redirect_feed" id="redirect_feed" type="checkbox" <% if preferences.redirect_feed %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="max_results"><%= translate(locale, "Number of videos shown in feed: ") %></label>
-                <input name="max_results" id="max_results" type="number" value="<%= user.preferences.max_results %>">
+                <input name="max_results" id="max_results" type="number" value="<%= preferences.max_results %>">
             </div>
 
             <div class="pure-control-group">
                 <label for="sort"><%= translate(locale, "Sort videos by: ") %></label>
                 <select name="sort" id="sort">
                 <% {"published", "published - reverse", "alphabetically", "alphabetically - reverse", "channel name", "channel name - reverse"}.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.sort == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.sort == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
             </div>
 
             <div class="pure-control-group">
-                <label for="latest_only">Only show latest <% if user.preferences.unseen_only %>unwatched<% end %> video from channel: </label>
+                <% if preferences.unseen_only %>
-                <input name="latest_only" id="latest_only" type="checkbox" <% if user.preferences.latest_only %>checked<% end %>>
+                <label for="latest_only"><%= translate(locale, "Only show latest unwatched video from channel: ") %></label>
+                <% else %>
+                <label for="latest_only"><%= translate(locale, "Only show latest video from channel: ") %></label>
+                <% end %>
+                <input name="latest_only" id="latest_only" type="checkbox" <% if preferences.latest_only %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="unseen_only"><%= translate(locale, "Only show unwatched: ") %></label>
-                <input name="unseen_only" id="unseen_only" type="checkbox" <% if user.preferences.unseen_only %>checked<% end %>>
+                <input name="unseen_only" id="unseen_only" type="checkbox" <% if preferences.unseen_only %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="notifications_only"><%= translate(locale, "Only show notifications (if there are any): ") %></label>
-                <input name="notifications_only" id="notifications_only" type="checkbox" <% if user.preferences.notifications_only %>checked<% end %>>
+                <input name="notifications_only" id="notifications_only" type="checkbox" <% if preferences.notifications_only %>checked<% end %>>
+            </div>
+            <% end %>
+
+            <% if env.get?("user") && config.admins.includes? env.get?("user").as(User).email %>
+            <legend><%= translate(locale, "Administrator preferences") %></legend>
+
+            <div class="pure-control-group">
+                <label for="default_home"><%= translate(locale, "Default homepage: ") %></label>
+                <select name="default_home" id="default_home">
+                <% {"Popular", "Top", "Trending", "Subscriptions"}.each do |option| %>
+                    <option value="<%= option %>" <% if config.default_home == option %> selected <% end %>><%= translate(locale, option) %></option>
+                <% end %>
+                </select>
             </div>
 
+            <div class="pure-control-group">
+                <label for="feed_menu"><%= translate(locale, "Feed menu: ") %></label>
+                <% 4.times do |index| %>
+                <select name="feed_menu[<%= index %>]" id="feed_menu[<%= index %>]">
+                <% {"", "Popular", "Top", "Trending", "Subscriptions"}.each do |option| %>
+                    <option value="<%= option %>" <% if config.feed_menu[index]? == option %> selected <% end %>><%= translate(locale, option) %></option>
+                <% end %>
+                </select>
+                <% end %>
+            </div>
+
+            <div class="pure-control-group">
+                <label for="top_enabled"><%= translate(locale, "Top enabled? ") %></label>
+                <input name="top_enabled" id="top_enabled" type="checkbox" <% if config.top_enabled %>checked<% end %>>
+            </div>
+
+            <div class="pure-control-group">
+                <label for="captcha_enabled"><%= translate(locale, "CAPTCHA enabled? ") %></label>
+                <input name="captcha_enabled" id="captcha_enabled" type="checkbox" <% if config.captcha_enabled %>checked<% end %>>
+            </div>
+
+            <div class="pure-control-group">
+                <label for="login_enabled"><%= translate(locale, "Login enabled? ") %></label>
+                <input name="login_enabled" id="login_enabled" type="checkbox" <% if config.login_enabled %>checked<% end %>>
+            </div>
+
+            <div class="pure-control-group">
+                <label for="registration_enabled"><%= translate(locale, "Registration enabled? ") %></label>
+                <input name="registration_enabled" id="registration_enabled" type="checkbox" <% if config.registration_enabled %>checked<% end %>>
+            </div>
+
+            <div class="pure-control-group">
+                <label for="statistics_enabled"><%= translate(locale, "Report statistics? ") %></label>
+                <input name="statistics_enabled" id="statistics_enabled" type="checkbox" <% if config.statistics_enabled %>checked<% end %>>
+            </div>
+            <% end %>
+
+            <% if env.get? "user" %>
             <legend><%= translate(locale, "Data preferences") %></legend>
 
             <div class="pure-control-group">
                 <a href="/clear_watch_history?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Clear watch history") %></a>
             </div>
-            
+
             <div class="pure-control-group">
                 <a href="/data_control?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Import/Export data") %></a>
             </div>
@@ -182,6 +218,7 @@ function update_value(element) {
             <div class="pure-control-group">
                 <a href="/delete_account?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Delete account") %></a>
             </div>
+            <% end %>
 
             <div class="pure-controls">
                 <button type="submit" class="pure-button pure-button-primary"><%= translate(locale, "Save preferences") %></button>

src/invidious/views/subscriptions.ecr

@@ -2,6 +2,8 @@
 <title><%= translate(locale, "Subscriptions") %> - Invidious</title>
 <% end %>
 
+<%= rendered "components/feed_menu" %>
+
 <div class="pure-g h-box">
     <div class="pure-u-1-3">
         <h3>
@@ -70,7 +72,7 @@ function mark_watched(target) {
 }
 </script>
 
-<div class="pure-g">
+<div class="pure-g h-box">
     <div class="pure-u-1 pure-u-md-1-5">
     <% if page >= 2 %>
         <a href="/feed/subscriptions?max_results=<%= max_results %>&page=<%= page - 1 %>">

src/invidious/views/template.ecr

@@ -18,7 +18,7 @@
   <link rel="stylesheet" href="/css/grids-responsive-min.css">
   <link rel="stylesheet" href="/css/ionicons.min.css">
   <link rel="stylesheet" href="/css/default.css">
-  <% if env.get?("user") && env.get("user").as(User).preferences.dark_mode %>
+  <% if env.get?("preferences").try &.as(Preferences).dark_mode %>
   <link rel="stylesheet" href="/css/darktheme.css">
   <% else %>
   <link rel="stylesheet" href="/css/lighttheme.css">
@@ -38,7 +38,7 @@
         <div class="pure-u-1 pure-u-md-12-24 searchbar">
           <form class="pure-form" action="/search" method="get">
             <fieldset>
-              <input type="search" style="width:100%;" name="q" placeholder="search" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } || env.params.query["q"]?.try {|x| HTML.escape(x)} %>">
+              <input type="search" style="width:100%;" name="q" placeholder="<%= translate(locale, "search") %>" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } || env.params.query["q"]?.try {|x| HTML.escape(x)} %>">
             </fieldset>
           </form>
         </div>
@@ -55,7 +55,7 @@
           </a>
         </div>
         <div class="pure-u-1-4">
-          <a href="/feed/subscriptions" class="pure-menu-heading">
+          <a title="<%= translate(locale, "Subscriptions") %>" href="/feed/subscriptions" class="pure-menu-heading">
             <% notification_count = env.get("user").as(User).notifications.size %>
             <% if notification_count > 0 %>
             <%= notification_count %> <i class="icon ion-ios-notifications"></i>
@@ -65,7 +65,7 @@
           </a>
         </div>
         <div class="pure-u-1-4">
-          <a href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+          <a title="<%= translate(locale, "Preferences") %>" href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
             <i class="icon ion-ios-cog"></i>
           </a>
         </div>
@@ -75,41 +75,62 @@
           </a>
         </div>
         <% else %>
+        <div class="pure-u-1-3">
+          <a href="/toggle_theme?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+            <% if env.get?("preferences").try &.as(Preferences).dark_mode %>
+            <i class="icon ion-ios-sunny"></i>
+            <% else %>
+            <i class="icon ion-ios-moon"></i>
+            <% end %>
+          </a>
+        </div>
+        <div class="pure-u-1-3">
+          <a title="<%= translate(locale, "Preferences") %>" href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+            <i class="icon ion-ios-cog"></i>
+          </a>
+        </div>
+        <% if config.login_enabled %>
+        <div class="pure-u-1-3">
           <a href="/login?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
             <%= translate(locale, "Login") %>
           </a>
+        </div>
+        <% end %>
         <% end %>
         </div>
       </div>
       <%= content %>
       <div class="footer">
-        <p>
+        <div class="pure-g">
-          <a href="https://github.com/omarroth">
+          <div class="pure-u-1 pure-u-md-1-3">
-            <%= translate(locale, "Released under the AGPLv3 by Omar Roth.") %>
+            <a href="https://github.com/omarroth/invidious">
-          </a>
+              <%= translate(locale, "Released under the AGPLv3 by Omar Roth.") %>
-        </p>
+            </a>
-        <p>
+          </div>
-          <a href="https://github.com/omarroth/invidious">
+          <div class="pure-u-1 pure-u-md-1-3">
-            <%= translate(locale, "Source available here.") %>
+            <i class="icon ion-logo-bitcoin"></i>
-          </a>
+            <%= translate(locale, "BTC: ") %>356DpZyMXu6rYd55Yqzjs29n79kGKWcYrY</div>
-        </p>
+          <div class="pure-u-1 pure-u-md-1-3">
-        <p><%= translate(locale, "Liberapay: ") %>
+            <i class="icon ion-logo-bitcoin"></i>
-          <a href="https://liberapay.com/omarroth">
+            <%= translate(locale, "BCH: ") %>qq4ptclkzej5eza6a50et5ggc58hxsq5aylqut2npk</div>
-            https://liberapay.com/omarroth
+          <div class="pure-u-1 pure-u-md-1-3">
-          </a>
+            <i class="icon ion-logo-usd"></i>
-        </p>
+            <a href="https://liberapay.com/omarroth"><%= translate(locale, "Liberapay") %></a>
-        <p><%= translate(locale, "Patreon: ") %>
+             / 
-          <a href="https://patreon.com/omarroth">
+            <a href="https://patreon.com/omarroth"><%= translate(locale, "Patreon") %></a>
-            https://patreon.com/omarroth
+          </div>
-          </a>
+          <div class="pure-u-1 pure-u-md-1-3">
-        </p>
+            <i class="icon ion-logo-javascript"></i>
-        <p><%= translate(locale, "BTC: ") %>356DpZyMXu6rYd55Yqzjs29n79kGKWcYrY</p>
+            <a rel="jslicense" href="/licenses">
-        <p><%= translate(locale, "BCH: ") %>qq4ptclkzej5eza6a50et5ggc58hxsq5aylqut2npk</p>
+              <%= translate(locale, "View JavaScript license information.") %>
-        <p>
+            </a>
-          <a rel="jslicense" href="/licenses">
+          </div>
-            <%= translate(locale, "View JavaScript license information.") %>
+          <div class="pure-u-1 pure-u-md-1-3">
-          </a>
+            <i class="icon ion-logo-github"></i>
-        </p>
+            <%= translate(locale, "Current version: ") %> <%= CURRENT_VERSION %>-<%= CURRENT_COMMIT %>
+            <i class="icon ion-logo-github"></i>
+            <%= CURRENT_BRANCH %></div>
+        </div>
       </div>
     </div>
     <div class="pure-u-1 pure-u-md-2-24"></div>

src/invidious/views/top.ecr

@@ -1,7 +1,10 @@
 <% content_for "header" do %>
-<title><%= translate(locale, "Top") %> - Invidious</title>
+<meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
+<title><% if config.default_home != "Top" %><%= translate(locale, "Top") %> - <% end %>Invidious</title>
 <% end %>
 
+<%= rendered "components/feed_menu" %>
+
 <div class="pure-g">
 <% top_videos.each_slice(4) do |slice| %>
         <% slice.each do |item| %>

src/invidious/views/trending.ecr

@@ -1,7 +1,10 @@
 <% content_for "header" do %>
-<title><%= translate(locale, "Trending") %> - Invidious</title>
+<meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
+<title><% if config.default_home != "Trending" %><%= translate(locale, "Trending") %> - <% end %>Invidious</title>
 <% end %>
 
+<%= rendered "components/feed_menu" %>
+
 <div class="pure-g h-box">
     <div class="pure-u-2-3">
         <form class="pure-form pure-form-aligned" action="/feed/trending" method="get">

src/invidious/views/watch.ecr

@@ -35,11 +35,11 @@
 <h1>
     <%= HTML.escape(video.title) %> 
     <% if params[:listen] %>
-    <a href="/watch?<%= env.params.query %>&listen=0">
+    <a title="<%=translate(locale, "Video mode")%>" href="/watch?<%= env.params.query %>&listen=0">
         <i class="icon ion-ios-videocam"></i>
     </a>
     <% else %>
-    <a href="/watch?<%= env.params.query %>&listen=1">
+    <a title="<%=translate(locale, "Audio mode")%>" href="/watch?<%= env.params.query %>&listen=1">
         <i class="icon ion-ios-volume-high"></i>
     </a>
     <% end %>
@@ -53,6 +53,34 @@
     <div class="pure-u-1 pure-u-md-1-5">
         <div class="h-box">
             <p><a href="https://www.youtube.com/watch?v=<%= video.id %>"><%= translate(locale, "Watch video on Youtube") %></a></p>
+        
+            <form class="pure-form pure-form-stacked" action="/latest_version" method="get" rel="noopener" target="_blank">
+                <div class="pure-control-group">
+                    <label for="download_widget"><%= translate(locale, "Download as: ") %></label>
+                    <select style="width:100%" name="download_widget" id="download_widget">
+                    <% video_streams.each do |option| %>
+                        <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.mp4"}'>
+                            <%= option["quality_label"] %> - <%= option["type"].split(";")[0] %> @ <%= option["fps"] %>fps - video only
+                        </option>
+                    <% end %>
+                    <% audio_streams.each do |option| %>
+                        <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.mp4"}'>
+                            <%= option["type"].split(";")[0] %> @ <%= option["bitrate"] %>k - audio only
+                        </option>
+                    <% end %>
+                    <% fmt_stream.each do |option| %>
+                        <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.mp4"}'>
+                            <%= itag_to_metadata?(option["itag"]).try &.["height"]? || "~240" %>p - <%= option["type"].split(";")[0] %>
+                        </option>
+                    <% end %>
+                    </select>
+                </div>
+
+                <button type="submit" class="pure-button pure-button-primary">
+                    <b><%= translate(locale, "Download") %></b>
+                </button>
+            </form>
+
             <p><i class="icon ion-ios-eye"></i> <%= number_with_separator(video.views) %></p>
             <p><i class="icon ion-ios-thumbs-up"></i> <%= number_with_separator(video.likes) %></p>
             <p><i class="icon ion-ios-thumbs-down"></i> <%= number_with_separator(video.dislikes) %></p>
@@ -82,37 +110,17 @@
         </div>
     </div>
 
-    <div class="pure-u-1 <% if preferences && !preferences.related_videos && !plid %>pure-u-md-4-5<% else %>pure-u-md-3-5<% end %>">
+    <div class="pure-u-1 <% if params[:related_videos] || plid %>pure-u-md-3-5<% else %>pure-u-md-4-5<% end %>">
         <div class="h-box">
             <p>
                 <a href="/channel/<%= video.ucid %>">
                     <h3><%= video.author %></h3>
                 </a>
             </p>
-        <% if user %>
+            <% ucid = video.ucid %>
-            <% if subscriptions.includes? video.ucid %>
+            <% author = video.author %>
-            <p>
+            <% sub_count_text = video.sub_count_text %>
-                <a id="subscribe" onclick="unsubscribe()" class="pure-button pure-button-primary" 
+            <%= rendered "components/subscribe_widget" %>
-                    href="/subscription_ajax?action_remove_subscriptions=1&c=<%= video.ucid %>&referer=<%= env.get("current_page") %>">
-                    <b><%= translate(locale, "Unsubscribe") %> | <%= video.sub_count_text %></b>
-                </a>
-            </p>
-            <% else %>
-            <p>
-                <a id="subscribe" onclick="subscribe()" class="pure-button pure-button-primary" 
-                    href="/subscription_ajax?action_create_subscription_to_channel=1&c=<%= video.ucid %>&referer=<%= env.get("current_page") %>">
-                    <b><%= translate(locale, "Subscribe") %> | <%= video.sub_count_text %></b>
-                </a>
-            </p>
-            <% end %>
-        <% else %>
-            <p>
-                <a id="subscribe" class="pure-button pure-button-primary" 
-                    href="/login?referer=<%= env.get("current_page") %>">
-                    <b><%= translate(locale, "Login to subscribe to `x`", video.author) %></b>
-                </a>
-            </p>
-        <% end %>
             <p>
                 <b><%= translate(locale, "Shared `x`", video.published.to_s("%B %-d, %Y")) %></b>
             </p>
@@ -133,14 +141,14 @@
             </div>
         </div>
     </div>
-    <% if preferences && preferences.related_videos || plid %>
+    <% if params[:related_videos] || plid %>
     <div class="pure-u-1 pure-u-md-1-5">
         <% if plid %>
         <div id="playlist" class="h-box">
         </div>
         <% end %>
 
-        <% if !preferences || preferences && preferences.related_videos %>
+        <% if params[:related_videos] %>
         <div class="h-box">
         
         <% if !rvs.empty? %>
@@ -179,7 +187,7 @@
 <script>
 <% if !rvs.empty? && !plid && params[:continue] %>
 player.on('ended', function() {
-    window.location.replace("/watch?v=" 
+    location.assign("/watch?v=" 
         + "<%= rvs.select { |rv| rv["id"]? }[0]?.try &.["id"] %>"
         + "&continue=1"
         <% if params[:listen] %>
@@ -198,7 +206,7 @@ player.on('ended', function() {
 function continue_autoplay(target) {
     if (target.checked) {
         player.on('ended', function() {
-            window.location.replace("/watch?v=" 
+            location.assign("/watch?v=" 
                 + "<%= rvs.select { |rv| rv["id"]? }[0]?.try &.["id"] %>"
                 + "&continue=1"
                 <% if params[:listen] %>
@@ -224,52 +232,22 @@ function number_with_separator(val) {
   return val;
 }
 
-subscribe_button = document.getElementById("subscribe");
+<% ucid = video.ucid %>
-if (subscribe_button.getAttribute('onclick')) {
+<% author = video.author %>
-    subscribe_button["href"] = "javascript:void(0)";
+<% sub_count_text = video.sub_count_text %>
-}
+<%= rendered "components/subscribe_widget_script" %>
 
-function subscribe() {
-    var url = "/subscription_ajax?action_create_subscription_to_channel=1&c=<%= video.ucid %>&referer=<%= env.get("current_page") %>";
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = "json";
-    xhr.timeout = 20000;
-    xhr.open("GET", url, true);
-    xhr.send();
-
-    xhr.onreadystatechange = function() {
-        if (xhr.readyState == 4) {
-            if (xhr.status == 200) {
-                subscribe_button = document.getElementById("subscribe");
-                subscribe_button.onclick = unsubscribe;
-                subscribe_button.innerHTML = '<b><%= translate(locale, "Unsubscribe") %> | <%= video.sub_count_text %></b>'
-            }
-        }
-    }
-}
-
-function unsubscribe() {
-    var url = "/subscription_ajax?action_remove_subscriptions=1&c=<%= video.ucid %>&referer=<%= env.get("current_page") %>";
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = "json";
-    xhr.timeout = 20000;
-    xhr.open("GET", url, true);
-    xhr.send();
-
-    xhr.onreadystatechange = function() {
-        if (xhr.readyState == 4) {
-            if (xhr.status == 200) {
-                subscribe_button = document.getElementById("subscribe");
-                subscribe_button.onclick = subscribe;
-                subscribe_button.innerHTML = '<b><%= translate(locale, "Subscribe") %> | <%= video.sub_count_text %></b>'
-            }
-        }
-    }
-}
 
 <% if plid %>
-function get_playlist() {
+function get_playlist(timeouts = 0) {
     playlist = document.getElementById("playlist");
+
+    if (timeouts > 10) {
+        console.log("Failed to pull playlist");
+        playlist.innerHTML = "";
+        return;
+    }
+
     playlist.innerHTML = ' \
       <h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3> \
       <hr>'
@@ -295,7 +273,7 @@ function get_playlist() {
                 
                 if (xhr.response.nextVideo) {
                     player.on('ended', function() {
-                        window.location.replace("/watch?v=" 
+                        location.assign("/watch?v=" 
                             + xhr.response.nextVideo
                             + "&list=<%= plid %>"
                             <% if params[:listen] %>
@@ -323,15 +301,22 @@ function get_playlist() {
         comments = document.getElementById("playlist");
         comments.innerHTML =
             '<h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3><hr>';
-        get_playlist();
+        get_playlist(timeouts + 1);
     };
 }
 
 get_playlist();
 <% end %>
 
-function get_reddit_comments() {
+function get_reddit_comments(timeouts = 0) {
   comments = document.getElementById("comments");
+
+  if (timeouts > 10) {
+    console.log("Failed to pull comments");
+    comments.innerHTML = "";
+    return;
+  }
+
   var fallback = comments.innerHTML;
   comments.innerHTML =
     '<h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3>';
@@ -382,12 +367,19 @@ function get_reddit_comments() {
   xhr.ontimeout = function() {
     console.log("Pulling comments timed out.");
 
-    get_reddit_comments();
+    get_reddit_comments(timeouts + 1);
   };
 }
 
-function get_youtube_comments() {
+function get_youtube_comments(timeouts = 0) {
   comments = document.getElementById("comments");
+
+  if (timeouts > 10) {
+    console.log("Failed to pull comments");
+    comments.innerHTML = "";
+    return;
+  }
+
   var fallback = comments.innerHTML;
   comments.innerHTML =
     '<h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3>';
@@ -438,7 +430,7 @@ function get_youtube_comments() {
 
     comments.innerHTML =
       '<h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3>';
-    get_youtube_comments();
+    get_youtube_comments(timeouts + 1);
   };
 }
 
@@ -468,7 +460,7 @@ function get_youtube_replies(target, load_more) {
         } else {
             body.innerHTML = ' \
                 <p><a href="javascript:void(0)" \
-                    onclick="hide_youtube_replies(this)"><%= translate(locale, "Hide replies") %> \
+                    onclick="hide_youtube_replies(this, \'<%= translate(locale, "Hide replies") %>\', \'<%= translate(locale, "Show replies") %>\')"><%= translate(locale, "Hide replies") %> \
                 </a></p> \
                 <div>{contentHtml}</div>'.supplant({
                 contentHtml: xhr.response.contentHtml,