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

Merge pull request #1504 from saltycrys/improve-error-message

Browse source 
Improve error message
This commit is contained in:
TheFrenchGhosty 2020-11-30 14:17:10 +00:00 committed by GitHub
commit 417fa3cf3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/invidious/helpers/errors.cr
View file

@ -15,16 +15,16 @@ def error_template_helper(env : HTTP::Server::Context, config : Config, locale :
return error_template_helper(env, config, locale, status_code, exception.message || "")
end
env.response.status_code = status_code
issue_template = %(Date: `#{Time::Format::ISO_8601_DATE_TIME.format(Time.utc)}`)
issue_template += %(\nRoute: `#{env.request.resource}`)
issue_template += %(\nVersion: `#{SOFTWARE["version"]} @ #{SOFTWARE["branch"]}`)
#issue_template += %(\nPreferences: ```#{env.get("preferences").as(Preferences).to_json}```)
issue_template += %(\nBacktrace: \n```\n#{exception.inspect_with_backtrace}```)
error_message = <<-END_HTML
Looks like you've found a bug in Invidious. Feel free to open a new issue
<a href="https://github.com/iv-org/invidious/issues">here</a>
or send an email to
<a href="mailto:#{CONFIG.admin_email}">#{CONFIG.admin_email}</a>.
<br>
<br>
<br>
Please include the following text in your message:
<pre style="padding: 20px; background: rgba(0, 0, 0, 0.12345);">#{exception.inspect_with_backtrace}</pre>
Looks like you've found a bug in Invidious. Please open a new issue
<a href="https://github.com/iv-org/invidious/issues">on GitHub</a>
and include the following text in your message:
<pre style="padding: 20px; background: rgba(0, 0, 0, 0.12345);">#{issue_template}</pre>
END_HTML
return templated "error"
end

2
src/invidious/videos.cr
View file

@ -998,7 +998,7 @@ def fetch_video(id, region)
}.try { |a| JSON::Any.new(a) } || JSON::Any.new([] of JSON::Any)
end
raise info["reason"]?.try &.as_s || "" if !info["videoDetails"]?
raise InfoException.new(info["reason"]?.try &.as_s || "") if !info["videoDetails"]?
video = Video.new({
id: id,