From 7dd699370fae20c69119a4117468b1d999a2752a Mon Sep 17 00:00:00 2001
From: meow <woem>
Date: Fri, 6 May 2022 04:46:59 +0300
Subject: js code rewrite. Created _helpers.js with XHR and storage wrapper

---
 src/invidious/comments.cr                           |  2 +-
 src/invidious/views/add_playlist_items.ecr          |  1 +
 src/invidious/views/community.ecr                   |  1 +
 src/invidious/views/components/player.ecr           |  1 +
 src/invidious/views/components/subscribe_widget.ecr |  1 +
 src/invidious/views/embed.ecr                       |  1 +
 src/invidious/views/feeds/history.ecr               |  1 +
 src/invidious/views/feeds/subscriptions.ecr         |  1 +
 src/invidious/views/licenses.ecr                    | 14 ++++++++++++++
 src/invidious/views/playlist.ecr                    |  1 +
 src/invidious/views/template.ecr                    |  1 +
 src/invidious/views/watch.ecr                       |  2 ++
 12 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr
index 1f8de657..f50b5907 100644
--- a/src/invidious/comments.cr
+++ b/src/invidious/comments.cr
@@ -481,7 +481,7 @@ def template_reddit_comments(root, locale)
 
         html << <<-END_HTML
         <p>
-          <a href="javascript:void(0)" data-onclick="toggle_parent">[ - ]</a>
+          <a href="javascript:void(0)" data-onclick="toggle_parent">[ − ]</a>
           <b><a href="https://www.reddit.com/user/#{child.author}">#{child.author}</a></b>
           #{translate_count(locale, "comments_points_count", child.score, NumberFormatting::Separator)}
           <span title="#{child.created_utc.to_s(translate(locale, "%a %B %-d %T %Y UTC"))}">#{translate(locale, "`x` ago", recode_date(child.created_utc, locale))}</span>
diff --git a/src/invidious/views/add_playlist_items.ecr b/src/invidious/views/add_playlist_items.ecr
index 22870317..758f3995 100644
--- a/src/invidious/views/add_playlist_items.ecr
+++ b/src/invidious/views/add_playlist_items.ecr
@@ -29,6 +29,7 @@
 }.to_pretty_json
 %>
 </script>
+<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/playlist_widget.js?v=<%= ASSET_COMMIT %>"></script>
 
 <div class="pure-g">
diff --git a/src/invidious/views/community.ecr b/src/invidious/views/community.ecr
index 3bc29e55..154c40b5 100644
--- a/src/invidious/views/community.ecr
+++ b/src/invidious/views/community.ecr
@@ -93,4 +93,5 @@
 }.to_pretty_json
 %>
 </script>
+<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/community.js?v=<%= ASSET_COMMIT %>"></script>
diff --git a/src/invidious/views/components/player.ecr b/src/invidious/views/components/player.ecr
index fffefc9a..483807d7 100644
--- a/src/invidious/views/components/player.ecr
+++ b/src/invidious/views/components/player.ecr
@@ -66,4 +66,5 @@
 }.to_pretty_json
 %>
 </script>
+<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/player.js?v=<%= ASSET_COMMIT %>"></script>
diff --git a/src/invidious/views/components/subscribe_widget.ecr b/src/invidious/views/components/subscribe_widget.ecr
index b9d5f783..7a8c7fda 100644
--- a/src/invidious/views/components/subscribe_widget.ecr
+++ b/src/invidious/views/components/subscribe_widget.ecr
@@ -31,6 +31,7 @@
     }.to_pretty_json
     %>
     </script>
+    <script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
     <script src="/js/subscribe_widget.js?v=<%= ASSET_COMMIT %>"></script>
 <% else %>
     <p>
diff --git a/src/invidious/views/embed.ecr b/src/invidious/views/embed.ecr
index ce5ff7f0..82f80f9d 100644
--- a/src/invidious/views/embed.ecr
+++ b/src/invidious/views/embed.ecr
@@ -31,6 +31,7 @@
 </script>
 
 <%= rendered "components/player" %>
