PrivateCoffee/invidious
4
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Add better error message for fetch_channel

Browse source
This commit is contained in:
Omar Roth 2019-12-05 15:46:21 -05:00
parent 0e844edacb
commit 513363504f
No known key found for this signature in database
GPG key ID: B8254FB7EC3D37F2
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/invidious/channels.cr
View file

@ -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) url = produce_channel_videos_url(ucid, page, auto_generated: auto_generated)
response = YT_POOL.client &.get(url) response = YT_POOL.client &.get(url)
begin
json = JSON.parse(response.body) 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? if json["content_html"]? && !json["content_html"].as_s.empty?
document = XML.parse_html(json["content_html"].as_s) document = XML.parse_html(json["content_html"].as_s)