diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/invidious.cr | 10 | ||||
| -rw-r--r-- | src/invidious/views/components/player_sources.ecr | 6 | ||||
| -rw-r--r-- | src/invidious/views/licenses.ecr | 14 |
3 files changed, 25 insertions, 5 deletions
diff --git a/src/invidious.cr b/src/invidious.cr index dc6ba734..1d2e63b2 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -347,7 +347,6 @@ get "/watch" do |env| params = process_video_params(env.params.query, preferences) env.params.query.delete_all("listen") - env.params.query.delete_all("iv_load_policy") begin video = get_video(id, PG_DB, proxies, region: params.region) @@ -359,9 +358,12 @@ get "/watch" do |env| next templated "error" end - if preferences.annotations_subscribed && subscriptions.includes? video.ucid + if preferences.annotations_subscribed && + subscriptions.includes?(video.ucid) && + (env.params.query["iv_load_policy"]? || "1") == "1" params.annotations = true end + env.params.query.delete_all("iv_load_policy") if watched && !watched.includes? id PG_DB.exec("UPDATE users SET watched = watched || $1 WHERE email = $2", [id], user.as(User).email) @@ -554,7 +556,9 @@ get "/embed/:id" do |env| next templated "error" end - if preferences.annotations_subscribed && subscriptions.includes? video.ucid + if preferences.annotations_subscribed && + subscriptions.includes?(video.ucid) && + (env.params.query["iv_load_policy"]? || "1") == "1" params.annotations = true end diff --git a/src/invidious/views/components/player_sources.ecr b/src/invidious/views/components/player_sources.ecr index d4e1c2f7..d51697c1 100644 --- a/src/invidious/views/components/player_sources.ecr +++ b/src/invidious/views/components/player_sources.ecr @@ -2,14 +2,16 @@ <link rel="stylesheet" href="/css/videojs-http-source-selector.css"> <link rel="stylesheet" href="/css/videojs.markers.min.css"> <link rel="stylesheet" href="/css/videojs-share.css"> -<link rel="stylesheet" href="/css/videojs-youtube-annotations.css"> <script src="/js/video.min.js"></script> <script src="/js/videojs-contrib-quality-levels.min.js"></script> <script src="/js/videojs-http-source-selector.min.js"></script> <script src="/js/videojs.hotkeys.min.js"></script> <script src="/js/videojs-markers.min.js"></script> <script src="/js/videojs-share.min.js"></script> -<script src="/js/videojs-youtube-annotations.js"></script> +<% if params.annotations %> +<link rel="stylesheet" href="/css/videojs-youtube-annotations.min.css"> +<script src="/js/videojs-youtube-annotations.min.js"></script> +<% end %> <% if params.listen || params.quality != "dash" %> <link rel="stylesheet" href="/css/quality-selector.css"> <script src="/js/silvermine-videojs-quality-selector.min.js"></script> diff --git a/src/invidious/views/licenses.ecr b/src/invidious/views/licenses.ecr index 07486d2c..a7798ff0 100644 --- a/src/invidious/views/licenses.ecr +++ b/src/invidious/views/licenses.ecr @@ -95,6 +95,20 @@ <tr> <td> + <a href="/js/videojs-youtube-annotations.min.js">videojs-youtube-annotations.min.js</a> + </td> + + <td> + <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPL-3.0</a> + </td> + + <td> + <a href="https://github.com/afrmtbl/videojs-youtube-annotations"><%= translate(locale, "source") %></a> + </td> + </tr> + + <tr> + <td> <a href="/js/video.min.js">video.min.js</a> </td> |