ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

Provide response on video error

Browse Source
This commit is contained in:
Omar Roth 2018-08-08 10:20:07 -05:00
parent f3c7409d72
commit 3ebe9139b7
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/invidious.cr
View File

@ -1752,7 +1752,7 @@ get "/api/v1/comments/:id" do |env|
env.response.content_type = "application/json" env.response.content_type = "application/json"
if !response["response"]["continuationContents"]? if !response["response"]["continuationContents"]?
halt env, status_code: 401 halt env, status_code: 403
end end
response = response["response"]["continuationContents"] response = response["response"]["continuationContents"]
@ -1862,7 +1862,7 @@ get "/api/v1/comments/:id" do |env|
comments = JSON.parse(comments) comments = JSON.parse(comments)
content_html = template_youtube_comments(comments) content_html = template_youtube_comments(comments)
{"content_html" => content_html}.to_json next {"content_html" => content_html}.to_json
end end
elsif source == "reddit" elsif source == "reddit"
client = make_client(REDDIT_URL) client = make_client(REDDIT_URL)
@ -1883,7 +1883,7 @@ get "/api/v1/comments/:id" do |env|
end end
env.response.content_type = "application/json" env.response.content_type = "application/json"
{"title" => reddit_thread.title, next {"title" => reddit_thread.title,
"permalink" => reddit_thread.permalink, "permalink" => reddit_thread.permalink,
"content_html" => content_html}.to_json "content_html" => content_html}.to_json
end end
@ -1895,7 +1895,9 @@ get "/api/v1/videos/:id" do |env|
begin begin
video = get_video(id, PG_DB) video = get_video(id, PG_DB)
rescue ex rescue ex
halt env, status_code: 403 env.response.content_type = "application/json"
response = {"error" => ex.message}.to_json
halt env, status_code: 500, response: response
end end
fmt_stream = video.fmt_stream(decrypt_function) fmt_stream = video.fmt_stream(decrypt_function)

2
src/invidious/helpers/utils.cr
View File

@ -68,7 +68,7 @@ def decode_date(string : String)
return Time.new(string.to_i, 1, 1) return Time.new(string.to_i, 1, 1)
end end
# String matches format "20 hours ago", "40 minutes ago"... # String matches format "20 hours ago", "4 months ago"...
date = string.split(" ")[-3, 3] date = string.split(" ")[-3, 3]
delta = date[0].to_i delta = date[0].to_i