Skip to content

Commit

Permalink
Add better error message for fetch_channel
Browse files Browse the repository at this point in the history
  • Loading branch information
omarroth committed Dec 5, 2019
1 parent 0e844ed commit 5133635
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion src/invidious/channels.cr
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,17 @@ def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)

url = produce_channel_videos_url(ucid, page, auto_generated: auto_generated)
response = YT_POOL.client &.get(url)
json = JSON.parse(response.body)

begin
json = JSON.parse(response.body)
rescue ex
if response.body.includes?("To continue with your YouTube experience, please fill out the form below.") ||
response.body.includes?("https://www.google.com/sorry/index")
raise "Could not extract channel info. Instance is likely blocked."
end

raise "Could not extract JSON"
end

if json["content_html"]? && !json["content_html"].as_s.empty?
document = XML.parse_html(json["content_html"].as_s)
Expand Down

0 comments on commit 5133635

Please sign in to comment.