Use get_video for pulling comment token

src/invidious.cr

@@ -254,6 +254,7 @@ end
 
 get "/watch" do |env|
   locale = LOCALES[env.get("locale").as(String)]?
+  region = env.params.query["region"]?
 
   if env.params.query.to_s.includes?("%20") || env.params.query.to_s.includes?("+")
     url = "/watch?" + env.params.query.to_s.gsub("%20", "").delete("+")
@@ -323,7 +324,7 @@ get "/watch" do |env|
 
       if source == "youtube"
         begin
-          comment_html = JSON.parse(fetch_youtube_comments(id, "", proxies, "html", locale))["contentHtml"]
+          comment_html = JSON.parse(fetch_youtube_comments(id, PG_DB, nil, proxies, "html", locale, region))["contentHtml"]
         rescue ex
           if preferences.comments[1] == "reddit"
             comments, reddit_thread = fetch_reddit_comments(id)
@@ -342,12 +343,12 @@ get "/watch" do |env|
           comment_html = replace_links(comment_html)
         rescue ex
           if preferences.comments[1] == "youtube"
-            comment_html = JSON.parse(fetch_youtube_comments(id, "", proxies, "html", locale))["contentHtml"]
+            comment_html = JSON.parse(fetch_youtube_comments(id, PG_DB, nil, proxies, "html", locale, region))["contentHtml"]
           end
         end
       end
     else
-      comment_html = JSON.parse(fetch_youtube_comments(id, "", proxies, "html", locale))["contentHtml"]
+      comment_html = JSON.parse(fetch_youtube_comments(id, PG_DB, nil, proxies, "html", locale, region))["contentHtml"]
     end
 
     comment_html ||= ""
@@ -2329,6 +2330,7 @@ end
 
 get "/api/v1/comments/:id" do |env|
   locale = LOCALES[env.get("locale").as(String)]?
+  region = env.params.query["region"]?
 
   env.response.content_type = "application/json"
 
@@ -2341,11 +2343,10 @@ get "/api/v1/comments/:id" do |env|
   format ||= "json"
 
   continuation = env.params.query["continuation"]?
-  continuation ||= ""
 
   if source == "youtube"
     begin
-      comments = fetch_youtube_comments(id, continuation, proxies, format, locale)
+      comments = fetch_youtube_comments(id, PG_DB, continuation, proxies, format, locale, region)
     rescue ex
       error_message = {"error" => ex.message}.to_json
       halt env, status_code: 500, response: error_message

src/invidious/comments.cr

@@ -56,72 +56,32 @@ class RedditListing
   })
 end
 
-def fetch_youtube_comments(id, continuation, proxies, format, locale)
+def fetch_youtube_comments(id, db, continuation, proxies, format, locale, region)
-  client = make_client(YT_URL)
+  video = get_video(id, db, proxies, region: region)
-  html = client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
-  headers = HTTP::Headers.new
-  headers["cookie"] = html.cookies.add_request_headers(headers)["cookie"]
-  body = html.body
-
-  session_token = body.match(/'XSRF_TOKEN': "(?<session_token>[A-Za-z0-9\_\-\=]+)"/).not_nil!["session_token"]
-  itct = body.match(/itct=(?<itct>[^"]+)"/).not_nil!["itct"]
-  ctoken = body.match(/'COMMENTS_TOKEN': "(?<ctoken>[^"]+)"/)
-
-  if body.match(/<meta itemprop="regionsAllowed" content="">/) && !body.match(/player-age-gate-content\">/)
-    bypass_channel = Channel({String, HTTPClient, HTTP::Headers} | Nil).new
-
-    proxies.each do |proxy_region, list|
-      spawn do
-        proxy_client = make_client(YT_URL, proxies, proxy_region)
-
-        response = proxy_client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
-        proxy_headers = HTTP::Headers.new
-        proxy_headers["Cookie"] = response.cookies.add_request_headers(headers)["cookie"]
-        proxy_html = response.body
-
-        if !proxy_html.match(/<meta itemprop="regionsAllowed" content="">/) && !proxy_html.match(/player-age-gate-content\">/)
-          bypass_channel.send({proxy_html, proxy_client, proxy_headers})
-        else
-          bypass_channel.send(nil)
-        end
-      end
-    end
-
-    proxies.size.times do
-      response = bypass_channel.receive
-      if response
-        html, client, headers = response
 
-        session_token = html.match(/'XSRF_TOKEN': "(?<session_token>[A-Za-z0-9\_\-\=]+)"/).not_nil!["session_token"]
+  session_token = video.info["session_token"]?
-        itct = html.match(/itct=(?<itct>[^"]+)"/).not_nil!["itct"]
+  itct = video.info["itct"]?
-        ctoken = html.match(/'COMMENTS_TOKEN': "(?<ctoken>[^"]+)"/)
+  ctoken = video.info["ctoken"]?
+  continuation ||= ctoken
 
-        break
+  if !continuation || !itct || !session_token
-      end
-    end
-  end
-
-  if !ctoken
     if format == "json"
       return {"comments" => [] of String}.to_json
     else
       return {"contentHtml" => "", "commentCount" => 0}.to_json
     end
   end
-  ctoken = ctoken["ctoken"]
-
-  if !continuation.empty?
-    ctoken = continuation
-  else
-    continuation = ctoken
-  end
 
   post_req = {
-    "session_token" => session_token,
+    "session_token" => session_token.not_nil!,
   }
   post_req = HTTP::Params.encode(post_req)
 
+  client = make_client(YT_URL, proxies, video.info["region"]?)
+  headers = HTTP::Headers.new
+
   headers["content-type"] = "application/x-www-form-urlencoded"
+  headers["cookie"] = video.info["cookie"]
 
   headers["x-client-data"] = "CIi2yQEIpbbJAQipncoBCNedygEIqKPKAQ=="
   headers["x-spf-previous"] = "https://www.youtube.com/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999"
@@ -129,7 +89,8 @@ def fetch_youtube_comments(id, continuation, proxies, format, locale)
 
   headers["x-youtube-client-name"] = "1"
   headers["x-youtube-client-version"] = "2.20180719"
-  response = client.post("/comment_service_ajax?action_get_comments=1&pbj=1&ctoken=#{ctoken}&continuation=#{continuation}&itct=#{itct}&hl=en&gl=US", headers, post_req)
+
+  response = client.post("/comment_service_ajax?action_get_comments=1&pbj=1&ctoken=#{continuation}&continuation=#{continuation}&itct=#{itct}&hl=en&gl=US", headers, post_req)
   response = JSON.parse(response.body)
 
   if !response["response"]["continuationContents"]?