+<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/embed.js?v=<%= ASSET_COMMIT %>"></script>
 </body>
 </html>
diff --git a/src/invidious/views/feeds/history.ecr b/src/invidious/views/feeds/history.ecr
index 6c1243c5..51dd78bd 100644
--- a/src/invidious/views/feeds/history.ecr
+++ b/src/invidious/views/feeds/history.ecr
@@ -25,6 +25,7 @@
 }.to_pretty_json
 %>
 </script>
+<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/watched_widget.js"></script>
 
 <div class="pure-g">
diff --git a/src/invidious/views/feeds/subscriptions.ecr b/src/invidious/views/feeds/subscriptions.ecr
index 8d56ad14..957277fa 100644
--- a/src/invidious/views/feeds/subscriptions.ecr
+++ b/src/invidious/views/feeds/subscriptions.ecr
@@ -50,6 +50,7 @@
 }.to_pretty_json
 %>
 </script>
+<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/watched_widget.js"></script>
 
 <div class="pure-g">
diff --git a/src/invidious/views/licenses.ecr b/src/invidious/views/licenses.ecr
index 861913d0..25b24ed4 100644
--- a/src/invidious/views/licenses.ecr
+++ b/src/invidious/views/licenses.ecr
@@ -9,6 +9,20 @@
 <body>
     <h1><%= translate(locale, "JavaScript license information") %></h1>
     <table id="jslicense-labels1">
+        <tr>
+            <td>
+                <a href="/js/_helpers.js?v=<%= ASSET_COMMIT %>">_helpers.js</a>
+            </td>
+
+            <td>
+                <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL-3.0</a>
+            </td>
+
+            <td>
+                <a href="/js/_helpers.js?v=<%= ASSET_COMMIT %>"><%= translate(locale, "source") %></a>
+            </td>
+        </tr>
+
         <tr>
             <td>
                 <a href="/js/community.js?v=<%= ASSET_COMMIT %>">community.js</a>
diff --git a/src/invidious/views/playlist.ecr b/src/invidious/views/playlist.ecr
index df3112db..641cbe2c 100644
--- a/src/invidious/views/playlist.ecr
+++ b/src/invidious/views/playlist.ecr
@@ -97,6 +97,7 @@
 }.to_pretty_json
 %>
 </script>
+<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/playlist_widget.js?v=<%= ASSET_COMMIT %>"></script>
 <% end %>
 
diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr
index bd908dd6..79decbe6 100644
--- a/src/invidious/views/template.ecr
+++ b/src/invidious/views/template.ecr
@@ -157,6 +157,7 @@
         </div>
         <div class="pure-u-1 pure-u-md-2-24"></div>
     </div>
+    <script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
     <script src="/js/handlers.js?v=<%= ASSET_COMMIT %>"></script>
     <script src="/js/themes.js?v=<%= ASSET_COMMIT %>"></script>
     <% if env.get? "user" %>
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index 8b6eb903..e6a14d0f 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -165,6 +165,7 @@ we're going to need to do it here in order to allow for translations.
                     }.to_pretty_json
                     %>
                     </script>
+                    <script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
                     <script src="/js/playlist_widget.js?v=<%= Time.utc.to_unix_ms %>"></script>
                 <% end %>
             <% end %>
@@ -303,4 +304,5 @@ we're going to need to do it here in order to allow for translations.
         </div>
     <% end %>
 </div>
+<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/watch.js?v=<%= ASSET_COMMIT %>"></script>
-- 
cgit v1.2.3


From 1097648f0a675215594f52c0e1b1f97975a07f39 Mon Sep 17 00:00:00 2001
From: meow <woem>
Date: Tue, 17 May 2022 10:09:01 +0300
Subject: Fix HTML validation. This is how browser really split tags

---
 src/invidious/views/watch.ecr | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index e6a14d0f..f2d8ba03 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -279,24 +279,24 @@ we're going to need to do it here in order to allow for translations.
                                     </div>
                                 <% end %>
                                 <p style="width:100%"><%= rv["title"] %></p>
