nihilist/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious synced 2024-11-27 21:43:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove useless 'locale' argument from error template functions

Browse Source
This commit is contained in:
Samantaz Fox 2022-01-19 18:47:54 +01:00
parent 5e3c9cf290
commit c7b74aa8b4
No known key found for this signature in database
GPG Key ID: F42821059186176E
1 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/invidious/helpers/errors.cr
View File

@ -6,8 +6,12 @@
class InfoException < Exception class InfoException < Exception
end end
# -------------------
# Issue template
# -------------------
macro error_template(*args) macro error_template(*args)
error_template_helper(env, locale, {{*args}}) error_template_helper(env, {{*args}})
end end
def github_details(summary : String, content : String) def github_details(summary : String, content : String)
@ -22,11 +26,13 @@ def github_details(summary : String, content : String)
return HTML.escape(details) return HTML.escape(details)
end end
def error_template_helper(env : HTTP::Server::Context, locale : String?, status_code : Int32, exception : Exception) def error_template_helper(env : HTTP::Server::Context, status_code : Int32, exception : Exception)
if exception.is_a?(InfoException) if exception.is_a?(InfoException)
return error_template_helper(env, locale, status_code, exception.message || "") return error_template_helper(env, status_code, exception.message || "")
end end
locale = env.get("preferences").as(Preferences).locale
env.response.content_type = "text/html" env.response.content_type = "text/html"
env.response.status_code = status_code env.response.status_code = status_code
@ -77,71 +83,99 @@ def error_template_helper(env : HTTP::Server::Context, locale : String?, status_
return templated "error" return templated "error"
end end
def error_template_helper(env : HTTP::Server::Context, locale : String?, status_code : Int32, message : String) def error_template_helper(env : HTTP::Server::Context, status_code : Int32, message : String)
env.response.content_type = "text/html" env.response.content_type = "text/html"
env.response.status_code = status_code env.response.status_code = status_code
locale = env.get("preferences").as(Preferences).locale
error_message = translate(locale, message) error_message = translate(locale, message)
next_steps = error_redirect_helper(env, locale) next_steps = error_redirect_helper(env)
return templated "error" return templated "error"
end end
# -------------------
# Atom feeds
# -------------------
macro error_atom(*args) macro error_atom(*args)
error_atom_helper(env, locale, {{*args}}) error_atom_helper(env, {{*args}})
end end
def error_atom_helper(env : HTTP::Server::Context, locale : String?, status_code : Int32, exception : Exception) def error_atom_helper(env : HTTP::Server::Context, status_code : Int32, exception : Exception)
if exception.is_a?(InfoException) if exception.is_a?(InfoException)
return error_atom_helper(env, locale, status_code, exception.message || "") return error_atom_helper(env, status_code, exception.message || "")
end end
env.response.content_type = "application/atom+xml" env.response.content_type = "application/atom+xml"
env.response.status_code = status_code env.response.status_code = status_code
return "<error>#{exception.inspect_with_backtrace}</error>" return "<error>#{exception.inspect_with_backtrace}</error>"
end end
def error_atom_helper(env : HTTP::Server::Context, locale : String?, status_code : Int32, message : String) def error_atom_helper(env : HTTP::Server::Context, status_code : Int32, message : String)
env.response.content_type = "application/atom+xml" env.response.content_type = "application/atom+xml"
env.response.status_code = status_code env.response.status_code = status_code
return "<error>#{message}</error>" return "<error>#{message}</error>"
end end
# -------------------
# JSON
# -------------------
macro error_json(*args) macro error_json(*args)
error_json_helper(env, locale, {{*args}}) error_json_helper(env, {{*args}})
end end
def error_json_helper(env : HTTP::Server::Context, locale : String?, status_code : Int32, exception : Exception, additional_fields : Hash(String, Object) | Nil) def error_json_helper(env : HTTP::Server::Context, status_code : Int32, exception : Exception, additional_fields : Hash(String, Object) | Nil)
if exception.is_a?(InfoException) if exception.is_a?(InfoException)
return error_json_helper(env, locale, status_code, exception.message || "", additional_fields) return error_json_helper(env, status_code, exception.message || "", additional_fields)
end end
env.response.content_type = "application/json" env.response.content_type = "application/json"
env.response.status_code = status_code env.response.status_code = status_code
error_message = {"error" => exception.message, "errorBacktrace" => exception.inspect_with_backtrace} error_message = {"error" => exception.message, "errorBacktrace" => exception.inspect_with_backtrace}
if additional_fields if additional_fields
error_message = error_message.merge(additional_fields) error_message = error_message.merge(additional_fields)
end end
return error_message.to_json return error_message.to_json
end end
def error_json_helper(env : HTTP::Server::Context, locale : String?, status_code : Int32, exception : Exception) def error_json_helper(env : HTTP::Server::Context, status_code : Int32, exception : Exception)
return error_json_helper(env, locale, status_code, exception, nil) return error_json_helper(env, status_code, exception, nil)
end end
def error_json_helper(env : HTTP::Server::Context, locale : String?, status_code : Int32, message : String, additional_fields : Hash(String, Object) | Nil) def error_json_helper(env : HTTP::Server::Context, status_code : Int32, message : String, additional_fields : Hash(String, Object) | Nil)
env.response.content_type = "application/json" env.response.content_type = "application/json"
env.response.status_code = status_code env.response.status_code = status_code
error_message = {"error" => message} error_message = {"error" => message}
if additional_fields if additional_fields
error_message = error_message.merge(additional_fields) error_message = error_message.merge(additional_fields)
end end
return error_message.to_json return error_message.to_json
end end
def error_json_helper(env : HTTP::Server::Context, locale : String?, status_code : Int32, message : String) def error_json_helper(env : HTTP::Server::Context, status_code : Int32, message : String)
error_json_helper(env, locale, status_code, message, nil) error_json_helper(env, status_code, message, nil)
end end
def error_redirect_helper(env : HTTP::Server::Context, locale : String?) # -------------------
# Redirect
# -------------------
def error_redirect_helper(env : HTTP::Server::Context)
request_path = env.request.path request_path = env.request.path
locale = env.get("preferences").as(Preferences).locale
if request_path.starts_with?("/search") || request_path.starts_with?("/watch") || if request_path.starts_with?("/search") || request_path.starts_with?("/watch") ||
request_path.starts_with?("/channel") || request_path.starts_with?("/playlist?list=PL") request_path.starts_with?("/channel") || request_path.starts_with?("/playlist?list=PL")
next_steps_text = translate(locale, "next_steps_error_message") next_steps_text = translate(locale, "next_steps_error_message")