Remove redundant code

This commit is contained in:
techmetx11 2023-04-28 20:25:43 +01:00
parent e609adab0d
commit f32db98779
No known key found for this signature in database
GPG Key ID: 20E0C88A0E7E5AF2
3 changed files with 5 additions and 51 deletions

View File

@ -28,48 +28,7 @@ def error_template_helper(env : HTTP::Server::Context, status_code : Int32, exce
env.response.content_type = "text/html" env.response.content_type = "text/html"
env.response.status_code = status_code env.response.status_code = status_code
issue_title = "#{exception.message} (#{exception.class})" error_message = error_template_message(env, exception)
issue_template = <<-TEXT
Title: `#{HTML.escape(issue_title)}`
Date: `#{Time::Format::ISO_8601_DATE_TIME.format(Time.utc)}`
Route: `#{HTML.escape(env.request.resource)}`
Version: `#{SOFTWARE["version"]} @ #{SOFTWARE["branch"]}`
TEXT
issue_template += github_details("Backtrace", exception.inspect_with_backtrace)
# URLs for the error message below
url_faq = "https://github.com/iv-org/documentation/blob/master/docs/faq.md"
url_search_issues = "https://github.com/iv-org/invidious/issues"
url_switch = "https://redirect.invidious.io" + env.request.resource
url_new_issue = "https://github.com/iv-org/invidious/issues/new"
url_new_issue += "?labels=bug&template=bug_report.md&title="
url_new_issue += URI.encode_www_form("[Bug] " + issue_title)
error_message = <<-END_HTML
<div class="error_message">
<h2>#{translate(locale, "crash_page_you_found_a_bug")}</h2>
<br/><br/>
<p><b>#{translate(locale, "crash_page_before_reporting")}</b></p>
<ul>
<li>#{translate(locale, "crash_page_refresh", env.request.resource)}</li>
<li>#{translate(locale, "crash_page_switch_instance", url_switch)}</li>
<li>#{translate(locale, "crash_page_read_the_faq", url_faq)}</li>
<li>#{translate(locale, "crash_page_search_issue", url_search_issues)}</li>
</ul>
<br/>
<p>#{translate(locale, "crash_page_report_issue", url_new_issue)}</p>
<!-- TODO: Add a "copy to clipboard" button -->
<pre style="padding: 20px; background: rgba(0, 0, 0, 0.12345);">#{issue_template}</pre>
</div>
END_HTML
# Don't show the usual "next steps" widget. The same options are # Don't show the usual "next steps" widget. The same options are
# proposed above the error message, just worded differently. # proposed above the error message, just worded differently.
@ -90,13 +49,8 @@ def error_template_helper(env : HTTP::Server::Context, status_code : Int32, mess
return templated "error" return templated "error"
end end
# ------------------- def error_template_message(env : HTTP::Server::Context, exception : Exception)
# Mini error templates (for components that had an error)
# -------------------
def mini_error_template(env : HTTP::Server::Context, exception : Exception)
String.build do |str| String.build do |str|
# Copied from error_template_helper
locale = env.get("preferences").as(Preferences).locale locale = env.get("preferences").as(Preferences).locale
issue_title = "#{exception.message} (#{exception.class})" issue_title = "#{exception.message} (#{exception.class})"

View File

@ -337,7 +337,7 @@ module Invidious::Routes::API::V1::Videos
rescue ex : NotFoundException rescue ex : NotFoundException
return error_json(404, ex) return error_json(404, ex)
rescue ex rescue ex
return error_json(500, ex, {"errorHtml" => mini_error_template(env, ex)}) return error_json(500, ex, {"errorHtml" => error_template_message(env, ex)})
end end
return comments return comments

View File

@ -104,7 +104,7 @@ module Invidious::Routes::Watch
comment_html = Comments.fill_links(comment_html, "https", "www.reddit.com") comment_html = Comments.fill_links(comment_html, "https", "www.reddit.com")
comment_html = Comments.replace_links(comment_html) comment_html = Comments.replace_links(comment_html)
else else
comment_html = mini_error_template(env, ex) comment_html = error_template_message(env, ex)
end end
end end
elsif source == "reddit" elsif source == "reddit"
@ -118,7 +118,7 @@ module Invidious::Routes::Watch
if preferences.comments[1] == "youtube" if preferences.comments[1] == "youtube"
comment_html = JSON.parse(Comments.fetch_youtube(id, nil, "html", locale, preferences.thin_mode, region))["contentHtml"] comment_html = JSON.parse(Comments.fetch_youtube(id, nil, "html", locale, preferences.thin_mode, region))["contentHtml"]
else else
comment_html = mini_error_template(env, ex) comment_html = error_template_message(env, ex)
end end
end end
end end