Mirrored_Repos/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-08-30 18:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add fix for nonexistent channels

Browse Source
This commit is contained in:
Omar Roth 2018-07-29 21:01:28 -05:00
parent 503c47c8bf
commit a09b12a774
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/invidious.cr
View File

@ -1146,9 +1146,15 @@ get "/api/v1/channels/:ucid/videos" do |env|
response = client.get(url) response = client.get(url)
json = JSON.parse(response.body) json = JSON.parse(response.body)
if !json["content_html"]?
env.response.content_type = "application/json"
next {"error" => "No videos or nonexistent channel"}.to_json
end
content_html = json["content_html"].as_s content_html = json["content_html"].as_s
if content_html.empty? if content_html.empty?
halt env, status_code: 403 env.response.content_type = "application/json"
next Hash(String, String).new.to_json
end end
document = XML.parse_html(content_html) document = XML.parse_html(content_html)
@ -1843,6 +1849,11 @@ get "/feed/channel/:ucid" do |env|
channel = get_channel(ucid, client, PG_DB, pull_all_videos: false) channel = get_channel(ucid, client, PG_DB, pull_all_videos: false)
json = JSON.parse(response.body) json = JSON.parse(response.body)
if !json["content_html"]?
error_message = "This channel does not exist or has no videos."
next templated "error"
end
content_html = json["content_html"].as_s content_html = json["content_html"].as_s
if content_html.empty? if content_html.empty?
halt env, status_code: 403 halt env, status_code: 403
@ -2222,6 +2233,11 @@ get "/channel/:ucid" do |env|
response = client.get(url) response = client.get(url)
json = JSON.parse(response.body) json = JSON.parse(response.body)
if !json["content_html"]?
error_message = "This channel does not exist or has no videos."
next templated "error"
end
if json["content_html"].as_s.strip(" \n").empty? if json["content_html"].as_s.strip(" \n").empty?
rss = client.get("/feeds/videos.xml?channel_id=#{ucid}").body rss = client.get("/feeds/videos.xml?channel_id=#{ucid}").body
rss = XML.parse_html(rss) rss = XML.parse_html(rss)