From e690e166b0df203887715a0ce5c160cdb9f34054 Mon Sep 17 00:00:00 2001
From: Samantaz Fox <coding@samantaz.fr>
Date: Sun, 1 May 2022 18:48:08 +0200
Subject: [PATCH] Fix javascript:void(0) instead of youtu.be links

---
 src/invidious/comments.cr              | 27 +++++++++++++++++---------
 src/invidious/videos.cr                |  2 +-
 src/invidious/yt_backend/extractors.cr |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr
index 71c16eb46..8e0d8a961 100644
--- a/src/invidious/comments.cr
+++ b/src/invidious/comments.cr
@@ -143,7 +143,7 @@ def fetch_youtube_comments(id, cursor, format, locale, thin_mode, region, sort_b
                 node_comment = node["commentRenderer"]
               end
 
-              content_html = node_comment["contentText"]?.try { |t| parse_content(t) } || ""
+              content_html = node_comment["contentText"]?.try { |t| parse_content(t, id) } || ""
               author = node_comment["authorText"]?.try &.["simpleText"]? || ""
 
               json.field "author", author
@@ -554,12 +554,12 @@ def fill_links(html, scheme, host)
   return html.to_xml(options: XML::SaveOptions::NO_DECL)
 end
 
-def parse_content(content : JSON::Any) : String
+def parse_content(content : JSON::Any, video_id : String? = "") : String
   content["simpleText"]?.try &.as_s.rchop('\ufeff').try { |b| HTML.escape(b) }.to_s ||
-    content["runs"]?.try &.as_a.try { |r| content_to_comment_html(r).try &.to_s.gsub("\n", "<br>") } || ""
+    content["runs"]?.try &.as_a.try { |r| content_to_comment_html(r, video_id).try &.to_s.gsub("\n", "<br>") } || ""
 end
 
-def content_to_comment_html(content)
+def content_to_comment_html(content, video_id : String? = "")
   comment_html = content.map do |run|
     text = HTML.escape(run["text"].as_s)
 
@@ -593,13 +593,22 @@ def content_to_comment_html(content)
 
         text = %(<a href="#{url}">#{reduce_uri(displayed_url)}</a>)
       elsif watch_endpoint = run["navigationEndpoint"]["watchEndpoint"]?
-        length_seconds = watch_endpoint["startTimeSeconds"]?
-        video_id = watch_endpoint["videoId"].as_s
+        start_time = watch_endpoint["startTimeSeconds"]?.try &.as_i
+        link_video_id = watch_endpoint["videoId"].as_s
 
-        if length_seconds && length_seconds.as_i >= 0
-          text = %(<a href="javascript:void(0)" data-onclick="jump_to_time" data-jump-time="#{length_seconds}">#{text}</a>)
+        url = "/watch?v=#{link_video_id}"
+        url += "&t=#{start_time}" if !start_time.nil?
+
+        # If the current video ID (passed through from the caller function)
+        # is the same as the video ID in the link, add HTML attributes for
+        # the JS handler function that bypasses page reload.
+        #
+        # See: https://github.com/iv-org/invidious/issues/3063
+        if link_video_id == video_id
+          start_time ||= 0
+          text = %(<a href="#{url}" data-onclick="jump_to_time" data-jump-time="#{start_time}">#{reduce_uri(text)}</a>)
         else
-          text = %(<a href="/watch?v=#{video_id}">#{"youtube.com/watch?v=#{video_id}"}</a>)
+          text = %(<a href="#{url}">#{text}</a>)
         end
       elsif url = run.dig?("navigationEndpoint", "commandMetadata", "webCommandMetadata", "url").try &.as_s
         if text.starts_with?(/\s?[@#]/)
diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
index 27c2b6d12..c007a07bc 100644
--- a/src/invidious/videos.cr
+++ b/src/invidious/videos.cr
@@ -1039,7 +1039,7 @@ def extract_video_info(video_id : String, proxy_region : String? = nil, context_
   # Description
 
   description_html = video_secondary_renderer.try &.dig?("description", "runs")
-    .try &.as_a.try { |t| content_to_comment_html(t) }
+    .try &.as_a.try { |t| content_to_comment_html(t, video_id) }
 
   params["descriptionHtml"] = JSON::Any.new(description_html || "<p></p>")
 
diff --git a/src/invidious/yt_backend/extractors.cr b/src/invidious/yt_backend/extractors.cr
index ce39bc284..f6229a9b9 100644
--- a/src/invidious/yt_backend/extractors.cr
+++ b/src/invidious/yt_backend/extractors.cr
@@ -69,7 +69,7 @@ private module Parsers
       # TODO change default value to nil and typical encoding type to tuple storing type (watchers, views, etc)
       # and count
       view_count = item_contents.dig?("viewCountText", "simpleText").try &.as_s.gsub(/\D+/, "").to_i64? || 0_i64
-      description_html = item_contents["descriptionSnippet"]?.try { |t| parse_content(t) } || ""
+      description_html = item_contents["descriptionSnippet"]?.try { |t| parse_content(t, video_id) } || ""
 
       # The length information generally exist in "lengthText". However, the info can sometimes
       # be retrieved from "thumbnailOverlays" (e.g when the video is a "shorts" one).