mirror of
https://git.freesoftwareextremist.com/bloat
synced 2024-12-22 09:10:42 +00:00
Show follow request count on user page
This commit is contained in:
parent
11ea3b4d47
commit
6ad1c5436a
3 changed files with 21 additions and 8 deletions
|
@ -40,6 +40,9 @@ type Account struct {
|
|||
Bot bool `json:"bot"`
|
||||
Source *AccountSource `json:"source"`
|
||||
Pleroma *AccountPleroma `json:"pleroma"`
|
||||
|
||||
// Duplicate field for compatibilty with Pleroma
|
||||
FollowRequestsCount int64 `json:"follow_requests_count"`
|
||||
}
|
||||
|
||||
// Field is a Mastodon account profile field.
|
||||
|
@ -51,11 +54,12 @@ type Field struct {
|
|||
|
||||
// AccountSource is a Mastodon account profile field.
|
||||
type AccountSource struct {
|
||||
Privacy *string `json:"privacy"`
|
||||
Sensitive *bool `json:"sensitive"`
|
||||
Language *string `json:"language"`
|
||||
Note *string `json:"note"`
|
||||
Fields *[]Field `json:"fields"`
|
||||
Privacy *string `json:"privacy"`
|
||||
Sensitive *bool `json:"sensitive"`
|
||||
Language *string `json:"language"`
|
||||
Note *string `json:"note"`
|
||||
Fields *[]Field `json:"fields"`
|
||||
FollowRequestsCount int64 `json:"follow_requests_count"`
|
||||
}
|
||||
|
||||
// GetAccount return Account.
|
||||
|
|
|
@ -511,12 +511,19 @@ func (s *service) UserPage(c *client, id string, pageType string,
|
|||
MinID: minID,
|
||||
Limit: 20,
|
||||
}
|
||||
isCurrent := c.s.UserID == id
|
||||
|
||||
user, err := c.GetAccount(c.ctx, id)
|
||||
// Some fields like AccountSource are only available in the
|
||||
// CurrentUser API
|
||||
var user *mastodon.Account
|
||||
if isCurrent {
|
||||
user, err = c.GetAccountCurrentUser(c.ctx)
|
||||
} else {
|
||||
user, err = c.GetAccount(c.ctx, id)
|
||||
}
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
isCurrent := c.s.UserID == user.ID
|
||||
|
||||
switch pageType {
|
||||
case "":
|
||||
|
|
|
@ -110,7 +110,9 @@
|
|||
- <a href="/user/{{.User.ID}}/likes">likes</a>
|
||||
- <a href="/user/{{.User.ID}}/mutes">mutes</a>
|
||||
- <a href="/user/{{.User.ID}}/blocks">blocks</a>
|
||||
{{if .User.Locked}}- <a href="/user/{{.User.ID}}/requests">requests</a>{{end}}
|
||||
{{if .User.Locked}}- <a href="/user/{{.User.ID}}/requests">requests (
|
||||
{{- if .User.FollowRequestsCount}}{{.User.FollowRequestsCount}}{{else}}{{.User.Source.FollowRequestsCount}}{{end -}}
|
||||
)</a>{{end}}
|
||||
</div>
|
||||
{{end}}
|
||||
<div>
|
||||
|
|
Loading…
Reference in a new issue