diff options
| author | r <r@freesoftwareextremist.com> | 2020-02-08 11:50:14 +0000 |
|---|---|---|
| committer | r <r@freesoftwareextremist.com> | 2020-02-08 11:50:14 +0000 |
| commit | a68a09a83ef2eb411e2a7a66e919f27c040c0b6a (patch) | |
| tree | 12365055d6865c10a5d61f7a81c07987dfbf9f22 | |
| parent | 1e44d5d3d50c850505065ef16bc513a207c0656c (diff) | |
| download | bloat-a68a09a83ef2eb411e2a7a66e919f27c040c0b6a.tar.gz bloat-a68a09a83ef2eb411e2a7a66e919f27c040c0b6a.zip | |
Remove account relationship buttons for logged in user's page
| -rw-r--r-- | renderer/model.go | 22 | ||||
| -rw-r--r-- | service/service.go | 1 | ||||
| -rw-r--r-- | templates/user.tmpl | 2 |
3 files changed, 19 insertions, 6 deletions
diff --git a/renderer/model.go b/renderer/model.go index 4ff73c3..842dd71 100644 --- a/renderer/model.go +++ b/renderer/model.go @@ -31,6 +31,15 @@ type CommonData struct { NavbarData *NavbarData } +func (c CommonData) IsCurrentUser(id string) bool { + if c.NavbarData != nil && + c.NavbarData.User != nil && + c.NavbarData.User.ID == id { + return true + } + return false +} + type ErrorData struct { *CommonData Error string @@ -69,12 +78,13 @@ type NotificationData struct { type UserData struct { *CommonData - User *mastodon.Account - Type string - Users []*mastodon.Account - Statuses []*mastodon.Status - NextLink string - DarkMode bool + User *mastodon.Account + IsCurrent bool + Type string + Users []*mastodon.Account + Statuses []*mastodon.Status + NextLink string + DarkMode bool } type UserSearchData struct { diff --git a/service/service.go b/service/service.go index c05097b..d762842 100644 --- a/service/service.go +++ b/service/service.go @@ -527,6 +527,7 @@ func (svc *service) ServeUserPage(ctx context.Context, c *model.Client, data := &renderer.UserData{ User: user, + IsCurrent: commonData.IsCurrentUser(user.ID), Type: pageType, Users: users, Statuses: statuses, diff --git a/templates/user.tmpl b/templates/user.tmpl index fb80de4..60d766b 100644 --- a/templates/user.tmpl +++ b/templates/user.tmpl @@ -18,6 +18,7 @@ source </a> </div> + {{if not .IsCurrent}} <div> <span> {{if .User.Pleroma.Relationship.FollowedBy}} follows you - {{end}} </span> {{if .User.Pleroma.Relationship.Following}} @@ -64,6 +65,7 @@ </form> {{end}} </div> + {{end}} <div> <a href="/user/{{.User.ID}}"> statuses ({{.User.StatusesCount}}) </a> - <a href="/user/{{.User.ID}}/following"> following ({{.User.FollowingCount}}) </a> - |