From 19da112a096e612ac9020b6cce9c9c1f9702a325 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Wed, 7 Oct 2020 15:27:56 +0200
Subject: yt_app.config: use 'TEMPLATES_AUTO_RELOAD'

---
 youtube/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/youtube/__init__.py b/youtube/__init__.py
index 6c2ec48..9038634 100644
--- a/youtube/__init__.py
+++ b/youtube/__init__.py
@@ -5,6 +5,7 @@ import traceback
 import re
 from sys import exc_info
 yt_app = flask.Flask(__name__)
+yt_app.config['TEMPLATES_AUTO_RELOAD'] = True
 yt_app.url_map.strict_slashes = False
 
 
-- 
cgit v1.2.3


From 05cec148810a18727f345853e8aadcb3648c1965 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Wed, 7 Oct 2020 15:28:32 +0200
Subject: autofocus search input

---
 youtube/templates/base.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/youtube/templates/base.html b/youtube/templates/base.html
index 4ff83c5..44aef20 100644
--- a/youtube/templates/base.html
+++ b/youtube/templates/base.html
@@ -19,7 +19,8 @@
         <header>
                 <a href="/youtube.com" id="home-link">Home</a>
                 <form id="site-search" action="/youtube.com/search">
-                    <input type="search" name="query" class="search-box" value="{{ search_box_value }}">
+                    <input type="search" name="query" class="search-box" value="{{ search_box_value }}"
+                        {{ "autofocus" if request.path == "/" else "" }}>
                     <button type="submit" value="Search" class="search-button">Search</button>
                     <div class="dropdown">
                         <button class="dropdown-label">Options</button>
-- 
cgit v1.2.3


From debc11931fe1102f17852fd082d0dac50d477ce9 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Wed, 7 Oct 2020 19:03:22 +0200
Subject: add comments.js

---
 settings.py                          |  7 +++++++
 youtube/__init__.py                  |  1 +
 youtube/comments.py                  | 18 ++++++++++++++----
 youtube/static/js/comments.js        | 20 ++++++++++++++++++++
 youtube/static/js/common.js          | 12 +++++++++++-
 youtube/templates/comments.html      |  9 ++++++++-
 youtube/templates/comments_page.html | 25 +++++++++++++++----------
 youtube/templates/watch.html         | 18 +++++++++++++++++-
 youtube/watch.py                     |  2 --
 9 files changed, 93 insertions(+), 19 deletions(-)
 create mode 100644 youtube/static/js/comments.js

