From 9a0996515f01d2233845acf002f78a65ff6c6c04 Mon Sep 17 00:00:00 2001
From: Omar Roth <omarroth@hotmail.com>
Date: Sun, 29 Jul 2018 21:15:18 -0500
Subject: [PATCH] Add fix for comments that don't have valid continuation

---
 src/invidious.cr | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/invidious.cr b/src/invidious.cr
index 1a739ae40..5d6a5e517 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -558,6 +558,12 @@ get "/api/v1/comments/:id" do |env|
     response = client.post("/comment_service_ajax?action_get_comments=1&pbj=1&ctoken=#{ctoken}&continuation=#{continuation}&itct=#{itct}", headers, post_req).body
     response = JSON.parse(response)
 
+    env.response.content_type = "application/json"
+
+    if !response["response"]["continuationContents"]?
+      halt env, status_code: 401
+    end
+
     response = response["response"]["continuationContents"]
     if response["commentRepliesContinuation"]?
       body = response["commentRepliesContinuation"]
@@ -566,8 +572,6 @@ get "/api/v1/comments/:id" do |env|
     end
     contents = body["contents"]?
     if !contents
-      env.response.content_type = "application/json"
-
       if format == "json"
         next {"comments" => [] of String}.to_json
       else
@@ -649,7 +653,6 @@ get "/api/v1/comments/:id" do |env|
       end
     end
 
-    env.response.content_type = "application/json"
     if format == "json"
       next comments
     else
@@ -676,7 +679,6 @@ get "/api/v1/comments/:id" do |env|
       halt env, status_code: 404
     end
 
-    env.response.content_type = "application/json"
     {"title"        => reddit_thread.title,
      "permalink"    => reddit_thread.permalink,
      "content_html" => content_html}.to_json