Update CHANGELOG and bump version

* Add Spanish translation

CHANGELOG.md

@@ -1,3 +1,129 @@
+# 0.16.0 (2019-04-06)
+
+# Version 0.16.0: API Improvements and Annotations
+
+Hello again! This past month has seen [116 commits](https://github.com/omarroth/invidious/compare/0.15.0..0.16.0) from 13 contributors and a couple important changes I'd like to announce.
+
+A privacy policy is now available [here](https://invidio.us/privacy). I've done my best to explain things as clearly as possible without oversimplifying, and would very much recommend reading it if you're concerned about your privacy and want to learn more about how Invidious uses your data. Please let me know if there is anything that needs clarification.
+
+I'm also very happy to announce that a Spanish translation has been added to the site. You can use it with `?hl=es` or by setting `es` as your default locale. As always I'm extremely grateful to translators for making the site accessible to more people.
+
+## For Administrators
+
+Invidious now supports server-to-server [push notifications](https://developers.google.com/youtube/v3/guides/push_notifications). This uses [PubSubHubbub](https://pubsubhubbub.github.io/PubSubHubbub/pubsubhubbub-core-0.4.html) to automatically handle new videos sent to an instance, which is less resource intensive and generally faster. Note that it will not pull all videos from a subscribed channel, so recommended usage is in addition to `channel_threads`. Using PubSub requires a valid `domain` that updates can be sent to, and a random string that can be used to sign updates sent to the instance. You can enable it by adding `use_pubsub_feeds: true` to your `config.yml`. See [Configuration](https://github.com/omarroth/invidious/wiki/Configuration) for more info.
+
+Unfortunately there are a couple necessary changes to the DB to support `liveNow` and `premiereTimestamp` in subscription feeds. Migration scripts have been provided that should be used automatically if following the instructions [here](https://github.com/omarroth/invidious/wiki/Updating).
+
+You can now configure default user preferences for your instance. This allows you to set default locale, player preferences, and more. See [#415](https://github.com/omarroth/invidious/issues/415) for more details and example usage.
+
+## For Developers
+
+The [fields](https://developers.google.com/youtube/v3/getting-started#fields) API has been added with [#429](https://github.com/omarroth/invidious/pull/429) and is now supported on all JSON endpoints, thanks [**@afrmtbl**](https://github.com/afrmtbl)! Synax is straight-forward and can be used to reduce data transfer and create a simpler response for debugging. You can see an example [here](https://invidio.us/api/v1/videos/CvFH_6DNRCY?pretty=1&fields=title,recommendedVideos/title). I've been quite happy using it and hope it is similarly useful for others.
+
+An `/api/v1/annotations/:id` endpoint has been added for pulling legacy annotation data from [this](https://archive.org/details/youtubeannotations) archive, see below for more details. You can also access annotation data available on YouTube using `?source=youtube`, although this will only return card data as legacy annotations were deleted on January 15th.
+
+A couple minor changes to existing endpoints:
+
+- A `premiereTimestamp` field has been added to `/api/v1/videos/:id`
+- A `sort_by` param has been added to `/api/v1/comments/:id`, supports `new`, `top`.
+
+More info is available in the [documentation](https://github.com/omarroth/invidious/wiki/API).
+
+## Annotations
+
+I'm pleased to announce that annotation data is finally available from the roughly 1.4 billion videos archived as part of [this](https://www.reddit.com/r/DataHoarder/comments/aa6czg/youtube_annotation_archive/) project. They are accessible from the Internet Archive [here](https://archive.org/details/youtubeannotations) or as a 355GB torrent, see [here](https://www.reddit.com/r/DataHoarder/comments/b7imx9/youtube_annotation_archive_annotation_data_from/) for more details. A corresponding `/api/v1/annotations/:id` endpoint has been added to Invidious which uses the collection from IA to provide legacy annotations.
+
+Support for them in the player is possible thanks to [this](https://github.com/afrmtbl/videojs-youtube-annotations) plugin developed by [**@afrmtbl**](https://github.com/afrmtbl). A PR for adding support to the site is available as [#303](https://github.com/omarroth/invidious/pull/303). There's also an [extension](https://github.com/afrmtbl/AnnotationsRestored) for overlaying them on top of the YouTube player (again thanks to [**@afrmtbl**](https://github.com/afrmtbl)), and an [extension](https://tech234a.bitbucket.io/AnnotationsReloaded?src=invidious) for hooking into code still present in the YouTube player itself, developed by [**@tech234a**](https://github.com/tech234a).
+
+I would recommend reading the [official announcement](https://www.reddit.com/r/DataHoarder/comments/b7imx9/youtube_annotation_archive_annotation_data_from/) for more details. I would like to again thank everyone that helped contribute to this project.
+
+## Finances
+
+### Donations
+
+- [Patreon](https://www.patreon.com/omarroth) : \$42.42
+- [Liberapay](https://liberapay.com/omarroth) : \$70.11
+- Crypto : ~\$1.76 (converted from BCH, BTC, BSV)
+- Total : \$114.29
+
+### 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-node5 (s-1vcpu-1gb) : \$5.00 (web server)
+- invidious-db1 (s-4vcpu-8gb) : \$40.00 (database)
+- Total : \$80.00
+
+This past month the site saw a couple abnormal peaks in traffic, so an additional webserver has been added to match the increased load. The goal on Patreon has been updated to match the above expenses.
+
+Thanks everyone!
+
+# 0.15.0 (2019-03-06)
+
+## Version 0.15.0: Preferences and Channel Playlists
+
+The project has seen quite a bit of activity this past month. Large focus has been on fixing bugs, but there's still quite a few new features I'm happy to announce. There have been [133 commits](https://github.com/omarroth/invidious/compare/0.14.0...0.15.0) from 15 contributors this past month.
+
+As a couple miscellaneous changes, a couple [nice screenshots](https://github.com/omarroth/invidious#screenshots) have been added to the README, so folks can see more of what the site has to offer without creating an account.
+
+The footer has also been cleaned up quite a bit, and now displays the current version, so it's easier to know what features are available from the current instance.
+
+## For Administrators
+
+This past month there has been a minor release - `0.14.1` - which fixes a breaking change made by YouTube for their polymer redesign.
+
+There have been several new features that unfortunately require a database migration. There are migration scripts provided in `config/migrate-scripts`, and the [wiki](https://github.com/omarroth/invidious/wiki/Updating) has instructions for automatically applying them. I'll do my best to keep those changes to a minimum, and expect to see a corresponding script to automatically apply any new changes.
+
+Administrator preferences have been added with [#312](https://github.com/omarroth/invidious/issues/312), which allows administrators to customize their instance. Administrators can change the order of feed menus, change the default homepage, disable open registration, and several other options. There's a short 'how-to' [here](https://github.com/omarroth/invidious/issues/312#issuecomment-468831842), and the new options are documented [here](https://github.com/omarroth/invidious/wiki/Configuration).
+
+An `/api/v1/stats` endpoint has been added with [#356](https://github.com/omarroth/invidious/issues/356), which reports the instance version and number of active users. Statistics are disabled by default, and can be enabled in administator preferences. Statistics for the official instance are available [here](https://invidio.us/api/v1/stats?pretty=1).
+
+## For Developers
+
+`/api/v1/channels/:ucid` now provides an `autoGenerated` tag, which returns true for [topic channels](https://www.youtube.com/channel/UCE80FOXpJydkkMo-BYoJdEg), and larger [genre channels](https://www.youtube.com/channel/UC-9-kyTW8ZkZNDHQJ6FgpwQ) generated by YouTube. These channels don't have any videos of their own, so `latestVideos` will be empty. It is recommended instead to display a list of playlists generated by YouTube.
+
+You can now pull a list of playlists from a channel with `/api/v1/channels/playlists/:ucid`. Supported options are documented in the [wiki](https://github.com/omarroth/invidious/wiki/API#get-apiv1channelsplaylistsucid-apiv1channelsucidplaylists). Pagination is handled with a `continuation` token, which is generated on each call. Of note is that auto-generated channels currently have one page of results, and subsequent calls will be empty.
+
+For quickly pulling the latest 30 videos from a channel, there is now `/api/v1/channels/latest/:ucid`. It is much faster than a call to `/api/v1/channels/:ucid`. It will not convert an author name to a valid ucid automatically, and will not return any extra data about a channel.
+
+## Preferences
+
+In addition to administrator preferences mentioned above, you can now change your preferences without an account (see [#42](https://github.com/omarroth/invidious/pull/42)). I think this is quite an improvement to the usability of the site, and is much friendlier to privacy-conscious folks that don't want to make an account. Preferences will be automatically imported to a newly created account.
+
+Several issues with sorting subscriptions have been fixed, and `/manage_subscriptions` has been sped up significantly. The subscription feed has also seen a bump in performance. Delayed notifications have unfortunately started becoming a problem now that there are more users on the site. Some new changes are currently being tested which should mostly resolve the issue, so expect to see more in the next release.
+
+## Channel Playlists
+
+You can now view available playlists from a channel, and [auto-generated channels](https://invidio.us/channel/UC-9-kyTW8ZkZNDHQJ6FgpwQ) are no longer empty. You can sort as you would on YouTube, and all the same functionality should be available. I'm quite pleased to finally have it implemented, since it's currently the only data available from the above mentioned auto-generated channels, and makes it much easier to consume music on the site.
+
+There's also more discussion on improving Invidious for streaming music in [#304](https://github.com/omarroth/invidious/issues/304), and adding support for music.youtube.com. I would appreciate any thoughts on how to improve that experience, since it's a very large and useful part of YouTube.
+
+## Finances
+
+### Donations
+
+- [Patreon](https://www.patreon.com/omarroth) : \$42.42
+- [Liberapay](https://liberapay.com/omarroth) : \$30.97
+- Crypto : ~\$0.00 (converted from BCH, BTC)
+- Total : \$73.39
+
+### 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
+
+It's been very humbling to see how fast the project has grown, and I look forward to making the site even better. Thank you everyone.
+
 # 0.14.0 (2019-02-06)
 
 ## Version 0.14.0: Community
@@ -59,14 +185,14 @@ Organizing this project has unfortunately taken up quite a bit of my time, and I
 
 ### 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
+- 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.
 

README.md

@@ -3,7 +3,7 @@
 ## Invidious is an alternative front-end to YouTube
 
 - Audio-only mode (and no need to keep window open on mobile)
-- [Open-source](https://github.com/omarroth/invidious) (AGPLv3 licensed)
+- [Free software](https://github.com/omarroth/invidious) (AGPLv3 licensed)
 - No ads
 - No need to create a Google account to save subscriptions
 - Lightweight (homepage is ~4 KB compressed)

assets/css/darktheme.css

@@ -28,6 +28,10 @@ body {
   color: rgba(35, 35, 35, 1);
 }
 
+.pure-form input[type="file"] {
+  color: #f0f0f0;
+}
+
 .navbar > .searchbar input {
   background-color: inherit;
   color: inherit;

assets/css/default.css

@@ -1,3 +1,7 @@
+.deleted {
+  background-color: rgb(255, 0, 0, 0.5);
+}
+
 .channel-owner {
   background-color: #008bec;
   color: #fff;
@@ -54,6 +58,7 @@ div {
 }
 
 .loading {
+  display: inline-block;
   animation: spin 2s linear infinite;
 }
 
@@ -76,11 +81,15 @@ a.pure-button-primary:hover {
 }
 
 div.thumbnail {
+  padding: 28.125%;
   position: relative;
+  box-sizing: border-box;
 }
 
 img.thumbnail {
+  position: absolute;
   width: 100%;
+  height: 100%;
   left: 0;
   top: 0;
 }
@@ -153,6 +162,15 @@ img.thumbnail {
   -webkit-appearance: none;
 }
 
+/* https://stackoverflow.com/a/55170420 */
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+  height: 14px;
+  width: 14px;
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAn0lEQVR42u3UMQrDMBBEUZ9WfQqDmm22EaTyjRMHAlM5K+Y7lb0wnUZPIKHlnutOa+25Z4D++MRBX98MD1V/trSppLKHqj9TTBWKcoUqffbUcbBBEhTjBOV4ja4l4OIAZThEOV6jHO8ARXD+gPPvKMABinGOrnu6gTNUawrcQKNCAQ7QeTxORzle3+sDfjJpPCqhJh7GixZq4rHcc9l5A9qZ+WeBhgEuAAAAAElFTkSuQmCC);
+  background-size: 14px;
+}
+
 .navbar > .searchbar .pure-form fieldset {
   padding: 0;
 }
@@ -177,6 +195,16 @@ img.thumbnail {
   margin-right: 1em;
 }
 
+@media only screen and (max-aspect-ratio: 16/9) {
+  .player-dimensions.vjs-fluid {
+    padding-top: 46.86% !important;
+  }
+
+  #player-container {
+    padding-bottom: 46.86% !important;
+  }
+}
+
 @media screen and (max-width: 767px) {
   .navbar {
     flex-direction: column;
@@ -203,7 +231,7 @@ img.thumbnail {
   }
 }
 
-/* 
+/*
  * Footer
  */
 
@@ -237,6 +265,41 @@ img.thumbnail {
   }
 }
 
+.vjs-play-control,
+.vjs-volume-panel,
+.vjs-current-time,
+.vjs-time-control,
+.vjs-duration,
+.vjs-progress-control,
+.vjs-remaining-time {
+  order: 1;
+}
+
+.vjs-captions-button {
+  order: 2;
+}
+
+.vjs-quality-selector {
+  order: 3;
+}
+
+.vjs-playback-rate {
+  order: 4;
+}
+
+.vjs-share-control {
+  order: 5;
+}
+
+.vjs-fullscreen-control {
+  order: 6;
+}
+
+.vjs-control-bar {
+  display: flex;
+  flex-direction: row;
+}
+
 .video-js .vjs-control-bar,
 .vjs-menu-button-popup .vjs-menu .vjs-menu-content {
   background-color: rgba(35, 35, 35, 0.75);
@@ -304,38 +367,21 @@ img.thumbnail {
   object-fit: cover;
 }
 
-#player {
-  position: absolute;
-  left: 0;
-  top: 0;
-  height: 100%;
+.player-dimensions.vjs-fluid {
+  padding-top: 82vh;
 }
 
-.player-dimensions.vjs-fluid {
-  padding-top: 46.86%;
+video.video-js {
+  position: absolute;
+  height: 100%;
 }
 
 #player-container {
   position: relative;
-  padding-bottom: 46.86%;
-  margin-left: 1em;
-  margin-right: 1em;
+  padding-bottom: 82vh;
   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;
+.pure-control-group label {
+  word-wrap: normal;
 }

assets/css/lighttheme.css

@@ -9,7 +9,7 @@ a {
 }
 
 /* All links that do not fit with the default color goes here */
-a > .icon,
+a:not([data-id]) > .icon,
 .pure-u-md-1-5 > .h-box > a[href^="/watch?"],
 .playlist-restricted > ol > li > a {
   color: #303030;

assets/css/videojs-share.css

@@ -1,7 +1,7 @@
 /**
  * videojs-share
- * @version 2.0.1
+ * @version 3.0.0
  * @copyright 2018 Mikhail Khazov <mkhazov.work@gmail.com>
  * @license MIT
  */
-.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-modal-dialog-content{display:flex;align-items:center;padding:0;background-image:linear-gradient(to bottom, rgba(0,0,0,0.77), rgba(0,0,0,0.75))}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{position:absolute;right:0;top:5px;width:30px;height:30px;color:#fff;cursor:pointer;opacity:0.9;transition:opacity 0.25s ease-out}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button:before{content:'×';font-size:20px;line-height:15px}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button:hover{opacity:1}.video-js .vjs-share{display:flex;flex-direction:column;justify-content:space-around;align-items:center;width:100%;height:100%;max-height:400px}.video-js .vjs-share__top,.video-js .vjs-share__middle,.video-js .vjs-share__bottom{display:flex}.video-js .vjs-share__top,.video-js .vjs-share__middle{flex-direction:column;justify-content:space-between}.video-js .vjs-share__middle{padding:0 25px}.video-js .vjs-share__title{align-self:center;font-size:22px;color:#fff}.video-js .vjs-share__subtitle{width:100%;margin:0 auto 12px;font-size:16px;color:#fff;opacity:0.7}.video-js .vjs-share__short-link-wrapper{position:relative;display:block;width:100%;height:40px;margin:0 auto;margin-bottom:15px;border:0;color:rgba(255,255,255,0.65);background-color:#363636;outline:none;overflow:hidden;flex-shrink:0}.video-js .vjs-share__short-link{display:block;width:100%;height:100%;padding:0 40px 0 15px;border:0;color:rgba(255,255,255,0.65);background-color:#363636;outline:none}.video-js .vjs-share__btn{position:absolute;right:0;bottom:0;height:40px;width:40px;display:flex;align-items:center;padding:0 11px;border:0;color:#fff;background-color:#2e2e2e;background-size:18px 19px;background-position:center;background-repeat:no-repeat;cursor:pointer;outline:none;transition:width 0.3s ease-out, padding 0.3s ease-out}.video-js .vjs-share__btn svg{flex-shrink:0}.video-js .vjs-share__btn span{position:relative;padding-left:10px;opacity:0;transition:opacity 0.3s ease-out}.video-js .vjs-share__btn:hover{justify-content:center;width:100%;padding:0 40px;background-image:none}.video-js .vjs-share__btn:hover span{opacity:1}.video-js .vjs-share__socials{display:flex;flex-wrap:wrap;justify-content:center;align-content:flex-start;transition:width 0.3s ease-out, height 0.3s ease-out}.video-js .vjs-share__social{display:flex;justify-content:center;align-items:center;flex-shrink:0;width:32px;height:32px;margin-right:6px;margin-bottom:6px;cursor:pointer;font-size:8px;transition:transform 0.3s ease-out, filter 0.2s ease-out;border:none;outline:none}.video-js .vjs-share__social:hover{filter:brightness(115%)}.video-js .vjs-share__social svg{width:100%;max-height:24px}.video-js .vjs-share__social_vk{background-color:#5d7294}.video-js .vjs-share__social_ok{background-color:#ed7c20}.video-js .vjs-share__social_mail{background-color:#134785}.video-js .vjs-share__social_tw{background-color:#76aaeb}.video-js .vjs-share__social_reddit{background-color:#ff4500}.video-js .vjs-share__social_fbFeed{background-color:#475995}.video-js .vjs-share__social_messenger{background-color:#0084ff}.video-js .vjs-share__social_gp{background-color:#d53f35}.video-js .vjs-share__social_linkedin{background-color:#0077b5}.video-js .vjs-share__social_viber{background-color:#766db5}.video-js .vjs-share__social_telegram{background-color:#4bb0e2}.video-js .vjs-share__social_whatsapp{background-color:#78c870}.video-js .vjs-share__bottom{justify-content:center}@media (max-height: 220px){.video-js .vjs-share .hidden-xs{display:none}}@media (max-height: 350px){.video-js .vjs-share .hidden-sm{display:none}}@media (min-height: 400px){.video-js .vjs-share__title{margin-bottom:15px}.video-js .vjs-share__short-link-wrapper{margin-bottom:30px}}@media (min-width: 320px){.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{right:5px;top:10px}}@media (min-width: 660px){.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{right:20px;top:20px}.video-js .vjs-share__social{width:40px;height:40px}}
+.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-modal-dialog-content{display:flex;align-items:center;padding:0;background-image:linear-gradient(to bottom, rgba(0,0,0,0.77), rgba(0,0,0,0.75))}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{position:absolute;right:0;top:5px;width:30px;height:30px;color:#fff;cursor:pointer;opacity:0.9;transition:opacity 0.25s ease-out}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button:before{content:'×';font-size:20px;line-height:15px}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button:hover{opacity:1}.video-js .vjs-share{display:flex;flex-direction:column;justify-content:space-around;align-items:center;width:100%;height:100%;max-height:400px}.video-js .vjs-share__top,.video-js .vjs-share__middle,.video-js .vjs-share__bottom{display:flex}.video-js .vjs-share__top,.video-js .vjs-share__middle{flex-direction:column;justify-content:space-between}.video-js .vjs-share__middle{padding:0 25px}.video-js .vjs-share__title{align-self:center;font-size:22px;color:#fff}.video-js .vjs-share__subtitle{width:100%;margin:0 auto 12px;font-size:16px;color:#fff;opacity:0.7}.video-js .vjs-share__short-link-wrapper{position:relative;display:block;width:100%;height:40px;margin:0 auto;margin-bottom:15px;border:0;color:rgba(255,255,255,0.65);background-color:#363636;outline:none;overflow:hidden;flex-shrink:0}.video-js .vjs-share__short-link{display:block;width:100%;height:100%;padding:0 40px 0 15px;border:0;color:rgba(255,255,255,0.65);background-color:#363636;outline:none}.video-js .vjs-share__btn{position:absolute;right:0;bottom:0;height:40px;width:40px;display:flex;align-items:center;padding:0 11px;border:0;color:#fff;background-color:#2e2e2e;background-size:18px 19px;background-position:center;background-repeat:no-repeat;cursor:pointer;outline:none;transition:width 0.3s ease-out, padding 0.3s ease-out}.video-js .vjs-share__btn svg{flex-shrink:0}.video-js .vjs-share__btn span{position:relative;padding-left:10px;opacity:0;transition:opacity 0.3s ease-out}.video-js .vjs-share__btn:hover{justify-content:center;width:100%;padding:0 40px;background-image:none}.video-js .vjs-share__btn:hover span{opacity:1}.video-js .vjs-share__socials{display:flex;flex-wrap:wrap;justify-content:center;align-content:flex-start;transition:width 0.3s ease-out, height 0.3s ease-out}.video-js .vjs-share__social{display:flex;justify-content:center;align-items:center;flex-shrink:0;width:32px;height:32px;margin-right:6px;margin-bottom:6px;cursor:pointer;font-size:8px;transition:transform 0.3s ease-out, filter 0.2s ease-out;border:none;outline:none}.video-js .vjs-share__social:hover{filter:brightness(115%)}.video-js .vjs-share__social svg{overflow:visible;max-height:24px}.video-js .vjs-share__social_vk{background-color:#5d7294}.video-js .vjs-share__social_ok{background-color:#ed7c20}.video-js .vjs-share__social_mail{background-color:#134785}.video-js .vjs-share__social_tw{background-color:#76aaeb}.video-js .vjs-share__social_reddit{background-color:#ff4500}.video-js .vjs-share__social_fbFeed{background-color:#475995}.video-js .vjs-share__social_messenger{background-color:#0084ff}.video-js .vjs-share__social_gp{background-color:#d53f35}.video-js .vjs-share__social_linkedin{background-color:#0077b5}.video-js .vjs-share__social_viber{background-color:#766db5}.video-js .vjs-share__social_telegram{background-color:#4bb0e2}.video-js .vjs-share__social_whatsapp{background-color:#78c870}.video-js .vjs-share__bottom{justify-content:center}@media (max-height: 220px){.video-js .vjs-share .hidden-xs{display:none}}@media (max-height: 350px){.video-js .vjs-share .hidden-sm{display:none}}@media (min-height: 400px){.video-js .vjs-share__title{margin-bottom:15px}.video-js .vjs-share__short-link-wrapper{margin-bottom:30px}}@media (min-width: 320px){.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{right:5px;top:10px}}@media (min-width: 660px){.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{right:20px;top:20px}.video-js .vjs-share__social{width:40px;height:40px}}

assets/js/videojs.hotkeys.js

@@ -1,413 +0,0 @@
-/*
- * Video.js Hotkeys
- * https://github.com/ctd1500/videojs-hotkeys
- *
- * Copyright (c) 2015 Chris Dougherty
- * Licensed under the Apache-2.0 license.
- */
-
-;(function(root, factory) {
-  if (typeof window !== 'undefined' && window.videojs) {
-    factory(window.videojs);
-  } else if (typeof define === 'function' && define.amd) {
-    define('videojs-hotkeys', ['video.js'], function (module) {
-      return factory(module.default || module);
-    });
-  } else if (typeof module !== 'undefined' && module.exports) {
-    module.exports = factory(require('video.js'));
-  }
-}(this, function (videojs) {
-  "use strict";
-  if (typeof window !== 'undefined') {
-    window['videojs_hotkeys'] = { version: "0.2.22" };
-  }
-
-  var hotkeys = function(options) {
-    var player = this;
-    var pEl = player.el();
-    var doc = document;
-    var def_options = {
-      volumeStep: 0.1,
-      seekStep: 5,
-      enableMute: true,
-      enableVolumeScroll: true,
-      enableHoverScroll: true,
-      enableFullscreen: true,
-      enableNumbers: true,
-      enableJogStyle: false,
-      alwaysCaptureHotkeys: false,
-      enableModifiersForNumbers: true,
-      enableInactiveFocus: true,
-      skipInitialFocus: false,
-      playPauseKey: playPauseKey,
-      rewindKey: rewindKey,
-      forwardKey: forwardKey,
-      volumeUpKey: volumeUpKey,
-      volumeDownKey: volumeDownKey,
-      muteKey: muteKey,
-      fullscreenKey: fullscreenKey,
-      customKeys: {}
-    };
-
-    var cPlay = 1,
-      cRewind = 2,
-      cForward = 3,
-      cVolumeUp = 4,
-      cVolumeDown = 5,
-      cMute = 6,
-      cFullscreen = 7;
-
-    // Use built-in merge function from Video.js v5.0+ or v4.4.0+
-    var mergeOptions = videojs.mergeOptions || videojs.util.mergeOptions;
-    options = mergeOptions(def_options, options || {});
-
-    var volumeStep = options.volumeStep,
-      seekStep = options.seekStep,
-      enableMute = options.enableMute,
-      enableVolumeScroll = options.enableVolumeScroll,
-      enableHoverScroll = options.enableHoverScroll,
-      enableFull = options.enableFullscreen,
-      enableNumbers = options.enableNumbers,
-      enableJogStyle = options.enableJogStyle,
-      alwaysCaptureHotkeys = options.alwaysCaptureHotkeys,
-      enableModifiersForNumbers = options.enableModifiersForNumbers,
-      enableInactiveFocus = options.enableInactiveFocus,
-      skipInitialFocus = options.skipInitialFocus;
-
-    // Set default player tabindex to handle keydown and doubleclick events
-    if (!pEl.hasAttribute('tabIndex')) {
-      pEl.setAttribute('tabIndex', '-1');
-    }
-
-    // Remove player outline to fix video performance issue
-    pEl.style.outline = "none";
-
-    if (alwaysCaptureHotkeys || !player.autoplay()) {
-      if (!skipInitialFocus) {
-        player.one('play', function() {
-          pEl.focus(); // Fixes the .vjs-big-play-button handing focus back to body instead of the player
-        });
-      }
-    }
-
-    if (enableInactiveFocus) {
-      player.on('userinactive', function() {
-        // When the control bar fades, re-apply focus to the player if last focus was a control button
-        var cancelFocusingPlayer = function() {
-          clearTimeout(focusingPlayerTimeout);
-        };
-        var focusingPlayerTimeout = setTimeout(function() {
-          player.off('useractive', cancelFocusingPlayer);
-          var activeElement = doc.activeElement;
-          var controlBar = pEl.querySelector('.vjs-control-bar');
-          if (activeElement && activeElement.parentElement == controlBar) {
-            pEl.focus();
-          }
-        }, 10);
-
-        player.one('useractive', cancelFocusingPlayer);
-      });
-    }
-
-    player.on('play', function() {
-      // Fix allowing the YouTube plugin to have hotkey support.
-      var ifblocker = pEl.querySelector('.iframeblocker');
-      if (ifblocker && ifblocker.style.display === '') {
-        ifblocker.style.display = "block";
-        ifblocker.style.bottom = "39px";
-      }
-    });
-
-    var keyDown = function keyDown(event) {
-      var ewhich = event.which, wasPlaying, seekTime;
-      var ePreventDefault = event.preventDefault;
-      var duration = player.duration();
-      // When controls are disabled, hotkeys will be disabled as well
-      if (player.controls()) {
-
-        // Don't catch keys if any control buttons are focused, unless alwaysCaptureHotkeys is true
-        var activeEl = doc.activeElement;
-        if (alwaysCaptureHotkeys ||
-            activeEl == pEl ||
-            activeEl == pEl.querySelector('.vjs-tech') ||
-            activeEl == pEl.querySelector('.vjs-control-bar') ||
-            activeEl == pEl.querySelector('.iframeblocker')) {
-
-          switch (checkKeys(event, player)) {
-            // Spacebar toggles play/pause
-            case cPlay:
-              ePreventDefault();
-              if (alwaysCaptureHotkeys) {
-                // Prevent control activation with space
-                event.stopPropagation();
-              }
-
-              if (player.paused()) {
-                player.play();
-              } else {
-                player.pause();
-              }
-              break;
-
-            // Seeking with the left/right arrow keys
-            case cRewind: // Seek Backward
-              wasPlaying = !player.paused();
-              ePreventDefault();
-              if (wasPlaying) {
-                player.pause();
-              }
-              seekTime = player.currentTime() - seekStepD(event);
-              // The flash player tech will allow you to seek into negative
-              // numbers and break the seekbar, so try to prevent that.
-              if (seekTime <= 0) {
-                seekTime = 0;
-              }
-              player.currentTime(seekTime);
-              if (wasPlaying) {
-                player.play();
-              }
-              break;
-            case cForward: // Seek Forward
-              wasPlaying = !player.paused();
-              ePreventDefault();
-              if (wasPlaying) {
-                player.pause();
-              }
-              seekTime = player.currentTime() + seekStepD(event);
-              // Fixes the player not sending the end event if you
-              // try to seek past the duration on the seekbar.
-              if (seekTime >= duration) {
-                seekTime = wasPlaying ? duration - .001 : duration;
-              }
-              player.currentTime(seekTime);
-              if (wasPlaying) {
-                player.play();
-              }
-              break;
-
-            // Volume control with the up/down arrow keys
-            case cVolumeDown:
-              ePreventDefault();
-              if (!enableJogStyle) {
-                player.volume(player.volume() - volumeStep);
-              } else {
-                seekTime = player.currentTime() - 1;
-                if (player.currentTime() <= 1) {
-                  seekTime = 0;
-                }
-                player.currentTime(seekTime);
-              }
-              break;
-            case cVolumeUp:
-              ePreventDefault();
-              if (!enableJogStyle) {
-                player.volume(player.volume() + volumeStep);
-              } else {
-                seekTime = player.currentTime() + 1;
-                if (seekTime >= duration) {
-                  seekTime = duration;
-                }
-                player.currentTime(seekTime);
-              }
-              break;
-
-            // Toggle Mute with the M key
-            case cMute:
-              if (enableMute) {
-                player.muted(!player.muted());
-              }
-              break;
-
-            // Toggle Fullscreen with the F key
-            case  cFullscreen:
-              if (enableFull) {
-                if (player.isFullscreen()) {
-                  player.exitFullscreen();
-                } else {
-                  player.requestFullscreen();
-                }
-              }
-              break;
-
-            default:
-              // Number keys from 0-9 skip to a percentage of the video. 0 is 0% and 9 is 90%
-              if ((ewhich > 47 && ewhich < 59) || (ewhich > 95 && ewhich < 106)) {
-                // Do not handle if enableModifiersForNumbers set to false and keys are Ctrl, Cmd or Alt
-                if (enableModifiersForNumbers || !(event.metaKey || event.ctrlKey || event.altKey)) {
-                  if (enableNumbers) {
-                    var sub = 48;
-                    if (ewhich > 95) {
-                      sub = 96;
-                    }
-                    var number = ewhich - sub;
-                    ePreventDefault();
-                    player.currentTime(player.duration() * number * 0.1);
-                  }
-                }
-              }
-
-              // Handle any custom hotkeys
-              for (var customKey in options.customKeys) {
-                var customHotkey = options.customKeys[customKey];
-                // Check for well formed custom keys
-                if (customHotkey && customHotkey.key && customHotkey.handler) {
-                  // Check if the custom key's condition matches
-                  if (customHotkey.key(event)) {
-                    ePreventDefault();
-                    customHotkey.handler(player, options, event);
-                  }
-                }
-              }
-          }
-        }
-      }
-    };
-
-    var doubleClick = function doubleClick(event) {
-      // When controls are disabled, hotkeys will be disabled as well
-      if (player.controls()) {
-
-        // Don't catch clicks if any control buttons are focused
-        var activeEl = event.relatedTarget || event.toElement || doc.activeElement;
-        if (activeEl == pEl ||
-            activeEl == pEl.querySelector('.vjs-tech') ||
-            activeEl == pEl.querySelector('.iframeblocker')) {
-
-          if (enableFull) {
-            if (player.isFullscreen()) {
-              player.exitFullscreen();
-            } else {
-              player.requestFullscreen();
-            }
-          }
-        }
-      }
-    };
-
-    var volumeHover = false;
-    var volumeSelector = pEl.querySelector('.vjs-volume-menu-button') || pEl.querySelector('.vjs-volume-panel');
-    volumeSelector.onmouseover = function() { volumeHover = true; }
-    volumeSelector.onmouseout = function() { volumeHover = false; }
-    
-    var mouseScroll = function mouseScroll(event) {
-      if (enableHoverScroll) {
-        // If we leave this undefined then it can match non-existent elements below
-        var activeEl = 0;
-      } else {
-        var activeEl = doc.activeElement;
-      }
-
-      // When controls are disabled, hotkeys will be disabled as well
-      if (player.controls()) {
-        if (alwaysCaptureHotkeys ||
-            activeEl == pEl ||
-            activeEl == pEl.querySelector('.vjs-tech') ||
-            activeEl == pEl.querySelector('.iframeblocker') ||
-            activeEl == pEl.querySelector('.vjs-control-bar') ||
-            volumeHover) {
-
-          if (enableVolumeScroll) {
-            event = window.event || event;
-            var delta = Math.max(-1, Math.min(1, (event.wheelDelta || -event.detail)));
-            event.preventDefault();
-
-            if (delta == 1) {
-              player.volume(player.volume() + volumeStep);
-            } else if (delta == -1) {
-              player.volume(player.volume() - volumeStep);
-            }
-          }
-        }
-      }
-    };
-
-    var checkKeys = function checkKeys(e, player) {
-      // Allow some modularity in defining custom hotkeys
-
-      // Play/Pause check
-      if (options.playPauseKey(e, player)) {
-        return cPlay;
-      }
-
-      // Seek Backward check
-      if (options.rewindKey(e, player)) {
-        return cRewind;
-      }
-
-      // Seek Forward check
-      if (options.forwardKey(e, player)) {
-        return cForward;
-      }
-
-      // Volume Up check
-      if (options.volumeUpKey(e, player)) {
-        return cVolumeUp;
-      }
-
-      // Volume Down check
-      if (options.volumeDownKey(e, player)) {
-        return cVolumeDown;
-      }
-
-      // Mute check
-      if (options.muteKey(e, player)) {
-        return cMute;
-      }
-
-      // Fullscreen check
-      if (options.fullscreenKey(e, player)) {
-        return cFullscreen;
-      }
-    };
-
-    function playPauseKey(e) {
-      // Space bar or MediaPlayPause
-      return (e.which === 32 || e.which === 179);
-    }
-
-    function rewindKey(e) {
-      // Left Arrow or MediaRewind
-      return (e.which === 37 || e.which === 177);
-    }
-
-    function forwardKey(e) {
-      // Right Arrow or MediaForward
-      return (e.which === 39 || e.which === 176);
-    }
-
-    function volumeUpKey(e) {
-      // Up Arrow
-      return (e.which === 38);
-    }
-
-    function volumeDownKey(e) {
-      // Down Arrow
-      return (e.which === 40);
-    }
-
-    function muteKey(e) {
-      // M key
-      return (e.which === 77);
-    }
-
-    function fullscreenKey(e) {
-      // F key
-      return (e.which === 70);
-    }
-
-    function seekStepD(e) {
-      // SeekStep caller, returns an int, or a function returning an int
-      return (typeof seekStep === "function" ? seekStep(e) : seekStep);
-    }
-
-    player.on('keydown', keyDown);
-    player.on('dblclick', doubleClick);
-    player.on('mousewheel', mouseScroll);
-    player.on("DOMMouseScroll", mouseScroll);
-
-    return this;
-  };
-
-  var registerPlugin = videojs.registerPlugin || videojs.plugin;
-  registerPlugin('hotkeys', hotkeys);
-}));

assets/js/videojs.hotkeys.min.js

@@ -1,2 +1,3 @@
-/* videojs-hotkeys v0.2.22 - https://github.com/ctd1500/videojs-hotkeys */
-!function(e,t){"undefined"!=typeof window&&window.videojs?t(window.videojs):"function"==typeof define&&define.amd?define("videojs-hotkeys",["video.js"],function(e){return t(e.default||e)}):"undefined"!=typeof module&&module.exports&&(module.exports=t(require("video.js")))}(0,function(s){"use strict";"undefined"!=typeof window&&(window.videojs_hotkeys={version:"0.2.22"});(s.registerPlugin||s.plugin)("hotkeys",function(m){var y=this,v=y.el(),f=document,e={volumeStep:.1,seekStep:5,enableMute:!0,enableVolumeScroll:!0,enableHoverScroll:!0,enableFullscreen:!0,enableNumbers:!0,enableJogStyle:!1,alwaysCaptureHotkeys:!1,enableModifiersForNumbers:!0,enableInactiveFocus:!0,skipInitialFocus:!1,playPauseKey:function(e){return 32===e.which||179===e.which},rewindKey:function(e){return 37===e.which||177===e.which},forwardKey:function(e){return 39===e.which||176===e.which},volumeUpKey:function(e){return 38===e.which},volumeDownKey:function(e){return 40===e.which},muteKey:function(e){return 77===e.which},fullscreenKey:function(e){return 70===e.which},customKeys:{}},t=s.mergeOptions||s.util.mergeOptions,d=(m=t(e,m||{})).volumeStep,n=m.seekStep,p=m.enableMute,r=m.enableVolumeScroll,o=m.enableHoverScroll,b=m.enableFullscreen,h=m.enableNumbers,w=m.enableJogStyle,k=m.alwaysCaptureHotkeys,S=m.enableModifiersForNumbers,u=m.enableInactiveFocus,l=m.skipInitialFocus;v.hasAttribute("tabIndex")||v.setAttribute("tabIndex","-1"),v.style.outline="none",!k&&y.autoplay()||l||y.one("play",function(){v.focus()}),u&&y.on("userinactive",function(){var n=function(){clearTimeout(e)},e=setTimeout(function(){y.off("useractive",n);var e=f.activeElement,t=v.querySelector(".vjs-control-bar");e&&e.parentElement==t&&v.focus()},10);y.one("useractive",n)}),y.on("play",function(){var e=v.querySelector(".iframeblocker");e&&""===e.style.display&&(e.style.display="block",e.style.bottom="39px")});var i=!1,c=v.querySelector(".vjs-volume-menu-button")||v.querySelector(".vjs-volume-panel");c.onmouseover=function(){i=!0},c.onmouseout=function(){i=!1};var a=function(e){if(o)var t=0;else t=f.activeElement;if(y.controls()&&(k||t==v||t==v.querySelector(".vjs-tech")||t==v.querySelector(".iframeblocker")||t==v.querySelector(".vjs-control-bar")||i)&&r){e=window.event||e;var n=Math.max(-1,Math.min(1,e.wheelDelta||-e.detail));e.preventDefault(),1==n?y.volume(y.volume()+d):-1==n&&y.volume(y.volume()-d)}},K=function(e,t){return m.playPauseKey(e,t)?1:m.rewindKey(e,t)?2:m.forwardKey(e,t)?3:m.volumeUpKey(e,t)?4:m.volumeDownKey(e,t)?5:m.muteKey(e,t)?6:m.fullscreenKey(e,t)?7:void 0};function q(e){return"function"==typeof n?n(e):n}return y.on("keydown",function(e){var t,n,r=e.which,o=e.preventDefault,u=y.duration();if(y.controls()){var l=f.activeElement;if(k||l==v||l==v.querySelector(".vjs-tech")||l==v.querySelector(".vjs-control-bar")||l==v.querySelector(".iframeblocker"))switch(K(e,y)){case 1:o(),k&&e.stopPropagation(),y.paused()?y.play():y.pause();break;case 2:t=!y.paused(),o(),t&&y.pause(),(n=y.currentTime()-q(e))<=0&&(n=0),y.currentTime(n),t&&y.play();break;case 3:t=!y.paused(),o(),t&&y.pause(),u<=(n=y.currentTime()+q(e))&&(n=t?u-.001:u),y.currentTime(n),t&&y.play();break;case 5:o(),w?(n=y.currentTime()-1,y.currentTime()<=1&&(n=0),y.currentTime(n)):y.volume(y.volume()-d);break;case 4:o(),w?(u<=(n=y.currentTime()+1)&&(n=u),y.currentTime(n)):y.volume(y.volume()+d);break;case 6:p&&y.muted(!y.muted());break;case 7:b&&(y.isFullscreen()?y.exitFullscreen():y.requestFullscreen());break;default:if((47<r&&r<59||95<r&&r<106)&&(S||!(e.metaKey||e.ctrlKey||e.altKey))&&h){var i=48;95<r&&(i=96);var c=r-i;o(),y.currentTime(y.duration()*c*.1)}for(var a in m.customKeys){var s=m.customKeys[a];s&&s.key&&s.handler&&s.key(e)&&(o(),s.handler(y,m,e))}}}}),y.on("dblclick",function(e){if(y.controls()){var t=e.relatedTarget||e.toElement||f.activeElement;t!=v&&t!=v.querySelector(".vjs-tech")&&t!=v.querySelector(".iframeblocker")||b&&(y.isFullscreen()?y.exitFullscreen():y.requestFullscreen())}}),y.on("mousewheel",a),y.on("DOMMouseScroll",a),this})});
+/* videojs-hotkeys v0.2.25 - https://github.com/ctd1500/videojs-hotkeys */
+!function(e,n){"undefined"!=typeof window&&window.videojs?n(window.videojs):"function"==typeof define&&define.amd?define("videojs-hotkeys",["video.js"],function(e){return n(e.default||e)}):"undefined"!=typeof module&&module.exports&&(module.exports=n(require("video.js")))}(0,function(e){"use strict";"undefined"!=typeof window&&(window.videojs_hotkeys={version:"0.2.25"});(e.registerPlugin||e.plugin)("hotkeys",function(n){function t(e){return"function"==typeof s?s(e):s}function r(e){null!=e&&"function"==typeof e.then&&e.then(null,function(e){})}var o=this,u=o.el(),l=document,i={volumeStep:.1,seekStep:5,enableMute:!0,enableVolumeScroll:!0,enableHoverScroll:!1,enableFullscreen:!0,enableNumbers:!0,enableJogStyle:!1,alwaysCaptureHotkeys:!1,enableModifiersForNumbers:!0,enableInactiveFocus:!0,skipInitialFocus:!1,playPauseKey:function(e){return 32===e.which||179===e.which},rewindKey:function(e){return 37===e.which||177===e.which},forwardKey:function(e){return 39===e.which||176===e.which},volumeUpKey:function(e){return 38===e.which},volumeDownKey:function(e){return 40===e.which},muteKey:function(e){return 77===e.which},fullscreenKey:function(e){return 70===e.which},customKeys:{}},c=e.mergeOptions||e.util.mergeOptions,a=(n=c(i,n||{})).volumeStep,s=n.seekStep,m=n.enableMute,f=n.enableVolumeScroll,y=n.enableHoverScroll,v=n.enableFullscreen,d=n.enableNumbers,p=n.enableJogStyle,b=n.alwaysCaptureHotkeys,h=n.enableModifiersForNumbers,w=n.enableInactiveFocus,k=n.skipInitialFocus,S=e.VERSION;u.hasAttribute("tabIndex")||u.setAttribute("tabIndex","-1"),u.style.outline="none",!b&&o.autoplay()||k||o.one("play",function(){u.focus()}),w&&o.on("userinactive",function(){var e=function(){clearTimeout(n)},n=setTimeout(function(){o.off("useractive",e);var n=l.activeElement,t=u.querySelector(".vjs-control-bar");n&&n.parentElement==t&&u.focus()},10);o.one("useractive",e)}),o.on("play",function(){var e=u.querySelector(".iframeblocker");e&&""===e.style.display&&(e.style.display="block",e.style.bottom="39px")});var K=!1,q=u.querySelector(".vjs-volume-menu-button")||u.querySelector(".vjs-volume-panel");null!=q&&(q.onmouseover=function(){K=!0},q.onmouseout=function(){K=!1});var j=function(e){if(y)n=0;else var n=l.activeElement;if(o.controls()&&(b||n==u||n==u.querySelector(".vjs-tech")||n==u.querySelector(".iframeblocker")||n==u.querySelector(".vjs-control-bar")||K)&&f){e=window.event||e;var t=Math.max(-1,Math.min(1,e.wheelDelta||-e.detail));e.preventDefault(),1==t?o.volume(o.volume()+a):-1==t&&o.volume(o.volume()-a)}},F=function(e,t){return n.playPauseKey(e,t)?1:n.rewindKey(e,t)?2:n.forwardKey(e,t)?3:n.volumeUpKey(e,t)?4:n.volumeDownKey(e,t)?5:n.muteKey(e,t)?6:n.fullscreenKey(e,t)?7:void 0};return o.on("keydown",function(e){var i,c,s=e.which,f=e.preventDefault,y=o.duration();if(o.controls()){var w=l.activeElement;if(b||w==u||w==u.querySelector(".vjs-tech")||w==u.querySelector(".vjs-control-bar")||w==u.querySelector(".iframeblocker"))switch(F(e,o)){case 1:f(),b&&e.stopPropagation(),o.paused()?r(o.play()):o.pause();break;case 2:i=!o.paused(),f(),i&&o.pause(),(c=o.currentTime()-t(e))<=0&&(c=0),o.currentTime(c),i&&r(o.play());break;case 3:i=!o.paused(),f(),i&&o.pause(),(c=o.currentTime()+t(e))>=y&&(c=i?y-.001:y),o.currentTime(c),i&&r(o.play());break;case 5:f(),p?(c=o.currentTime()-1,o.currentTime()<=1&&(c=0),o.currentTime(c)):o.volume(o.volume()-a);break;case 4:f(),p?((c=o.currentTime()+1)>=y&&(c=y),o.currentTime(c)):o.volume(o.volume()+a);break;case 6:m&&o.muted(!o.muted());break;case 7:v&&(o.isFullscreen()?o.exitFullscreen():o.requestFullscreen());break;default:if((s>47&&s<59||s>95&&s<106)&&(h||!(e.metaKey||e.ctrlKey||e.altKey))&&d){var k=48;s>95&&(k=96);var S=s-k;f(),o.currentTime(o.duration()*S*.1)}for(var K in n.customKeys){var q=n.customKeys[K];q&&q.key&&q.handler&&q.key(e)&&(f(),q.handler(o,n,e))}}}}),o.on("dblclick",function(e){if(null!=S&&S<="7.1.0"&&o.controls()){var n=e.relatedTarget||e.toElement||l.activeElement;n!=u&&n!=u.querySelector(".vjs-tech")&&n!=u.querySelector(".iframeblocker")||v&&(o.isFullscreen()?o.exitFullscreen():o.requestFullscreen())}}),o.on("mousewheel",j),o.on("DOMMouseScroll",j),this})});
+//# sourceMappingURL=videojs.hotkeys.min.js.map

config/config.yml

@@ -1,5 +1,3 @@
-video_threads: 0
-crawl_threads: 0
 channel_threads: 1
 feed_threads: 1
 db:

config/migrate-scripts/migrate-db-1c8075c.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+psql invidious -c "ALTER TABLE channel_videos DROP COLUMN live_now CASCADE"
+psql invidious -c "ALTER TABLE channel_videos DROP COLUMN premiere_timestamp CASCADE"
+
+psql invidious -c "ALTER TABLE channel_videos ADD COLUMN live_now bool"
+psql invidious -c "ALTER TABLE channel_videos ADD COLUMN premiere_timestamp timestamptz"

config/migrate-scripts/migrate-db-6e51189.sh

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

config/migrate-scripts/migrate-db-88b7097.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+psql invidious -c "ALTER TABLE channel_videos ADD COLUMN premiere_timestamp timestamptz;"

config/sql/channel_videos.sql

@@ -11,6 +11,8 @@ CREATE TABLE public.channel_videos
   ucid text,
   author text,
   length_seconds integer,
+  live_now boolean,
+  premiere_timestamp timestamp with time zone,
   CONSTRAINT channel_videos_id_key UNIQUE (id)
 );
 

locales/ar.json

@@ -10,8 +10,9 @@
   "newest": "الأجدد",
   "oldest": "الأقدم",
   "popular": "الاكثر شعبية",
-  "Preview page": "معاينة الصفحة",
+  "last": "اخر الفيديوهات المعدلة",
   "Next page": "الصفحة الثانية",
+  "Previous page": "الصفحة السابقة",
   "Clear watch history?": "مسح السجل ؟",
   "Yes": "نعم",
   "No": "لا",
@@ -28,7 +29,6 @@
   "Export data as JSON": "استخراج البيانات كـ JSON",
   "Delete account?": "حذف الحساب ؟",
   "History": "السجل",
-  "Previous page": "الصفحة السابقة",
   "An alternative front-end to YouTube": "البديل الكامل لموقع يوتيوب",
   "JavaScript license information": "معلومات ترخيص JavaScript",
   "source": "المصدر",
@@ -50,6 +50,7 @@
   "Autoplay: ": "تشغيل تلقائى: ",
   "Autoplay next video: ": "شغل الفيديو التالى تلقائى: ",
   "Listen by default: ": "تشغيل النسخة السمعية تلقائى: ",
+  "Proxy videos? ": "عرض الفيديوهات عن طريق الوكيل(proxy) ؟",
   "Default speed: ": "السرعة الإفتراضية: ",
   "Preferred video quality: ": "الجودة المفضلة للفيديوهات: ",
   "Player volume: ": "صوت المشغل: ",
@@ -82,14 +83,14 @@
   "Manage subscriptions": "إدارة المشتركين",
   "Watch history": "سجل المشاهدة",
   "Delete account": "حذف الحساب",
-  "Administrator preferences": "",
-  "Default homepage: ": "",
-  "Feed menu: ": "",
-  "Top enabled? ": "",
-  "CAPTCHA enabled? ": "",
-  "Login enabled? ": "",
-  "Registration enabled? ": "",
-  "Report statistics? ": "",
+  "Administrator preferences": "إعدادات المدير",
+  "Default homepage: ": "الصفحة الرئيسية الافتراضية ",
+  "Feed menu: ": "قائمة التغذية",
+  "Top enabled? ": "تفعيل 'الأفضل' ؟ ",
+  "CAPTCHA enabled? ": "تفعيل الكابتشا ؟",
+  "Login enabled? ": "تفعيل تسجيل الدخول ؟",
+  "Registration enabled? ": "تفعيل التسجيل ؟",
+  "Report statistics? ": "إبلاغ الإحصائيات",
   "Save preferences": "حفظ التفضيلات",
   "Subscription manager": "مدير الإشتراكات",
   "`x` subscriptions": "`x` مشتركين",
@@ -101,12 +102,10 @@
   "Sign out": "تسجيل الخروج",
   "Released under the AGPLv3 by Omar Roth.": "تم الإنشاء تحت AGPLv3 بواسطة عمر روث.",
   "Source available here.": "الأكواد متوفرة هنا.",
-  "Liberapay: ": "ليبرباى: ",
-  "Patreon: ": "باتريون: ",
-  "BTC: ": "بيتكوين: ",
-  "BCH: ": "بيتكوين كاش: ",
   "View JavaScript license information.": "مشاهدة معلومات حول تراخيص الجافاسكريبت.",
+  "View privacy policy.": "عرض سياسة الخصوصية",
   "Trending": "الشائع",
+  "Unlisted": "غير مصنف",
   "Watch video on Youtube": "مشاهدة الفيديو على اليوتيوب",
   "Genre: ": "النوع: ",
   "License: ": "التراخيص: ",
@@ -116,6 +115,7 @@
   "Whitelisted regions: ": "الدول المسموح فيها هذا الفيديو: ",
   "Blacklisted regions: ": "الدول الحظور فيها هذا الفيديو: ",
   "Shared `x`": "شارك منذ `x`",
+  "Premieres in `x`": "يعرض فى '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": "عرض المزيد من التعليقات على\\من موقع Reddit",
@@ -286,9 +286,12 @@
   "Download as: ": "تحميل كـ",
   "Download": "تحميل",
   "%A %B %-d, %Y": "",
-  "(edited)": "",
-  "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": "",
-  "Audio mode": "",
-  "Video mode": ""
+  "(edited)": "(تم تعديلة)",
+  "Youtube permalink of the comment": "رابط التعليق على اليوتيوب",
+  "`x` marked it with a ❤": "'x' اعجب بهذا",
+  "Audio mode": "الوضع الصوتى",
+  "Video mode": "وضع الفيديو",
+  "Videos": "الفيديوهات",
+  "Playlists": "قوائم التشغيل",
+  "Current version: ": "الإصدار الحالى"
 }

locales/de.json

@@ -10,8 +10,9 @@
   "newest": "neueste",
   "oldest": "älteste",
   "popular": "beliebt",
-  "Preview page": "Vorschau Seite",
+  "last": "",
   "Next page": "Nächste Seite",
+  "Previous page": "Vorherige Seite",
   "Clear watch history?": "Verlauf löschen?",
   "Yes": "Ja",
   "No": "Nein",
@@ -28,7 +29,6 @@
   "Export data as JSON": "Daten als JSON exportieren",
   "Delete account?": "Account löschen?",
   "History": "Verlauf",
-  "Previous page": "Vorherige Seite",
   "An alternative front-end to YouTube": "Eine alternative Oberfläche für YouTube",
   "JavaScript license information": "JavaScript Lizenzinformationen",
   "source": "Quelle",
@@ -50,6 +50,7 @@
   "Autoplay: ": "Automatisch abspielen: ",
   "Autoplay next video: ": "nächstes Video automatisch abspielen: ",
   "Listen by default: ": "Nur Ton als Standard: ",
+  "Proxy videos? ": "",
   "Default speed: ": "Standardgeschwindigkeit: ",
   "Preferred video quality: ": "Bevorzugte Videoqualität: ",
   "Player volume: ": "Playerlautstärke: ",
@@ -101,12 +102,10 @@
   "Sign out": "Abmelden",
   "Released under the AGPLv3 by Omar Roth.": "Veröffentlicht unter AGPLv3 von Omar Roth.",
   "Source available here.": "Quellcode verfügbar hier.",
-  "Liberapay: ": "Liberapay: ",
-  "Patreon: ": "Patreon: ",
-  "BTC: ": "BTC: ",
-  "BCH: ": "BCH: ",
   "View JavaScript license information.": "Javascript Lizenzinformationen anzeigen.",
+  "View privacy policy.": "",
   "Trending": "Trending",
+  "Unlisted": "",
   "Watch video on Youtube": "Video auf YouTube ansehen",
   "Genre: ": "Genre: ",
   "License: ": "Lizenz: ",
@@ -116,6 +115,7 @@
   "Whitelisted regions: ": "Erlaubte Regionen: ",
   "Blacklisted regions: ": "Unerlaubte Regionen: ",
   "Shared `x`": "Geteilt `x`",
+  "Premieres in `x`": "",
   "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.",
   "View YouTube comments": "YouTube Kommentare anzeigen",
   "View more comments on Reddit": "Mehr Kommentare auf Reddit anzeigen",
@@ -290,5 +290,8 @@
   "Youtube permalink of the comment": "",
   "`x` marked it with a ❤": "",
   "Audio mode": "",
-  "Video mode": ""
+  "Video mode": "",
+  "Videos": "",
+  "Playlists": "",
+  "Current version: ": ""
 }

locales/en-US.json

@@ -10,8 +10,9 @@
   "newest": "newest",
   "oldest": "oldest",
   "popular": "popular",
-  "Preview page": "Preview page",
+  "last": "last",
   "Next page": "Next page",
+  "Previous page": "Previous page",
   "Clear watch history?": "Clear watch history?",
   "Yes": "Yes",
   "No": "No",
@@ -28,7 +29,6 @@
   "Export data as JSON": "Export data as JSON",
   "Delete account?": "Delete account?",
   "History": "History",
-  "Previous page": "Previous page",
   "An alternative front-end to YouTube": "An alternative front-end to YouTube",
   "JavaScript license information": "JavaScript license information",
   "source": "source",
@@ -50,6 +50,7 @@
   "Autoplay: ": "Autoplay: ",
   "Autoplay next video: ": "Autoplay next video: ",
   "Listen by default: ": "Listen by default: ",
+  "Proxy videos? ": "Proxy videos? ",
   "Default speed: ": "Default speed: ",
   "Preferred video quality: ": "Preferred video quality: ",
   "Player volume: ": "Player volume: ",
@@ -100,7 +101,9 @@
   "Released under the AGPLv3 by Omar Roth.": "Released under the AGPLv3 by Omar Roth.",
   "Source available here.": "Source available here.",
   "View JavaScript license information.": "View JavaScript license information.",
+  "View privacy policy.": "View privacy policy.",
   "Trending": "Trending",
+  "Unlisted": "",
   "Watch video on Youtube": "Watch video on Youtube",
   "Genre: ": "Genre: ",
   "License: ": "License: ",
@@ -110,6 +113,7 @@
   "Whitelisted regions: ": "Whitelisted regions: ",
   "Blacklisted regions: ": "Blacklisted regions: ",
   "Shared `x`": "Shared `x`",
+  "Premieres in `x`": "",
   "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "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 YouTube comments",
   "View more comments on Reddit": "View more comments on Reddit",
@@ -284,5 +288,8 @@
   "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"
+  "Video mode": "Video mode",
+  "Videos": "Videos",
+  "Playlists": "Playlists",
+  "Current version: ": "Current version: "
 }

locales/es.json

@@ -0,0 +1,295 @@
+{
+  "`x` subscribers": "`x` suscriptores",
+  "`x` videos": "`x` vídeos",
+  "LIVE": "DIRECTO",
+  "Shared `x` ago": "Compartido hace `x`",
+  "Unsubscribe": "Desuscribirse",
+  "Subscribe": "Suscribirse",
+  "Login to subscribe to `x`": "Inicie sesión para suscribirse a `x`",
+  "View channel on YouTube": "Ver el canal en YouTube",
+  "newest": "más nuevos",
+  "oldest": "más viejos",
+  "popular": "populares",
+  "last": "último",
+  "Next page": "Página siguiente",
+  "Previous page": "Página anterior",
+  "Clear watch history?": "¿Quiere borrar el historial de reproducción?",
+  "Yes": "Sí",
+  "No": "No",
+  "Import and Export Data": "Importación y exportación de datos",
+  "Import": "Importar",
+  "Import Invidious data": "Importar datos de Invidious",
+  "Import YouTube subscriptions": "Importar suscripciones de YouTube",
+  "Import FreeTube subscriptions (.db)": "Importar suscripciones de FreeTube (.db)",
+  "Import NewPipe subscriptions (.json)": "Importar suscripciones de NewPipe (.json)",
+  "Import NewPipe data (.zip)": "Importar datos de NewPipe (.zip)",
+  "Export": "Exportar",
+  "Export subscriptions as OPML": "Exportar suscripciones como OPML",
+  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exportar suscripciones como OPML (para NewPipe y FreeTube)",
+  "Export data as JSON": "Exportar datos como JSON",
+  "Delete account?": "¿Quiere borrar la cuenta?",
+  "History": "Historial",
+  "An alternative front-end to YouTube": "Una interfaz alternativa para YouTube",
+  "JavaScript license information": "Información de licencia de JavaScript",
+  "source": "código fuente",
+  "Login": "Iniciar sesión",
+  "Login/Register": "Iniciar sesión/Registrarse",
+  "Login to Google": "Iniciar sesión en Google",
+  "User ID:": "Nombre:",
+  "Password:": "Contraseña:",
+  "Time (h:mm:ss):": "Hora (h:mm:ss):",
+  "Text CAPTCHA": "CAPTCHA en texto",
+  "Image CAPTCHA": "CAPTCHA en imagen",
+  "Sign In": "Iniciar sesión",
+  "Register": "Registrarse",
+  "Email:": "Correo:",
+  "Google verification code:": "Código de verificación de Google:",
+  "Preferences": "Preferencias",
+  "Player preferences": "Preferencias del reproductor",
+  "Always loop: ": "Repetir siempre: ",
+  "Autoplay: ": "Reproducción automática: ",
+  "Autoplay next video: ": "Reproducir automáticamente el vídeo siguiente: ",
+  "Listen by default: ": "Activar el sonido por defecto: ",
+  "Proxy videos? ": "¿Usar un proxy para los vídeos? ",
+  "Default speed: ": "Velocidad por defecto: ",
+  "Preferred video quality: ": "Calidad de vídeo preferida: ",
+  "Player volume: ": "Volumen del reproductor: ",
+  "Default comments: ": "Comentarios por defecto: ",
+  "Default captions: ": "Subtítulos por defecto: ",
+  "Fallback captions: ": "Subtítulos alternativos: ",
+  "Show related videos? ": "¿Mostrar vídeos relacionados? ",
+  "Visual preferences": "Preferencias visuales",
+  "Dark mode: ": "Modo oscuro: ",
+  "Thin mode: ": "Modo compacto: ",
+  "Subscription preferences": "Preferencias de la suscripción",
+  "Redirect homepage to feed: ": "Redirigir la página de inicio a la fuente: ",
+  "Number of videos shown in feed: ": "Número de vídeos mostrados en la fuente: ",
+  "Sort videos by: ": "Ordenar los vídeos por: ",
+  "published": "fecha de publicación",
+  "published - reverse": "fecha de publicación: orden inverso",
+  "alphabetically": "alfabéticamente",
+  "alphabetically - reverse": "alfabéticamente: orden inverso",
+  "channel name": "nombre del canal",
+  "channel name - reverse": "nombre del canal: orden inverso",
+  "Only show latest video from channel: ": "Mostrar solo el último vídeo del canal: ",
+  "Only show latest unwatched video from channel: ": "Mostrar solo el último vídeo sin ver del canal: ",
+  "Only show unwatched: ": "Mostrar solo los no vistos: ",
+  "Only show notifications (if there are any): ": "Mostrar solo notificaciones (si hay alguna): ",
+  "Data preferences": "Preferencias de los datos",
+  "Clear watch history": "Borrar el historial de reproducción",
+  "Import/Export data": "Importar/Exportar datos",
+  "Manage subscriptions": "Gestionar las suscripciones",
+  "Watch history": "Historial de reproducción",
+  "Delete account": "Borrar cuenta",
+  "Administrator preferences": "Preferencias de administrador",
+  "Default homepage: ": "Página de inicio por defecto: ",
+  "Feed menu: ": "Menú de fuentes: ",
+  "Top enabled? ": "¿Habilitar los destacados? ",
+  "CAPTCHA enabled? ": "¿Habilitar los CAPTCHA? ",
+  "Login enabled? ": "¿Habilitar el inicio de sesión? ",
+  "Registration enabled? ": "¿Habilitar el registro? ",
+  "Report statistics? ": "¿Enviar estadísticas? ",
+  "Save preferences": "Guardar las preferencias",
+  "Subscription manager": "Gestor de suscripciones",
+  "`x` subscriptions": "`x` suscripciones",
+  "Import/Export": "Importar/Exportar",
+  "unsubscribe": "Desuscribirse",
+  "Subscriptions": "Suscripciones",
+  "`x` unseen notifications": "`x` notificaciones sin ver",
+  "search": "buscar",
+  "Sign out": "Cerrar la sesión",
+  "Released under the AGPLv3 by Omar Roth.": "Publicado bajo licencia AGPLv3 por Omar Roth.",
+  "Source available here.": "Código fuente disponible aquí.",
+  "View JavaScript license information.": "Ver información de licencia de JavaScript.",
+  "View privacy policy.": "Ver la política de privacidad.",
+  "Trending": "Tendencias",
+  "Unlisted": "",
+  "Watch video on Youtube": "Ver el vídeo en Youtube",
+  "Genre: ": "Género: ",
+  "License: ": "Licencia: ",
+  "Family friendly? ": "¿Filtrar contenidos? ",
+  "Wilson score: ": "Puntuación Wilson: ",
+  "Engagement: ": "Compromiso: ",
+  "Whitelisted regions: ": "Regiones permitidas: ",
+  "Blacklisted regions: ": "Regiones bloqueadas: ",
+  "Shared `x`": "Compartido `x`",
+  "Premieres in `x`": "",
+  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "¡Hola! Parece que tiene JavaScript desactivado. Haga clic aquí para ver los comentarios, pero tenga en cuenta que pueden tardar un poco más en cargarse.",
+  "View YouTube comments": "Ver los comentarios de YouTube",
+  "View more comments on Reddit": "Ver más comentarios en Reddit",
+  "View `x` comments": "Ver `x` comentarios",
+  "View Reddit comments": "Ver los comentarios de Reddit",
+  "Hide replies": "Ocultar las respuestas",
+  "Show replies": "Mostrar las respuestas",
+  "Incorrect password": "Contraseña incorrecta",
+  "Quota exceeded, try again in a few hours": "Cuota excedida, pruebe otra vez en unas horas",
+  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "No se puede iniciar sesión, asegúrese de que la autentificación de dos factores (autentificador o SMS) esté habilitada.",
+  "Invalid TFA code": "Código TFA no válido",
+  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Error de inicio de sesion. Puede deberse a que la autentificación de dos factores no está habilitada en su cuenta.",
+  "Invalid answer": "Respuesta no válida",
+  "Invalid CAPTCHA": "CAPTCHA no válido",
+  "CAPTCHA is a required field": "El CAPTCHA es un campo obligatorio",
+  "User ID is a required field": "El nombre es un campo obligatorio",
+  "Password is a required field": "La contraseña es un campo obligatorio",
+  "Invalid username or password": "Nombre o contraseña incorrecto",
+  "Please sign in using 'Sign in with Google'": "Inicie sesión con «Iniciar sesión con Google»",
+  "Password cannot be empty": "La contraseña no puede estar en blanco",
+  "Password cannot be longer than 55 characters": "La contraseña no puede tener más de 55 caracteres",
+  "Please sign in": "Inicie sesión, por favor",
+  "Invidious Private Feed for `x`": "Fuente privada de Invidious para `x`",
+  "channel:`x`": "canal: `x`",
+  "Deleted or invalid channel": "El canal no es válido o ha sido borrado",
+  "This channel does not exist.": "El canal no existe.",
+  "Could not get channel info.": "No se ha podido obtener información del canal.",
+  "Could not fetch comments": "No se han podido recuperar los comentarios.",
+  "View `x` replies": "Ver `x` respuestas",
+  "`x` ago": "hace `x`",
+  "Load more": "Cargar más",
+  "`x` points": "`x` puntos",
+  "Could not create mix.": "No se ha podido crear la mezcla.",
+  "Playlist is empty": "La lista de reproducción está vacía",
+  "Invalid playlist.": "Lista de reproducción no válida.",
+  "Playlist does not exist.": "La lista de reproducción no existe.",
+  "Could not pull trending pages.": "No se han podido obtener las páginas de tendencias.",
+  "Hidden field \"challenge\" is a required field": "El campo oculto «desafío» es un campo obligatorio",
+  "Hidden field \"token\" is a required field": "El campo oculto «símbolo» es un campo obligatorio",
+  "Invalid challenge": "Desafío no válido",
+  "Invalid token": "Símbolo no válido",
+  "Invalid user": "Usuario no válido",
+  "Token is expired, please try again": "El símbolo ha caducado, inténtelo de nuevo",
+  "English": "Inglés",
+  "English (auto-generated)": "Inglés (autogenerado)",
+  "Afrikaans": "Afrikáans",
+  "Albanian": "Albanés",
+  "Amharic": "Amárico",
+  "Arabic": "Árabe",
+  "Armenian": "Armenio",
+  "Azerbaijani": "Azerbaiyano",
+  "Bangla": "Bengalí",
+  "Basque": "Euskera",
+  "Belarusian": "Bielorruso",
+  "Bosnian": "Bosnio",
+  "Bulgarian": "Búlgaro",
+  "Burmese": "Birmano",
+  "Catalan": "Catalán",
+  "Cebuano": "Cebuano",
+  "Chinese (Simplified)": "Chino (simplificado)",
+  "Chinese (Traditional)": "Chino (tradicional)",
+  "Corsican": "Corso",
+  "Croatian": "Croata",
+  "Czech": "Checo",
+  "Danish": "Danés",
+  "Dutch": "Holandés",
+  "Esperanto": "Esperanto",
+  "Estonian": "Estonio",
+  "Filipino": "Filipino",
+  "Finnish": "Finés",
+  "French": "Francés",
+  "Galician": "Gallego",
+  "Georgian": "Georgiano",
+  "German": "Alemán",
+  "Greek": "Griego",
+  "Gujarati": "Guyaratí",
+  "Haitian Creole": "Criollo haitiano",
+  "Hausa": "Hausa",
+  "Hawaiian": "Hawaiano",
+  "Hebrew": "Hebreo",
+  "Hindi": "Hindi",
+  "Hmong": "Hmong",
+  "Hungarian": "Húngaro",
+  "Icelandic": "Islandés",
+  "Igbo": "Igbo",
+  "Indonesian": "Indonesio",
+  "Irish": "Irlandés",
+  "Italian": "Italiano",
+  "Japanese": "Japonés",
+  "Javanese": "Javanés",
+  "Kannada": "Canarés",
+  "Kazakh": "Kazajo",
+  "Khmer": "Camboyano",
+  "Korean": "Coreano",
+  "Kurdish": "Kurdo",
+  "Kyrgyz": "Kirguís",
+  "Lao": "Laosiano",
+  "Latin": "Latín",
+  "Latvian": "Letón",
+  "Lithuanian": "Lituano",
+  "Luxembourgish": "Luxemburgués",
+  "Macedonian": "Macedonio",
+  "Malagasy": "Malgache",
+  "Malay": "Malayo",
+  "Malayalam": "Malabar",
+  "Maltese": "Maltés",
+  "Maori": "Maorí",
+  "Marathi": "Maratí",
+  "Mongolian": "Mongol",
+  "Nepali": "Nepalí",
+  "Norwegian": "Noruego",
+  "Nyanja": "Chichewa",
+  "Pashto": "Pastún",
+  "Persian": "Persa",
+  "Polish": "Polaco",
+  "Portuguese": "Portugués",
+  "Punjabi": "Panyabí",
+  "Romanian": "Rumano",
+  "Russian": "Ruso",
+  "Samoan": "Samoano",
+  "Scottish Gaelic": "Gaélico escocés",
+  "Serbian": "Serbio",
+  "Shona": "Shona",
+  "Sindhi": "Sindi",
+  "Sinhala": "Cingalés",
+  "Slovak": "Eslovaco",
+  "Slovenian": "Esloveno",
+  "Somali": "Somalí",
+  "Southern Sotho": "Sesoto",
+  "Spanish": "Español",
+  "Spanish (Latin America)": "Español (Hispanoamérica)",
+  "Sundanese": "Sondanés",
+  "Swahili": "Suajili",
+  "Swedish": "Sueco",
+  "Tajik": "Tayiko",
+  "Tamil": "Tamil",
+  "Telugu": "Telugu",
+  "Thai": "Tailandés",
+  "Turkish": "Turco",
+  "Ukrainian": "Ucraniano",
+  "Urdu": "Urdu",
+  "Uzbek": "Uzbeko",
+  "Vietnamese": "Vietnamita",
+  "Welsh": "Galés",
+  "Western Frisian": "Frisón",
+  "Xhosa": "Xhosa",
+  "Yiddish": "Yidis",
+  "Yoruba": "Yoruba",
+  "Zulu": "Zulú",
+  "`x` years": "`x` años",
+  "`x` months": "`x` meses",
+  "`x` weeks": "`x` semanas",
+  "`x` days": "`x` días",
+  "`x` hours": "`x` horas",
+  "`x` minutes": "`x` minutos",
+  "`x` seconds": "`x` segundos",
+  "Fallback comments: ": "Comentarios alternativos: ",
+  "Popular": "Populares",
+  "Top": "Destacados",
+  "About": "Acerca de",
+  "Rating: ": "Valoración: ",
+  "Language: ": "Idioma: ",
+  "Default": "Por defecto",
+  "Music": "Música",
+  "Gaming": "Videojuegos",
+  "News": "Noticias",
+  "Movies": "Películas",
+  "Download": "Descargar",
+  "Download as: ": "Descargar como: ",
+  "%A %B %-d, %Y": "%A %B %-d, %Y",
+  "(edited)": "(editado)",
+  "Youtube permalink of the comment": "Enlace permanente de YouTube del comentario",
+  "`x` marked it with a ❤": "`x` lo ha marcado con un ❤",
+  "Audio mode": "Modo de audio",
+  "Video mode": "Modo de vídeo",
+  "Videos": "Vídeos",
+  "Playlists": "Listas de reproducción",
+  "Current version: ": "Versión actual: "
+}

locales/eu.json

@@ -10,8 +10,9 @@
   "newest": "berrienak",
   "oldest": "zaharrenak",
   "popular": "ospetsuenak",
-  "Preview page": "Aurrebista orria",
+  "last": "",
   "Next page": "Hurrengo orria",
+  "Previous page": "Aurreko orria",
   "Clear watch history?": "Garbitu ikusitakoen historia?",
   "Yes": "Bai",
   "No": "Ez",
@@ -28,7 +29,6 @@
   "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",
@@ -50,6 +50,7 @@
   "Autoplay: ": "",
   "Autoplay next video: ": "",
   "Listen by default: ": "",
+  "Proxy videos? ": "",
   "Default speed: ": "",
   "Preferred video quality: ": "",
   "Player volume: ": "",
@@ -100,6 +101,8 @@
   "Released under the AGPLv3 by Omar Roth.": "",
   "Source available here.": "",
   "View JavaScript license information.": "",
+  "View privacy policy.": "",
+  "Unlisted": "",
   "Trending": "",
   "Watch video on Youtube": "",
   "Genre: ": "",
@@ -110,6 +113,7 @@
   "Whitelisted regions: ": "",
   "Blacklisted regions: ": "",
   "Shared `x`": "",
+  "Premieres in `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": "",
@@ -284,5 +288,8 @@
   "Youtube permalink of the comment": "",
   "`x` marked it with a ❤": "",
   "Audio mode": "",
-  "Video mode": ""
+  "Video mode": "",
+  "Videos": "",
+  "Playlists": "",
+  "Current version: ": ""
 }

locales/fr.json

@@ -2,7 +2,7 @@
   "`x` subscribers": "`x` abonnés",
   "`x` videos": "`x` vidéos",
   "LIVE": "EN DIRECT",
-  "Shared `x` ago": "Partagé il y a `x`",
+  "Shared `x` ago": "Ajoutée il y a `x`",
   "Unsubscribe": "Se désabonner",
   "Subscribe": "S'abonner",
   "Login to subscribe to `x`": "Vous devez vous connecter pour vous abonner à `x`",
@@ -10,11 +10,13 @@
   "newest": "Date d'ajout (la plus récente)",
   "oldest": "Date d'ajout (la plus ancienne)",
   "popular": "Les plus populaires",
+  "last": "Dernières",
   "Next page": "Page suivante",
+  "Previous page": "Page précédente",
   "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 and Export Data": "Importer et exporter des données",
   "Import": "Importer",
   "Import Invidious data": "Importer des données Invidious",
   "Import YouTube subscriptions": "Importer des abonnements YouTube",
@@ -25,38 +27,38 @@
   "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 ?",
+  "Delete account?": "Êtes-vous sûr de vouloir 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 :",
+  "Login": "Se connecter",
+  "Login/Register": "Se connecter/Créer un compte",
+  "Login to Google": "Se connecter avec Google",
+  "User ID:": "Identifiant 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",
+  "Sign In": "Se connecter",
   "Register": "S'inscrire",
-  "Email:": "Email :",
+  "Email:": "E-mail :",
   "Google verification code:": "Code de vérification Google :",
   "Preferences": "Préférences",
-  "Player preferences": "Préférences du Lecteur",
+  "Player preferences": "Préférences du lecteur",
   "Always loop: ": "Lire en boucle : ",
-  "Autoplay: ": "Lire Automatiquement : ",
+  "Autoplay: ": "Lire automatiquement : ",
   "Autoplay next video: ": "Lire automatiquement la vidéo suivante : ",
-  "Listen by default: ": "Audio Uniquement par défaut : ",
+  "Listen by default: ": "Audio uniquement : ",
+  "Proxy videos? ": "Charger les vidéos à travers un proxy ? ",
   "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",
+  "Default comments: ": "Source des commentaires : ",
+  "Default captions: ": "Sous-titres par défaut : ",
+  "Fallback captions: ": "Fallback captions: ",
+  "Show related videos? ": "Voir les vidéos liées ? ",
+  "Visual preferences": "Préférences du site",
   "Dark mode: ": "Mode Sombre : ",
   "Thin mode: ": "Mode Simplifié : ",
   "Subscription preferences": "Préférences de la page d'abonnements",
@@ -79,14 +81,14 @@
   "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? ": "",
+  "Administrator preferences": "Préferences d'Administrateur",
+  "Default homepage: ": "Page d'accueil par défaut : ",
+  "Feed menu: ": "Menu des Flux : ",
+  "Top enabled? ": "Top activé ? ",
+  "CAPTCHA enabled? ": "CAPTCHA activé ? ",
+  "Login enabled? ": "Connexion activé ? ",
+  "Registration enabled? ": "Inscription activée ? ",
+  "Report statistics? ": "Télémétrie activé ? ",
   "Save preferences": "Enregistrer les préférences",
   "Subscription manager": "Gestionnaire d'abonnement",
   "`x` subscriptions": "`x` abonnements",
@@ -99,17 +101,20 @@
   "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.",
+  "View privacy policy.": "Politique de confidentialité",
   "Trending": "Tendances",
+  "Unlisted": "Non répertoriée",
   "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 : ",
+  "Engagement: ": "Poucentage de spectateur aillant aimé Like ou Dislike 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.",
+  "Shared `x`": "Ajoutée le `x`",
+  "Premieres in `x`": "Première dans `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 soit désactivé. Cliquez ici pour voir les commentaires sans. 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",
@@ -121,13 +126,13 @@
   "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 answer": "Réponse invalide",
   "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",
+  "CAPTCHA is a required field": "Veuillez entrer un CAPTCHA",
+  "User ID is a required field": "Veuillez entrer un Identifiant Utilisateur",
+  "Password is a required field": "Veuillez entrer 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\"",
+  "Please sign in using 'Sign in with Google'": "Veuillez vous connecter en utilisant \"Se connecter 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",
@@ -265,7 +270,7 @@
   "`x` hours": "`x` heures",
   "`x` minutes": "`x` minutes",
   "`x` seconds": "`x` secondes",
-  "Fallback comments: ": "Commentaires secondaires : ",
+  "Fallback comments: ": "Fallback comments: ",
   "Popular": "Populaire",
   "Top": "Top",
   "About": "A Propos",
@@ -283,5 +288,8 @@
   "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"
+  "Video mode": "Mode Vidéo",
+  "Videos": "Vidéos",
+  "Playlists": "Liste de lecture",
+  "Current version: ": "Version :"
 }

locales/it.json

@@ -10,7 +10,9 @@
   "newest": "Data di aggiunta (più recente)",
   "oldest": "Data di aggiunta (più vecchia)",
   "popular": "Tendenze",
+  "last": "",
   "Next page": "Pagina successiva",
+  "Previous page": "Pagina precedente",
   "Clear watch history?": "Sei sicuro di voler cancellare la cronologia dei video guardati?",
   "Yes": "Si",
   "No": "No",
@@ -27,7 +29,6 @@
   "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",
@@ -49,6 +50,7 @@
   "Autoplay: ": "Riproduzione automatica: ",
   "Autoplay next video: ": "Riproduci automaticamente il prossimo video: ",
   "Listen by default: ": "Modalità solo audio come predefinita: ",
+  "Proxy videos? ": "",
   "Default speed: ": "Velocità di riproduzione predefinita: ",
   "Preferred video quality: ": "Preferenza sulla qualità video: ",
   "Player volume: ": "Volume di riproduzione: ",
@@ -99,7 +101,9 @@
   "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.",
+  "View privacy policy.": "",
   "Trending": "Tendenze",
+  "Unlisted": "",
   "Watch video on Youtube": "Guarda il video su YouTube",
   "Genre: ": "Genere: ",
   "License: ": "Licenza: ",
@@ -109,6 +113,7 @@
   "Whitelisted regions: ": "Regioni nella lista bianca: ",
   "Blacklisted regions: ": "Regioni nella lista nera: ",
   "Shared `x`": "Condiviso `x`",
+  "Premieres in `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",
@@ -283,5 +288,8 @@
   "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"
+  "Video mode": "Modalità video",
+  "Videos": "",
+  "Playlists": "",
+  "Current version: ": ""
 }

locales/nb_NO.json

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

locales/nl.json

@@ -10,8 +10,9 @@
   "newest": "nieuwste",
   "oldest": "oudste",
   "popular": "populair",
-  "Preview page": "Pagina voorvertonen",
+  "last": "",
   "Next page": "Volgende pagina",
+  "Previous page": "Vorige pagina",
   "Clear watch history?": "Kijk geschiedenis wissen?",
   "Yes": "Ja",
   "No": "Nee",
@@ -28,7 +29,6 @@
   "Export data as JSON": "Exporteer gegevens als JSON",
   "Delete account?": "Verwijder account?",
   "History": "Geschiedenis",
-  "Previous page": "Vorige pagina",
   "An alternative front-end to YouTube": "Een alternatieve front-end voor YouTube",
   "JavaScript license information": "JavaScript licentie informatie",
   "source": "bron",
@@ -50,6 +50,7 @@
   "Autoplay: ": "Automatisch afspelen: ",
   "Autoplay next video: ": "Automatisch volgende video afspelen: ",
   "Listen by default: ": "Standaard luisteren: ",
+  "Proxy videos? ": "",
   "Default speed: ": "Standaard snelheid: ",
   "Preferred video quality: ": "Video kwaliteit voorkeur: ",
   "Player volume: ": "Afspeler volume: ",
@@ -100,7 +101,9 @@
   "Released under the AGPLv3 by Omar Roth.": "Uitgegeven onder AGPLv3 door Omar Roth.",
   "Source available here.": "Bron beschikbaar hier.",
   "View JavaScript license information.": "Bekijk JavaScript licentie informatie.",
+  "View privacy policy.": "",
   "Trending": "Trending",
+  "Unlisted": "",
   "Watch video on Youtube": "Bekijk video op Youtube",
   "Genre: ": "Genre: ",
   "License: ": "Licentie: ",
@@ -110,6 +113,7 @@
   "Whitelisted regions: ": "Toegestane regio's: ",
   "Blacklisted regions: ": "Geblokkeerde regio's: ",
   "Shared `x`": "`x` gedeeld",
+  "Premieres in `x`": "",
   "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hoi! Het lijkt erop dat je JavaScript uit hebt staan. Klik hier om de reacties te bekijken, hou er rekening mee dat het wat langer duurt om te laden.",
   "View YouTube comments": "Bekijk YouTube reacties",
   "View more comments on Reddit": "Bekijk meer reacties op Reddit",
@@ -284,5 +288,8 @@
   "Youtube permalink of the comment": "",
   "`x` marked it with a ❤": "",
   "Audio mode": "",
-  "Video mode": ""
+  "Video mode": "",
+  "Videos": "",
+  "Playlists": "",
+  "Current version: ": ""
 }

locales/pl.json

@@ -10,8 +10,9 @@
   "newest": "najnowsze",
   "oldest": "najstarsze",
   "popular": "popularne",
-  "Preview page": "Podgląd strony",
+  "last": "ostatnie",
   "Next page": "Następna strona",
+  "Previous page": "Poprzednia strona",
   "Clear watch history?": "Wyczyścić historię?",
   "Yes": "Tak",
   "No": "Nie",
@@ -28,7 +29,6 @@
   "Export data as JSON": "Eksportuj dane jako JSON",
   "Delete account?": "Usunąć konto?",
   "History": "Historia",
-  "Previous page": "Poprzednia strona",
   "An alternative front-end to YouTube": "Alternatywny front-end dla YouTube",
   "JavaScript license information": "Informacja o licencji JavaScript",
   "source": "źródło",
@@ -50,12 +50,13 @@
   "Autoplay: ": "Autoodtwarzanie: ",
   "Autoplay next video: ": "Odtwórz następny film: ",
   "Listen by default: ": "Tryb dźwiękowy: ",
+  "Proxy videos? ": "Filmy przez proxy? ",
   "Default speed: ": "Domyślna prędkość: ",
   "Preferred video quality: ": "Preferowana jakość filmów: ",
   "Player volume: ": "Głośność odtwarzacza: ",
   "Default comments: ": "Domyślne komentarze: ",
   "Default captions: ": "Domyślne napisy: ",
-  "Fallback captions: ": "Rezerwowe napisy: ",
+  "Fallback captions: ": "Zastępcze napisy: ",
   "Show related videos? ": "Pokaż powiązane filmy? ",
   "Visual preferences": "Preferencje Wizualne",
   "Dark mode: ": "Ciemny motyw: ",
@@ -63,13 +64,13 @@
   "Subscription preferences": "Preferencje subskrybcji",
   "Redirect homepage to feed: ": "Przekieruj stronę główną do subskrybcji: ",
   "Number of videos shown in feed: ": "Liczba filmów widoczna na stronie subskrybcji: ",
-  "Sort videos by: ": "Sortuj filmy po: ",
-  "published": "czasie publikacji",
-  "published - reverse": "czasie publikacji od najstarszych",
+  "Sort videos by: ": "Sortuj filmy: ",
+  "published": "po czasie publikacji",
+  "published - reverse": "po czasie publikacji od najstarszych",
   "alphabetically": "alfabetycznie",
   "alphabetically - reverse": "alfabetycznie od tyłu",
-  "channel name": "nazwie kanału",
-  "channel name - reverse": "nazwie kanału od tyłu",
+  "channel name": "po nazwie kanału",
+  "channel name - reverse": "po nazwie kanału od tyłu",
   "Only show latest video from channel: ": "Pokazuj tylko najnowszy film z kanału: ",
   "Only show latest unwatched video from channel: ": "Pokazuj tylko najnowszy nie obejrzany film z kanału: ",
   "Only show unwatched: ": "Pokazuj tylko nie obejrzane: ",
@@ -80,14 +81,14 @@
   "Manage subscriptions": "Organizuj subskrybcje",
   "Watch history": "Historia",
   "Delete account": "Usuń konto",
-  "Administrator preferences": "",
-  "Default homepage: ": "",
+  "Administrator preferences": "Preferencje administratora",
+  "Default homepage: ": "Domyślna strona główna: ",
   "Feed menu: ": "",
   "Top enabled? ": "",
-  "CAPTCHA enabled? ": "",
-  "Login enabled? ": "",
-  "Registration enabled? ": "",
-  "Report statistics? ": "",
+  "CAPTCHA enabled? ": "CAPTCHA aktywna? ",
+  "Login enabled? ": "Logowanie włączone? ",
+  "Registration enabled? ": "Rejestracja włączona? ",
+  "Report statistics? ": "Raportować statystyki? ",
   "Save preferences": "Zapisz preferencje",
   "Subscription manager": "Manager subskrybcji",
   "`x` subscriptions": "`x` subskrybcji",
@@ -100,7 +101,9 @@
   "Released under the AGPLv3 by Omar Roth.": "Wydano na licencji AGPLv3 przez Omar Roth.",
   "Source available here.": "Kod źródłowy dostępny tutaj.",
   "View JavaScript license information.": "Wyświetl informację o licencji JavaScript.",
+  "View privacy policy.": "Polityka prywatności.",
   "Trending": "Na czasie",
+  "Unlisted": "",
   "Watch video on Youtube": "Zobacz film na YouTube",
   "Genre: ": "Gatunek: ",
   "License: ": "Licencja: ",
@@ -110,6 +113,7 @@
   "Whitelisted regions: ": "Dostępny na obszarach: ",
   "Blacklisted regions: ": "Niedostępny na obszarach: ",
   "Shared `x`": "Udostępniono `x`",
+  "Premieres in `x`": "",
   "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Cześć! Wygląda na to, że masz wyłączoną obsługę JavaScriptu. Kliknij tutaj, żeby zobaczyć komentarze. Pamiętaj, że wczytywanie może potrwać dłużej.",
   "View YouTube comments": "Wyświetl komentarze z YouTube",
   "View more comments on Reddit": "Wyświetl więcej komentarzy na Reddicie",
@@ -155,20 +159,20 @@
   "Token is expired, please try again": "Token wygasł, spróbuj ponownie",
   "English": "angielski",
   "English (auto-generated)": "angielski (automatycznie generowane)",
-  "Afrikaans": "",
+  "Afrikaans": "afrykanerski",
   "Albanian": "albański",
-  "Amharic": "",
+  "Amharic": "amharski",
   "Arabic": "arabski",
-  "Armenian": "",
-  "Azerbaijani": "",
-  "Bangla": "",
-  "Basque": "",
+  "Armenian": "armeński",
+  "Azerbaijani": "azerski",
+  "Bangla": "bengalski",
+  "Basque": "baskijski",
   "Belarusian": "białoruski",
   "Bosnian": "bośniacki",
   "Bulgarian": "bułgarski",
   "Burmese": "birmański",
   "Catalan": "kataloński",
-  "Cebuano": "",
+  "Cebuano": "cebuański",
   "Chinese (Simplified)": "chiński (uproszczony)",
   "Chinese (Traditional)": "chiński (tradycyjny)",
   "Corsican": "korsykański",
@@ -185,28 +189,28 @@
   "Georgian": "gruziński",
   "German": "niemiecki",
   "Greek": "grecki",
-  "Gujarati": "",
-  "Haitian Creole": "",
-  "Hausa": "",
+  "Gujarati": "gudźarati",
+  "Haitian Creole": "kreolski haitański",
+  "Hausa": "hausa",
   "Hawaiian": "hawajski",
   "Hebrew": "hebrajski",
   "Hindi": "hindi",
-  "Hmong": "",
+  "Hmong": "hmong",
   "Hungarian": "węgierski",
   "Icelandic": "islandzki",
-  "Igbo": "",
+  "Igbo": "ibo",
   "Indonesian": "indonezyjski",
   "Irish": "irlandzki",
   "Italian": "włoski",
   "Japanese": "japoński",
   "Javanese": "jawajski",
-  "Kannada": "",
+  "Kannada": "kannada",
   "Kazakh": "kazachski",
-  "Khmer": "",
+  "Khmer": "khmerski",
   "Korean": "koreański",
   "Kurdish": "kurdyjski",
   "Kyrgyz": "kirgiski",
-  "Lao": "",
+  "Lao": "laotański",
   "Latin": "łaciński",
   "Latvian": "łotewski",
   "Lithuanian": "litewski",
@@ -214,51 +218,51 @@
   "Macedonian": "macedoński",
   "Malagasy": "malgaski",
   "Malay": "malajski",
-  "Malayalam": "",
+  "Malayalam": "malajalam",
   "Maltese": "maltański",
-  "Maori": "",
-  "Marathi": "",
+  "Maori": "maoryski",
+  "Marathi": "marathi",
   "Mongolian": "mongolski",
   "Nepali": "nepalski",
   "Norwegian": "norweski",
-  "Nyanja": "",
-  "Pashto": "",
+  "Nyanja": "njandża",
+  "Pashto": "paszto",
   "Persian": "perski",
   "Polish": "polski",
   "Portuguese": "portugalski",
-  "Punjabi": "",
+  "Punjabi": "pendżabski",
   "Romanian": "rumuński",
   "Russian": "rosyjski",
-  "Samoan": "",
-  "Scottish Gaelic": "",
+  "Samoan": "samoański",
+  "Scottish Gaelic": "gaelicki szkocki",
   "Serbian": "serbski",
-  "Shona": "",
-  "Sindhi": "",
-  "Sinhala": "",
+  "Shona": "shona",
+  "Sindhi": "sindhi",
+  "Sinhala": "syngaleski",
   "Slovak": "słowacki",
   "Slovenian": "słoweński",
   "Somali": "somalijski",
-  "Southern Sotho": "",
+  "Southern Sotho": "sotho południowy",
   "Spanish": "hiszpański",
   "Spanish (Latin America)": "hiszpański (ameryka łacińska)",
-  "Sundanese": "",
-  "Swahili": "",
+  "Sundanese": "sundajski",
+  "Swahili": "suahili",
   "Swedish": "szwedzki",
-  "Tajik": "",
-  "Tamil": "",
-  "Telugu": "",
+  "Tajik": "tadżycki",
+  "Tamil": "tamilski",
+  "Telugu": "telugu",
   "Thai": "tajski",
   "Turkish": "turecki",
   "Ukrainian": "ukraiński",
-  "Urdu": "",
+  "Urdu": "urdu",
   "Uzbek": "uzbecki",
   "Vietnamese": "wietnamski",
   "Welsh": "walijski",
-  "Western Frisian": "",
-  "Xhosa": "",
-  "Yiddish": "",
-  "Yoruba": "",
-  "Zulu": "",
+  "Western Frisian": "zachodniofryzyjski",
+  "Xhosa": "xhosa",
+  "Yiddish": "jidysz",
+  "Yoruba": "joruba",
+  "Zulu": "zuluski",
   "`x` years": "`x` lat",
   "`x` months": "`x` miesięcy",
   "`x` weeks": "`x` tygodni",
@@ -268,11 +272,11 @@
   "`x` seconds": "`x` sekund",
   "Fallback comments: ": "Zastępcze komentarze: ",
   "Popular": "Popularne",
-  "Top": "Na czasie",
+  "Top": "Najczęściej oglądane",
   "About": "Informacje",
   "Rating: ": "Ocena: ",
   "Language: ": "Język: ",
-  "Default": "",
+  "Default": "Domyślnie",
   "Music": "Muzyka",
   "Gaming": "Gry",
   "News": "Wiadomości",
@@ -282,7 +286,10 @@
   "%A %B %-d, %Y": "",
   "(edited)": "(edytowany)",
   "Youtube permalink of the comment": "Odnośnik bezpośredni do komentarza na YouTube",
-  "`x` marked it with a ❤": "",
+  "`x` marked it with a ❤": "'x' oznaczonych ❤",
   "Audio mode": "Tryb audio",
-  "Video mode": "Tryb wideo"
+  "Video mode": "Tryb wideo",
+  "Videos": "Filmy",
+  "Playlists": "Playlisty",
+  "Current version: ": "Aktualna wersja: "
 }

locales/ru.json

@@ -1,294 +1,297 @@
 {
-  "`x` subscribers": "`x` подписчиков",
-  "`x` videos": "`x` видео",
-  "LIVE": "ПРЯМОЙ ЭФИР",
-  "Shared `x` ago": "Опубликовано `x` назад",
-  "Unsubscribe": "Отписаться",
-  "Subscribe": "Подписаться",
-  "Login to subscribe to `x`": "Войти, чтобы подписаться на `x`",
-  "View channel on YouTube": "Канал на YouTube",
-  "newest": "новые",
-  "oldest": "старые",
-  "popular": "популярные",
-  "Preview page": "Предварительный просмотр",
-  "Next page": "Следующая страница",
-  "Clear watch history?": "Очистить историю просмотров?",
-  "Yes": "Да",
-  "No": "Нет",
-  "Import and Export Data": "Импорт и экспорт данных",
-  "Import": "Импорт",
-  "Import Invidious data": "Импортировать данные Invidious",
-  "Import YouTube subscriptions": "Импортировать YouTube подписки",
-  "Import FreeTube subscriptions (.db)": "Импортировать FreeTube подписки (.db)",
-  "Import NewPipe subscriptions (.json)": "Импортировать NewPipe подписки (.json)",
-  "Import NewPipe data (.zip)": "Импортировать данные NewPipe (.zip)",
-  "Export": "Экспорт",
-  "Export subscriptions as OPML": "Экспортировать подписки в OPML",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Экспортировать подписки в OPML (для NewPipe и FreeTube)",
-  "Export data as JSON": "Экспортировать данные в JSON",
-  "Delete account?": "Удалить аккаунт?",
-  "History": "История",
-  "Previous page": "Предыдущая страница",
-  "An alternative front-end to YouTube": "Альтернативный фронтенд для YouTube",
-  "JavaScript license information": "Лицензии JavaScript",
-  "source": "источник",
-  "Login": "Войти",
-  "Login/Register": "Войти/Регистрация",
-  "Login to Google": "Войти через Google",
-  "User ID:": "ID пользователя:",
-  "Password:": "Пароль:",
-  "Time (h:mm:ss):": "Время (ч:мм:сс):",
-  "Text CAPTCHA": "Текст капчи",
-  "Image CAPTCHA": "Изображение капчи",
-  "Sign In": "Войти",
-  "Register": "Регистрация",
-  "Email:": "Эл. почта:",
-  "Google verification code:": "Код подтверждения Google:",
-  "Preferences": "Настройки",
-  "Player preferences": "Настройки проигрывателя",
-  "Always loop: ": "Всегда повторять: ",
-  "Autoplay: ": "Автовоспроизведение: ",
-  "Autoplay next video: ": "Автовоспроизведение следующего видео: ",
-  "Listen by default: ": "Режим \"только аудио\" по-умолчанию: ",
-  "Default speed: ": "Скорость по-умолчанию: ",
-  "Preferred video quality: ": "Предпочтительное качество видео: ",
-  "Player volume: ": "Громкость воспроизведения: ",
-  "Default comments: ": "Источник комментариев: ",
-  "youtube": "YouTube",
-  "reddit": "Reddit",
-  "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": "`x` подписок",
-  "Import/Export": "Импорт/Экспорт",
-  "unsubscribe": "отписаться",
-  "Subscriptions": "Подписки",
-  "`x` unseen notifications": "`x` новых оповещений",
-  "search": "поиск",
-  "Sign out": "Выйти",
-  "Released under the AGPLv3 by Omar Roth.": "Распространяется Omar Roth по AGPLv3.",
-  "Source available here.": "Исходный код доступен здесь.",
-  "Liberapay: ": "Liberapay: ",
-  "Patreon: ": "Patreon: ",
-  "BTC: ": "BTC: ",
-  "BCH: ": "BCH: ",
-  "View JavaScript license information.": "Посмотреть лицензии JavaScript кода.",
-  "Trending": "В тренде",
-  "Watch video on Youtube": "Смотреть на YouTube",
-  "Genre: ": "Жанр: ",
-  "License: ": "Лицензия: ",
-  "Family friendly? ": "Семейный просмотр: ",
-  "Wilson score: ": "Рейтинг Вильсона: ",
-  "Engagement: ": "Вовлеченность: ",
-  "Whitelisted regions: ": "Доступно для: ",
-  "Blacklisted regions: ": "Недоступно для: ",
-  "Shared `x`": "Опубликовано `x`",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Похоже, что у Вас отключен JavaScript. Нажмите сюда, чтобы увидеть комментарии (учтите, что они могут загружаться дольше).",
-  "View YouTube comments": "Смотреть комментарии с YouTube",
-  "View more comments on Reddit": "Больше комментариев на Reddit",
-  "View `x` comments": "Показать `x` комментариев",
-  "View Reddit comments": "Смотреть комментарии с Reddit",
-  "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": "Неправильный TFA код",
-  "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'": "Пожалуйста войдите через Google",
-  "Password cannot be empty": "Пароль не может быть пустым",
-  "Password cannot be longer than 55 characters": "Пароль не может быть длиннее 55 символов",
-  "Please sign in": "Пожалуйста, войдите",
-  "Invidious Private Feed for `x`": "Приватная лента Invidious для `x`",
-  "channel:`x`": "канал: `x`",
-  "Deleted or invalid channel": "Канал удален или не найден",
-  "This channel does not exist.": "Такой канал не существует.",
-  "Could not get channel info.": "Невозможно получить информацию о канале.",
-  "Could not fetch comments": "Невозможно получить комментарии",
-  "View `x` replies": "Показать `x` ответов",
-  "`x` ago": "`x` назад",
-  "Load more": "Загрузить больше",
-  "`x` points": "`x` очков",
-  "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": "Необходимо заполнить скрытое поле \"challenge\"",
-  "Hidden field \"token\" is a required field": "Необходимо заполнить скрытое поле \"токен\"",
-  "Invalid challenge": "Неправильный ответ в \"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` лет",
-  "`x` months": "`x` месяцев",
-  "`x` weeks": "`x` недель",
-  "`x` days": "`x` дней",
-  "`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": "Видео режим"
+    "`x` subscribers": "`x` подписчиков",
+    "`x` videos": "`x` видео",
+    "LIVE": "ПРЯМОЙ ЭФИР",
+    "Shared `x` ago": "Опубликовано `x` назад",
+    "Unsubscribe": "Отписаться",
+    "Subscribe": "Подписаться",
+    "Login to subscribe to `x`": "Войти, чтобы подписаться на `x`",
+    "View channel on YouTube": "Канал на YouTube",
+    "newest": "новые",
+    "oldest": "старые",
+    "popular": "популярные",
+    "last": "недавно обновленные",
+    "Next page": "Следующая страница",
+    "Previous page": "Предыдущая страница",
+    "Clear watch history?": "Очистить историю просмотров?",
+    "Yes": "Да",
+    "No": "Нет",
+    "Import and Export Data": "Импорт и экспорт данных",
+    "Import": "Импорт",
+    "Import Invidious data": "Импортировать данные Invidious",
+    "Import YouTube subscriptions": "Импортировать YouTube подписки",
+    "Import FreeTube subscriptions (.db)": "Импортировать FreeTube подписки (.db)",
+    "Import NewPipe subscriptions (.json)": "Импортировать NewPipe подписки (.json)",
+    "Import NewPipe data (.zip)": "Импортировать данные NewPipe (.zip)",
+    "Export": "Экспорт",
+    "Export subscriptions as OPML": "Экспортировать подписки в OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Экспортировать подписки в OPML (для NewPipe и FreeTube)",
+    "Export data as JSON": "Экспортировать данные в JSON",
+    "Delete account?": "Удалить аккаунт?",
+    "History": "История",
+    "An alternative front-end to YouTube": "Альтернативный фронтенд для YouTube",
+    "JavaScript license information": "Лицензии JavaScript",
+    "source": "источник",
+    "Login": "Войти",
+    "Login/Register": "Войти/Регистрация",
+    "Login to Google": "Войти через Google",
+    "User ID:": "ID пользователя:",
+    "Password:": "Пароль:",
+    "Time (h:mm:ss):": "Время (ч:мм:сс):",
+    "Text CAPTCHA": "Текст капчи",
+    "Image CAPTCHA": "Изображение капчи",
+    "Sign In": "Войти",
+    "Register": "Регистрация",
+    "Email:": "Эл. почта:",
+    "Google verification code:": "Код подтверждения Google:",
+    "Preferences": "Настройки",
+    "Player preferences": "Настройки проигрывателя",
+    "Always loop: ": "Всегда повторять: ",
+    "Autoplay: ": "Автовоспроизведение: ",
+    "Autoplay next video: ": "Автовоспроизведение следующего видео: ",
+    "Listen by default: ": "Режим \"только аудио\" по-умолчанию: ",
+    "Proxy videos? ": "Проксировать видео? ",
+    "Default speed: ": "Скорость по-умолчанию: ",
+    "Preferred video quality: ": "Предпочтительное качество видео: ",
+    "Player volume: ": "Громкость воспроизведения: ",
+    "Default comments: ": "Источник комментариев: ",
+    "youtube": "YouTube",
+    "reddit": "Reddit",
+    "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": "`x` подписок",
+    "Import/Export": "Импорт/Экспорт",
+    "unsubscribe": "отписаться",
+    "Subscriptions": "Подписки",
+    "`x` unseen notifications": "`x` новых оповещений",
+    "search": "поиск",
+    "Sign out": "Выйти",
+    "Released under the AGPLv3 by Omar Roth.": "Распространяется Omar Roth по AGPLv3.",
+    "Source available here.": "Исходный код доступен здесь.",
+    "View JavaScript license information.": "Посмотреть лицензии JavaScript кода.",
+    "View privacy policy.": "См. политику конфиденциальности.",
+    "Trending": "В тренде",
+    "Unlisted": "Доступно по ссылке",
+    "Watch video on Youtube": "Смотреть на YouTube",
+    "Genre: ": "Жанр: ",
+    "License: ": "Лицензия: ",
+    "Family friendly? ": "Семейный просмотр: ",
+    "Wilson score: ": "Рейтинг Вильсона: ",
+    "Engagement: ": "Вовлеченность: ",
+    "Whitelisted regions: ": "Доступно для: ",
+    "Blacklisted regions: ": "Недоступно для: ",
+    "Shared `x`": "Опубликовано `x`",
+    "Premieres in `x`": "Премьера через `x`",
+    "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Похоже, что у Вас отключен JavaScript. Нажмите сюда, чтобы увидеть комментарии (учтите, что они могут загружаться дольше).",
+    "View YouTube comments": "Смотреть комментарии с YouTube",
+    "View more comments on Reddit": "Больше комментариев на Reddit",
+    "View `x` comments": "Показать `x` комментариев",
+    "View Reddit comments": "Смотреть комментарии с Reddit",
+    "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": "Неправильный TFA код",
+    "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'": "Пожалуйста войдите через Google",
+    "Password cannot be empty": "Пароль не может быть пустым",
+    "Password cannot be longer than 55 characters": "Пароль не может быть длиннее 55 символов",
+    "Please sign in": "Пожалуйста, войдите",
+    "Invidious Private Feed for `x`": "Приватная лента Invidious для `x`",
+    "channel:`x`": "канал: `x`",
+    "Deleted or invalid channel": "Канал удален или не найден",
+    "This channel does not exist.": "Такой канал не существует.",
+    "Could not get channel info.": "Невозможно получить информацию о канале.",
+    "Could not fetch comments": "Невозможно получить комментарии",
+    "View `x` replies": "Показать `x` ответов",
+    "`x` ago": "`x` назад",
+    "Load more": "Загрузить больше",
+    "`x` points": "`x` очков",
+    "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": "Необходимо заполнить скрытое поле \"challenge\"",
+    "Hidden field \"token\" is a required field": "Необходимо заполнить скрытое поле \"токен\"",
+    "Invalid challenge": "Неправильный ответ в \"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` лет",
+    "`x` months": "`x` месяцев",
+    "`x` weeks": "`x` недель",
+    "`x` days": "`x` дней",
+    "`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": "Видео режим",
+    "Videos": "Видео",
+    "Playlists": "Плейлисты",
+    "Current version: ": "Текущая версия: "
 }

shard.yml

@@ -1,8 +1,8 @@
 name: invidious
-version: 0.14.1
+version: 0.16.0
 
 authors:
-  - Omar Roth <omarroth@hotmail.com>
+  - Omar Roth <omarroth@protonmail.com>
 
 targets:
   invidious:

spec/helpers_spec.cr

@@ -4,8 +4,10 @@ require "spec"
 require "yaml"
 require "../src/invidious/helpers/*"
 require "../src/invidious/channels"
+require "../src/invidious/comments"
 require "../src/invidious/playlists"
 require "../src/invidious/search"
+require "../src/invidious/users"
 
 describe "Helpers" do
   describe "#produce_channel_videos_url" do
@@ -16,9 +18,7 @@ describe "Helpers" do
 
       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")
+      produce_channel_videos_url(ucid: "UC-9-kyTW8ZkZNDHQJ6FgpwQ", page: 20, sort_by: "popular").should eq("/browse_ajax?continuation=4qmFsgJAEhhVQy05LWt5VFc4WmtaTkRIUUo2Rmdwd1EaJEVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQUFlZ0l5TUJnQg%3D%3D&gl=US&hl=en")
     end
   end
 
@@ -59,4 +59,26 @@ describe "Helpers" do
       produce_search_params(content_type: "channel").should eq("CAASAhAC")
     end
   end
+
+  describe "#produce_comment_continuation" do
+    it "correctly produces a continuation token for comments" do
+      produce_comment_continuation("_cE8xSu6swE", "ADSJ_i2qvJeFtL0htmS5_K5Ctj3eGFVBMWL9Wd42o3kmUL6_mAzdLp85-liQZL0mYr_16BhaggUqX652Sv9JqV6VXinShSP-ZT6rL4NolPBaPXVtJsO5_rA_qE3GubAuLFw9uzIIXU2-HnpXbdgPLWTFavfX206hqWmmpHwUOrmxQV_OX6tYkM3ux3rPAKCDrT8eWL7MU3bLiNcnbgkW8o0h8KYLL_8BPa8LcHbTv8pAoNkjerlX1x7K4pqxaXPoyz89qNlnh6rRx6AXgAzzoHH1dmcyQ8CIBeOHg-m4i8ZxdX4dP88XWrIFg-jJGhpGP8JUMDgZgavxVx225hUEYZMyrLGler5em4FgbG62YWC51moLDLeYEA").should eq("EiYSC19jRTh4U3U2c3dFwAEByAEB4AEBogINKP___________wFAABgGMowDCvYCQURTSl9pMnF2SmVGdEwwaHRtUzVfSzVDdGozZUdGVkJNV0w5V2Q0Mm8za21VTDZfbUF6ZExwODUtbGlRWkwwbVlyXzE2QmhhZ2dVcVg2NTJTdjlKcVY2VlhpblNoU1AtWlQ2ckw0Tm9sUEJhUFhWdEpzTzVfckFfcUUzR3ViQXVMRnc5dXpJSVhVMi1IbnBYYmRnUExXVEZhdmZYMjA2aHFXbW1wSHdVT3JteFFWX09YNnRZa00zdXgzclBBS0NEclQ4ZVdMN01VM2JMaU5jbmJna1c4bzBoOEtZTExfOEJQYThMY0hiVHY4cEFvTmtqZXJsWDF4N0s0cHF4YVhQb3l6ODlxTmxuaDZyUng2QVhnQXp6b0hIMWRtY3lROENJQmVPSGctbTRpOFp4ZFg0ZFA4OFhXcklGZy1qSkdocEdQOEpVTURnWmdhdnhWeDIyNWhVRVlaTXlyTEdsZXI1ZW00RmdiRzYyWVdDNTFtb0xETGVZRUEiDyILX2NFOHhTdTZzd0UwACgU")
+
+      produce_comment_continuation("_cE8xSu6swE", "ADSJ_i1yz21HI4xrtsYXVC-2_kfZ6kx1yjYQumXAAxqH3CAd7ZxKxfLdZS1__fqhCtOASRbbpSBGH_tH1J96Dxux-Qfjk-lUbupMqv08Q3aHzGu7p70VoUMHhI2-GoJpnbpmcOxkGzeIuenRS_ym2Y8fkDowhqLPFgsS0n4djnZ2UmC17F3Ch3N1S1UYf1ZVOc991qOC1iW9kJDzyvRQTWCPsJUPneSaAKW-Rr97pdesOkR4i8cNvHZRnQKe2HEfsvlJOb2C3lF1dJBfJeNfnQYeh5hv6_fZN7bt3-JL1Xk3Qc9NXNxmmbDpwAC_yFR8dthFfUJdyIO9Nu1D79MLYeR-H5HxqUJokkJiGIz4lTE_CXXbhAI").should eq("EiYSC19jRTh4U3U2c3dFwAEByAEB4AEBogINKP___________wFAABgGMokDCvMCQURTSl9pMXl6MjFISTR4cnRzWVhWQy0yX2tmWjZreDF5allRdW1YQUF4cUgzQ0FkN1p4S3hmTGRaUzFfX2ZxaEN0T0FTUmJicFNCR0hfdEgxSjk2RHh1eC1RZmprLWxVYnVwTXF2MDhRM2FIekd1N3A3MFZvVU1IaEkyLUdvSnBuYnBtY094a0d6ZUl1ZW5SU195bTJZOGZrRG93aHFMUEZnc1MwbjRkam5aMlVtQzE3RjNDaDNOMVMxVVlmMVpWT2M5OTFxT0MxaVc5a0pEenl2UlFUV0NQc0pVUG5lU2FBS1ctUnI5N3BkZXNPa1I0aThjTnZIWlJuUUtlMkhFZnN2bEpPYjJDM2xGMWRKQmZKZU5mblFZZWg1aHY2X2ZaTjdidDMtSkwxWGszUWM5TlhOeG1tYkRwd0FDX3lGUjhkdGhGZlVKZHlJTzlOdTFENzlNTFllUi1INUh4cVVKb2trSmlHSXo0bFRFX0NYWGJoQUkiDyILX2NFOHhTdTZzd0UwACgU")
+
+      produce_comment_continuation("29-q7YnyUmY", "").should eq("EiYSCzI5LXE3WW55VW1ZwAEByAEB4AEBogINKP___________wFAABgGMhMiDyILMjktcTdZbnlVbVkwAHgC")
+
+      produce_comment_continuation("CvFH_6DNRCY", "").should eq("EiYSC0N2RkhfNkROUkNZwAEByAEB4AEBogINKP___________wFAABgGMhMiDyILQ3ZGSF82RE5SQ1kwAHgC")
+    end
+  end
+
+  describe "#produce_comment_reply_continuation" do
+    it "correctly produces a continuation token for replies to a given comment" do
+      produce_comment_reply_continuation("cIHQWOoJeag", "UCq6VFHwMzcMXbuKyG7SQYIg", "Ugx1IP_wGVv3WtGWcdV4AaABAg").should eq("EiYSC2NJSFFXT29KZWFnwAEByAEB4AEBogINKP___________wFAABgGMk0aSxIaVWd4MUlQX3dHVnYzV3RHV2NkVjRBYUFCQWciAggAKhhVQ3E2VkZId016Y01YYnVLeUc3U1FZSWcyC2NJSFFXT29KZWFnQAFICg%3D%3D")
+
+      produce_comment_reply_continuation("cIHQWOoJeag", "UCq6VFHwMzcMXbuKyG7SQYIg", "Ugza62y_TlmTu9o2RfF4AaABAg").should eq("EiYSC2NJSFFXT29KZWFnwAEByAEB4AEBogINKP___________wFAABgGMk0aSxIaVWd6YTYyeV9UbG1UdTlvMlJmRjRBYUFCQWciAggAKhhVQ3E2VkZId016Y01YYnVLeUc3U1FZSWcyC2NJSFFXT29KZWFnQAFICg%3D%3D")
+
+      produce_comment_reply_continuation("_cE8xSu6swE", "UC1AZY74-dGVPe6bfxFwwEMg", "UgyBUaRGHB9Jmt1dsUZ4AaABAg").should eq("EiYSC19jRTh4U3U2c3dFwAEByAEB4AEBogINKP___________wFAABgGMk0aSxIaVWd5QlVhUkdIQjlKbXQxZHNVWjRBYUFCQWciAggAKhhVQzFBWlk3NC1kR1ZQZTZiZnhGd3dFTWcyC19jRTh4U3U2c3dFQAFICg%3D%3D")
+    end
+  end
 end

src/invidious/channels.cr

@@ -1,5 +1,5 @@
-class InvidiousChannel
-  add_mapping({
+struct InvidiousChannel
+  db_mapping({
     id:         String,
     author:     String,
     updated:    Time,
@@ -8,39 +8,52 @@ class InvidiousChannel
   })
 end
 
-class ChannelVideo
-  add_mapping({
-    id:             String,
-    title:          String,
-    published:      Time,
-    updated:        Time,
-    ucid:           String,
-    author:         String,
-    length_seconds: {type: Int32, default: 0},
+struct ChannelVideo
+  db_mapping({
+    id:                 String,
+    title:              String,
+    published:          Time,
+    updated:            Time,
+    ucid:               String,
+    author:             String,
+    length_seconds:     {type: Int32, default: 0},
+    live_now:           {type: Bool, default: false},
+    premiere_timestamp: {type: Time?, default: nil},
   })
 end
 
 def get_batch_channels(channels, db, refresh = false, pull_all_videos = true, max_threads = 10)
-  active_threads = 0
-  active_channel = Channel(String | Nil).new
+  finished_channel = Channel(String | Nil).new
 
-  final = [] of String
-  channels.map do |ucid|
-    if active_threads >= max_threads
-      if response = active_channel.receive
+  spawn do
+    active_threads = 0
+    active_channel = Channel(Nil).new
+
+    channels.each do |ucid|
+      if active_threads >= max_threads
+        active_channel.receive
         active_threads -= 1
-        final << response
+      end
+
+      active_threads += 1
+      spawn do
+        begin
+          get_channel(ucid, db, refresh, pull_all_videos)
+          finished_channel.send(ucid)
+        rescue ex
+          finished_channel.send(nil)
+        ensure
+          active_channel.send(nil)
+        end
       end
     end
+  end
 
-    active_threads += 1
-    spawn do
-      begin
-        get_channel(ucid, db, refresh, pull_all_videos)
-        active_channel.send(ucid)
-      rescue ex
-        active_channel.send(nil)
-      end
+  final = [] of String
+  channels.size.times do
+    ucid = finished_channel.receive
+    if ucid
+      final << ucid
     end
   end
 
@@ -112,15 +125,32 @@ def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
     rss.xpath_nodes("//feed/entry").each do |entry|
       video_id = entry.xpath_node("videoid").not_nil!.content
       title = entry.xpath_node("title").not_nil!.content
-      published = Time.parse(entry.xpath_node("published").not_nil!.content, "%FT%X%z", Time::Location.local)
-      updated = Time.parse(entry.xpath_node("updated").not_nil!.content, "%FT%X%z", Time::Location.local)
+      published = Time.parse_rfc3339(entry.xpath_node("published").not_nil!.content)
+      updated = Time.parse_rfc3339(entry.xpath_node("updated").not_nil!.content)
       author = entry.xpath_node("author/name").not_nil!.content
       ucid = entry.xpath_node("channelid").not_nil!.content
 
-      length_seconds = videos.select { |video| video.id == video_id }[0]?.try &.length_seconds
+      channel_video = videos.select { |video| video.id == video_id }[0]?
+
+      length_seconds = channel_video.try &.length_seconds
       length_seconds ||= 0
 
-      video = ChannelVideo.new(video_id, title, published, Time.now, ucid, author, length_seconds)
+      live_now = channel_video.try &.live_now
+      live_now ||= false
+
+      premiere_timestamp = channel_video.try &.premiere_timestamp
+
+      video = ChannelVideo.new(
+        video_id,
+        title,
+        published,
+        Time.now,
+        ucid,
+        author,
+        length_seconds,
+        live_now,
+        premiere_timestamp
+      )
 
       db.exec("UPDATE users SET notifications = notifications || $1 \
         WHERE updated < $2 AND $3 = ANY(subscriptions) AND $1 <> ALL(notifications)", video.id, video.published, ucid)
@@ -128,9 +158,12 @@ def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
       video_array = video.to_a
       args = arg_array(video_array)
 
+      # We don't include the 'premire_timestamp' here because channel pages don't include them,
+      # meaning the above timestamp is always null
       db.exec("INSERT INTO channel_videos VALUES (#{args}) \
       ON CONFLICT (id) DO UPDATE SET title = $2, published = $3, \
-      updated = $4, ucid = $5, author = $6, length_seconds = $7", video_array)
+      updated = $4, ucid = $5, author = $6, length_seconds = $7, \
+      live_now = $8", video_array)
     end
   else
     page = 1
@@ -157,7 +190,17 @@ def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
       end
 
       count = nodeset.size
-      videos = videos.map { |video| ChannelVideo.new(video.id, video.title, video.published, Time.now, video.ucid, video.author, video.length_seconds) }
+      videos = videos.map { |video| ChannelVideo.new(
+        video.id,
+        video.title,
+        video.published,
+        Time.now,
+        video.ucid,
+        video.author,
+        video.length_seconds,
+        video.live_now,
+        video.premiere_timestamp
+      ) }
 
       videos.each do |video|
         ids << video.id
@@ -170,8 +213,12 @@ def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
           video_array = video.to_a
           args = arg_array(video_array)
 
-          db.exec("INSERT INTO channel_videos VALUES (#{args}) ON CONFLICT (id) DO UPDATE SET title = $2, \
-          published = $3, updated = $4, ucid = $5, author = $6, length_seconds = $7", video_array)
+          # We don't include the 'premire_timestamp' here because channel pages don't include them,
+          # meaning the above timestamp is always null
+          db.exec("INSERT INTO channel_videos VALUES (#{args}) \
+          ON CONFLICT (id) DO UPDATE SET title = $2, published = $3, \
+          updated = $4, ucid = $5, author = $6, length_seconds = $7, \
+          live_now = $8", video_array)
         end
       end
 

src/invidious/comments.cr

@@ -29,7 +29,7 @@ class RedditComment
   })
 end
 
-class RedditLink
+struct RedditLink
   JSON.mapping({
     author:       String,
     score:        Int32,
@@ -41,7 +41,7 @@ class RedditLink
   })
 end
 
-class RedditMore
+struct RedditMore
   JSON.mapping({
     children: Array(String),
     count:    Int32,
@@ -56,15 +56,14 @@ class RedditListing
   })
 end
 
-def fetch_youtube_comments(id, db, continuation, proxies, format, locale, region)
+def fetch_youtube_comments(id, db, continuation, proxies, format, locale, thin_mode, region, sort_by = "top")
   video = get_video(id, db, proxies, region: region)
-
   session_token = video.info["session_token"]?
-  itct = video.info["itct"]?
-  ctoken = video.info["ctoken"]?
+
+  ctoken = produce_comment_continuation(id, cursor: "", sort_by: sort_by)
   continuation ||= ctoken
 
-  if !continuation || !itct || !session_token
+  if !continuation || !session_token
     if format == "json"
       return {"comments" => [] of String}.to_json
     else
@@ -73,7 +72,7 @@ def fetch_youtube_comments(id, db, continuation, proxies, format, locale, region
   end
 
   post_req = {
-    "session_token" => session_token.not_nil!,
+    "session_token" => session_token,
   }
   post_req = HTTP::Params.encode(post_req)
 
@@ -90,7 +89,7 @@ def fetch_youtube_comments(id, db, continuation, proxies, format, locale, region
   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=#{continuation}&continuation=#{continuation}&itct=#{itct}&hl=en&gl=US", headers, post_req)
+  response = client.post("/comment_service_ajax?action_get_comments=1&ctoken=#{continuation}&continuation=#{continuation}&hl=en&gl=US", headers, post_req)
   response = JSON.parse(response.body)
 
   if !response["response"]["continuationContents"]?
@@ -232,7 +231,7 @@ def fetch_youtube_comments(id, db, continuation, proxies, format, locale, region
 
   if format == "html"
     comments = JSON.parse(comments)
-    content_html = template_youtube_comments(comments, locale)
+    content_html = template_youtube_comments(comments, locale, thin_mode)
 
     comments = JSON.build do |json|
       json.object do
@@ -278,7 +277,7 @@ def fetch_reddit_comments(id)
   return comments, thread
 end
 
-def template_youtube_comments(comments, locale)
+def template_youtube_comments(comments, locale, thin_mode)
   html = ""
 
   root = comments["comments"].as_a
@@ -297,7 +296,11 @@ def template_youtube_comments(comments, locale)
       END_HTML
     end
 
-    author_thumbnail = "/ggpht#{URI.parse(child["authorThumbnails"][-1]["url"].as_s).full_path}"
+    if !thin_mode
+      author_thumbnail = "/ggpht#{URI.parse(child["authorThumbnails"][-1]["url"].as_s).full_path}"
+    else
+      author_thumbnail = ""
+    end
 
     html += <<-END_HTML
     <div class="pure-g">
@@ -308,17 +311,22 @@ def template_youtube_comments(comments, locale)
         <p>
           <b>
             <a class="#{child["authorIsChannelOwner"] == true ? "channel-owner" : ""}" href="#{child["authorUrl"]}">#{child["author"]}</a>
-          </b> 
+          </b>
           <p style="white-space:pre-wrap">#{child["contentHtml"]}</p>
           <span title="#{Time.unix(child["published"].as_i64).to_s(translate(locale, "%A %B %-d, %Y"))}">#{translate(locale, "`x` ago", recode_date(Time.unix(child["published"].as_i64), locale))} #{child["isEdited"] == true ? translate(locale, "(edited)") : ""}</span>
           |
           <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"])} 
+          |
+          <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}"
+      if !thin_mode
+        creator_thumbnail = "/ggpht#{URI.parse(child["creatorHeart"]["creatorThumbnail"].as_s).full_path}"
+      else
+        creator_thumbnail = ""
+      end
+
       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">
@@ -372,8 +380,8 @@ def template_reddit_comments(root, locale)
 
       content = <<-END_HTML
       <p>
-        <a href="javascript:void(0)" onclick="toggle_parent(this)">[ - ]</a> 
-        <b><a href="https://www.reddit.com/user/#{author}">#{author}</a></b> 
+        <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, locale))}
       </p>
@@ -507,3 +515,111 @@ def content_to_comment_html(content)
 
   return comment_html
 end
+
+def produce_comment_continuation(video_id, cursor = "", sort_by = "top")
+  continuation = IO::Memory.new
+
+  continuation.write(Bytes[0x12, 0x26])
+
+  continuation.write(Bytes[0x12, video_id.size])
+  continuation.print(video_id)
+
+  continuation.write(Bytes[0xc0, 0x01, 0x01])
+  continuation.write(Bytes[0xc8, 0x01, 0x01])
+  continuation.write(Bytes[0xe0, 0x01, 0x01])
+
+  continuation.write(Bytes[0xa2, 0x02, 0x0d])
+  continuation.write(Bytes[0x28, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01])
+
+  continuation.write(Bytes[0x40, 0x00])
+  continuation.write(Bytes[0x18, 0x06])
+
+  if cursor.empty?
+    continuation.write(Bytes[0x32])
+    continuation.write(write_var_int(video_id.size + 8))
+
+    continuation.write(Bytes[0x22, video_id.size + 4])
+    continuation.write(Bytes[0x22, video_id.size])
+    continuation.print(video_id)
+
+    case sort_by
+    when "top"
+      continuation.write(Bytes[0x30, 0x00])
+    when "new", "newest"
+      continuation.write(Bytes[0x30, 0x01])
+    end
+
+    continuation.write(Bytes[0x78, 0x02])
+  else
+    continuation.write(Bytes[0x32])
+    continuation.write(write_var_int(cursor.size + video_id.size + 11))
+
+    continuation.write(Bytes[0x0a])
+    continuation.write(write_var_int(cursor.size))
+    continuation.print(cursor)
+
+    continuation.write(Bytes[0x22, video_id.size + 4])
+    continuation.write(Bytes[0x22, video_id.size])
+    continuation.print(video_id)
+
+    case sort_by
+    when "top"
+      continuation.write(Bytes[0x30, 0x00])
+    when "new", "newest"
+      continuation.write(Bytes[0x30, 0x01])
+    end
+
+    continuation.write(Bytes[0x28, 0x14])
+  end
+
+  continuation.rewind
+  continuation = continuation.gets_to_end
+
+  continuation = Base64.urlsafe_encode(continuation.to_slice)
+  continuation = URI.escape(continuation)
+
+  return continuation
+end
+
+def produce_comment_reply_continuation(video_id, ucid, comment_id)
+  continuation = IO::Memory.new
+
+  continuation.write(Bytes[0x12, 0x26])
+
+  continuation.write(Bytes[0x12, video_id.size])
+  continuation.print(video_id)
+
+  continuation.write(Bytes[0xc0, 0x01, 0x01])
+  continuation.write(Bytes[0xc8, 0x01, 0x01])
+  continuation.write(Bytes[0xe0, 0x01, 0x01])
+
+  continuation.write(Bytes[0xa2, 0x02, 0x0d])
+  continuation.write(Bytes[0x28, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01])
+
+  continuation.write(Bytes[0x40, 0x00])
+  continuation.write(Bytes[0x18, 0x06])
+
+  continuation.write(Bytes[0x32, ucid.size + video_id.size + comment_id.size + 16])
+  continuation.write(Bytes[0x1a, ucid.size + video_id.size + comment_id.size + 14])
+
+  continuation.write(Bytes[0x12, comment_id.size])
+  continuation.print(comment_id)
+
+  continuation.write(Bytes[0x22, 0x02, 0x08, 0x00]) # ??
+
+  continuation.write(Bytes[ucid.size + video_id.size + 7])
+  continuation.write(Bytes[ucid.size])
+  continuation.print(ucid)
+  continuation.write(Bytes[0x32, video_id.size])
+  continuation.print(video_id)
+  continuation.write(Bytes[0x40, 0x01])
+  continuation.write(Bytes[0x48, 0x0a])
+
+  continuation.rewind
+  continuation = continuation.gets_to_end
+
+  continuation = Base64.urlsafe_encode(continuation.to_slice)
+  continuation = URI.escape(continuation)
+
+  return continuation
+end

src/invidious/helpers/handlers.cr

@@ -0,0 +1,143 @@
+module HTTP::Handler
+  @@exclude_routes_tree = Radix::Tree(String).new
+
+  macro exclude(paths, method = "GET")
+      class_name = {{@type.name}}
+      method_downcase = {{method.downcase}}
+      class_name_method = "#{class_name}/#{method_downcase}"
+      ({{paths}}).each do |path|
+        @@exclude_routes_tree.add class_name_method + path, '/' + method_downcase + path
+      end
+    end
+
+  def exclude_match?(env : HTTP::Server::Context)
+    @@exclude_routes_tree.find(radix_path(env.request.method, env.request.path)).found?
+  end
+
+  private def radix_path(method : String, path : String)
+    "#{self.class}/#{method.downcase}#{path}"
+  end
+end
+
+class Kemal::RouteHandler
+  exclude ["/api/v1/*"]
+
+  # Processes the route if it's a match. Otherwise renders 404.
+  private def process_request(context)
+    raise Kemal::Exceptions::RouteNotFound.new(context) unless context.route_found?
+    content = context.route.handler.call(context)
+
+    if !Kemal.config.error_handlers.empty? && Kemal.config.error_handlers.has_key?(context.response.status_code) && exclude_match?(context)
+      raise Kemal::Exceptions::CustomException.new(context)
+    end
+
+    context.response.print(content)
+    context
+  end
+end
+
+class Kemal::ExceptionHandler
+  exclude ["/api/v1/*"]
+
+  private def call_exception_with_status_code(context : HTTP::Server::Context, exception : Exception, status_code : Int32)
+    return if context.response.closed?
+    return if exclude_match? context
+
+    if !Kemal.config.error_handlers.empty? && Kemal.config.error_handlers.has_key?(status_code)
+      context.response.content_type = "text/html" unless context.response.headers.has_key?("Content-Type")
+      context.response.status_code = status_code
+      context.response.print Kemal.config.error_handlers[status_code].call(context, exception)
+      context
+    end
+  end
+end
+
+class FilteredCompressHandler < Kemal::Handler
+  exclude ["/videoplayback", "/videoplayback/*", "/vi/*", "/ggpht/*"]
+
+  def call(env)
+    return call_next env if exclude_match? env
+
+    {% if flag?(:without_zlib) %}
+        call_next env
+      {% else %}
+        request_headers = env.request.headers
+
+        if request_headers.includes_word?("Accept-Encoding", "gzip")
+          env.response.headers["Content-Encoding"] = "gzip"
+          env.response.output = Gzip::Writer.new(env.response.output, sync_close: true)
+        elsif request_headers.includes_word?("Accept-Encoding", "deflate")
+          env.response.headers["Content-Encoding"] = "deflate"
+          env.response.output = Flate::Writer.new(env.response.output, sync_close: true)
+        end
+
+        call_next env
+      {% end %}
+  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"] = "*"
+
+    # Here we swap out the socket IO so we can modify the response as needed
+    output = env.response.output
+    env.response.output = IO::Memory.new
+
+    begin
+      call_next env
+
+      env.response.output.rewind
+      response = env.response.output.gets_to_end
+
+      if env.response.headers["Content-Type"]?.try &.== "application/json"
+        response = JSON.parse(response)
+
+        if env.params.query["fields"]?
+          fields_text = env.params.query["fields"]
+          begin
+            JSONFilter.filter(response, fields_text)
+          rescue ex
+            env.response.status_code = 400
+            response = {"error" => ex.message}
+          end
+        end
+
+        if env.params.query["pretty"]? && env.params.query["pretty"] == "1"
+          response = response.to_pretty_json
+        else
+          response = response.to_json
+        end
+      end
+    rescue
+    ensure
+      env.response.output = output
+      env.response.puts response
+
+      env.response.flush
+    end
+  end
+end
+
+class DenyFrame < Kemal::Handler
+  exclude ["/embed/*"]
+
+  def call(env)
+    return call_next env if exclude_match? env
+
+    env.response.headers["X-Frame-Options"] = "sameorigin"
+    call_next env
+  end
+end
+
+# Temp fix for https://github.com/crystal-lang/crystal/issues/7383
+class HTTP::Client
+  private def handle_response(response)
+    # close unless response.keep_alive?
+    response
+  end
+end

src/invidious/helpers/helpers.cr

@@ -1,7 +1,77 @@
-class Config
+require "./macros"
+
+struct ConfigPreferences
+  module StringToArray
+    def self.to_yaml(value : Array(String), yaml : YAML::Nodes::Builder)
+      yaml.sequence do
+        value.each do |element|
+          yaml.scalar element
+        end
+      end
+    end
+
+    def self.from_yaml(ctx : YAML::ParseContext, node : YAML::Nodes::Node) : Array(String)
+      begin
+        unless node.is_a?(YAML::Nodes::Sequence)
+          node.raise "Expected sequence, not #{node.class}"
+        end
+
+        result = [] of String
+        node.nodes.each do |item|
+          unless item.is_a?(YAML::Nodes::Scalar)
+            node.raise "Expected scalar, not #{item.class}"
+          end
+
+          result << item.value
+        end
+      rescue ex
+        if node.is_a?(YAML::Nodes::Scalar)
+          result = [node.value, ""]
+        else
+          result = ["", ""]
+        end
+      end
+
+      result
+    end
+  end
+
+  yaml_mapping({
+    autoplay:           {type: Bool, default: false},
+    captions:           {type: Array(String), default: ["", "", ""], converter: StringToArray},
+    comments:           {type: Array(String), default: ["youtube", ""], converter: StringToArray},
+    continue:           {type: Bool, default: false},
+    dark_mode:          {type: Bool, default: false},
+    latest_only:        {type: Bool, default: false},
+    listen:             {type: Bool, default: false},
+    local:              {type: Bool, default: false},
+    locale:             {type: String, default: "en-US"},
+    max_results:        {type: Int32, default: 40},
+    notifications_only: {type: Bool, default: false},
+    quality:            {type: String, default: "hd720"},
+    redirect_feed:      {type: Bool, default: false},
+    related_videos:     {type: Bool, default: true},
+    sort:               {type: String, default: "published"},
+    speed:              {type: Float32, default: 1.0_f32},
+    thin_mode:          {type: Bool, default: false},
+    unseen_only:        {type: Bool, default: false},
+    video_loop:         {type: Bool, default: false},
+    volume:             {type: Int32, default: 100},
+  })
+end
+
+struct Config
+  module ConfigPreferencesConverter
+    def self.from_yaml(ctx : YAML::ParseContext, node : YAML::Nodes::Node) : Preferences
+      Preferences.new(*ConfigPreferences.new(ctx, node).to_tuple)
+    end
+
+    def self.to_yaml(value : Preferences, yaml : YAML::Nodes::Builder)
+      value.to_yaml(yaml)
+    end
+  end
+
   YAML.mapping({
-    video_threads:   Int32,      # Number of threads to use for updating videos in cache (mostly non-functional)
-    crawl_threads:   Int32,      # Number of threads to use for finding new videos from YouTube (used to populate "top" page)
     channel_threads: Int32,      # Number of threads to use for crawling videos from channels (for updating subscriptions)
     feed_threads:    Int32,      # Number of threads to use for updating feeds
     db:              NamedTuple( # Database configuration
@@ -11,69 +81,28 @@ user: String,
       port: Int32,
       dbname: String,
     ),
-    full_refresh:         Bool,                         # Used for crawling channels: threads should check all videos uploaded by a channel
-    https_only:           Bool?,                        # Used to tell Invidious it is behind a proxy, so links to resources should be https://
-    hmac_key:             String?,                      # HMAC signing key for CSRF tokens and verifying pubsub subscriptions
-    domain:               String?,                      # Domain to be used for links to resources on the site where an absolute URL is required
-    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},
+    full_refresh:             Bool,                                 # Used for crawling channels: threads should check all videos uploaded by a channel
+    https_only:               Bool?,                                # Used to tell Invidious it is behind a proxy, so links to resources should be https://
+    hmac_key:                 String?,                              # HMAC signing key for CSRF tokens and verifying pubsub subscriptions
+    domain:                   String?,                              # Domain to be used for links to resources on the site where an absolute URL is required
+    use_pubsub_feeds:         {type: Bool | Int32, 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},
+    external_port:            {type: Int32?, default: nil},
+    default_user_preferences: {type: Preferences,
+                               default: Preferences.new(*ConfigPreferences.from_yaml("").to_tuple),
+                               converter: ConfigPreferencesConverter,
+    },
+    dmca_content: {type: Array(String), default: [] of String}, # For compliance with DMCA, disables download widget using list of video IDs
   })
 end
 
-class FilteredCompressHandler < Kemal::Handler
-  exclude ["/videoplayback", "/videoplayback/*", "/vi/*", "/api/*", "/ggpht/*"]
-
-  def call(env)
-    return call_next env if exclude_match? env
-
-    {% if flag?(:without_zlib) %}
-      call_next env
-    {% else %}
-      request_headers = env.request.headers
-
-      if request_headers.includes_word?("Accept-Encoding", "gzip")
-        env.response.headers["Content-Encoding"] = "gzip"
-        env.response.output = Gzip::Writer.new(env.response.output, sync_close: true)
-      elsif request_headers.includes_word?("Accept-Encoding", "deflate")
-        env.response.headers["Content-Encoding"] = "deflate"
-        env.response.output = Flate::Writer.new(env.response.output, sync_close: true)
-      end
-
-      call_next env
-    {% end %}
-  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/*"]
-
-  def call(env)
-    return call_next env if exclude_match? env
-
-    env.response.headers["X-Frame-Options"] = "sameorigin"
-    call_next env
-  end
-end
-
 def rank_videos(db, n)
   top = [] of {Float64, String}
 
@@ -223,13 +252,22 @@ def extract_items(nodeset, ucid = nil, author_name = nil)
         )
       end
 
+      playlist_thumbnail = node.xpath_node(%q(.//div/span/img)).try &.["data-thumb"]?
+      playlist_thumbnail ||= node.xpath_node(%q(.//div/span/img)).try &.["src"]
+      if !playlist_thumbnail || playlist_thumbnail.empty?
+        thumbnail_id = videos[0]?.try &.id
+      else
+        thumbnail_id = playlist_thumbnail.match(/\/vi\/(?<video_id>[a-zA-Z0-9_-]{11})\/\w+\.jpg/).try &.["video_id"]
+      end
+
       items << SearchPlaylist.new(
         title,
         plid,
         author,
         author_id,
         video_count,
-        videos
+        videos,
+        thumbnail_id
       )
     when .includes? "yt-lockup-channel"
       author = title.strip
@@ -239,6 +277,12 @@ def extract_items(nodeset, ucid = nil, author_name = nil)
 
       author_thumbnail = node.xpath_node(%q(.//div/span/img)).try &.["data-thumb"]?
       author_thumbnail ||= node.xpath_node(%q(.//div/span/img)).try &.["src"]
+      if author_thumbnail
+        author_thumbnail = URI.parse(author_thumbnail)
+        author_thumbnail.scheme = "https"
+        author_thumbnail = author_thumbnail.to_s
+      end
+
       author_thumbnail ||= ""
 
       subscriber_count = node.xpath_node(%q(.//span[contains(@class, "yt-subscriber-count")])).try &.["title"].delete(",").to_i?
@@ -307,6 +351,11 @@ def extract_items(nodeset, ucid = nil, author_name = nil)
         paid = true
       end
 
+      premiere_timestamp = node.xpath_node(%q(.//ul[@class="yt-lockup-meta-info"]/li/span[@class="localized-date"])).try &.["data-timestamp"]?.try &.to_i64
+      if premiere_timestamp
+        premiere_timestamp = Time.unix(premiere_timestamp)
+      end
+
       items << SearchVideo.new(
         title: title,
         id: id,
@@ -319,7 +368,8 @@ def extract_items(nodeset, ucid = nil, author_name = nil)
         length_seconds: length_seconds,
         live_now: live_now,
         paid: paid,
-        premium: premium
+        premium: premium,
+        premiere_timestamp: premiere_timestamp
       )
     end
   end
@@ -390,13 +440,28 @@ def extract_shelf_items(nodeset, ucid = nil, author_name = nil)
         playlist_title ||= ""
         plid ||= ""
 
+        playlist_thumbnail = child_node.xpath_node(%q(.//span/img)).try &.["data-thumb"]?
+        playlist_thumbnail ||= child_node.xpath_node(%q(.//span/img)).try &.["src"]
+        if !playlist_thumbnail || playlist_thumbnail.empty?
+          thumbnail_id = videos[0]?.try &.id
+        else
+          thumbnail_id = playlist_thumbnail.match(/\/vi\/(?<video_id>[a-zA-Z0-9_-]{11})\/\w+\.jpg/).try &.["video_id"]
+        end
+
+        video_count_label = child_node.xpath_node(%q(.//span[@class="formatted-video-count-label"]))
+        if video_count_label
+          video_count = video_count_label.content.strip.match(/^\d+/).try &.[0].to_i?
+        end
+        video_count ||= 50
+
         items << SearchPlaylist.new(
           playlist_title,
           plid,
           author_name,
           ucid,
-          50,
-          Array(SearchPlaylistVideo).new
+          video_count,
+          Array(SearchPlaylistVideo).new,
+          thumbnail_id
         )
       end
     end
@@ -410,7 +475,8 @@ def extract_shelf_items(nodeset, ucid = nil, author_name = nil)
         author_name,
         ucid,
         videos.size,
-        videos
+        videos,
+        videos[0].try &.id
       )
     end
   end

src/invidious/helpers/json_filter.cr

@@ -0,0 +1,248 @@
+module JSONFilter
+  alias BracketIndex = Hash(Int64, Int64)
+
+  alias GroupedFieldsValue = String | Array(GroupedFieldsValue)
+  alias GroupedFieldsList = Array(GroupedFieldsValue)
+
+  class FieldsParser
+    class ParseError < Exception
+    end
+
+    # Returns the `Regex` pattern used to match nest groups
+    def self.nest_group_pattern : Regex
+      # uses a '.' character to match json keys as they are allowed
+      # to contain any unicode codepoint
+      /(?:|,)(?<groupname>[^,\n]*?)\(/
+    end
+
+    # Returns the `Regex` pattern used to check if there are any empty nest groups
+    def self.unnamed_nest_group_pattern : Regex
+      /^\(|\(\(|\/\(/
+    end
+
+    def self.parse_fields(fields_text : String) : Nil
+      if fields_text.empty?
+        raise FieldsParser::ParseError.new "Fields is empty"
+      end
+
+      opening_bracket_count = fields_text.count('(')
+      closing_bracket_count = fields_text.count(')')
+
+      if opening_bracket_count != closing_bracket_count
+        bracket_type = opening_bracket_count > closing_bracket_count ? "opening" : "closing"
+        raise FieldsParser::ParseError.new "There are too many #{bracket_type} brackets (#{opening_bracket_count}:#{closing_bracket_count})"
+      elsif match_result = unnamed_nest_group_pattern.match(fields_text)
+        raise FieldsParser::ParseError.new "Unnamed nest group at position #{match_result.begin}"
+      end
+
+      # first, handle top-level single nested properties: items/id, playlistItems/snippet, etc
+      parse_single_nests(fields_text) { |nest_list| yield nest_list }
+
+      # next, handle nest groups: items(id, etag, etc)
+      parse_nest_groups(fields_text) { |nest_list| yield nest_list }
+    end
+
+    def self.parse_single_nests(fields_text : String) : Nil
+      single_nests = remove_nest_groups(fields_text)
+
+      if !single_nests.empty?
+        property_nests = single_nests.split(',')
+
+        property_nests.each do |nest|
+          nest_list = nest.split('/')
+          if nest_list.includes? ""
+            raise FieldsParser::ParseError.new "Empty key in nest list: #{nest_list}"
+          end
+          yield nest_list
+        end
+        # else
+        #   raise FieldsParser::ParseError.new "Empty key in nest list 22: #{fields_text} | #{single_nests}"
+      end
+    end
+
+    def self.parse_nest_groups(fields_text : String) : Nil
+      nest_stack = [] of NamedTuple(group_name: String, closing_bracket_index: Int64)
+      bracket_pairs = get_bracket_pairs(fields_text, true)
+
+      text_index = 0
+      regex_index = 0
+
+      while regex_result = self.nest_group_pattern.match(fields_text, regex_index)
+        raw_match = regex_result[0]
+        group_name = regex_result["groupname"]
+
+        text_index = regex_result.begin
+        regex_index = regex_result.end
+
+        if text_index.nil? || regex_index.nil?
+          raise FieldsParser::ParseError.new "Received invalid index while parsing nest groups: text_index: #{text_index} | regex_index: #{regex_index}"
+        end
+
+        offset = raw_match.starts_with?(',') ? 1 : 0
+
+        opening_bracket_index = (text_index + group_name.size) + offset
+        closing_bracket_index = bracket_pairs[opening_bracket_index]
+        content_start = opening_bracket_index + 1
+
+        content = fields_text[content_start...closing_bracket_index]
+
+        if content.empty?
+          raise FieldsParser::ParseError.new "Empty nest group at position #{content_start}"
+        else
+          content = remove_nest_groups(content)
+        end
+
+        while nest_stack.size > 0 && closing_bracket_index > nest_stack[nest_stack.size - 1][:closing_bracket_index]
+          if nest_stack.size
+            nest_stack.pop
+          end
+        end
+
+        group_name.split('/').each do |group_name|
+          nest_stack.push({
+            group_name:            group_name,
+            closing_bracket_index: closing_bracket_index,
+          })
+        end
+
+        if !content.empty?
+          properties = content.split(',')
+
+          properties.each do |prop|
+            nest_list = nest_stack.map { |nest_prop| nest_prop[:group_name] }
+
+            if !prop.empty?
+              if prop.includes?('/')
+                parse_single_nests(prop) { |list| nest_list += list }
+              else
+                nest_list.push prop
+              end
+            else
+              raise FieldsParser::ParseError.new "Empty key in nest list: #{nest_list << prop}"
+            end
+
+            yield nest_list
+          end
+        end
+      end
+    end
+
+    def self.remove_nest_groups(text : String) : String
+      content_bracket_pairs = get_bracket_pairs(text, false)
+
+      content_bracket_pairs.each_key.to_a.reverse.each do |opening_bracket|
+        closing_bracket = content_bracket_pairs[opening_bracket]
+        last_comma = text.rindex(',', opening_bracket) || 0
+
+        text = text[0...last_comma] + text[closing_bracket + 1...text.size]
+      end
+
+      return text.starts_with?(',') ? text[1...text.size] : text
+    end
+
+    def self.get_bracket_pairs(text : String, recursive = true) : BracketIndex
+      istart = [] of Int64
+      bracket_index = BracketIndex.new
+
+      text.each_char_with_index do |char, index|
+        if char == '('
+          istart.push(index.to_i64)
+        end
+
+        if char == ')'
+          begin
+            opening = istart.pop
+            if recursive || (!recursive && istart.size == 0)
+              bracket_index[opening] = index.to_i64
+            end
+          rescue
+            raise FieldsParser::ParseError.new "No matching opening parenthesis at: #{index}"
+          end
+        end
+      end
+
+      if istart.size != 0
+        idx = istart.pop
+        raise FieldsParser::ParseError.new "No matching closing parenthesis at: #{idx}"
+      end
+
+      return bracket_index
+    end
+  end
+
+  class FieldsGrouper
+    alias SkeletonValue = Hash(String, SkeletonValue)
+
+    def self.create_json_skeleton(fields_text : String) : SkeletonValue
+      root_hash = {} of String => SkeletonValue
+
+      FieldsParser.parse_fields(fields_text) do |nest_list|
+        current_item = root_hash
+        nest_list.each do |key|
+          if current_item[key]?
+            current_item = current_item[key]
+          else
+            current_item[key] = {} of String => SkeletonValue
+            current_item = current_item[key]
+          end
+        end
+      end
+      root_hash
+    end
+
+    def self.create_grouped_fields_list(json_skeleton : SkeletonValue) : GroupedFieldsList
+      grouped_fields_list = GroupedFieldsList.new
+      json_skeleton.each do |key, value|
+        grouped_fields_list.push key
+
+        nested_keys = create_grouped_fields_list(value)
+        grouped_fields_list.push nested_keys unless nested_keys.empty?
+      end
+      return grouped_fields_list
+    end
+  end
+
+  class FilterError < Exception
+  end
+
+  def self.filter(item : JSON::Any, fields_text : String, in_place : Bool = true)
+    skeleton = FieldsGrouper.create_json_skeleton(fields_text)
+    grouped_fields_list = FieldsGrouper.create_grouped_fields_list(skeleton)
+    filter(item, grouped_fields_list, in_place)
+  end
+
+  def self.filter(item : JSON::Any, grouped_fields_list : GroupedFieldsList, in_place : Bool = true) : JSON::Any
+    item = item.clone unless in_place
+
+    if !item.as_h? && !item.as_a?
+      raise FilterError.new "Can't filter '#{item}' by #{grouped_fields_list}"
+    end
+
+    top_level_keys = Array(String).new
+    grouped_fields_list.each do |value|
+      if value.is_a? String
+        top_level_keys.push value
+      elsif value.is_a? Array
+        if !top_level_keys.empty?
+          key_to_filter = top_level_keys.last
+
+          if item.as_h?
+            filter(item[key_to_filter], value, in_place: true)
+          elsif item.as_a?
+            item.as_a.each { |arr_item| filter(arr_item[key_to_filter], value, in_place: true) }
+          end
+        else
+          raise FilterError.new "Tried to filter while top level keys list is empty"
+        end
+      end
+    end
+
+    if item.as_h?
+      item.as_h.select! top_level_keys
+    elsif item.as_a?
+      item.as_a.map { |value| filter(value, top_level_keys, in_place: true) }
+    end
+
+    item
+  end
+end

src/invidious/helpers/macros.cr

@@ -1,4 +1,4 @@
-macro add_mapping(mapping)
+macro db_mapping(mapping)
     def initialize({{*mapping.keys.map { |id| "@#{id}".id }}})
     end
 
@@ -9,6 +9,33 @@ macro add_mapping(mapping)
     DB.mapping({{mapping}})
 end
 
+macro json_mapping(mapping)
+    def initialize({{*mapping.keys.map { |id| "@#{id}".id }}})
+    end
+
+    def to_a
+        return [{{*mapping.keys.map { |id| "@#{id}".id }}}]
+    end
+
+    JSON.mapping({{mapping}})
+    YAML.mapping({{mapping}})
+end
+
+macro yaml_mapping(mapping)
+    def initialize({{*mapping.keys.map { |id| "@#{id}".id }}})
+    end
+
+    def to_a
+        return [{{*mapping.keys.map { |id| "@#{id}".id }}}]
+    end
+
+    def to_tuple
+        return { {{*mapping.keys.map { |id| "@#{id}".id }}} }
+    end
+
+    YAML.mapping({{mapping}})
+end
+
 macro templated(filename, template = "template")
     render "src/invidious/views/#{{{filename}}}.ecr", "src/invidious/views/#{{{template}}}.ecr"
 end

src/invidious/helpers/utils.cr

@@ -162,6 +162,23 @@ def number_with_separator(number)
   number.to_s.reverse.gsub(/(\d{3})(?=\d)/, "\\1,").reverse
 end
 
+def short_text_to_number(short_text)
+  case short_text
+  when .ends_with? "M"
+    number = short_text.rstrip(" mM").to_f
+    number *= 1000000
+  when .ends_with? "K"
+    number = short_text.rstrip(" kK").to_f
+    number *= 1000
+  else
+    number = short_text.rstrip(" ")
+  end
+
+  number = number.to_i
+
+  return number
+end
+
 def number_to_short_text(number)
   seperated = number_with_separator(number).gsub(",", ".").split("")
   text = seperated.first(2).join
@@ -195,6 +212,7 @@ end
 
 def make_host_url(config, kemal_config)
   ssl = config.https_only || kemal_config.ssl
+  port = config.external_port || kemal_config.port
 
   if ssl
     scheme = "https://"
@@ -202,7 +220,8 @@ def make_host_url(config, kemal_config)
     scheme = "http://"
   end
 
-  if kemal_config.port != 80 && kemal_config.port != 443
+  # Add if non-standard port
+  if port != 80 && port != 443
     port = ":#{kemal_config.port}"
   else
     port = ""

src/invidious/jobs.cr

@@ -1,51 +1,3 @@
-def crawl_videos(db, logger)
-  ids = Deque(String).new
-  random = Random.new
-
-  search(random.base64(3)).as(Tuple)[1].each do |video|
-    if video.is_a?(SearchVideo)
-      ids << video.id
-    end
-  end
-
-  loop do
-    if ids.empty?
-      search(random.base64(3)).as(Tuple)[1].each do |video|
-        if video.is_a?(SearchVideo)
-          ids << video.id
-        end
-      end
-    end
-
-    begin
-      id = ids[0]
-      video = get_video(id, db)
-    rescue ex
-      logger.write("#{id} : #{ex.message}\n")
-      next
-    ensure
-      ids.delete(id)
-    end
-
-    rvs = [] of Hash(String, String)
-    video.info["rvs"]?.try &.split(",").each do |rv|
-      rvs << HTTP::Params.parse(rv).to_h
-    end
-
-    rvs.each do |rv|
-      if rv.has_key?("id") && !db.query_one?("SELECT EXISTS (SELECT true FROM videos WHERE id = $1)", rv["id"], as: Bool)
-        ids.delete(id)
-        ids << rv["id"]
-        if ids.size == 150
-          ids.shift
-        end
-      end
-    end
-
-    Fiber.yield
-  end
-end
-
 def refresh_channels(db, logger, max_threads = 1, full_refresh = false)
   max_channel = Channel(Int32).new
 
@@ -82,30 +34,14 @@ def refresh_channels(db, logger, max_threads = 1, full_refresh = false)
           end
         end
       end
+
+      sleep 1.minute
     end
   end
 
   max_channel.send(max_threads)
 end
 
-def refresh_videos(db, logger)
-  loop do
-    db.query("SELECT id FROM videos ORDER BY updated") do |rs|
-      rs.each do
-        begin
-          id = rs.read(String)
-          video = get_video(id, db)
-        rescue ex
-          logger.write("#{id} : #{ex.message}\n")
-          next
-        end
-      end
-    end
-
-    Fiber.yield
-  end
-end
-
 def refresh_feeds(db, logger, max_threads = 1)
   max_channel = Channel(Int32).new
 
@@ -129,15 +65,26 @@ def refresh_feeds(db, logger, max_threads = 1)
           active_threads += 1
           spawn do
             begin
+              db.query("SELECT * FROM #{view_name} LIMIT 1") do |rs|
+                # View doesn't contain same number of rows as ChannelVideo
+                if ChannelVideo.from_rs(rs)[0]?.try &.to_a.size.try &.!= rs.column_count
+                  db.exec("DROP MATERIALIZED VIEW #{view_name}")
+                  raise "valid schema does not exist"
+                end
+              end
+
               db.exec("REFRESH MATERIALIZED VIEW #{view_name}")
             rescue ex
               # 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}")
+              if ex.message.try &.ends_with?("does not exist")
+                # While iterating through, we may have an email stored from a deleted account
+                if db.query_one?("SELECT true FROM users WHERE email = $1", email, as: Bool)
+                  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}\n")
+                end
               else
                 logger.write("REFRESH #{email} : #{ex.message}\n")
               end
@@ -147,6 +94,8 @@ def refresh_feeds(db, logger, max_threads = 1)
           end
         end
       end
+
+      sleep 1.minute
     end
   end
 
@@ -155,23 +104,52 @@ end
 
 def subscribe_to_feeds(db, logger, key, config)
   if config.use_pubsub_feeds
+    case config.use_pubsub_feeds
+    when Bool
+      max_threads = config.use_pubsub_feeds.as(Bool).to_unsafe
+    when Int32
+      max_threads = config.use_pubsub_feeds.as(Int32)
+    end
+    max_channel = Channel(Int32).new
+
     spawn do
+      max_threads = max_channel.receive
+      active_threads = 0
+      active_channel = Channel(Bool).new
+
       loop do
-        db.query_all("SELECT id FROM channels WHERE CURRENT_TIMESTAMP - subscribed > '4 days'") do |rs|
+        db.query_all("SELECT id FROM channels WHERE CURRENT_TIMESTAMP - subscribed > interval '4 days' OR subscribed IS NULL") 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")
+            if active_threads >= max_threads.as(Int32)
+              if active_channel.receive
+                active_threads -= 1
+              end
+            end
+
+            active_threads += 1
+
+            spawn do
+              begin
+                response = subscribe_pubsub(ucid, key, config)
+
+                if response.status_code >= 400
+                  logger.write("#{ucid} : #{response.body}\n")
+                end
+              rescue ex
+              end
+
+              active_channel.send(true)
             end
           end
         end
 
         sleep 1.minute
-        Fiber.yield
       end
     end
+
+    max_channel.send(max_threads.as(Int32))
   end
 end
 
@@ -200,7 +178,7 @@ def pull_top_videos(config, db)
     end
 
     yield videos
-    Fiber.yield
+    sleep 1.minute
   end
 end
 
@@ -215,7 +193,7 @@ def pull_popular_videos(db)
     ORDER BY ucid, published DESC", subscriptions, as: ChannelVideo).sort_by { |video| video.published }.reverse
 
     yield videos
-    Fiber.yield
+    sleep 1.minute
   end
 end
 
@@ -228,6 +206,7 @@ def update_decrypt_function
     end
 
     yield decrypt_function
+    sleep 1.minute
   end
 end
 
@@ -239,7 +218,8 @@ def find_working_proxies(regions)
       # proxies = filter_proxies(proxies)
 
       yield region, proxies
-      Fiber.yield
     end
+
+    sleep 1.minute
   end
 end

src/invidious/mixes.cr

@@ -1,5 +1,5 @@
-class MixVideo
-  add_mapping({
+struct MixVideo
+  db_mapping({
     title:          String,
     id:             String,
     author:         String,
@@ -10,8 +10,8 @@ class MixVideo
   })
 end
 
-class Mix
-  add_mapping({
+struct Mix
+  db_mapping({
     title:  String,
     id:     String,
     videos: Array(MixVideo),

src/invidious/playlists.cr

@@ -1,5 +1,5 @@
-class PlaylistVideo
-  add_mapping({
+struct PlaylistVideo
+  db_mapping({
     title:          String,
     id:             String,
     author:         String,
@@ -8,11 +8,12 @@ class PlaylistVideo
     published:      Time,
     playlists:      Array(String),
     index:          Int32,
+    live_now:       Bool,
   })
 end
 
-class Playlist
-  add_mapping({
+struct Playlist
+  db_mapping({
     title:            String,
     id:               String,
     author:           String,
@@ -101,8 +102,10 @@ def extract_playlist(plid, nodeset, index)
     anchor = video.xpath_node(%q(.//td[@class="pl-video-time"]/div/div[1]))
     if anchor && !anchor.content.empty?
       length_seconds = decode_length_seconds(anchor.content)
+      live_now = false
     else
       length_seconds = 0
+      live_now = true
     end
 
     videos << PlaylistVideo.new(
@@ -114,6 +117,7 @@ def extract_playlist(plid, nodeset, index)
       published: Time.now,
       playlists: [plid],
       index: index + offset,
+      live_now: live_now
     )
   end
 

src/invidious/search.cr

@@ -1,41 +1,43 @@
-class SearchVideo
-  add_mapping({
-    title:            String,
-    id:               String,
-    author:           String,
-    ucid:             String,
-    published:        Time,
-    views:            Int64,
-    description:      String,
-    description_html: String,
-    length_seconds:   Int32,
-    live_now:         Bool,
-    paid:             Bool,
-    premium:          Bool,
+struct SearchVideo
+  db_mapping({
+    title:              String,
+    id:                 String,
+    author:             String,
+    ucid:               String,
+    published:          Time,
+    views:              Int64,
+    description:        String,
+    description_html:   String,
+    length_seconds:     Int32,
+    live_now:           Bool,
+    paid:               Bool,
+    premium:            Bool,
+    premiere_timestamp: Time?,
   })
 end
 
-class SearchPlaylistVideo
-  add_mapping({
+struct SearchPlaylistVideo
+  db_mapping({
     title:          String,
     id:             String,
     length_seconds: Int32,
   })
 end
 
-class SearchPlaylist
-  add_mapping({
-    title:       String,
-    id:          String,
-    author:      String,
-    ucid:        String,
-    video_count: Int32,
-    videos:      Array(SearchPlaylistVideo),
+struct SearchPlaylist
+  db_mapping({
+    title:        String,
+    id:           String,
+    author:       String,
+    ucid:         String,
+    video_count:  Int32,
+    videos:       Array(SearchPlaylistVideo),
+    thumbnail_id: String?,
   })
 end
 
-class SearchChannel
-  add_mapping({
+struct SearchChannel
+  db_mapping({
     author:           String,
     ucid:             String,
     author_thumbnail: String,

src/invidious/users.cr

@@ -1,24 +1,23 @@
 require "crypto/bcrypt/password"
 
-class User
+struct User
   module PreferencesConverter
     def self.from_rs(rs)
       begin
         Preferences.from_json(rs.read(String))
       rescue ex
-        DEFAULT_USER_PREFERENCES
+        Preferences.from_json("{}")
       end
     end
   end
 
-  add_mapping({
+  db_mapping({
     updated:       Time,
     notifications: Array(String),
     subscriptions: Array(String),
     email:         String,
     preferences:   {
       type:      Preferences,
-      default:   DEFAULT_USER_PREFERENCES,
       converter: PreferencesConverter,
     },
     password: String?,
@@ -27,29 +26,7 @@ class User
   })
 end
 
-DEFAULT_USER_PREFERENCES = Preferences.from_json({
-  "video_loop"         => false,
-  "autoplay"           => false,
-  "continue"           => false,
-  "listen"             => false,
-  "speed"              => 1.0,
-  "quality"            => "hd720",
-  "volume"             => 100,
-  "comments"           => ["youtube", ""],
-  "captions"           => ["", "", ""],
-  "related_videos"     => true,
-  "redirect_feed"      => false,
-  "locale"             => "en-US",
-  "dark_mode"          => false,
-  "thin_mode"          => false,
-  "max_results"        => 40,
-  "sort"               => "published",
-  "latest_only"        => false,
-  "unseen_only"        => false,
-  "notifications_only" => false,
-}.to_json)
-
-class Preferences
+struct Preferences
   module StringToArray
     def self.to_json(value : Array(String), json : JSON::Builder)
       json.array do
@@ -71,56 +48,62 @@ class Preferences
 
       result
     end
+
+    def self.to_yaml(value : Array(String), yaml : YAML::Nodes::Builder)
+      yaml.sequence do
+        value.each do |element|
+          yaml.scalar element
+        end
+      end
+    end
+
+    def self.from_yaml(ctx : YAML::ParseContext, node : YAML::Nodes::Node) : Array(String)
+      begin
+        unless node.is_a?(YAML::Nodes::Sequence)
+          node.raise "Expected sequence, not #{node.class}"
+        end
+
+        result = [] of String
+        node.nodes.each do |item|
+          unless item.is_a?(YAML::Nodes::Scalar)
+            node.raise "Expected scalar, not #{item.class}"
+          end
+
+          result << item.value
+        end
+      rescue ex
+        if node.is_a?(YAML::Nodes::Scalar)
+          result = [node.value, ""]
+        else
+          result = ["", ""]
+        end
+      end
+
+      result
+    end
   end
 
-  JSON.mapping({
-    video_loop: Bool,
-    autoplay:   Bool,
-    continue:   {
-      type:    Bool,
-      default: DEFAULT_USER_PREFERENCES.continue,
-    },
-    listen: {
-      type:    Bool,
-      default: DEFAULT_USER_PREFERENCES.listen,
-    },
-    speed:    Float32,
-    quality:  String,
-    volume:   Int32,
-    comments: {
-      type:      Array(String),
-      default:   DEFAULT_USER_PREFERENCES.comments,
-      converter: StringToArray,
-    },
-    captions: {
-      type:    Array(String),
-      default: DEFAULT_USER_PREFERENCES.captions,
-    },
-    redirect_feed: {
-      type:    Bool,
-      default: DEFAULT_USER_PREFERENCES.redirect_feed,
-    },
-    related_videos: {
-      type:    Bool,
-      default: DEFAULT_USER_PREFERENCES.related_videos,
-    },
-    dark_mode: Bool,
-    thin_mode: {
-      type:    Bool,
-      default: DEFAULT_USER_PREFERENCES.thin_mode,
-    },
-    max_results:        Int32,
-    sort:               String,
-    latest_only:        Bool,
-    unseen_only:        Bool,
-    notifications_only: {
-      type:    Bool,
-      default: DEFAULT_USER_PREFERENCES.notifications_only,
-    },
-    locale: {
-      type:    String,
-      default: DEFAULT_USER_PREFERENCES.locale,
-    },
+  json_mapping({
+    autoplay:           {type: Bool, default: CONFIG.default_user_preferences.autoplay},
+    captions:           {type: Array(String), default: CONFIG.default_user_preferences.captions, converter: StringToArray},
+    comments:           {type: Array(String), default: CONFIG.default_user_preferences.comments, converter: StringToArray},
+    continue:           {type: Bool, default: CONFIG.default_user_preferences.continue},
+    dark_mode:          {type: Bool, default: CONFIG.default_user_preferences.dark_mode},
+    latest_only:        {type: Bool, default: CONFIG.default_user_preferences.latest_only},
+    listen:             {type: Bool, default: CONFIG.default_user_preferences.listen},
+    local:              {type: Bool, default: CONFIG.default_user_preferences.local},
+    locale:             {type: String, default: CONFIG.default_user_preferences.locale},
+    max_results:        {type: Int32, default: CONFIG.default_user_preferences.max_results},
+    notifications_only: {type: Bool, default: CONFIG.default_user_preferences.notifications_only},
+    quality:            {type: String, default: CONFIG.default_user_preferences.quality},
+    redirect_feed:      {type: Bool, default: CONFIG.default_user_preferences.redirect_feed},
+    related_videos:     {type: Bool, default: CONFIG.default_user_preferences.related_videos},
+    sort:               {type: String, default: CONFIG.default_user_preferences.sort},
+    speed:              {type: Float32, default: CONFIG.default_user_preferences.speed},
+    thin_mode:          {type: Bool, default: CONFIG.default_user_preferences.thin_mode},
+    unseen_only:        {type: Bool, default: CONFIG.default_user_preferences.unseen_only},
+    video_loop:         {type: Bool, default: CONFIG.default_user_preferences.video_loop},
+    volume:             {type: Int32, default: CONFIG.default_user_preferences.volume},
   })
 end
 
@@ -201,7 +184,7 @@ def fetch_user(sid, headers, db)
 
   token = Base64.urlsafe_encode(Random::Secure.random_bytes(32))
 
-  user = User.new(Time.now, [] of String, channels, email, DEFAULT_USER_PREFERENCES, nil, token, [] of String)
+  user = User.new(Time.now, [] of String, channels, email, CONFIG.default_user_preferences, nil, token, [] of String)
   return user, sid
 end
 
@@ -209,7 +192,7 @@ 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(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, CONFIG.default_user_preferences, password.to_s, token, [] of String)
 
   return user, sid
 end
@@ -250,8 +233,12 @@ def validate_response(challenge, token, user_id, operation, key, db, locale)
   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)
-    db.exec("DELETE FROM nonces * WHERE nonce = $1", nonce)
+  if nonce = db.query_one?("SELECT * FROM nonces WHERE nonce = $1", nonce, as: {String, Time})
+    if nonce[1] > Time.now
+      db.exec("UPDATE nonces SET expire = $1 WHERE nonce = $2", Time.new(1990, 1, 1), nonce[0])
+    else
+      raise translate(locale, "Invalid token")
+    end
   else
     raise translate(locale, "Invalid token")
   end
@@ -265,7 +252,7 @@ def validate_response(challenge, token, user_id, operation, key, db, locale)
   end
 
   if challenge_user_id != user_id
-    raise translate(locale, "Invalid user")
+    raise translate(locale, "Invalid token")
   end
 
   if expire < Time.now.to_unix
@@ -291,7 +278,7 @@ def generate_captcha(key, db)
   clock_svg = <<-END_SVG
   <svg viewBox="0 0 100 100" width="200px">
   <circle cx="50" cy="50" r="45" fill="#eee" stroke="black" stroke-width="2"></circle>
-  
+
   <text x="69"     y="20.091" text-anchor="middle" fill="black" font-family="Arial" font-size="10px"> 1</text>
   <text x="82.909" y="34"     text-anchor="middle" fill="black" font-family="Arial" font-size="10px"> 2</text>
   <text x="88"     y="53"     text-anchor="middle" fill="black" font-family="Arial" font-size="10px"> 3</text>
@@ -323,7 +310,22 @@ def generate_captcha(key, db)
   answer = "#{hour}:#{minute.to_s.rjust(2, '0')}:#{second.to_s.rjust(2, '0')}"
   answer = OpenSSL::HMAC.hexdigest(:sha256, key, answer)
 
-  challenge, token = create_response(answer, "sign_in", key, db)
-
-  return {image: image, challenge: challenge, token: token}
+  return {
+    question: image,
+    tokens:   [create_response(answer, "sign_in", key, db)],
+  }
+end
+
+def generate_text_captcha(key, db)
+  response = HTTP::Client.get(TEXTCAPTCHA_URL).body
+  response = JSON.parse(response)
+
+  tokens = response["a"].as_a.map do |answer|
+    create_response(answer.as_s, "sign_in", key, db)
+  end
+
+  return {
+    question: response["q"].as_s,
+    tokens:   tokens,
+  }
 end

src/invidious/videos.cr

@@ -136,18 +136,6 @@ BYPASS_REGIONS = {
   "TR",
 }
 
-VIDEO_THUMBNAILS = {
-  {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},
-  {name: "medium", host: "i.ytimg.com", url: "mqdefault", height: 180, width: 320},
-  {name: "default", host: "i.ytimg.com", url: "default", height: 90, width: 120},
-  {name: "start", host: "i.ytimg.com", url: "1", height: 90, width: 120},
-  {name: "middle", host: "i.ytimg.com", url: "2", height: 90, width: 120},
-  {name: "end", host: "i.ytimg.com", url: "3", height: 90, width: 120},
-}
-
 # See https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/youtube.py#L380-#L476
 VIDEO_FORMATS = {
   "5"  => {"ext" => "flv", "width" => 400, "height" => 240, "acodec" => "mp3", "abr" => 64, "vcodec" => "h263"},
@@ -253,7 +241,7 @@ VIDEO_FORMATS = {
   "251" => {"ext" => "webm", "format" => "DASH audio", "acodec" => "opus", "abr" => 160},
 }
 
-class Video
+struct Video
   property player_json : JSON::Any?
 
   module HTTPParamConverter
@@ -262,6 +250,63 @@ class Video
     end
   end
 
+  def allow_ratings
+    allow_ratings = player_response["videoDetails"]?.try &.["allowRatings"]?.try &.as_bool
+
+    if allow_ratings.nil?
+      return true
+    end
+
+    return allow_ratings
+  end
+
+  def live_now
+    live_now = self.player_response["videoDetails"]?.try &.["isLive"]?.try &.as_bool
+
+    if live_now.nil?
+      return false
+    end
+
+    return live_now
+  end
+
+  def is_listed
+    is_listed = player_response["videoDetails"]?.try &.["isCrawlable"]?.try &.as_bool
+
+    if is_listed.nil?
+      return true
+    end
+
+    return is_listed
+  end
+
+  def is_upcoming
+    is_upcoming = player_response["videoDetails"]?.try &.["isUpcoming"]?.try &.as_bool
+
+    if is_upcoming.nil?
+      return false
+    end
+
+    return is_upcoming
+  end
+
+  def premiere_timestamp
+    if self.is_upcoming
+      premiere_timestamp = player_response["playabilityStatus"]?
+        .try &.["liveStreamability"]?
+          .try &.["liveStreamabilityRenderer"]?
+            .try &.["offlineSlate"]?
+              .try &.["liveStreamOfflineSlateRenderer"]?
+                .try &.["scheduledStartTime"]?.try &.as_s.to_i64
+    end
+
+    if premiere_timestamp
+      premiere_timestamp = Time.unix(premiere_timestamp)
+    end
+
+    return premiere_timestamp
+  end
+
   def keywords
     keywords = self.player_response["videoDetails"]?.try &.["keywords"]?.try &.as_a
     keywords ||= [] of String
@@ -329,6 +374,7 @@ class Video
     end
 
     streams.each do |fmt|
+      fmt["url"] += "&host=" + (URI.parse(fmt["url"]).host || "")
       fmt["url"] += decrypt_signature(fmt, decrypt_function)
     end
 
@@ -396,6 +442,7 @@ class Video
     end
 
     adaptive_fmts.each do |fmt|
+      fmt["url"] += "&host=" + (URI.parse(fmt["url"]).host || "")
       fmt["url"] += decrypt_signature(fmt, decrypt_function)
     end
 
@@ -474,7 +521,7 @@ class Video
     return self.info["length_seconds"].to_i
   end
 
-  add_mapping({
+  db_mapping({
     id:   String,
     info: {
       type:      HTTP::Params,
@@ -502,7 +549,7 @@ class Video
   })
 end
 
-class Caption
+struct Caption
   JSON.mapping(
     name: CaptionName,
     baseUrl: String,
@@ -510,7 +557,7 @@ class Caption
   )
 end
 
-class CaptionName
+struct CaptionName
   JSON.mapping(
     simpleText: String,
   )
@@ -561,14 +608,6 @@ def extract_player_config(body, html)
     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
@@ -654,6 +693,10 @@ def fetch_video(id, proxies, region)
     raise "Video unavailable."
   end
 
+  if !info["title"]?
+    raise "Video unavailable."
+  end
+
   title = info["title"]
   author = info["author"]
   ucid = info["ucid"]
@@ -743,11 +786,12 @@ 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
+  local = query["local"]? && (query["local"] == "true").to_unsafe
   preferred_captions = query["subtitles"]?.try &.split(",").map { |a| a.downcase }
   quality = query["quality"]?
   region = query["region"]?
+  related_videos = query["related_videos"]?
   speed = query["speed"]?.try &.to_f?
   video_loop = query["loop"]?.try &.to_i?
   volume = query["volume"]?.try &.to_i?
@@ -756,29 +800,32 @@ 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
+    local ||= preferences.local.to_unsafe
     preferred_captions ||= preferences.captions
     quality ||= preferences.quality
+    related_videos ||= preferences.related_videos.to_unsafe
     speed ||= preferences.speed
     video_loop ||= preferences.video_loop.to_unsafe
     volume ||= preferences.volume
   end
 
-  autoplay ||= DEFAULT_USER_PREFERENCES.autoplay.to_unsafe
-  continue ||= DEFAULT_USER_PREFERENCES.continue.to_unsafe
-  related_videos ||= DEFAULT_USER_PREFERENCES.related_videos.to_unsafe
-  listen ||= DEFAULT_USER_PREFERENCES.listen.to_unsafe
-  preferred_captions ||= DEFAULT_USER_PREFERENCES.captions
-  quality ||= DEFAULT_USER_PREFERENCES.quality
-  speed ||= DEFAULT_USER_PREFERENCES.speed
-  video_loop ||= DEFAULT_USER_PREFERENCES.video_loop.to_unsafe
-  volume ||= DEFAULT_USER_PREFERENCES.volume
+  autoplay ||= CONFIG.default_user_preferences.autoplay.to_unsafe
+  continue ||= CONFIG.default_user_preferences.continue.to_unsafe
+  listen ||= CONFIG.default_user_preferences.listen.to_unsafe
+  local ||= CONFIG.default_user_preferences.local.to_unsafe
+  preferred_captions ||= CONFIG.default_user_preferences.captions
+  quality ||= CONFIG.default_user_preferences.quality
+  related_videos ||= CONFIG.default_user_preferences.related_videos.to_unsafe
+  speed ||= CONFIG.default_user_preferences.speed
+  video_loop ||= CONFIG.default_user_preferences.video_loop.to_unsafe
+  volume ||= CONFIG.default_user_preferences.volume
 
   autoplay = autoplay == 1
   continue = continue == 1
-  related_videos = related_videos == 1
   listen = listen == 1
+  local = local == 1
+  related_videos = related_videos == 1
   video_loop = video_loop == 1
 
   if query["t"]?
@@ -804,13 +851,14 @@ def process_video_params(query, preferences)
 
   controls = query["controls"]?.try &.to_i?
   controls ||= 1
-  controls = controls == 1
+  controls = controls >= 1
 
   params = {
     autoplay:           autoplay,
     continue:           continue,
     controls:           controls,
     listen:             listen,
+    local:              local,
     preferred_captions: preferred_captions,
     quality:            quality,
     raw:                raw,
@@ -826,12 +874,26 @@ def process_video_params(query, preferences)
   return params
 end
 
-def generate_thumbnails(json, id)
+def build_thumbnails(id, config, kemal_config)
+  return {
+    {name: "maxres", host: "#{make_host_url(config, kemal_config)}", url: "maxres", height: 720, width: 1280},
+    {name: "maxresdefault", host: "https://i.ytimg.com", url: "maxresdefault", height: 720, width: 1280},
+    {name: "sddefault", host: "https://i.ytimg.com", url: "sddefault", height: 480, width: 640},
+    {name: "high", host: "https://i.ytimg.com", url: "hqdefault", height: 360, width: 480},
+    {name: "medium", host: "https://i.ytimg.com", url: "mqdefault", height: 180, width: 320},
+    {name: "default", host: "https://i.ytimg.com", url: "default", height: 90, width: 120},
+    {name: "start", host: "https://i.ytimg.com", url: "1", height: 90, width: 120},
+    {name: "middle", host: "https://i.ytimg.com", url: "2", height: 90, width: 120},
+    {name: "end", host: "https://i.ytimg.com", url: "3", height: 90, width: 120},
+  }
+end
+
+def generate_thumbnails(json, id, config, kemal_config)
   json.array do
-    VIDEO_THUMBNAILS.each do |thumbnail|
+    build_thumbnails(id, config, kemal_config).each do |thumbnail|
       json.object do
         json.field "quality", thumbnail[:name]
-        json.field "url", "https://#{thumbnail[:host]}/vi/#{id}/#{thumbnail["url"]}.jpg"
+        json.field "url", "#{thumbnail[:host]}/vi/#{id}/#{thumbnail["url"]}.jpg"
         json.field "width", thumbnail[:width]
         json.field "height", thumbnail[:height]
       end

src/invidious/views/channel.ecr

@@ -1,5 +1,6 @@
 <% content_for "header" do %>
 <title><%= author %> - Invidious</title>
+<link rel="alternate" type="application/rss+xml" title="RSS" href="/feed/channel/<%= ucid %>" />
 <% end %>
 
 <div class="pure-g h-box">
@@ -21,13 +22,17 @@
 <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>
+        <% if !auto_generated %>
         <div class="pure-u-1 pure-md-1-3">
             <b><%= translate(locale, "Videos") %></b>
         </div>
+        <% end %>
         <div class="pure-u-1 pure-md-1-3">
-            <% if !auto_generated %>
-                <a href="/channel/<%= ucid %>/playlists"><%= translate(locale, "Playlists") %></a>
-            <% end %>
+        <% if auto_generated %>
+            <b><%= translate(locale, "Playlists") %></b>
+        <% else %>
+            <a href="/channel/<%= ucid %>/playlists"><%= translate(locale, "Playlists") %></a>
+        <% end %>
         </div>
     </div>
     <div class="pure-u-1-3">
@@ -59,7 +64,7 @@
         <%= rendered "components/item" %>
     <% end %>
 <% end %>
-</div> 
+</div>
 
 <div class="pure-g h-box">
     <div class="pure-u-1 pure-u-md-1-5">

src/invidious/views/components/item.ecr

@@ -3,7 +3,7 @@
     <% case item when %>
     <% when SearchChannel %>
         <a style="width:100%;" href="/channel/<%= item.ucid %>">
-            <% if env.get?("user") && env.get("user").as(User).preferences.thin_mode %>
+            <% if env.get("preferences").as(Preferences).thin_mode %>
             <% else %>
             <center>
                 <img style="width:56.25%;" src="/ggpht<%= URI.parse(item.author_thumbnail).full_path %>"/>
@@ -16,15 +16,15 @@
         <h5><%= item.description_html %></h5>
     <% when SearchPlaylist %>
         <% if item.id.starts_with? "RD" %>
-        <% url = "/mix?list=#{item.id}&continuation=#{item.videos[0]?.try &.id}" %>
+        <% url = "/mix?list=#{item.id}&continuation=#{item.thumbnail_id}" %>
         <% else %>
         <% url = "/playlist?list=#{item.id}" %>
         <% end %>
         <a style="width:100%;" href="<%= url %>">
-            <% if env.get?("user") && env.get("user").as(User).preferences.thin_mode %>
+            <% if env.get("preferences").as(Preferences).thin_mode %>
             <% else %>
             <div class="thumbnail">
-                <img class="thumbnail" src="/vi/<%= item.videos[0]?.try &.id %>/mqdefault.jpg"/>
+                <img class="thumbnail" src="/vi/<%= item.thumbnail_id %>/mqdefault.jpg"/>
                 <p class="length"><%= number_with_separator(item.video_count) %> videos</p>
             </div>
             <% end %>
@@ -35,27 +35,11 @@
         </p>
     <% when MixVideo %>
         <a style="width:100%;" href="/watch?v=<%= item.id %>&list=<%= item.mixes[0] %>">
-            <% if env.get?("user") && env.get("user").as(User).preferences.thin_mode %>
+            <% if env.get("preferences").as(Preferences).thin_mode %>
             <% else %>
             <div class="thumbnail">
                 <img class="thumbnail" src="/vi/<%= item.id %>/mqdefault.jpg"/>
-                <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
-            </div>
-            <% end %>
-            <p><%= item.title %></p>
-        </a>
-        <p>
-            <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
-        </p>
-    <% when PlaylistVideo %>
-        <a style="width:100%;" href="/watch?v=<%= item.id %>&list=<%= item.playlists[0] %>">
-            <% if env.get?("user") && env.get("user").as(User).preferences.thin_mode %>
-            <% 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 %>
+                <% if item.length_seconds != 0 %>
                 <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
                 <% end %>
             </div>
@@ -65,12 +49,32 @@
         <p>
             <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
         </p>
-        
-        <% if Time.now - item.published > 1.minute %>
+    <% when PlaylistVideo %>
+        <a style="width:100%;" href="/watch?v=<%= item.id %>&list=<%= item.playlists[0] %>">
+            <% if env.get("preferences").as(Preferences).thin_mode %>
+            <% 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>
+                <% elsif item.length_seconds != 0 %>
+                <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
+                <% end %>
+            </div>
+            <% end %>
+            <p><%= item.title %></p>
+        </a>
+        <p>
+            <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
+        </p>
+
+        <% if item.responds_to?(:premiere_timestamp) && item.premiere_timestamp && item.premiere_timestamp.not_nil! > Time.now %>
+        <h5><%= translate(locale, "Premieres in `x`", recode_date((item.premiere_timestamp.as(Time) - Time.now).ago, locale)) %></h5>
+        <% elsif Time.now - item.published > 1.minute %>
         <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 %>
+        <% if env.get("preferences").as(Preferences).thin_mode %>
         <% else %>
         <a style="width:100%;" href="/watch?v=<%= item.id %>">
             <div class="thumbnail">
@@ -90,7 +94,7 @@
                 <% 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 %>
+                <% elsif item.length_seconds != 0 %>
                 <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
                 <% end %>
             </div>
@@ -100,8 +104,10 @@
         <p>
             <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
         </p>
-        
-        <% if Time.now - item.published > 1.minute %>
+
+        <% if item.responds_to?(:premiere_timestamp) && item.premiere_timestamp && item.premiere_timestamp.not_nil! > Time.now %>
+        <h5><%= translate(locale, "Premieres in `x`", recode_date((item.premiere_timestamp.as(Time) - Time.now).ago, locale)) %></h5>
+        <% elsif Time.now - item.published > 1.minute %>
         <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></h5>
         <% end %>
     <% end %>

src/invidious/views/components/player.ecr

@@ -1,4 +1,4 @@
-<video style="width:100%" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" 
+<video style="outline:none;width:100%" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>"
     id="player" class="video-js"
     onmouseenter='this["data-title"]=this["title"];this["title"]=""'
     onmouseleave='this["title"]=this["data-title"];this["data-title"]=""'
@@ -11,7 +11,7 @@
     <% else %>
         <% if params[:listen] %>
             <% audio_streams.each_with_index do |fmt, i| %>
-                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
+                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %><% if params[:local] %>&local=true<% end %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
             <% end %>
         <% else %>
             <% if params[:quality] == "dash" %>
@@ -19,20 +19,20 @@
             <% end %>
             <% fmt_stream.each_with_index do |fmt, i| %>
                 <% if params[:quality] %>
-                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= params[:quality] == fmt["label"].split(" - ")[0] %>">
+                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %><% if params[:local] %>&local=true<% end %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= params[:quality] == fmt["label"].split(" - ")[0] %>">
                 <% else %>
-                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>">
+                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %><% if params[:local] %>&local=true<% end %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>">
                 <% end %>
             <% end %>
         <% end %>
 
         <% preferred_captions.each_with_index do |caption, i| %>
-        <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("locale").as(String) %>"
+        <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("preferences").as(Preferences).locale %>"
             label="<%= caption.name.simpleText %>" <% if i == 0 %>default<% end %>>
         <% end %>
 
         <% captions.each do |caption| %>
-        <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("locale").as(String) %>"
+        <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("preferences").as(Preferences).locale %>"
             label="<%= caption.name.simpleText %>">
         <% end %>
     <% end %>
@@ -44,7 +44,7 @@ var options = {
   aspectRatio: "<%= aspect_ratio %>",
   <% end %>
   preload: "auto",
-  playbackRates: [0.5, 1, 1.5, 2],
+  playbackRates: [0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 2.0],
   controlBar: {
     children: [
       "playToggle",
@@ -78,10 +78,11 @@ var player = videojs("player", options, function() {
     volumeStep: 0.1,
     seekStep: 5,
     enableModifiersForNumbers: false,
+    enableHoverScroll: true,
     customKeys: {
+      // Toggle play with K Key
       play: {
         key: function(e) {
-          // Toggle play with K Key
           return e.which === 75;
         },
         handler: function(player, options, e) {
@@ -92,23 +93,45 @@ var player = videojs("player", options, function() {
           }
         }
       },
+      // Go backward 5 seconds
       backward: {
         key: function(e) {
-          // Go backward 5 seconds
           return e.which === 74;
         },
         handler: function(player, options, e) {
           player.currentTime(player.currentTime() - 5);
         }
       },
+      // Go forward 5 seconds
       forward: {
         key: function(e) {
-          // Go forward 5 seconds
           return e.which === 76;
         },
         handler: function(player, options, e) {
           player.currentTime(player.currentTime() + 5);
         }
+      },
+      // Increase speed
+      increase_speed: {
+        key: function(e) {
+          return e.which === 190;
+        },
+        handler: function(player, _, e) {
+          size = options.playbackRates.length;
+          index = options.playbackRates.indexOf(player.playbackRate());
+          player.playbackRate(options.playbackRates[(index + 1) % size]);
+        }
+      },
+      // Decrease speed
+      decrease_speed: {
+        key: function(e) {
+          return e.which === 188;
+        },
+        handler: function(player, _, e) {
+          size = options.playbackRates.length;
+          index = options.playbackRates.indexOf(player.playbackRate());
+          player.playbackRate(options.playbackRates[(size + index - 1) % size]);
+        }
       }
     }
   });
@@ -129,7 +152,7 @@ player.on('error', function(event) {
       }
       player.currentTime(currentTime);
       player.playbackRate(playbackRate);
-      
+
       if (!paused) {
         player.play();
       }
@@ -169,7 +192,7 @@ var bpb = player.getChild('bigPlayButton');
 
 if (bpb) {
   bpb.hide();
-  
+
   player.ready(function() {
     new Promise(function(resolve, reject) {
       setTimeout(() => resolve(1), 1);

src/invidious/views/components/subscribe_widget.ecr

@@ -1,14 +1,14 @@
 <% if user %>
     <% if subscriptions.includes? ucid %>
     <p>
-        <a id="subscribe" onclick="unsubscribe()" class="pure-button pure-button-primary" 
+        <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" 
+        <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>
@@ -16,7 +16,7 @@
     <% end %>
 <% else %>
     <p>
-        <a id="subscribe" class="pure-button pure-button-primary" 
+        <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>

src/invidious/views/components/subscribe_widget_script.ecr

@@ -4,13 +4,13 @@ if (subscribe_button.getAttribute('onclick')) {
 }
 
 function subscribe(timeouts = 0) {
-    subscribe_button = document.getElementById("subscribe");    
+    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";
@@ -21,7 +21,7 @@ function subscribe(timeouts = 0) {
     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) {
@@ -30,7 +30,7 @@ function subscribe(timeouts = 0) {
             }
         }
     }
-    
+
     xhr.ontimeout = function() {
         console.log("Subscribing timed out.");
 
@@ -39,8 +39,8 @@ function subscribe(timeouts = 0) {
 }
 
 function unsubscribe(timeouts = 0) {
-    subscribe_button = document.getElementById("subscribe");    
-    
+    subscribe_button = document.getElementById("subscribe");
+
     if (timeouts > 10) {
         console.log("Failed to subscribe");
         return;

src/invidious/views/data_control.ecr

@@ -20,7 +20,7 @@
                 </label>
                 <input type="file" id="import_youtube" name="import_youtube">
             </div>
-            
+
             <div class="pure-control-group">
                 <label for="import_freetube"><%= translate(locale, "Import FreeTube subscriptions (.db)") %></label>
                 <input type="file" id="import_freetube" name="import_freetube">
@@ -35,7 +35,7 @@
                 <label for="import_newpipe"><%= translate(locale, "Import NewPipe data (.zip)") %></label>
                 <input type="file" id="import_newpipe" name="import_newpipe">
             </div>
-        
+
             <div class="pure-controls">
                 <button type="submit" class="pure-button pure-button-primary"><%= translate(locale, "Import") %></button>
             </div>

src/invidious/views/embed.ecr

@@ -9,15 +9,14 @@
   <link rel="stylesheet" href="/css/default.css">
   <title><%= HTML.escape(video.title) %> - Invidious</title>
   <style>
-  video, #my_video, .video-js, .vjs-default-skin
-  {
-    position: fixed; 
-    right: 0; 
+  #player {
+    position: fixed;
+    right: 0;
     bottom: 0;
-    min-width: 100%; 
+    min-width: 100%;
     min-height: 100%;
-    width: auto; 
-    height: auto; 
+    width: auto;
+    height: auto;
     z-index: -100;
   }
   </style>

src/invidious/views/history.ecr

@@ -19,7 +19,7 @@
         <div class="pure-u-1 pure-u-md-1-4">
             <div class="h-box">
                 <a style="width:100%;" href="/watch?v=<%= item %>">
-                    <% if env.get?("user") && env.get("user").as(User).preferences.thin_mode %>
+                    <% if env.get("preferences").as(Preferences).thin_mode %>
                     <% else %>
                     <div class="thumbnail">
                         <img class="thumbnail" src="/vi/<%= item %>/mqdefault.jpg"/>

src/invidious/views/licenses.ecr

@@ -19,7 +19,7 @@
             </td>
 
             <td>
-                <a href="https://unpkg.com/dashjs@2.9.0/dist/dash.mediaplayer.debug.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/Dash-Industry-Forum/dash.js"><%= translate(locale, "source") %></a>
             </td>
         </tr>
 
@@ -33,7 +33,7 @@
             </td>
 
             <td>
-                <a href="/js/silvermine-videojs-quality-selector.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/omarroth/videojs-quality-selector"><%= translate(locale, "source") %></a>
             </td>
         </tr>
 
@@ -47,7 +47,7 @@
             </td>
 
             <td>
-                <a href="https://unpkg.com/video.js@6.12.1/dist/video.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/videojs/video.js"><%= translate(locale, "source") %></a>
             </td>
         </tr>
 
@@ -61,7 +61,7 @@
             </td>
 
             <td>
-                <a href="https://unpkg.com/videojs-contrib-quality-levels@2.0.7/dist/videojs-contrib-quality-levels.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/videojs/videojs-contrib-quality-levels"><%= translate(locale, "source") %></a>
             </td>
         </tr>
 
@@ -75,7 +75,7 @@
             </td>
 
             <td>
-                <a href="https://unpkg.com/videojs-contrib-dash@2.8.2/dist/videojs-dash.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/videojs/videojs-contrib-dash"><%= translate(locale, "source") %></a>
             </td>
         </tr>
 
@@ -89,7 +89,7 @@
             </td>
 
             <td>
-                <a href="https://unpkg.com/@videojs/http-streaming@1.2.2/dist/videojs-http-streaming.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/videojs/http-streaming"><%= translate(locale, "source") %></a>
             </td>
         </tr>
 
@@ -103,7 +103,7 @@
             </td>
 
             <td>
-                <a href="https://unpkg.com/videojs-markers@1.0.1/dist/videojs-markers.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/spchuang/videojs-markers"><%= translate(locale, "source") %></a>
             </td>
         </tr>
 
@@ -117,7 +117,7 @@
             </td>
 
             <td>
-                <a href="https://unpkg.com/videojs-share@2.0.1/dist/videojs-share.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/mkhazov/videojs-share"><%= translate(locale, "source") %></a>
             </td>
         </tr>
 
@@ -131,7 +131,7 @@
             </td>
 
             <td>
-                <a href="/js/videojs.hotkeys.js"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/ctd1500/videojs-hotkeys"><%= translate(locale, "source") %></a>
             </td>
         </tr>
 

src/invidious/views/login.ecr

@@ -8,7 +8,7 @@
         <div class="h-box">
             <div class="pure-g">
                 <div class="pure-u-1-2">
-                    <a class="pure-button <% if account_type == "invidious" %>pure-button-disabled<% end %>" href="/login">
+                    <a class="pure-button <% if account_type == "invidious" %>pure-button-disabled<% end %>" href="/login?type=invidious">
                         <%= translate(locale, "Login/Register") %>
                     </a>
                 </div>
@@ -22,55 +22,84 @@
             <% if account_type == "invidious" %>
             <form class="pure-form pure-form-stacked" action="/login?referer=<%= URI.escape(referer) %>&type=invidious" method="post">
                 <fieldset>
+                    <% if email %>
+                    <input name="email" type="hidden" value="<%= email %>">
+                    <% else %>
                     <label for="email"><%= translate(locale, "User ID:") %></label>
                     <input required class="pure-input-1" name="email" type="text" placeholder="User ID">
+                    <% end %>
 
+                    <% if password %>
+                    <input name="password" type="hidden" value="<%= password %>">
+                    <% else %>
                     <label for="password"><%= translate(locale, "Password:") %></label>
                     <input required class="pure-input-1" name="password" type="password" placeholder="Password">
+                    <% end %>
 
-                <% if config.captcha_enabled %>
-                    <% 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] %>">
+                <% if captcha %>
+                    <% case captcha_type when %>
+                    <% when "image" %>
+                        <% captcha = captcha.not_nil! %>
+                        <img style="width:100%" src='<%= captcha[:question] %>'/>
+                        <% captcha[:tokens].each_with_index do |token, i| %>
+                            <input type="hidden" name="challenge[<%= i %>]" value="<%= token[0] %>">
+                            <input type="hidden" name="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">
+                        <input type="hidden" name="captcha_type" value="image">
+                        <label for="answer"><%= translate(locale, "Time (h:mm:ss):") %></label>
+                        <input type="text" name="answer" type="text" placeholder="h:mm:ss">
+                    <% when "text" %>
+                        <% captcha = captcha.not_nil! %>
+                        <% captcha[:tokens].each_with_index do |token, i| %>
+                            <input type="hidden" name="challenge[<%= i %>]" value="<%= token[0] %>">
+                            <input type="hidden" name="token[<%= i %>]" value="<%= token[1] %>">
+                        <% end %>
+                        <input type="hidden" name="captcha_type" value="text">
+                        <label for="answer"><%= captcha[:question] %></label>
+                        <input type="text" name="answer" type="text" placeholder="Answer">
+                    <% end %>
 
+                    <button type="submit" name="action" value="signin" class="pure-button pure-button-primary">
+                        <%= translate(locale, "Register") %>
+                    </button>
+
+                    <% case captcha_type when %>
+                    <% when "image" %>
                         <label>
-                            <a href="/login?referer=<%= URI.escape(referer) %>&type=invidious">
+                            <button type="submit" name="change_type" class="pure-button pure-button-primary" value="text">
+                                <%= translate(locale, "Text CAPTCHA") %>
+                            </button>
+                        </label>
+                    <% when "text" %>
+                        <label>
+                            <button type="submit" name="change_type" class="pure-button pure-button-primary" value="image">
                                 <%= translate(locale, "Image CAPTCHA") %>
-                            </a>
+                            </button>
                         </label>
                     <% end %>
+                <% else %>
+                    <button type="submit" name="action" value="signin" class="pure-button pure-button-primary">
+                        <%= translate(locale, "Sign In") %>/<%= translate(locale, "Register") %>
+                    </button>
                 <% 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" %>
-            <form class="pure-form pure-form-stacked" action="/login?referer=<%= URI.escape(referer) %>" method="post">
+            <form class="pure-form pure-form-stacked" action="/login?referer=<%= URI.escape(referer) %>&type=google" method="post">
                 <fieldset>
+                    <% if email %>
+                    <input name="email" type="hidden" value="<%= email %>">
+                    <% else %>
                     <label for="email"><%= translate(locale, "Email:") %></label>
                     <input required class="pure-input-1" name="email" type="email" placeholder="Email">
+                    <% end %>
 
+                    <% if password %>
+                    <input name="password" type="hidden" value="<%= password %>">
+                    <% else %>
                     <label for="password"><%= translate(locale, "Password:") %></label>
                     <input required class="pure-input-1" name="password" type="password" placeholder="Password">
+                    <% end %>
 
                     <% if tfa %>
                     <label for="tfa"><%= translate(locale, "Google verification code:") %></label>

src/invidious/views/mix.ecr

@@ -19,4 +19,4 @@
         <%= rendered "components/item" %>
     <% end %>
 <% end %>
-</div> 
+</div>

src/invidious/views/playlist.ecr

@@ -1,5 +1,6 @@
 <% content_for "header" do %>
 <title><%= playlist.title %> - Invidious</title>
+<link rel="alternate" type="application/rss+xml" title="RSS" href="/feed/playlist/<%= plid %>" />
 <% end %>
 
 <div class="pure-g h-box">
@@ -30,7 +31,7 @@
         <%= rendered "components/item" %>
     <% end %>
 <% end %>
-</div> 
+</div>
 
 <div class="pure-g h-box">
     <div class="pure-u-1 pure-u-md-1-5">

src/invidious/views/preferences.ecr

@@ -28,6 +28,11 @@ function update_value(element) {
                 <input name="continue" id="continue" type="checkbox" <% if preferences.continue %>checked<% end %>>
             </div>
 
+            <div class="pure-control-group">
+                <label for="local"><%= translate(locale, "Proxy videos? ") %></label>
+                <input name="local" id="local" type="checkbox" <% if preferences.local %>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 preferences.listen %>checked<% end %>>
@@ -36,7 +41,7 @@ function update_value(element) {
             <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| %>
+                <% {2.0, 1.5, 1.25, 1.0, 0.75, 0.5, 0.25}.each do |option| %>
                     <option <% if preferences.speed == option %> selected <% end %>><%= option %></option>
                 <% end %>
                 </select>

src/invidious/views/privacy.ecr

@@ -0,0 +1,75 @@
+<% content_for "header" do %>
+<title>Privacy Policy - Invidious</title>
+<% end %>
+
+<div class="h-box">
+<%= Markdown.to_html(<<-END_PRIVACY_POLICY
+  ## Privacy
+
+  This document concerns what data you provide to this website, the purpose of the data, how the data is stored, and how the data can be removed.
+
+  ### Data you directly provide
+
+  Data that you provide to the website for the purpose of the site's operation (for example: an account name, account password, or channel subscription) will be stored in the website's database until the user decides to remove it. This data will not be intentionally shared with anyone or anything.
+
+  Information stored about a registered user is limited to:
+
+  - a list of session tokens for remaining logged in across devices
+  - the last time an account was updated (to provide accurate notifications)
+  - a list of video IDs identifying notifications from a user's subscriptions
+  - a list of channel UCIDs the user is subscribed to
+  - a user ID (for persistent storage of subscriptions and preferences)
+  - a json object containing user preferences
+  - a hashed password if applicable (not present on google accounts)
+  - a randomly generated token for providing an RSS feed of a user's subscriptions
+  - a list of video IDs identifying watched videos
+
+  The above list reflects [this code](https://github.com/omarroth/invidious/blob/master/src/invidious/users.cr#L14-L51).
+
+  Users can clear their watch history using the [clear watch history](/clear_watch_history) page.
+
+  If a user is logged in with a Google account, no password will ever be stored. This website uses the session token provided by Google to identify a user, but does not store the information required to make requests on a user's behalf without their knowledge or consent.
+
+  ### Data you passively provide
+
+  When you request any resource from this website (for example: a page, a font, an image, or an API endpoint) information about the request may be logged.
+
+  Information about a request is limited to:
+
+  - the time the request was made
+  - the status code of the response
+  - the method of the request
+  - the requested URL
+  - how long it took to complete the request.
+
+  No identifying information is logged, such as the visitor's cookie, user-agent, or IP address. Here are a couple lines to serve as an example:
+
+  ```
+  2019-01-19 16:37:47 +00:00 200 GET /api/v1/comments/xrlETJYzH-c?format=html&hl=en-US 1345.88ms
+  2019-01-19 16:37:53 +00:00 200 GET /vi/r5P-f5arPXE/maxres.jpg 1085.41ms
+  2019-01-19 16:37:54 +00:00 200 GET /watch 7.04ms
+  ```
+
+  This website does not store the visitor's user-agent or IP address and does not use fingerprinting, advertisements, or tracking of any form.
+
+  This website provides links to googlevideo.com to provide audio and video playback. googlevideo.com is owned by Google and is subject to their [privacy policy](https://policies.google.com/privacy).
+
+  ### Data stored in your browser
+
+  This website uses browser cookies to authenticate registered users. This data consists of:
+
+  - An account token to keep you logged into the website between visits, which is sent when any page is loaded while you are logged in
+
+  This website also provides an option to store site preferences, such as the theme or locale, without an account. Using this feature will store a cookie in the visitor's browser containing their preferences. This cookie is sent on every request and does not contain any identifying information.
+
+  You can remove this data from your browser by logging out of this website, or by using your browser's cookie-related controls to delete the data.
+
+  ### Removal of data
+
+  To remove data stored in your browser, you can log out of the website, or you can use your browser's cookie-related controls to delete the data.
+
+  To remove data that has been stored in the website's database, you can use the [delete my account](/delete_account) page.
+  END_PRIVACY_POLICY
+  )
+%>
+</div>

src/invidious/views/search.ecr

@@ -8,7 +8,7 @@
         <%= rendered "components/item" %>
     <% end %>
 <% end %>
-</div> 
+</div>
 
 <div class="pure-g h-box">
     <div class="pure-u-1 pure-u-md-1-5">

src/invidious/views/subscription_manager.ecr

@@ -4,7 +4,9 @@
 
 <div class="pure-g h-box">
     <div class="pure-u-1-3">
-        <h3><%= translate(locale, "`x` subscriptions", %(<span id="count">#{subscriptions.size}</span>)) %></h3>
+        <h3>
+            <a href="/feed/subscriptions"><%= translate(locale, "`x` subscriptions", %(<span id="count">#{subscriptions.size}</span>)) %></a>
+        </h3>
     </div>
     <div class="pure-u-1-3" style="text-align:center;">
         <h3>
@@ -20,15 +22,15 @@
 
 <% subscriptions.each do |channel| %>
 <div class="h-box">
-    <div class="pure-g">
+    <div class="pure-g<% if channel.deleted %> deleted <% end%>">
         <div class="pure-u-2-5">
-            <h3>
+            <h3 style="padding-left: 0.5em">
                 <a href="/channel/<%= channel.id %>"><%= channel.author %></a>
             </h3>
         </div>
         <div class="pure-u-2-5"></div>
         <div class="pure-u-1-5" style="text-align: right;">
-            <h3>
+            <h3 style="padding-right: 0.5em">
                 <a onclick="remove_subscription(this)"
                     data-id="<%= channel.id %>"
                     onmouseenter='this["href"]="javascript:void(0)"'

src/invidious/views/subscriptions.ecr

@@ -1,5 +1,6 @@
 <% content_for "header" do %>
 <title><%= translate(locale, "Subscriptions") %> - Invidious</title>
+<link rel="alternate" type="application/rss+xml" title="RSS" href="/feed/private?token=<%= token %>" />
 <% end %>
 
 <%= rendered "components/feed_menu" %>
@@ -17,7 +18,7 @@
     </div>
     <div class="pure-u-1-3" style="text-align:right;">
         <h3>
-            <a href="/feed/private?token=<%= user.token %>"><i class="icon ion-logo-rss"></i></a>
+            <a href="/feed/private?token=<%= token %>"><i class="icon ion-logo-rss"></i></a>
         </h3>
     </div>
 </div>

src/invidious/views/template.ecr

@@ -18,14 +18,14 @@
   <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?("preferences").try &.as(Preferences).dark_mode %>
+  <% if env.get("preferences").as(Preferences).dark_mode %>
   <link rel="stylesheet" href="/css/darktheme.css">
   <% else %>
   <link rel="stylesheet" href="/css/lighttheme.css">
   <% end %>
 </head>
 
-<% locale = LOCALES[env.get("locale").as(String)]? %>
+<% locale = LOCALES[env.get("preferences").as(Preferences).locale]? %>
 
 <body>
   <div class="pure-g">
@@ -46,8 +46,7 @@
         <% if env.get? "user" %>
         <div class="pure-u-1-4">
           <a href="/toggle_theme?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
-            <% preferences = env.get("user").as(User).preferences %>
-            <% if preferences.dark_mode %>
+            <% if env.get("preferences").as(Preferences).dark_mode %>
             <i class="icon ion-ios-sunny"></i>
             <% else %>
             <i class="icon ion-ios-moon"></i>
@@ -77,7 +76,7 @@
         <% 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 %>
+            <% if env.get("preferences").as(Preferences).dark_mode %>
             <i class="icon ion-ios-sunny"></i>
             <% else %>
             <i class="icon ion-ios-moon"></i>
@@ -109,21 +108,26 @@
           </div>
           <div class="pure-u-1 pure-u-md-1-3">
             <i class="icon ion-logo-bitcoin"></i>
-            <%= translate(locale, "BTC: ") %>356DpZyMXu6rYd55Yqzjs29n79kGKWcYrY</div>
+            BTC: 356DpZyMXu6rYd55Yqzjs29n79kGKWcYrY</div>
           <div class="pure-u-1 pure-u-md-1-3">
             <i class="icon ion-logo-bitcoin"></i>
-            <%= translate(locale, "BCH: ") %>qq4ptclkzej5eza6a50et5ggc58hxsq5aylqut2npk</div>
+            BCH: qq4ptclkzej5eza6a50et5ggc58hxsq5aylqut2npk</div>
           <div class="pure-u-1 pure-u-md-1-3">
             <i class="icon ion-logo-usd"></i>
-            <a href="https://liberapay.com/omarroth"><%= translate(locale, "Liberapay") %></a>
-             / 
-            <a href="https://patreon.com/omarroth"><%= translate(locale, "Patreon") %></a>
+            <a href="https://liberapay.com/omarroth">Liberapay</a>
+             /
+            <a href="https://patreon.com/omarroth">Patreon</a>
           </div>
           <div class="pure-u-1 pure-u-md-1-3">
             <i class="icon ion-logo-javascript"></i>
             <a rel="jslicense" href="/licenses">
               <%= translate(locale, "View JavaScript license information.") %>
             </a>
+            /
+            <i class="icon ion-ios-paper"></i>
+            <a href="/privacy">
+              <%= translate(locale, "View privacy policy.") %>
+            </a>
           </div>
           <div class="pure-u-1 pure-u-md-1-3">
             <i class="icon ion-logo-github"></i>

src/invidious/views/watch.ecr

@@ -18,7 +18,7 @@
 <meta name="twitter:url" content="<%= host_url %>/watch?v=<%= video.id %>">
 <meta name="twitter:title" content="<%= HTML.escape(video.title) %>">
 <meta name="twitter:description" content="<%= description %>">
-<meta name="twitter:image" content="/vi/<%= video.id %>/hqdefault.jpg">
+<meta name="twitter:image" content="<%= host_url %>/vi/<%= video.id %>/maxres.jpg">
 <meta name="twitter:player" content="<%= host_url %>/embed/<%= video.id %>">
 <meta name="twitter:player:width" content="1280">
 <meta name="twitter:player:height" content="720">
@@ -33,7 +33,7 @@
 
 <div class="h-box">
 <h1>
-    <%= HTML.escape(video.title) %> 
+    <%= HTML.escape(video.title) %>
     <% if params[:listen] %>
     <a title="<%=translate(locale, "Video mode")%>" href="/watch?<%= env.params.query %>&listen=0">
         <i class="icon ion-ios-videocam"></i>
@@ -44,6 +44,9 @@
     </a>
     <% end %>
 </h1>
+<% if !video.is_listed %>
+<h3><i class="icon ion-ios-lock"></i> <%= translate(locale, "Unlisted") %></h3>
+<% end %>
 <% if !reason.empty? %>
 <h3><%= reason %></h3>
 <% end %>
@@ -53,23 +56,26 @@
     <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>
-        
+
+            <% if CONFIG.dmca_content.includes? video.id %>
+            <p>Download is disabled.</p>
+            <% else %>
             <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 value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'>
                             <%= 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 value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'>
                             <%= 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"}'>
+                        <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'>
                             <%= itag_to_metadata?(option["itag"]).try &.["height"]? || "~240" %>p - <%= option["type"].split(";")[0] %>
                         </option>
                     <% end %>
@@ -80,6 +86,7 @@
                     <b><%= translate(locale, "Download") %></b>
                 </button>
             </form>
+            <% end %>
 
             <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>
@@ -150,7 +157,7 @@
 
         <% if params[:related_videos] %>
         <div class="h-box">
-        
+
         <% if !rvs.empty? %>
         <div id="continue" <% if plid %>style="display:none"<% end %>>
             <div class="pure-control-group">
@@ -164,7 +171,7 @@
         <% rvs.each do |rv| %>
             <% if rv["id"]? %>
             <a href="/watch?v=<%= rv["id"] %>">
-                <% if preferences && preferences.thin_mode %>
+                <% if env.get("preferences").as(Preferences).thin_mode %>
                 <% else %>
                 <div class="thumbnail">
                     <img class="thumbnail" src="/vi/<%= rv["id"] %>/mqdefault.jpg">
@@ -187,7 +194,7 @@
 <script>
 <% if !rvs.empty? && !plid && params[:continue] %>
 player.on('ended', function() {
-    location.assign("/watch?v=" 
+    location.assign("/watch?v="
         + "<%= rvs.select { |rv| rv["id"]? }[0]?.try &.["id"] %>"
         + "&continue=1"
         <% if params[:listen] %>
@@ -206,7 +213,7 @@ player.on('ended', function() {
 function continue_autoplay(target) {
     if (target.checked) {
         player.on('ended', function() {
-            location.assign("/watch?v=" 
+            location.assign("/watch?v="
                 + "<%= rvs.select { |rv| rv["id"]? }[0]?.try &.["id"] %>"
                 + "&continue=1"
                 <% if params[:listen] %>
@@ -249,15 +256,15 @@ function get_playlist(timeouts = 0) {
     }
 
     playlist.innerHTML = ' \
-      <h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3> \
+      <h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3> \
       <hr>'
 
     var plid = "<%= plid %>"
 
     if (plid.startsWith("RD")) {
-        var plid_url = "/api/v1/mixes/<%= plid %>?continuation=<%= video.id %>&format=html&hl=<%= env.get("locale").as(String) %>";
+        var plid_url = "/api/v1/mixes/<%= plid %>?continuation=<%= video.id %>&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>";
     } else {
-        var plid_url = "/api/v1/playlists/<%= plid %>?continuation=<%= video.id %>&format=html&hl=<%= env.get("locale").as(String) %>";
+        var plid_url = "/api/v1/playlists/<%= plid %>?continuation=<%= video.id %>&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>";
     }
 
     var xhr = new XMLHttpRequest();
@@ -270,10 +277,10 @@ function get_playlist(timeouts = 0) {
         if (xhr.readyState == 4) {
             if (xhr.status == 200) {
                 playlist.innerHTML = xhr.response.playlistHtml;
-                
+
                 if (xhr.response.nextVideo) {
                     player.on('ended', function() {
-                        location.assign("/watch?v=" 
+                        location.assign("/watch?v="
                             + xhr.response.nextVideo
                             + "&list=<%= plid %>"
                             <% if params[:listen] %>
@@ -300,7 +307,7 @@ function get_playlist(timeouts = 0) {
 
         comments = document.getElementById("playlist");
         comments.innerHTML =
-            '<h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3><hr>';
+            '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3><hr>';
         get_playlist(timeouts + 1);
     };
 }
@@ -319,9 +326,9 @@ function get_reddit_comments(timeouts = 0) {
 
   var fallback = comments.innerHTML;
   comments.innerHTML =
-    '<h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3>';
+    '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
 
-  var url = "/api/v1/comments/<%= video.id %>?source=reddit&format=html&hl=<%= env.get("locale").as(String) %>";
+  var url = "/api/v1/comments/<%= video.id %>?source=reddit&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>";
   var xhr = new XMLHttpRequest();
   xhr.responseType = "json";
   xhr.timeout = 20000;
@@ -355,7 +362,7 @@ function get_reddit_comments(timeouts = 0) {
           contentHtml: xhr.response.contentHtml
         });
       } else {
-        <% if preferences && preferences.comments[1] == "youtube" %> 
+        <% if preferences && preferences.comments[1] == "youtube" %>
         get_youtube_comments();
         <% else %>
         comments.innerHTML = fallback;
@@ -382,9 +389,9 @@ function get_youtube_comments(timeouts = 0) {
 
   var fallback = comments.innerHTML;
   comments.innerHTML =
-    '<h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3>';
+    '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
 
-  var url = "/api/v1/comments/<%= video.id %>?format=html&hl=<%= env.get("locale").as(String) %>";
+  var url = "/api/v1/comments/<%= video.id %>?format=html&hl=<%= env.get("preferences").as(Preferences).locale %>&thin_mode=<%= env.get("preferences").as(Preferences).thin_mode %>";
   var xhr = new XMLHttpRequest();
   xhr.responseType = "json";
   xhr.timeout = 20000;
@@ -416,7 +423,7 @@ function get_youtube_comments(timeouts = 0) {
           comments.innerHTML = "";
         }
       } else {
-        <% if preferences && preferences.comments[1] == "youtube" %> 
+        <% if preferences && preferences.comments[1] == "youtube" %>
         get_youtube_comments();
         <% else %>
         comments.innerHTML = "";
@@ -429,7 +436,7 @@ function get_youtube_comments(timeouts = 0) {
     console.log("Pulling comments timed out.");
 
     comments.innerHTML =
-      '<h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3>';
+      '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
     get_youtube_comments(timeouts + 1);
   };
 }
@@ -440,9 +447,9 @@ function get_youtube_replies(target, load_more) {
   var body = target.parentNode.parentNode;
   var fallback = body.innerHTML;
   body.innerHTML =
-      '<h3><center class="loading"><i class="icon ion-ios-refresh"></i></center></h3>';
+      '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
 
-  var url = '/api/v1/comments/<%= video.id %>?format=html&hl=<%= env.get("locale").as(String) %>&continuation=' +
+  var url = '/api/v1/comments/<%= video.id %>?format=html&hl=<%= env.get("preferences").as(Preferences).locale %>&thin_mode=<%= env.get("preferences").as(Preferences).thin_mode %>&continuation=' +
       continuation;
   var xhr = new XMLHttpRequest();
   xhr.responseType = 'json';