From f7f2b9fa06fd2218179636c712e43f0c4d65bd9e Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Sat, 17 Oct 2020 19:51:41 +0200
Subject: add sponsorblock.js

---
 youtube/templates/base.html  |  4 +++-
 youtube/templates/watch.html | 15 +++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'youtube/templates')

diff --git a/youtube/templates/base.html b/youtube/templates/base.html
index f325f86..df7bb99 100644
--- a/youtube/templates/base.html
+++ b/youtube/templates/base.html
@@ -4,7 +4,9 @@
         <meta charset="utf-8">
         <title>{{ page_title }}</title>
         <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline'; media-src 'self' https://*.googlevideo.com;
-            {{ "img-src https://*.googleusercontent.com https://*.ggpht.com https://*.ytimg.com;" if not settings.proxy_images else "" }}">
+            {{ "img-src https://*.googleusercontent.com https://*.ggpht.com https://*.ytimg.com;" if not settings.proxy_images else "" }}
+            {{ "" if not settings.use_sponsorblock_js else "connect-src 'self' https://sponsor.ajay.app;"|safe }}">
+
         <link href="{{ theme_path }}" type="text/css" rel="stylesheet">
         <link href="/youtube.com/static/shared.css" type="text/css" rel="stylesheet">
         <link href="/youtube.com/static/comments.css" type="text/css" rel="stylesheet">
diff --git a/youtube/templates/watch.html b/youtube/templates/watch.html
index 86644ea..d89cc05 100644
--- a/youtube/templates/watch.html
+++ b/youtube/templates/watch.html
@@ -494,6 +494,12 @@ Reload without invidious (for usage of new identity button).</a>
                     <p>Used Invidious as fallback.</p>
                 {% endif %}
                 <p class="allowed-countries">Allowed countries: {{ allowed_countries|join(', ') }}</p>
+
+                {% if settings.use_sponsorblock_js %}
+                <ul class="more-actions">
+                <li><label><input type=checkbox id=skip_sponsors checked>skip sponsors</label> <span id=skip_n></span>
+                </ul>
+                {% endif %}
             </div>
         </details>
     </div>
@@ -691,10 +697,7 @@ Reload without invidious (for usage of new identity button).</a>
 
     <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 %}
-    {% if settings.use_comments_js %}
-        <script src="/youtube.com/static/js/comments.js"></script>
-    {% endif %}
+    {% if settings.use_video_hotkeys %} <script src="/youtube.com/static/js/hotkeys.js"></script> {% endif %}
+    {% if settings.use_comments_js %} <script src="/youtube.com/static/js/comments.js"></script> {% endif %}
+    {% if settings.use_sponsorblock_js %} <script src="/youtube.com/static/js/sponsorblock.js"></script> {% endif %}
 {% endblock main %}
-- 
cgit v1.2.3


From a8916b9308a4e2b7c1441a4d8d3c6d0b19c38fd2 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Sun, 18 Oct 2020 17:58:16 +0200
Subject: proxy 'sponsor.ajay.app'

---
 youtube/templates/base.html  | 5 +++--
 youtube/templates/watch.html | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'youtube/templates')

diff --git a/youtube/templates/base.html b/youtube/templates/base.html
index df7bb99..ef69960 100644
--- a/youtube/templates/base.html
+++ b/youtube/templates/base.html
@@ -4,8 +4,9 @@
         <meta charset="utf-8">
         <title>{{ page_title }}</title>
         <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline'; media-src 'self' https://*.googlevideo.com;
-            {{ "img-src https://*.googleusercontent.com https://*.ggpht.com https://*.ytimg.com;" if not settings.proxy_images else "" }}
-            {{ "" if not settings.use_sponsorblock_js else "connect-src 'self' https://sponsor.ajay.app;"|safe }}">
+            {% if not settings.proxy_images %}
+                img-src https://*.googleusercontent.com https://*.ggpht.com https://*.ytimg.com;
+            {% endif %}
 
         <link href="{{ theme_path }}" type="text/css" rel="stylesheet">
         <link href="/youtube.com/static/shared.css" type="text/css" rel="stylesheet">
diff --git a/youtube/templates/watch.html b/youtube/templates/watch.html
index d89cc05..319c314 100644
--- a/youtube/templates/watch.html
+++ b/youtube/templates/watch.html
@@ -695,6 +695,7 @@ Reload without invidious (for usage of new identity button).</a>
         {% endif %}
     {% endif %}
 
+    <script> data = {{ js_data|tojson }} </script>
     <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 %}
-- 
cgit v1.2.3


From 832524e421349e279d8ec06c89fef7f16dc46ae8 Mon Sep 17 00:00:00 2001
From: zrose584 <57181548+zrose584@users.noreply.github.com>
Date: Wed, 21 Oct 2020 10:29:49 +0200
Subject: fix html

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

(limited to 'youtube/templates')

diff --git a/youtube/templates/base.html b/youtube/templates/base.html
index ef69960..4fc48cf 100644
--- a/youtube/templates/base.html
+++ b/youtube/templates/base.html
@@ -6,7 +6,7 @@
         <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline'; media-src 'self' https://*.googlevideo.com;
             {% if not settings.proxy_images %}
                 img-src https://*.googleusercontent.com https://*.ggpht.com https://*.ytimg.com;
-            {% endif %}
+            {% endif %}">
 
         <link href="{{ theme_path }}" type="text/css" rel="stylesheet">
         <link href="/youtube.com/static/shared.css" type="text/css" rel="stylesheet">
-- 
cgit v1.2.3