-                                <h5 class="pure-g">
-                                    <div class="pure-u-14-24">
-                                        <% if rv["ucid"]? %>
-                                            <b style="width:100%"><a href="/channel/<%= rv["ucid"] %>"><%= rv["author"]? %><% if rv["author_verified"]? == "true" %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></a></b>
-                                        <% else %>
-                                            <b style="width:100%"><%= rv["author"]? %><% if rv["author_verified"]? == "true" %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></b>
-                                        <% end %>
-                                    </div>
-
-                                    <div class="pure-u-10-24" style="text-align:right">
-                                        <b class="width:100%"><%=
-                                            views = rv["view_count"]?.try &.to_i?
-                                            views ||= rv["view_count_short"]?.try { |x| short_text_to_number(x) }
-                                            translate_count(locale, "generic_views_count", views || 0, NumberFormatting::Short)
-                                        %></b>
-                                    </div>
-                                </h5>
                             </a>
+                            <h5 class="pure-g">
+                                <div class="pure-u-14-24">
+                                    <% if rv["ucid"]? %>
+                                        <b style="width:100%"><a href="/channel/<%= rv["ucid"] %>"><%= rv["author"]? %><% if rv["author_verified"]? == "true" %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></a></b>
+                                    <% else %>
+                                        <b style="width:100%"><%= rv["author"]? %><% if rv["author_verified"]? == "true" %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></b>
+                                    <% end %>
+                                </div>
+
+                                <div class="pure-u-10-24" style="text-align:right">
+                                    <b class="width:100%"><%=
+                                        views = rv["view_count"]?.try &.to_i?
+                                        views ||= rv["view_count_short"]?.try { |x| short_text_to_number(x) }
+                                        translate_count(locale, "generic_views_count", views || 0, NumberFormatting::Short)
+                                    %></b>
+                                </div>
+                            </h5>
                         <% end %>
                     <% end %>
                 </div>
-- 
cgit v1.2.3


From a402128a7d4a2d3dccbeeb553e5363447f501a37 Mon Sep 17 00:00:00 2001
From: meow <woem>
Date: Sun, 5 Jun 2022 21:19:59 +0300
Subject: Move `_helpers.js` include from various .ecr's into `template.ecr`
 `head` tag

---
 src/invidious/views/add_playlist_items.ecr          | 1 -
 src/invidious/views/community.ecr                   | 1 -
 src/invidious/views/components/player.ecr           | 1 -
 src/invidious/views/components/subscribe_widget.ecr | 1 -
 src/invidious/views/embed.ecr                       | 1 -
 src/invidious/views/feeds/history.ecr               | 1 -
 src/invidious/views/feeds/subscriptions.ecr         | 1 -
 src/invidious/views/playlist.ecr                    | 1 -
 src/invidious/views/template.ecr                    | 2 +-
 src/invidious/views/watch.ecr                       | 2 --
 10 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/invidious/views/add_playlist_items.ecr b/src/invidious/views/add_playlist_items.ecr
index 758f3995..22870317 100644
--- a/src/invidious/views/add_playlist_items.ecr
+++ b/src/invidious/views/add_playlist_items.ecr
@@ -29,7 +29,6 @@
 }.to_pretty_json
 %>
 </script>
-<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/playlist_widget.js?v=<%= ASSET_COMMIT %>"></script>
 
 <div class="pure-g">
diff --git a/src/invidious/views/community.ecr b/src/invidious/views/community.ecr
index 154c40b5..3bc29e55 100644
--- a/src/invidious/views/community.ecr
+++ b/src/invidious/views/community.ecr
@@ -93,5 +93,4 @@
 }.to_pretty_json
 %>
 </script>
-<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/community.js?v=<%= ASSET_COMMIT %>"></script>
diff --git a/src/invidious/views/components/player.ecr b/src/invidious/views/components/player.ecr
index 483807d7..fffefc9a 100644
--- a/src/invidious/views/components/player.ecr
+++ b/src/invidious/views/components/player.ecr
@@ -66,5 +66,4 @@
 }.to_pretty_json
 %>
 </script>
