From e2b5b7793a3604fae22dedd3a370ee2ab38a1234 Mon Sep 17 00:00:00 2001
From: Omar Roth <omarroth@hotmail.com>
Date: Thu, 5 Apr 2018 20:06:22 -0500
Subject: [PATCH] Use fill_links once instead of per comment

---
 src/helpers.cr   | 8 +++-----
 src/invidious.cr | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/helpers.cr b/src/helpers.cr
index 6b05a016..f973fc6a 100644
--- a/src/helpers.cr
+++ b/src/helpers.cr
@@ -381,9 +381,6 @@ def template_comments(root)
       score = child["data"]["score"]
       body_html = HTML.unescape(child["data"]["body_html"].as_s)
 
-      # Replace local links wtih links back to Reddit
-      body_html = fill_links(body_html, "https", "www.reddit.com")
-
       replies_html = ""
       if child["data"]["replies"] != ""
         replies_html = template_comments(child["data"]["replies"]["data"]["children"])
@@ -402,7 +399,8 @@ def template_comments(root)
       if child["data"]["depth"].as_i > 0
         html += <<-END_HTML
           <div class="pure-g">
-          <div class="pure-u-1-24"></div>
+          <div class="pure-u-1-24">
+          </div>
           <div class="pure-u-23-24">
           #{content}
           </div>
@@ -483,7 +481,7 @@ def fill_links(html, scheme, host)
   html.xpath_nodes("//a").each do |match|
     url = URI.parse(match["href"])
     # Reddit links don't have host
-    if !url.host
+    if !url.host && !match["href"].starts_with?("javascript")
       url.scheme = scheme
       url.host = host
       match["href"] = url
diff --git a/src/invidious.cr b/src/invidious.cr
index af070b6f..7307b255 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -296,6 +296,7 @@ get "/watch" do |env|
     reddit_comments, reddit_thread = get_reddit_comments(id, reddit_client, headers)
     reddit_html = template_comments(reddit_comments)
 
+    reddit_html = fill_links(reddit_html, "https", "www.reddit.com")
     reddit_html = add_alt_links(reddit_html)
   rescue ex
     reddit_thread = nil