Check /browse_ajax for channel blocks

1 files changed, 83 insertions, 88 deletions

diff --git a/src/invidious/helpers/jobs.cr b/src/invidious/helpers/jobs.cr
index f368d6df..609e53c9 100644
--- a/src/invidious/helpers/jobs.cr
+++ b/src/invidious/helpers/jobs.cr
@@ -236,114 +236,109 @@ end
 def bypass_captcha(captcha_key, logger)
   loop do
     begin
-      response = YT_POOL.client &.get("/watch?v=CvFH_6DNRCY&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
-      if response.body.includes?("To continue with your YouTube experience, please fill out the form below.")
-        html = XML.parse_html(response.body)
-        form = html.xpath_node(%(//form[@action="/das_captcha"])).not_nil!
-        site_key = form.xpath_node(%(.//div[@class="g-recaptcha"])).try &.["data-sitekey"]
-
-        inputs = {} of String => String
-        form.xpath_nodes(%(.//input[@name])).map do |node|
-          inputs[node["name"]] = node["value"]
-        end
-
-        headers = response.cookies.add_request_headers(HTTP::Headers.new)
-
-        response = JSON.parse(HTTP::Client.post("https://api.anti-captcha.com/createTask", body: {
-          "clientKey" => CONFIG.captcha_key,
-          "task"      => {
-            "type" => "NoCaptchaTaskProxyless",
-            # "type"          => "NoCaptchaTask",
-            "websiteURL" => "https://www.youtube.com/watch?v=CvFH_6DNRCY&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999",
-            "websiteKey" => site_key,
-            # "proxyType"     => "http",
-            # "proxyAddress"  => CONFIG.proxy_address,
-            # "proxyPort"     => CONFIG.proxy_port,
-            # "proxyLogin"    => CONFIG.proxy_user,
-            # "proxyPassword" => CONFIG.proxy_pass,
-            # "userAgent"     => "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.97 Safari/537.36",
-          },
-        }.to_json).body)
-
-        if response["error"]?
-          raise response["error"].as_s
-        end
-
-        task_id = response["taskId"].as_i
+      {"/watch?v=CvFH_6DNRCY&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999", produce_channel_videos_url(ucid: "UCXuqSBlHAE6Xw-yeJA0Tunw")}.each do |path|
+        response = YT_POOL.client &.get(path)
+        if response.body.includes?("To continue with your YouTube experience, please fill out the form below.")
+          html = XML.parse_html(response.body)
+          form = html.xpath_node(%(//form[@action="/das_captcha"])).not_nil!
+          site_key = form.xpath_node(%(.//div[@class="g-recaptcha"])).try &.["data-sitekey"]
+
+          inputs = {} of String => String
+          form.xpath_nodes(%(.//input[@name])).map do |node|
+            inputs[node["name"]] = node["value"]
+          end
 
-        loop do
-          sleep 10.seconds
+          headers = response.cookies.add_request_headers(HTTP::Headers.new)
 
-          response = JSON.parse(HTTP::Client.post("https://api.anti-captcha.com/getTaskResult", body: {
+          response = JSON.parse(HTTP::Client.post("https://api.anti-captcha.com/createTask", body: {
             "clientKey" => CONFIG.captcha_key,
-            "taskId"    => task_id,
+            "task"      => {
+              "type"       => "NoCaptchaTaskProxyless",
+              "websiteURL" => "https://www.youtube.com/watch?v=CvFH_6DNRCY&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999",
+              "websiteKey" => site_key,
+            },
           }.to_json).body)
 
-          if response["status"]?.try &.== "ready"
-            break
-          elsif response["errorId"]?.try &.as_i != 0
-            raise response["errorDescription"].as_s
+          if response["error"]?
+            raise response["error"].as_s
           end
-        end
 
-        inputs["g-recaptcha-response"] = response["solution"]["gRecaptchaResponse"].as_s
-        response = YT_POOL.client &.post("/das_captcha", headers, form: inputs)
+          task_id = response["taskId"].as_i
 
-        yield response.cookies.select { |cookie| cookie.name != "PREF" }
-      elsif response.headers["Location"]?.try &.includes?("/sorry/index")
-        location = response.headers["Location"].try { |u| URI.parse(u) }
-        client = QUIC::Client.new(location.host.not_nil!)
-        response = client.get(location.full_path)
+          loop do
+            sleep 10.seconds
 
-        html = XML.parse_html(response.body)
-        form = html.xpath_node(%(//form[@action="index"])).not_nil!
-        site_key = form.xpath_node(%(.//div[@class="g-recaptcha"])).try &.["data-sitekey"]
+            response = JSON.parse(HTTP::Client.post("https://api.anti-captcha.com/getTaskResult", body: {
+              "clientKey" => CONFIG.captcha_key,
+              "taskId"    => task_id,
+            }.to_json).body)
 
-        inputs = {} of String => String
-        form.xpath_nodes(%(.//input[@name])).map do |node|
-          inputs[node["name"]] = node["value"]
-        end
+            if response["status"]?.try &.== "ready"
+              break
+            elsif response["errorId"]?.try &.as_i != 0
+              raise response["errorDescription"].as_s
+            end
+          end
 
-        response = JSON.parse(HTTP::Client.post("https://api.anti-captcha.com/createTask", body: {
-          "clientKey" => CONFIG.captcha_key,
-          "task"      => {
-            "type"       => "NoCaptchaTaskProxyless",
-            "websiteURL" => location.to_s,
-            "websiteKey" => site_key,
-          },
-        }.to_json).body)
-
-        if response["error"]?
-          raise response["error"].as_s
-        end
+          inputs["g-recaptcha-response"] = response["solution"]["gRecaptchaResponse"].as_s
+          response = YT_POOL.client &.post("/das_captcha", headers, form: inputs)
 
-        task_id = response["taskId"].as_i
+          yield response.cookies.select { |cookie| cookie.name != "PREF" }
+        elsif response.headers["Location"]?.try &.includes?("/sorry/index")
+          location = response.headers["Location"].try { |u| URI.parse(u) }
+          client = QUIC::Client.new(location.host.not_nil!)
+          response = client.get(location.full_path)
 
-        loop do
-          sleep 10.seconds
+          html = XML.parse_html(response.body)
+          form = html.xpath_node(%(//form[@action="index"])).not_nil!
+          site_key = form.xpath_node(%(.//div[@class="g-recaptcha"])).try &.["data-sitekey"]
 
-          response = JSON.parse(HTTP::Client.post("https://api.anti-captcha.com/getTaskResult", body: {
+          inputs = {} of String => String
+          form.xpath_nodes(%(.//input[@name])).map do |node|
+            inputs[node["name"]] = node["value"]
+          end
+
+          response = JSON.parse(HTTP::Client.post("https://api.anti-captcha.com/createTask", body: {
             "clientKey" => CONFIG.captcha_key,
-            "taskId"    => task_id,
+            "task"      => {
+              "type"       => "NoCaptchaTaskProxyless",
+              "websiteURL" => location.to_s,
+              "websiteKey" => site_key,
+            },
           }.to_json).body)
 
-          if response["status"]?.try &.== "ready"
-            break
-          elsif response["errorId"]?.try &.as_i != 0
-            raise response["errorDescription"].as_s
+          if response["error"]?
+            raise response["error"].as_s
           end
-        end
 
-        inputs["g-recaptcha-response"] = response["solution"]["gRecaptchaResponse"].as_s
-        client.close
-        client = QUIC::Client.new("www.google.com")
-        response = client.post(location.full_path, form: inputs)
-        headers = HTTP::Headers{
-          "Cookie" => URI.parse(response.headers["location"]).query_params["google_abuse"].split(";")[0],
-        }
-        cookies = HTTP::Cookies.from_headers(headers)
+          task_id = response["taskId"].as_i
+
+          loop do
+            sleep 10.seconds
+
+            response = JSON.parse(HTTP::Client.post("https://api.anti-captcha.com/getTaskResult", body: {
+              "clientKey" => CONFIG.captcha_key,
+              "taskId"    => task_id,
+            }.to_json).body)
 
-        yield cookies
+            if response["status"]?.try &.== "ready"
+              break
+            elsif response["errorId"]?.try &.as_i != 0
+              raise response["errorDescription"].as_s
+            end
+          end
+
+          inputs["g-recaptcha-response"] = response["solution"]["gRecaptchaResponse"].as_s
+          client.close
+          client = QUIC::Client.new("www.google.com")
+          response = client.post(location.full_path, form: inputs)
+          headers = HTTP::Headers{
+            "Cookie" => URI.parse(response.headers["location"]).query_params["google_abuse"].split(";")[0],
+          }
+          cookies = HTTP::Cookies.from_headers(headers)
+
+          yield cookies
+        end
       end
     rescue ex
       logger.puts("Exception: #{ex.message}")