diff --git a/settings.py b/settings.py
index 942f79c..fffe6f2 100644
--- a/settings.py
+++ b/settings.py
@@ -128,6 +128,13 @@ For security reasons, enabling this is not recommended.''',
         'comment': '',
     }),
 
+    ('use_comments_js', {
+        'label': 'Enable comments.js',
+        'type': bool,
+        'default': True,
+        'comment': '',
+    }),
+
     ('theme', {
         'type': int,
         'default': 0,
diff --git a/youtube/__init__.py b/youtube/__init__.py
index 6c2ec48..c2ce276 100644
--- a/youtube/__init__.py
+++ b/youtube/__init__.py
@@ -25,6 +25,7 @@ theme_names = {
 def inject_theme_preference():
     return {
         'theme_path': '/youtube.com/static/' + theme_names[settings.theme] + '.css',
+        'settings': settings,
     }
 
 @yt_app.template_filter('commatize')
diff --git a/youtube/comments.py b/youtube/comments.py
index 07d4b89..1af9079 100644
--- a/youtube/comments.py
+++ b/youtube/comments.py
@@ -27,7 +27,7 @@ from flask import request
 def make_comment_ctoken(video_id, sort=0, offset=0, lc='', secret_key=''):
     video_id = proto.as_bytes(video_id)
     secret_key = proto.as_bytes(secret_key)
-    
+
 
     page_info = proto.string(4,video_id) + proto.uint(6, sort)
     offset_information = proto.nested(4, page_info) + proto.uint(5, offset)
@@ -41,11 +41,11 @@ def make_comment_ctoken(video_id, sort=0, offset=0, lc='', secret_key=''):
     result = proto.nested(2, page_params) + proto.uint(3,6) + proto.nested(6, offset_information)
     return base64.urlsafe_b64encode(result).decode('ascii')
 
-def comment_replies_ctoken(video_id, comment_id, max_results=500):  
+def comment_replies_ctoken(video_id, comment_id, max_results=500):
 
     params = proto.string(2, comment_id) + proto.uint(9, max_results)
     params = proto.nested(3, params)
-    
+
     result = proto.nested(2, proto.string(2, video_id)) + proto.uint(3,6) + proto.nested(6, params)
     return base64.urlsafe_b64encode(result).decode('ascii')
 
@@ -121,10 +121,18 @@ def post_process_comments_info(comments_info):
             comment['view_replies_text'] = str(reply_count) + ' replies'
 
 
+        def fmt_num(num):
+            for unit in ['','k']:
+                if num < 1000:
+                    return "%3.1f%s" % (num, unit) if unit else num
+                num /= 1000.0
+            return "%.1f%s" % (num, 'm')
+
+        # if comment['like_count'] = '👍 ' + str(fmt_num(comment['like_count']))
         if comment['like_count'] == 1:
             comment['likes_text'] = '1 like'
         else:
-            comment['likes_text'] = str(comment['like_count']) + ' likes'
+            comment['likes_text'] = str(fmt_num(comment['like_count'])) + ' likes'
 
     comments_info['include_avatars'] = settings.enable_comment_avatars
     if comments_info['ctoken']:
@@ -187,8 +195,10 @@ def get_comments_page():
         'replying': replies,
     }
 
+
     return flask.render_template('comments_page.html',
         comments_info = comments_info,
         comment_posting_box_info = comment_posting_box_info,
+        slim = request.args.get('slim', False)
     )
 
diff --git a/youtube/static/js/comments.js b/youtube/static/js/comments.js
new file mode 100644
index 0000000..845ed3e
--- /dev/null
+++ b/youtube/static/js/comments.js
@@ -0,0 +1,20 @@
+function onClickReplies(e) {
+  var details = e.target.parentElement;
+  // e.preventDefault();
+  console.log("loading replies ..");
+  doXhr(details.getAttribute("src") + "&slim=1", (html) => {
+    var div = details.querySelector(".comment_page");
+    div.innerHTML = html;
+  });
+  details.removeEventListener('click', onClickReplies);
+}
+
+window.addEventListener('DOMContentLoaded', function() {
+    QA("details.replies").forEach(details => {
+      details.addEventListener('click', onClickReplies);
+      details.addEventListener('auxclick', (e) => {
+        if (e.target.parentElement !== details) return;
+        if (e.button == 1) window.open(details.getAttribute("src"));
+      });
+    });
+});
\ No newline at end of file
diff --git a/youtube/static/js/common.js b/youtube/static/js/common.js
index 687c6fa..40bc132 100644
--- a/youtube/static/js/common.js
+++ b/youtube/static/js/common.js
@@ -1,4 +1,5 @@
 Q = document.querySelector.bind(document);
+QA = document.querySelectorAll.bind(document);
 function text(msg) { return document.createTextNode(msg); }
 function clearNode(node) { while (node.firstChild) node.removeChild(node.firstChild); }
 function toTimestamp(seconds) {
@@ -36,6 +37,15 @@ function getDefaultTranscriptTrackIdx() {
   return textTracks.length - 1;
 }
 
+function doXhr(url, callback=null) {
+    var xhr = new XMLHttpRequest();
+    xhr.open("GET", url);
+    xhr.onload = (e) => {callback(e.currentTarget.response)};
+    xhr.send();
+    return xhr;
+}
+
+
 window.addEventListener('DOMContentLoaded', function() {
     cur_track_idx = getDefaultTranscriptTrackIdx();
-});
+});
\ No newline at end of file
diff --git a/youtube/templates/comments.html b/youtube/templates/comments.html
index f2cdf65..9d93b8c 100644
--- a/youtube/templates/comments.html
+++ b/youtube/templates/comments.html
@@ -22,7 +22,14 @@
 
             <span class="likes">{{ comment['likes_text'] if comment['like_count'] else ''}}</span>
             <div class="bottom-row">
-                <a href="{{ comment['replies_url'] }}" class="replies">{{ comment['view_replies_text'] }}</a>
+                {% if settings.use_comments_js and comment['reply_count'] %}
+                    <details class="replies" src="{{ comment['replies_url'] }}">
+                        <summary>{{ comment['view_replies_text'] }}</summary>
+                        <div class="comment_page">loading..</div>
+                    </details>
+                {% else %}
+                    <a href="{{ comment['replies_url'] }}" class="replies">{{ comment['view_replies_text'] }}</a>
+                {% endif %}
                 {% if 'delete_url' is in comment %}
                     <a href="{{ comment['delete_url'] }}" target="_blank">Delete</a>
                 {% endif %}
diff --git a/youtube/templates/comments_page.html b/youtube/templates/comments_page.html
index 047404a..2984f1e 100644
--- a/youtube/templates/comments_page.html
+++ b/youtube/templates/comments_page.html
@@ -1,13 +1,16 @@
 {% set page_title = ('Replies' if comments_info['is_replies'] else 'Comments page ' + comments_info['page_number']) %}
-{% extends "base.html" %}
-{% import "comments.html" as comments %}
+{% import "comments.html" as comments with context %}
 
-{% block style %}
-    .comments-area{
-        margin: auto;
-        width:640px;
-    }
-{% endblock style %}
+{% if not slim %}
+    {% extends "base.html" %}
+
+    {% block style %}
+        .comments-area{
+            margin: auto;
+            width:640px;
+        }
+    {% endblock style %}
+{% endif %}
 
 
 {% block main %}
@@ -24,7 +27,9 @@
             </section>
         {% endif %}
 
-        {{ comments.comment_posting_box(comment_posting_box_info) }}
+        {% if not slim %}
+            {{ comments.comment_posting_box(comment_posting_box_info) }}
+        {% endif %}
 
         {% if not comments_info['is_replies'] %}
             <div class="comment-links">
@@ -36,7 +41,7 @@
 
         <div class="comments">
             {% for comment in comments_info['comments'] %}
-                {{ comments.render_comment(comment, comments_info['include_avatars']) }}
+                {{ comments.render_comment(comment, comments_info['include_avatars'], slim) }}
             {% endfor %}
         </div>
         {% if 'more_comments_url' is in comments_info %}
diff --git a/youtube/templates/watch.html b/youtube/templates/watch.html
index 89f8daa..8835a69 100644
--- a/youtube/templates/watch.html
+++ b/youtube/templates/watch.html
@@ -1,7 +1,7 @@
 {% set page_title = title %}
 {% extends "base.html" %}
 {% import "common_elements.html" as common_elements %}
-{% import "comments.html" as comments %}
+{% import "comments.html" as comments with context %}
 {% block style %}
     details > summary{
         background-color: var(--interface-color);
@@ -14,6 +14,21 @@
         text-decoration: underline;
     }
 
+    details.replies > summary{
+        background-color: var(--interface-color);
+        border-style: outset;
+        border-width: 1px;
+        font-weight: bold;
+        padding-bottom: 0px;
+    }
+
+    details.replies .comment{
+        width: 600px;
+        border-style: solid;
+        border-width: 1px;
+        border-color: #0402025e;
+    }
+
     .playability-error{
         height: 360px;
         width: 640px;
@@ -682,4 +697,5 @@ Reload without invidious (for usage of new identity button).</a>
         <script src="/youtube.com/static/js/hotkeys.js"></script>
     {% endif %}
     <script src="/youtube.com/static/js/transcript-table.js"></script>
+    <script src="/youtube.com/static/js/comments.js"></script>
 {% endblock main %}
diff --git a/youtube/watch.py b/youtube/watch.py
index 0746cd6..1a9e6c4 100644
--- a/youtube/watch.py
+++ b/youtube/watch.py
@@ -470,8 +470,6 @@ def get_watch_page(video_id=None):
         comment_count           = info['comment_count'],
         comments_disabled       = info['comments_disabled'],
 
-        settings                = settings,
-
         video_height            = video_height,
         video_width             = video_width,
         theater_video_target_width = theater_video_target_width,
-- 
cgit v1.2.3


From 205665f138afa3e6b1242bbe5dd433c0991f5fe6 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Fri, 9 Oct 2020 18:49:50 +0200
Subject: doXhr: check xhr.status

---
 youtube/static/js/common.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/youtube/static/js/common.js b/youtube/static/js/common.js
index 40bc132..2997f61 100644
--- a/youtube/static/js/common.js
+++ b/youtube/static/js/common.js
@@ -40,7 +40,11 @@ function getDefaultTranscriptTrackIdx() {
 function doXhr(url, callback=null) {
     var xhr = new XMLHttpRequest();
     xhr.open("GET", url);
-    xhr.onload = (e) => {callback(e.currentTarget.response)};
+    xhr.onload = (e) => {
+      let ok = xhr.status >= 200 && xhr.status < 300;
+      if (ok) callback(e.currentTarget.response);
+      else alert(`${xhr.responseURL} status code: ${xhr.status}`);
+    }
     xhr.send();
     return xhr;
 }
-- 
cgit v1.2.3


From fd9bb643f8272ae681e0caeca8803b539b147448 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Fri, 9 Oct 2020 18:53:39 +0200
Subject: replies: remove css border

---
 youtube/templates/watch.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/youtube/templates/watch.html b/youtube/templates/watch.html
index 8835a69..c44e01d 100644
--- a/youtube/templates/watch.html
+++ b/youtube/templates/watch.html
@@ -24,9 +24,6 @@
 
     details.replies .comment{
         width: 600px;
-        border-style: solid;
-        border-width: 1px;
-        border-color: #0402025e;
     }
 
     .playability-error{
-- 
cgit v1.2.3


From 6a7d0557e24eb8e1b738ca4bd2eae3eef8371288 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Fri, 9 Oct 2020 18:55:04 +0200
Subject: jinja: only include 'comments.js' if needed

---
 youtube/templates/watch.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/youtube/templates/watch.html b/youtube/templates/watch.html
index c44e01d..86644ea 100644
--- a/youtube/templates/watch.html
+++ b/youtube/templates/watch.html
@@ -690,9 +690,11 @@ Reload without invidious (for usage of new identity button).</a>
     {% endif %}
 
     <script src="/youtube.com/static/js/common.js"></script>
+    <script src="/youtube.com/static/js/transcript-table.js"></script>
     {% if settings.use_video_hotkeys %}
         <script src="/youtube.com/static/js/hotkeys.js"></script>
     {% endif %}
-    <script src="/youtube.com/static/js/transcript-table.js"></script>
-    <script src="/youtube.com/static/js/comments.js"></script>
+    {% if settings.use_comments_js %}
+        <script src="/youtube.com/static/js/comments.js"></script>
+    {% endif %}
 {% endblock main %}
-- 
cgit v1.2.3


From a0c33c621e49a255cd90d5062c8a3efaef77f703 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Fri, 9 Oct 2020 19:41:31 +0200
Subject: fix get_number_of_videos_channel

---
 youtube/channel.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/youtube/channel.py b/youtube/channel.py
index ad6db5b..e9cc87b 100644
--- a/youtube/channel.py
+++ b/youtube/channel.py
@@ -150,7 +150,8 @@ def get_number_of_videos_channel(channel_id):
 
     response = response.decode('utf-8')
 
-    match = re.search(r'"numVideosText":\s*{\s*"runs":\s*\[{"text":\s*"([\d,]*) videos"', response)
+    # match = re.search(r'"numVideosText":\s*{\s*"runs":\s*\[{"text":\s*"([\d,]*) videos"', response)
+    match = re.search(r'"numVideosText".*?([,\d]+)', response)
     if match:
         return int(match.group(1).replace(',',''))
     else:
@@ -209,7 +210,7 @@ def get_channel_page_general_url(base_url, tab, request, channel_id=None):
 
     if tab == 'videos' and channel_id:
         tasks = (
-            gevent.spawn(get_number_of_videos_channel, channel_id), 
+            gevent.spawn(get_number_of_videos_channel, channel_id),
             gevent.spawn(get_channel_tab, channel_id, page_number, sort, 'videos', view)
         )
         gevent.joinall(tasks)
@@ -217,7 +218,7 @@ def get_channel_page_general_url(base_url, tab, request, channel_id=None):
         number_of_videos, polymer_json = tasks[0].value, tasks[1].value
     elif tab == 'videos':
         tasks = (
-            gevent.spawn(get_number_of_videos_general, base_url), 
+            gevent.spawn(get_number_of_videos_general, base_url),
             gevent.spawn(util.fetch_url, base_url + '/videos?pbj=1&view=0', headers_desktop, debug_name='gen_channel_videos')
         )
         gevent.joinall(tasks)
-- 
cgit v1.2.3


From e182cf82839c7de137b05ba347fed7767d554020 Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Fri, 9 Oct 2020 21:11:27 -0700
Subject: playlist: Fix add-to-local-playlist form missing

---
 youtube/playlist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/youtube/playlist.py b/youtube/playlist.py
index b7167f6..2e2af98 100644
--- a/youtube/playlist.py
+++ b/youtube/playlist.py
@@ -1,4 +1,4 @@
-from youtube import util, yt_data_extract, proto
+from youtube import util, yt_data_extract, proto, local_playlist
 from youtube import yt_app
 
 import base64
@@ -114,6 +114,7 @@ def get_playlist_page():
         video_count = 40
 
     return flask.render_template('playlist.html',
+        header_playlist_names = local_playlist.get_playlist_names(),
         video_list = info.get('items', []),
         num_pages = math.ceil(video_count/20),
         parameters_dictionary = request.args,
-- 
cgit v1.2.3


From 4844fa6d658bbe4964e906b44c3b459f9c4507c9 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Sat, 10 Oct 2020 19:01:44 +0200
Subject: add comments.js to /comments

---
 youtube/templates/comments_page.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/youtube/templates/comments_page.html b/youtube/templates/comments_page.html
index 2984f1e..269ac83 100644
--- a/youtube/templates/comments_page.html
+++ b/youtube/templates/comments_page.html
@@ -48,6 +48,11 @@
             <a class="page-button more-comments" href="{{ comments_info['more_comments_url'] }}">More comments</a>
         {% endif %}
     </section>
+
+    {% if settings.use_comments_js %}
+        <script src="/youtube.com/static/js/common.js"></script>
+        <script src="/youtube.com/static/js/comments.js"></script>
+    {% endif %}
 {% endblock main %}
 
 
-- 
cgit v1.2.3


From 643a0e8659b7358bb2c06cc707e36b82b949c912 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Sun, 11 Oct 2020 16:28:30 +0200
Subject: remove trimming of comment likes

---
 youtube/comments.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/youtube/comments.py b/youtube/comments.py
index 1af9079..032ce8a 100644
--- a/youtube/comments.py
+++ b/youtube/comments.py
@@ -121,18 +121,10 @@ def post_process_comments_info(comments_info):
             comment['view_replies_text'] = str(reply_count) + ' replies'
 
 
-        def fmt_num(num):
-            for unit in ['','k']:
-                if num < 1000:
-                    return "%3.1f%s" % (num, unit) if unit else num
-                num /= 1000.0
-            return "%.1f%s" % (num, 'm')
-
-        # if comment['like_count'] = '👍 ' + str(fmt_num(comment['like_count']))
         if comment['like_count'] == 1:
             comment['likes_text'] = '1 like'
         else:
-            comment['likes_text'] = str(fmt_num(comment['like_count'])) + ' likes'
+            comment['likes_text'] = str(comment['like_count']) + ' likes'
 
     comments_info['include_avatars'] = settings.enable_comment_avatars
     if comments_info['ctoken']:
-- 
cgit v1.2.3