diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2024-03-13 13:53:29 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-03-13 13:53:29 +0100 |
| commit | ab2d063fcb04f241a3147c843a021491f5fc0a55 (patch) | |
| tree | 3d2eff864e8b19d4d9a24f4f1fe92feda8ee4dac /web | |
| parent | [bugfix]: Add missing Link headers in Swagger spec (#2751) (diff) | |
| download | gotosocial-ab2d063fcb04f241a3147c843a021491f5fc0a55.tar.xz | |
[feature] Process outgoing Move from clientAPI (#2750)
* prevent moved accounts from taking create-type actions
* update move logic
* federate move out
* indicate on web profile when an account has moved
* [docs] Add migration docs section
* lock while checking + setting move state
* use redirectFollowers func for clientAPI as well
* comment typo
* linter? i barely know 'er!
* Update internal/uris/uri.go
Co-authored-by: Daenney <daenney@users.noreply.github.com>
* add a couple tests for move
* fix little mistake exposed by tests (thanks tests)
* ensure Move marked as successful
* attach shared util funcs to struct
* lock whole account when doing move
* move moving check to after error check
* replace repeated text with error func
* linterrrrrr!!!!
* catch self follow case
---------
Co-authored-by: Daenney <daenney@users.noreply.github.com>
Diffstat (limited to 'web')
| -rw-r--r-- | web/source/css/profile.css | 5 | ||||
| -rw-r--r-- | web/template/profile.tmpl | 21 |
2 files changed, 26 insertions, 0 deletions
diff --git a/web/source/css/profile.css b/web/source/css/profile.css index 97dbdfe88..a966d768a 100644 --- a/web/source/css/profile.css +++ b/web/source/css/profile.css @@ -38,6 +38,11 @@ overflow: hidden; margin-bottom: 1rem; + .moved-to { + padding: 1rem; + text-align: center; + } + .header-image-wrapper { position: relative; padding-top: 33.33%; /* aspect-ratio 1/3 */ diff --git a/web/template/profile.tmpl b/web/template/profile.tmpl index 0b079db10..b6ef056f0 100644 --- a/web/template/profile.tmpl +++ b/web/template/profile.tmpl @@ -17,10 +17,31 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. */ -}} +{{- define "profileMovedTo" -}} +{{- with .account.Moved }} +<div class="moved-to"> + <b> + ℹ️ This account has permanently moved to + <a + href="{{ .URL }}" + class="nounderline" + rel="nofollow noreferrer noopener" + target="_blank" + > + @{{ .Username }} + </a> + </b> +</div> +{{- end }} +{{- end -}} + {{- with . }} <main class="profile"> <h2 class="sr-only">Profile for {{ .account.Username -}}</h2> <section class="profile-header" role="region" aria-label="Basic info"> + {{- if .account.Moved }} + {{- include "profileMovedTo" . | indent 2 }} + {{- end }} <div class="header-image-wrapper"> <img src="{{- .account.Header -}}" |