Fix templating for videos with 0 comments

2 files changed, 18 insertions, 20 deletions

diff --git a/src/invidious.cr b/src/invidious.cr
index c7de22fb..f267d7c1 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -2041,26 +2041,7 @@ get "/api/v1/comments/:id" do |env|
       halt env, status_code: 500, response: error_message
     end
 
-    if format == "json"
-      next comments
-    else
-      comments = JSON.parse(comments)
-      content_html = template_youtube_comments(comments)
-
-      response = JSON.build do |json|
-        json.object do
-          json.field "contentHtml", content_html
-
-          if comments["commentCount"]?
-            json.field "commentCount", comments["commentCount"]
-          else
-            json.field "commentCount", 0
-          end
-        end
-      end
-
-      next response
-    end
+    next comments
   elsif source == "reddit"
     begin
       comments, reddit_thread = fetch_reddit_comments(id)
diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr
index a699aaac..ba5d6f08 100644
--- a/src/invidious/comments.cr
+++ b/src/invidious/comments.cr
@@ -264,6 +264,23 @@ def fetch_youtube_comments(id, continuation, proxies, format)
     end
   end
 
+  if format == "html"
+    comments = JSON.parse(comments)
+    content_html = template_youtube_comments(comments)
+
+    comments = JSON.build do |json|
+      json.object do
+        json.field "contentHtml", content_html
+
+        if comments["commentCount"]?
+          json.field "commentCount", comments["commentCount"]
+        else
+          json.field "commentCount", 0
+        end
+      end
+    end
+  end
+
   return comments
 end