-<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/player.js?v=<%= ASSET_COMMIT %>"></script>
diff --git a/src/invidious/views/components/subscribe_widget.ecr b/src/invidious/views/components/subscribe_widget.ecr
index 7a8c7fda..b9d5f783 100644
--- a/src/invidious/views/components/subscribe_widget.ecr
+++ b/src/invidious/views/components/subscribe_widget.ecr
@@ -31,7 +31,6 @@
     }.to_pretty_json
     %>
     </script>
-    <script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
     <script src="/js/subscribe_widget.js?v=<%= ASSET_COMMIT %>"></script>
 <% else %>
     <p>
diff --git a/src/invidious/views/embed.ecr b/src/invidious/views/embed.ecr
index 82f80f9d..ce5ff7f0 100644
--- a/src/invidious/views/embed.ecr
+++ b/src/invidious/views/embed.ecr
@@ -31,7 +31,6 @@
 </script>
 
 <%= rendered "components/player" %>
-<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/embed.js?v=<%= ASSET_COMMIT %>"></script>
 </body>
 </html>
diff --git a/src/invidious/views/feeds/history.ecr b/src/invidious/views/feeds/history.ecr
index 51dd78bd..6c1243c5 100644
--- a/src/invidious/views/feeds/history.ecr
+++ b/src/invidious/views/feeds/history.ecr
@@ -25,7 +25,6 @@
 }.to_pretty_json
 %>
 </script>
-<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/watched_widget.js"></script>
 
 <div class="pure-g">
diff --git a/src/invidious/views/feeds/subscriptions.ecr b/src/invidious/views/feeds/subscriptions.ecr
index 957277fa..8d56ad14 100644
--- a/src/invidious/views/feeds/subscriptions.ecr
+++ b/src/invidious/views/feeds/subscriptions.ecr
@@ -50,7 +50,6 @@
 }.to_pretty_json
 %>
 </script>
-<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/watched_widget.js"></script>
 
 <div class="pure-g">
diff --git a/src/invidious/views/playlist.ecr b/src/invidious/views/playlist.ecr
index 641cbe2c..df3112db 100644
--- a/src/invidious/views/playlist.ecr
+++ b/src/invidious/views/playlist.ecr
@@ -97,7 +97,6 @@
 }.to_pretty_json
 %>
 </script>
-<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/playlist_widget.js?v=<%= ASSET_COMMIT %>"></script>
 <% end %>
 
diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr
index 79decbe6..4e2b29f0 100644
--- a/src/invidious/views/template.ecr
+++ b/src/invidious/views/template.ecr
@@ -17,6 +17,7 @@
     <link rel="stylesheet" href="/css/grids-responsive-min.css?v=<%= ASSET_COMMIT %>">
     <link rel="stylesheet" href="/css/ionicons.min.css?v=<%= ASSET_COMMIT %>">
     <link rel="stylesheet" href="/css/default.css?v=<%= ASSET_COMMIT %>">
+    <script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 </head>
 
 <%
@@ -157,7 +158,6 @@
         </div>
         <div class="pure-u-1 pure-u-md-2-24"></div>
     </div>
-    <script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
     <script src="/js/handlers.js?v=<%= ASSET_COMMIT %>"></script>
     <script src="/js/themes.js?v=<%= ASSET_COMMIT %>"></script>
     <% if env.get? "user" %>
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index f2d8ba03..861b2048 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -165,7 +165,6 @@ we're going to need to do it here in order to allow for translations.
                     }.to_pretty_json
                     %>
                     </script>
-                    <script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
                     <script src="/js/playlist_widget.js?v=<%= Time.utc.to_unix_ms %>"></script>
                 <% end %>
             <% end %>
@@ -304,5 +303,4 @@ we're going to need to do it here in order to allow for translations.
         </div>
     <% end %>
 </div>
-<script src="/js/_helpers.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/watch.js?v=<%= ASSET_COMMIT %>"></script>
-- 
cgit v1.2.3