From 65e9eacfb1106277f3698bbcfb3883753e8efaf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milien=20Devos?= <contact@emiliendevos.be>
Date: Wed, 27 Oct 2021 06:59:48 +0000
Subject: [PATCH] update PRs

---
 patches/3-2444.patch |  61 ++-------
 patches/4-2538.patch | 318 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 328 insertions(+), 51 deletions(-)

diff --git a/patches/3-2444.patch b/patches/3-2444.patch
index ce2503c..a6fbe6a 100644
--- a/patches/3-2444.patch
+++ b/patches/3-2444.patch
@@ -1,7 +1,7 @@
-From 97dc90ae792c3ad876dd5d60c79fb33c23706096 Mon Sep 17 00:00:00 2001
+From 66e7285108363c3c3dcb814bdffb716c14e1724d Mon Sep 17 00:00:00 2001
 From: syeopite <syeopite@syeopite.dev>
 Date: Sat, 2 Oct 2021 11:51:15 -0700
-Subject: [PATCH 1/5] Only use /redirect when automatically redirecting
+Subject: [PATCH 1/4] Only use /redirect when automatically redirecting
 
 ---
  src/invidious/routes/misc.cr                  |  2 +-
@@ -11,9 +11,8 @@ Subject: [PATCH 1/5] Only use /redirect when automatically redirecting
  .../components/video-context-buttons.ecr      | 21 +++++++++++++
  src/invidious/views/playlist.ecr              | 13 ++++++--
  src/invidious/views/playlists.ecr             |  6 +++-
- src/invidious/views/preferences.ecr           |  2 +-
  src/invidious/views/watch.ecr                 |  4 +++
- 9 files changed, 57 insertions(+), 34 deletions(-)
+ 8 files changed, 56 insertions(+), 33 deletions(-)
  create mode 100644 src/invidious/views/components/video-context-buttons.ecr
 
 diff --git a/src/invidious/routes/misc.cr b/src/invidious/routes/misc.cr
@@ -64,7 +63,7 @@ index 15d8ed1e0..17bc4f89b 100644
          <% if !channel.auto_generated %>
              <div class="pure-u-1 pure-md-1-3">
 diff --git a/src/invidious/views/components/item.ecr b/src/invidious/views/components/item.ecr
-index d084bfd4d..1852d3659 100644
+index 5788bf513..a58571aa1 100644
 --- a/src/invidious/views/components/item.ecr
 +++ b/src/invidious/views/components/item.ecr
 @@ -79,19 +79,8 @@
@@ -181,21 +180,8 @@ index 1245256fe..74890f5a1 100644
          </div>
  
          <div class="pure-u-1 pure-md-1-3">
-diff --git a/src/invidious/views/preferences.ecr b/src/invidious/views/preferences.ecr
-index 401c15ea6..5999169ad 100644
---- a/src/invidious/views/preferences.ecr
-+++ b/src/invidious/views/preferences.ecr
-@@ -186,7 +186,7 @@
- 
-             <div class="pure-control-group">
-                 <label for="automatic_instance_redirect"><%= translate(locale, "Automaticatic instance redirection (fallback to redirect.invidious.io): ") %></label>
--                <input name="automatic_instance_redirect" id="automatic_instance_redirect" type="checkbox" <% if preferences.automatic_instance_redirect %>checked<% end %>>
-+                <input name="automatic_instance_redirect" id="automatic_instance_redirect" type="checkbox" <% if env.get("preferences").as(Preferences).automatic_instance_redirect %>checked<% end %>>
-             </div>
- 
-             <% if env.get? "user" %>
 diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
-index 68e7eb801..845b01177 100644
+index cad36e732..928e56453 100644
 --- a/src/invidious/views/watch.ecr
 +++ b/src/invidious/views/watch.ecr
 @@ -116,7 +116,11 @@ we're going to need to do it here in order to allow for translations.
@@ -211,10 +197,10 @@ index 68e7eb801..845b01177 100644
              <p id="embed-link">
                  <a href="<%= embed_link %>"><%= translate(locale, "Embed Link") %></a>
 
-From 67cd9c0dd96b35d89cd73a6b93c510cc341ccbb5 Mon Sep 17 00:00:00 2001
+From bb396a310ed8b3042793e0dc7a4c88f8412f7e3d Mon Sep 17 00:00:00 2001
 From: syeopite <syeopite@syeopite.dev>
 Date: Sat, 2 Oct 2021 12:25:22 -0700
