diff options
author | 2022-06-08 20:38:03 +0200 | |
---|---|---|
committer | 2022-06-08 20:38:03 +0200 | |
commit | 1ede54ddf6dfd2d4ba039eb7e23b74bcac65b643 (patch) | |
tree | 727436fb9bf9da25e30c5ded65c5b5ccaffe0cf0 /web | |
parent | [bugfix] #621: add weak type handing to mapstructure decode (#625) (diff) | |
download | gotosocial-1ede54ddf6dfd2d4ba039eb7e23b74bcac65b643.tar.xz |
[feature] More consistent API error handling (#637)
* update templates
* start reworking api error handling
* update template
* return AP status at web endpoint if negotiated
* start making api error handling much more consistent
* update account endpoints to new error handling
* use new api error handling in admin endpoints
* go fmt ./...
* use api error logic in app
* use generic error handling in auth
* don't export generic error handler
* don't defer clearing session
* user nicer error handling on oidc callback handler
* tidy up the sign in handler
* tidy up the token handler
* use nicer error handling in blocksget
* auth emojis endpoint
* fix up remaining api endpoints
* fix whoopsie during login flow
* regenerate swagger docs
* change http error logging to debug
Diffstat (limited to 'web')
-rw-r--r-- | web/template/404.tmpl | 12 | ||||
-rw-r--r-- | web/template/error.tmpl | 1 | ||||
-rw-r--r-- | web/template/footer.tmpl | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/web/template/404.tmpl b/web/template/404.tmpl index 096f7f364..7153bfd40 100644 --- a/web/template/404.tmpl +++ b/web/template/404.tmpl @@ -2,7 +2,17 @@ <main> <section> <h1>404: Page Not Found</h1> - If you believe this was an error, you can <a href="{{.instance.ContactAccount.URL}}">contact an admin</a> + <p> + GoToSocial only serves Public statuses via the web. + If you reached this page by clicking on a status link, + it's possible that the status is not Public, has been + deleted by the author, you don't have permission to see + it, or it just doesn't exist at all. + </p> + <p> + If you believe this 404 was an error, you can contact + the instance admin. + </p> </section> </main> diff --git a/web/template/error.tmpl b/web/template/error.tmpl index a8a72b062..c7df695dd 100644 --- a/web/template/error.tmpl +++ b/web/template/error.tmpl @@ -3,6 +3,5 @@ <section class="error"> <span>❌</span> <pre>{{.error}}</pre> </section> - </main> {{ template "footer.tmpl" .}}
\ No newline at end of file diff --git a/web/template/footer.tmpl b/web/template/footer.tmpl index 5aba0e1a9..f95d8b71b 100644 --- a/web/template/footer.tmpl +++ b/web/template/footer.tmpl @@ -5,10 +5,14 @@ <a href="https://github.com/superseriousbusiness/gotosocial">Source Code</a> </div> <div id="contact"> + {{ if .instance.ContactAccount }} Contact: <a href="{{.instance.ContactAccount.URL}}" class="nounderline">{{.instance.ContactAccount.Username}}</a><br> + {{ end }} </div> <div id="email"> + {{ if .instance.Email }} Email: <a href="mailto:{{.instance.Email}}" class="nounderline">{{.instance.Email}}</a><br> + {{ end }} </div> </footer> </body> |