Merge 307e6f5686 into 3e17d04875

2024-11-08 13:42:27 +05:30 · 2024-08-25 15:53:36 -07:00 · 2024-08-25 15:53:36 -07:00 · c967bef733
commit c967bef733
parent 3e17d04875 307e6f5686
14 changed files with 102 additions and 9 deletions
--- a/locales/en-US.json
+++ b/locales/en-US.json
@ -496,5 +496,6 @@
    "toggle_theme": "Toggle Theme",
    "carousel_slide": "Slide {{current}} of {{total}}",
    "carousel_skip": "Skip the Carousel",
-    "carousel_go_to": "Go to slide `x`"
+    "carousel_go_to": "Go to slide `x`",
+    "confirm_dialog_external_link": "You are leaving Invidious. Continue to external link?"
 }
--- a/src/invidious/channels/about.cr
+++ b/src/invidious/channels/about.cr
@ -159,6 +159,9 @@ def get_about_info(ucid, locale) : AboutChannel
    end
  end

+  # use comments link_utils to replace external links with the confirmation page
+  description_html = Invidious::Comments.replace_external_links(description_html)
+
  sub_count = 0

  if (metadata_rows = initdata.dig?("header", "pageHeaderRenderer", "content", "pageHeaderViewModel", "metadata", "contentMetadataViewModel", "metadataRows").try &.as_a)
--- a/src/invidious/comments/links_util.cr
+++ b/src/invidious/comments/links_util.cr
@ -73,4 +73,30 @@ module Invidious::Comments

    return html.to_xml(options: XML::SaveOptions::NO_DECL)
  end