-Subject: [PATCH 2/5] Remove unneeded redirect.invidious.io code in /redirect
+Subject: [PATCH 2/4] Remove unneeded redirect.invidious.io code in /redirect
 
 ---
  src/invidious/routes/misc.cr | 5 -----
@@ -237,10 +223,10 @@ index 94d542836..3ea4c2727 100644
      env.redirect "https://#{instance_url}#{referer}"
    end
 
-From 2c4a30de554f6405937ef8fee993aa79140f293c Mon Sep 17 00:00:00 2001
+From a531f4f05750db76ff61eb3477b75f71bdce2841 Mon Sep 17 00:00:00 2001
 From: syeopite <syeopite@syeopite.dev>
 Date: Fri, 15 Oct 2021 07:45:36 -0700
-Subject: [PATCH 3/5] Rebase error
+Subject: [PATCH 3/4] Rebase error
 
 ---
  src/invidious/views/components/video-context-buttons.ecr | 2 +-
@@ -260,10 +246,10 @@ index 062c3de00..daa107f0e 100644
              </a>
          <% else %>
 
-From 31fd593e93c6e10957001377c8b04add9436e25a Mon Sep 17 00:00:00 2001
+From 437bdedb07b438d329d254f9d515803fd8520a9f Mon Sep 17 00:00:00 2001
 From: syeopite <syeopite@syeopite.dev>
 Date: Fri, 15 Oct 2021 14:40:59 -0700
-Subject: [PATCH 4/5] Use env.request.resource for instance switch link
+Subject: [PATCH 4/4] Use env.request.resource for instance switch link
 
 ---
  src/invidious/views/channel.ecr   | 2 +-
@@ -326,7 +312,7 @@ index 74890f5a1..12dba088f 100644
          </div>
  
 diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
-index 845b01177..6018e5c2d 100644
+index 928e56453..2f3709dd3 100644
 --- a/src/invidious/views/watch.ecr
 +++ b/src/invidious/views/watch.ecr
 @@ -119,7 +119,7 @@ we're going to need to do it here in order to allow for translations.
@@ -338,26 +324,3 @@ index 845b01177..6018e5c2d 100644
              <% end %>
              </p>
              <p id="embed-link">
-
-From de0c4a7a56191d5fbbefa8009fd541edd1805c25 Mon Sep 17 00:00:00 2001
-From: syeopite <70992037+syeopite@users.noreply.github.com>
-Date: Tue, 26 Oct 2021 12:16:27 +0000
-Subject: [PATCH 5/5] Use env.request.resource not .path for redirect
-
----
- src/invidious/views/channel.ecr | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr
-index 40b553a9c..1ba62d53d 100644
---- a/src/invidious/views/channel.ecr
-+++ b/src/invidious/views/channel.ecr
-@@ -48,7 +48,7 @@
-             <% if env.get("preferences").as(Preferences).automatic_instance_redirect%>
-                 <a href="/redirect?referer=<%= env.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a>
-             <% else %>
--                <a href="https://redirect.invidious.io<%= env.request.path %>"><%= translate(locale, "Switch Invidious Instance") %></a>
-+                <a href="https://redirect.invidious.io<%= env.request.resource %>"><%= translate(locale, "Switch Invidious Instance") %></a>
-             <% end %>
-         </div>
-         <% if !channel.auto_generated %>
diff --git a/patches/4-2538.patch b/patches/4-2538.patch
index 3e90d04..c0d2876 100644
--- a/patches/4-2538.patch
+++ b/patches/4-2538.patch
@@ -1,7 +1,7 @@
 From 85c914fe8a7003c15090f7f90bcc6100d2af6052 Mon Sep 17 00:00:00 2001
 From: bbielsa <bgb7@njit.edu>
 Date: Mon, 25 Oct 2021 19:50:17 -0400
-Subject: [PATCH 1/2] Add remember_position field to the Preferences and
+Subject: [PATCH 1/7] Add remember_position field to the Preferences and
  VideoPreferences structs, and add a checkbox in the preferences page to
  toggle it
 
@@ -132,7 +132,7 @@ index 401c15ea6..025e8399f 100644
 From baa578033a25d886ca66c813afc859a97dfa5f8f Mon Sep 17 00:00:00 2001
 From: bbielsa <bgb7@njit.edu>
 Date: Mon, 25 Oct 2021 20:59:36 -0400
-Subject: [PATCH 2/2] Save and load the position for the video using a local
+Subject: [PATCH 2/7] Save and load the position for the video using a local
  storage object, the object is a dictionary, where the key is the video ID,
  and the value is the time at which the user last left off watching the video.
  If the user deselected the 'remember video position' checkbox in the
