diff options
| author | TheFrenchGhosty <47571719+TheFrenchGhosty@users.noreply.github.com> | 2020-12-01 16:36:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 16:36:27 +0000 |
| commit | ff3b53e34ad8f6d7c09f427aa123e8e67c9a2733 (patch) | |
| tree | 532b12fc6c6cc8c1d667f1b87021a31836401a10 | |
| parent | dd35877edaffc4c6cae141b31449dc7ad50f7bd8 (diff) | |
| parent | b409cdece5d4cc3e4f19235c117fb0f39f5a3c16 (diff) | |
| download | invidious-ff3b53e34ad8f6d7c09f427aa123e8e67c9a2733.tar.gz invidious-ff3b53e34ad8f6d7c09f427aa123e8e67c9a2733.tar.bz2 invidious-ff3b53e34ad8f6d7c09f427aa123e8e67c9a2733.zip | |
Merge pull request #1513 from saltycrys/improve-error-message-2
Improve error message 2
| -rw-r--r-- | src/invidious.cr | 2 | ||||
| -rw-r--r-- | src/invidious/helpers/errors.cr | 19 |
2 files changed, 17 insertions, 4 deletions
diff --git a/src/invidious.cr b/src/invidious.cr index 9c3dffb2..4793a60a 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -64,7 +64,7 @@ HTTP_CHUNK_SIZE = 10485760 # ~10MB CURRENT_BRANCH = {{ "#{`git branch | sed -n '/* /s///p'`.strip}" }} CURRENT_COMMIT = {{ "#{`git rev-list HEAD --max-count=1 --abbrev-commit`.strip}" }} -CURRENT_VERSION = {{ "#{`git describe --tags --abbrev=0`.strip}" }} +CURRENT_VERSION = {{ "#{`git log -1 --format=%cs | sed s/-/./g`.strip}" }} # This is used to determine the `?v=` on the end of file URLs (for cache busting). We # only need to expire modified assets, so we can use this to find the last commit that changes diff --git a/src/invidious/helpers/errors.cr b/src/invidious/helpers/errors.cr index 68f7dd31..4487ff8c 100644 --- a/src/invidious/helpers/errors.cr +++ b/src/invidious/helpers/errors.cr @@ -10,16 +10,29 @@ macro error_template(*args) error_template_helper(env, config, locale, {{*args}}) end +def github_details(summary : String, content : String) + details = %(\n<details>) + details += %(\n<summary>#{summary}</summary>) + details += %(\n<p>) + details += %(\n \n```\n) + details += content.strip + details += %(\n```) + details += %(\n</p>) + details += %(\n</details>) + return HTML.escape(details) +end + def error_template_helper(env : HTTP::Server::Context, config : Config, locale : Hash(String, JSON::Any) | Nil, status_code : Int32, exception : Exception) if exception.is_a?(InfoException) 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 = %(Title: `#{exception.message} (#{exception.class})`) + issue_template += %(\nDate: `#{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}```) + # issue_template += github_details("Preferences", env.get("preferences").as(Preferences).to_pretty_json) + issue_template += github_details("Backtrace", exception.inspect_with_backtrace) error_message = <<-END_HTML 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> |