+
+  def replace_external_links(html)
+    # Check if the document is empty
+    # Prevents edge-case bug with Reddit comments, see issue #3115
+    if html.nil? || html.empty?
+      return html
+    end
+
+    html = XML.parse_html(html)
+
+    html.xpath_nodes(%q(//a)).each do |anchor|
+      url = URI.parse(anchor["href"])
+
+      if !url.host.nil? && !url.host.not_nil!.ends_with?("youtube.com") && !url.host.not_nil!.ends_with?("youtu.be")
+        confirm_leave = "/confirm_leave?link=#{URI.encode_path(url.to_s)}"
+        anchor["href"] = confirm_leave
+      end
+    end
+
+    html = html.xpath_node(%q(//body)).not_nil!
+    if node = html.xpath_node(%q(./p))
+      html = node
+    end
+
+    return html.to_xml(options: XML::SaveOptions::NO_DECL)
+  end
 end
--- a/src/invidious/comments/youtube.cr
+++ b/src/invidious/comments/youtube.cr
@ -303,6 +303,7 @@ module Invidious::Comments
    if format == "html"
      response = JSON.parse(response)
      content_html = Frontend::Comments.template_youtube(response, locale, thin_mode)
+      content_html = Comments.replace_external_links(content_html)
      response = JSON.build do |json|
        json.object do
          json.field "contentHtml", content_html
--- a/src/invidious/frontend/comments_youtube.cr
+++ b/src/invidious/frontend/comments_youtube.cr
@ -1,3 +1,5 @@
+require "uri"
+
 module Invidious::Frontend::Comments
  extend self

@ -148,13 +150,17 @@ module Invidious::Frontend::Comments
        END_HTML

        if comments["videoId"]?
+          permalink = "https://www.youtube.com/watch?v=#{comments["videoId"]}&lc=#{child["commentId"]}"
+          permalink_confirm = "/confirm_leave?link=#{URI.encode_path(permalink)}"
          html << <<-END_HTML
-            <a rel="noreferrer noopener" href="https://www.youtube.com/watch?v=#{comments["videoId"]}&lc=#{child["commentId"]}" title="#{translate(locale, "YouTube comment permalink")}">[YT]</a>
+            <a href="#{permalink_confirm}" title="#{translate(locale, "YouTube comment permalink")}">[YT]</a>
            |
          END_HTML
        elsif comments["authorId"]?
+          permalink = "https://www.youtube.com/channel/#{comments["authorId"]}/community?lb=#{child["commentId"]}"
+          permalink_confirm = "/confirm_leave?link=#{URI.encode_path(permalink)}"
          html << <<-END_HTML
-            <a rel="noreferrer noopener" href="https://www.youtube.com/channel/#{comments["authorId"]}/community?lb=#{child["commentId"]}" title="#{translate(locale, "YouTube comment permalink")}">[YT]</a>
+            <a href="#{permalink_confirm}" title="#{translate(locale, "YouTube comment permalink")}">[YT]</a>
            |
          END_HTML
        end
--- a/src/invidious/helpers/errors.cr
+++ b/src/invidious/helpers/errors.cr
@ -180,6 +180,9 @@ def error_redirect_helper(env : HTTP::Server::Context)
    go_to_youtube = translate(locale, "next_steps_error_message_go_to_youtube")
    switch_instance = translate(locale, "Switch Invidious Instance")

+    youtube_link = "https://youtube.com#{env.request.resource}"
+    youtube_link_confirm = "/confirm_leave?link=#{URI.encode_path(youtube_link)}"
+
    return <<-END_HTML
      <p style="margin-bottom: 4px;">#{next_steps_text}</p>
      <ul>
@ -190,7 +193,7 @@ def error_redirect_helper(env : HTTP::Server::Context)
          <a href="/redirect?referer=#{env.get("current_page")}">#{switch_instance}</a>
        </li>
        <li>
-          <a rel="noreferrer noopener" href="https://youtube.com#{env.request.resource}">#{go_to_youtube}</a>
+          <a href="#{youtube_link_confirm}">#{go_to_youtube}</a>
        </li>
      </ul>
    END_HTML
--- a/src/invidious/routes/misc.cr
+++ b/src/invidious/routes/misc.cr
@ -43,4 +43,17 @@ module Invidious::Routes::Misc
    instance_url = fetch_random_instance
    env.redirect "https://#{instance_url}#{referer}"
  end
+
+  def self.confirm_leave(env)
+    locale = env.get("preferences").as(Preferences).locale
+    referer = get_referer(env)
+
+    if env.params.query["link"]? && !env.params.query["link"].empty?
+      link = HTML.escape(env.params.query["link"].to_s)
+      
+      templated "confirm_leave"
+    else
+      env.redirect "#{referer}"
+    end
+  end
 end
--- a/src/invidious/routing.cr
+++ b/src/invidious/routing.cr
@ -21,6 +21,7 @@ module Invidious::Routing
      get "/privacy", Routes::Misc, :privacy
      get "/licenses", Routes::Misc, :licenses
      get "/redirect", Routes::Misc, :cross_instance_redirect
+      get "/confirm_leave", Routes::Misc, :confirm_leave

      self.register_channel_routes
      self.register_watch_routes
--- a/src/invidious/videos/parser.cr
+++ b/src/invidious/videos/parser.cr
@ -316,6 +316,9 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any

  description_html = parse_description(video_secondary_renderer.try &.dig?("attributedDescription"), video_id)

+  # use comments link_utils to replace external links with the confirmation page
+  description_html = Invidious::Comments.replace_external_links(description_html)
+
  # Video metadata

  metadata = video_secondary_renderer
--- a/src/invidious/views/components/channel_info.ecr
+++ b/src/invidious/views/components/channel_info.ecr
@ -37,7 +37,10 @@
 <div class="pure-g h-box">
    <div class="pure-u-1-2">
        <div class="pure-u-1 pure-md-1-3">
-            <a href="<%= youtube_url %>"><%= translate(locale, "View channel on YouTube") %></a>
+            <%-
+                confirm_view_yt = "/confirm_leave?link=#{URI.encode_path(youtube_url)}"
+            -%>
+            <a href="<%= confirm_view_yt %>"><%= translate(locale, "View channel on YouTube") %></a>
        </div>
        <div class="pure-u-1 pure-md-1-3">
            <a href="<%= redirect_url %>"><%= translate(locale, "Switch Invidious Instance") %></a>
--- a/src/invidious/views/components/video-context-buttons.ecr
+++ b/src/invidious/views/components/video-context-buttons.ecr
@ -1,6 +1,10 @@
 <div class="flex-right flexible">
    <div class="icon-buttons">
-        <a title="<%=translate(locale, "videoinfo_watch_on_youTube")%>" rel="noreferrer noopener" href="https://www.youtube.com/watch<%=endpoint_params%>">
+        <%-
+            watch_yt = "https://www.youtube.com/watch#{endpoint_params}"
+            confirm_watch_yt = "/confirm_leave?link=#{URI.encode_path(watch_yt)}"
+        -%>
+        <a title="<%=translate(locale, "videoinfo_watch_on_youTube")%>" href="<%= confirm_watch_yt %>">
            <i class="icon ion-logo-youtube"></i>
        </a>
        <a title="<%=translate(locale, "Audio mode")%>" href="/watch<%=endpoint_params%>&listen=1">
--- a/src/invidious/views/confirm_leave.ecr
+++ b/src/invidious/views/confirm_leave.ecr
@ -0,0 +1,22 @@
+<% content_for "header" do %>
+<title><%= translate(locale, "Leave") %> - Invidious</title>
+<% end %>
+
+<div class="h-box">
+    <h3><%= translate(locale, "You are leaving Invidious. Continue to external link?") %></h3>
+    
+    <p><%= link %></p>
+    
+    <div class="pure-g">
+        <div class="pure-u-1-2">
+            <a rel="noreferrer noopener" value="confirm_leave" class="pure-button pure-button-primary" href="<%= link %>">
+                <%= translate(locale, "Yes") %>
+            </a>
+        </div>
+        <div class="pure-u-1-2">
+            <a class="pure-button" href="<%= referer %>">
+                <%= translate(locale, "No") %>
+            </a>
+        </div>
+    </div>
+</div>
--- a/src/invidious/views/playlist.ecr
+++ b/src/invidious/views/playlist.ecr
@ -83,7 +83,11 @@

        <% if !playlist.is_a? InvidiousPlaylist %>
            <div class="pure-u-2-3">
-                    <a rel="noreferrer noopener" href="https://www.youtube.com/playlist?list=<%= playlist.id %>">
+                    <%-
+                        view_yt = "https://www.youtube.com/playlist?list=#{playlist.id}"
+                        confirm_view_yt = "/confirm_leave?link=#{URI.encode_path(view_yt)}"
+                    -%>
+                    <a href="<%= confirm_view_yt %>">
                        <%= translate(locale, "View playlist on YouTube") %>
                    </a>
                    <span> | </span>
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@ -122,9 +122,12 @@ we're going to need to do it here in order to allow for translations.
                        link_yt_watch = IV::HttpServer::Utils.add_params_to_url(link_yt_watch, link_yt_param)
                        link_yt_embed = IV::HttpServer::Utils.add_params_to_url(link_yt_embed, link_yt_param)
                    end
+
+                    confirm_yt_watch = "/confirm_leave?link=#{URI.encode_path(link_yt_watch.to_s)}"
+                    confirm_yt_embed = "/confirm_leave?link=#{URI.encode_path(link_yt_embed.to_s)}"
                -%>
-                <a id="link-yt-watch" rel="noreferrer noopener" data-base-url="<%= link_yt_watch %>" href="<%= link_yt_watch %>"><%= translate(locale, "videoinfo_watch_on_youTube") %></a>
-                (<a id="link-yt-embed" rel="noreferrer noopener" data-base-url="<%= link_yt_embed %>" href="<%= link_yt_embed %>"><%= translate(locale, "videoinfo_youTube_embed_link") %></a>)
+                <a id="link-yt-watch" data-base-url="<%= confirm_yt_watch %>" href="<%= confirm_yt_watch %>"><%= translate(locale, "videoinfo_watch_on_youTube") %></a>
+                (<a id="link-yt-embed" data-base-url="<%= confirm_yt_embed %>" href="<%= confirm_yt_embed %>"><%= translate(locale, "videoinfo_youTube_embed_link") %></a>)
            </span>

            <p id="watch-on-another-invidious-instance">