@@ -239,3 +239,317 @@ index a461c53d6..4c12f1fe8 100644
  function set_time_percent(percent) {
      const duration = player.duration();
      const newTime = duration * (percent / 100);
+
+From 28c5143b8ad99c1f0973c707f97aa17ccbc712cc Mon Sep 17 00:00:00 2001
+From: bbielsa <bgb7@njit.edu>
+Date: Tue, 26 Oct 2021 17:30:59 -0400
+Subject: [PATCH 3/7] Remove console.log debugging
+
+---
+ assets/js/player.js | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/assets/js/player.js b/assets/js/player.js
+index 4c12f1fe8..ed9c62eea 100644
+--- a/assets/js/player.js
++++ b/assets/js/player.js
+@@ -218,7 +218,6 @@ if (video_data.params.remember_position) {
+     });
+ }
+ else {
+-    console.log("Removing data for remebered positions");
+     remove_all_video_times();
+ }
+ 
+
+From 888d90a3b637b5f8c9dcbc8c392d1480fda44b74 Mon Sep 17 00:00:00 2001
+From: bbielsa <bgb7@njit.edu>
+Date: Tue, 26 Oct 2021 18:43:28 -0400
+Subject: [PATCH 4/7] Added default value for get_video_time() which was
+ causing a bug in safari
+
+---
+ assets/js/player.js | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/assets/js/player.js b/assets/js/player.js
+index ed9c62eea..2a0c6fd78 100644
+--- a/assets/js/player.js
++++ b/assets/js/player.js
+@@ -207,7 +207,7 @@ if (video_data.params.remember_position) {
+ 
+     set_seconds_after_start(remeberedTime);
+ 
+-    player.on("timeupdate", e => {
++    const updateTime = () => {
+         const raw = player.currentTime();
+         const time = Math.floor(raw);
+ 
+@@ -215,7 +215,9 @@ if (video_data.params.remember_position) {
+             save_video_time(time);
+             lastUpdated = time;
+         }
+-    });
++    };
++
++    player.on("timeupdate", updateTime);
+ }
+ else {
+     remove_all_video_times();
+@@ -372,7 +374,7 @@ function get_video_time() {
+         const all_video_times = get_all_video_times();
+         const timestamp = all_video_times[videoId];
+ 
+-        return timestamp;
++        return timestamp || 0;
+     }
+     catch {
+         return 0;
+
+From 40bf6466c2bb2331cd37dc9153432d3554bd6542 Mon Sep 17 00:00:00 2001
+From: bbielsa <bgb7@njit.edu>
+Date: Tue, 26 Oct 2021 19:25:29 -0400
+Subject: [PATCH 5/7] Rename 'remember_position' to 'save_player_pos' for
+ clarity
+
+---
+ assets/js/player.js                 | 10 +++++-----
+ src/invidious/config.cr             |  2 +-
+ src/invidious/routes/preferences.cr |  8 ++++----
+ src/invidious/user/preferences.cr   |  2 +-
+ src/invidious/videos.cr             | 12 ++++++------
+ src/invidious/views/preferences.ecr |  4 ++--
+ 6 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/assets/js/player.js b/assets/js/player.js
+index 2a0c6fd78..b4973482b 100644
+--- a/assets/js/player.js
++++ b/assets/js/player.js
+@@ -38,7 +38,7 @@ embed_url.searchParams.delete('v');
+ short_url = location.origin + '/' + video_data.id + embed_url.search;
+ embed_url = location.origin + '/embed/' + video_data.id + embed_url.search;
+ 
+-var remember_position_key = "remember_position";
++var save_player_pos_key = "save_player_pos";
+ 
+ var shareOptions = {
+     socials: ['fbFeed', 'tw', 'reddit', 'email'],
+@@ -201,7 +201,7 @@ if (video_data.premiere_timestamp && Math.round(new Date() / 1000) < video_data.
+     player.getChild('bigPlayButton').hide();
+ }
+ 
+-if (video_data.params.remember_position) {
++if (video_data.params.save_player_pos) {
+     const remeberedTime = get_video_time();
+     let lastUpdated = 0;
+ 
+@@ -384,12 +384,12 @@ function get_video_time() {
+ function set_all_video_times(times) {
+     const json = JSON.stringify(times);
+ 
+-    localStorage.setItem(remember_position_key, json);
++    localStorage.setItem(save_player_pos_key, json);
+ }
+ 
+ function get_all_video_times() {
+     try {
+-        const raw = localStorage.getItem(remember_position_key);
++        const raw = localStorage.getItem(save_player_pos_key);
+         const times = JSON.parse(raw);
+ 
+         return times || {};
+@@ -400,7 +400,7 @@ function get_all_video_times() {
+ }
+ 
+ function remove_all_video_times() {
+-    localStorage.removeItem(remember_position_key);
++    localStorage.removeItem(save_player_pos_key);
+ }
+ 
+ function set_time_percent(percent) {
+diff --git a/src/invidious/config.cr b/src/invidious/config.cr
+index 52b473f00..c10ba43e4 100644
+--- a/src/invidious/config.cr
++++ b/src/invidious/config.cr
+@@ -41,7 +41,7 @@ struct ConfigPreferences
+   property volume : Int32 = 100
+   property vr_mode : Bool = true
+   property show_nick : Bool = true
+-  property remember_position : Bool = false
++  property save_player_pos : Bool = false
+ 
+   def to_tuple
+     {% begin %}
+diff --git a/src/invidious/routes/preferences.cr b/src/invidious/routes/preferences.cr
+index e2254f4d1..21d19d748 100644
+--- a/src/invidious/routes/preferences.cr
++++ b/src/invidious/routes/preferences.cr
+@@ -70,9 +70,9 @@ module Invidious::Routes::PreferencesRoute
+     vr_mode ||= "off"
+     vr_mode = vr_mode == "on"
+ 
+-    remember_position = env.params.body["remember_position"]?.try &.as(String)
+-    remember_position ||= "off"
+-    remember_position = remember_position == "on"
++    save_player_pos = env.params.body["save_player_pos"]?.try &.as(String)
++    save_player_pos ||= "off"
++    save_player_pos = save_player_pos == "on"
+ 
+     show_nick = env.params.body["show_nick"]?.try &.as(String)
+     show_nick ||= "off"
+@@ -166,7 +166,7 @@ module Invidious::Routes::PreferencesRoute
+       extend_desc:                 extend_desc,
+       vr_mode:                     vr_mode,
+       show_nick:                   show_nick,
+-      remember_position:           remember_position,
++      save_player_pos:           save_player_pos,
+     }.to_json).to_json
+ 
+     if user = env.get? "user"
+diff --git a/src/invidious/user/preferences.cr b/src/invidious/user/preferences.cr
+index 5e3329949..a7f67edcb 100644
+--- a/src/invidious/user/preferences.cr
++++ b/src/invidious/user/preferences.cr
+@@ -52,7 +52,7 @@ struct Preferences
+   property video_loop : Bool = CONFIG.default_user_preferences.video_loop
+   property extend_desc : Bool = CONFIG.default_user_preferences.extend_desc
+   property volume : Int32 = CONFIG.default_user_preferences.volume
+-  property remember_position : Bool = CONFIG.default_user_preferences.remember_position
++  property save_player_pos : Bool = CONFIG.default_user_preferences.save_player_pos
+ 
+   module BoolToString
+     def self.to_json(value : String, json : JSON::Builder)
+diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
+index a4353fd0f..4d1f1fd95 100644
+--- a/src/invidious/videos.cr
++++ b/src/invidious/videos.cr
+@@ -246,7 +246,7 @@ struct VideoPreferences
+   property video_start : Float64 | Int32
+   property volume : Int32
+   property vr_mode : Bool
+-  property remember_position : Bool
++  property save_player_pos : Bool
+ end
+ 
+ struct Video
+@@ -1040,7 +1040,7 @@ def process_video_params(query, preferences)
+   extend_desc = query["extend_desc"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+   volume = query["volume"]?.try &.to_i?
+   vr_mode = query["vr_mode"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+-  remember_position = query["remember_position"]?.try { |q| (q == "true" || q == "1").to_unsafe }
++  save_player_pos = query["save_player_pos"]?.try { |q| (q == "true" || q == "1").to_unsafe }
+ 
+   if preferences
+     # region ||= preferences.region
+@@ -1061,7 +1061,7 @@ def process_video_params(query, preferences)
+     extend_desc ||= preferences.extend_desc.to_unsafe
+     volume ||= preferences.volume
+     vr_mode ||= preferences.vr_mode.to_unsafe
+-    remember_position ||= preferences.remember_position.to_unsafe
++    save_player_pos ||= preferences.save_player_pos.to_unsafe
+   end
+ 
+   annotations ||= CONFIG.default_user_preferences.annotations.to_unsafe
+@@ -1081,7 +1081,7 @@ def process_video_params(query, preferences)
+   extend_desc ||= CONFIG.default_user_preferences.extend_desc.to_unsafe
+   volume ||= CONFIG.default_user_preferences.volume
+   vr_mode ||= CONFIG.default_user_preferences.vr_mode.to_unsafe
+-  remember_position ||= CONFIG.default_user_preferences.remember_position.to_unsafe
++  save_player_pos ||= CONFIG.default_user_preferences.save_player_pos.to_unsafe
+ 
+   annotations = annotations == 1
+   autoplay = autoplay == 1
+@@ -1093,7 +1093,7 @@ def process_video_params(query, preferences)
+   video_loop = video_loop == 1
+   extend_desc = extend_desc == 1
+   vr_mode = vr_mode == 1
+-  remember_position = remember_position == 1
++  save_player_pos = save_player_pos == 1
+ 
+   if CONFIG.disabled?("dash") && quality == "dash"
+     quality = "high"
+@@ -1144,7 +1144,7 @@ def process_video_params(query, preferences)
+     video_start:        video_start,
+     volume:             volume,
+     vr_mode:            vr_mode,
+-    remember_position:  remember_position,
++    save_player_pos:  save_player_pos,
+   })
+ 
+   return params
+diff --git a/src/invidious/views/preferences.ecr b/src/invidious/views/preferences.ecr
+index 025e8399f..590f104c6 100644
+--- a/src/invidious/views/preferences.ecr
++++ b/src/invidious/views/preferences.ecr
+@@ -117,8 +117,8 @@
+             </div>
+ 
+             <div class="pure-control-group">
+-                <label for="remember_position">Remember the current video time:</label>
+-                <input name="remember_position" id="remember_position" type="checkbox" <% if preferences.remember_position %>checked<% end %>>
++                <label for="save_player_pos">Remember the current video time:</label>
++                <input name="save_player_pos" id="save_player_pos" type="checkbox" <% if preferences.save_player_pos %>checked<% end %>>
+             </div>
+ 
+             <legend><%= translate(locale, "Visual preferences") %></legend>
+
+From 928636ec9f93a0023206f8de2cb5ab7199100267 Mon Sep 17 00:00:00 2001
+From: bbielsa <bgb7@njit.edu>
+Date: Tue, 26 Oct 2021 19:31:50 -0400
+Subject: [PATCH 6/7] Use localization for save player position label in the
+ preferences page
+
+---
+ locales/en-US.json                  | 3 ++-
+ src/invidious/views/preferences.ecr | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/locales/en-US.json b/locales/en-US.json
+index 230d96ad2..730cd0933 100644
+--- a/locales/en-US.json
++++ b/locales/en-US.json
+@@ -431,5 +431,6 @@
+     "footer_source_code": "Source code",
+     "footer_original_source_code": "Original source code",
+     "footer_modfied_source_code": "Modified Source code",
+-    "adminprefs_modified_source_code_url_label": "URL to modified source code repository"
++    "adminprefs_modified_source_code_url_label": "URL to modified source code repository",
++    "preferences_save_player_pos_label": "Save the current video time: "
+ }
+diff --git a/src/invidious/views/preferences.ecr b/src/invidious/views/preferences.ecr
+index 590f104c6..c1b293f0f 100644
+--- a/src/invidious/views/preferences.ecr
++++ b/src/invidious/views/preferences.ecr
+@@ -117,7 +117,7 @@
+             </div>
+ 
+             <div class="pure-control-group">
+-                <label for="save_player_pos">Remember the current video time:</label>
++                <label for="save_player_pos"><%= translate(locale, "preferences_save_player_pos_label") %></label>
+                 <input name="save_player_pos" id="save_player_pos" type="checkbox" <% if preferences.save_player_pos %>checked<% end %>>
+             </div>
+ 
+
+From bac8f3aa92a4c3576a8ea674d8e8ee9d9a4e18e5 Mon Sep 17 00:00:00 2001
+From: bbielsa <bgb7@njit.edu>
+Date: Tue, 26 Oct 2021 19:50:48 -0400
+Subject: [PATCH 7/7] Fix indentation of save_player_pos property value in
+ videos.cr
+
+---
+ src/invidious/videos.cr | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
+index 4d1f1fd95..bcde7d2d9 100644
+--- a/src/invidious/videos.cr
++++ b/src/invidious/videos.cr
+@@ -1144,7 +1144,7 @@ def process_video_params(query, preferences)
+     video_start:        video_start,
+     volume:             volume,
+     vr_mode:            vr_mode,
+-    save_player_pos:  save_player_pos,
++    save_player_pos:    save_player_pos,
+   })
+ 
+   return params