diff options
| author |  Vyr Cossont <VyrCossont@users.noreply.github.com> | 2024-06-06 09:38:02 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-06-06 16:38:02 +0000 |
| commit | 5e2d4fdb19eb4fcd4c0bbfb3e2f29067a58c88c8 (patch) | |
| tree | 607006af6b4bb63bb625b39f3ca0fe869eb6ba95 /internal/api/model/account.go | |
| parent | [bugfix] update media if more than just url changes (#2970) (diff) | |
| download | gotosocial-5e2d4fdb19eb4fcd4c0bbfb3e2f29067a58c88c8.tar.xz | |
[feature] User muting (#2960)
* User muting
* Address review feedback
* Rename uniqueness constraint on user_mutes to match convention
* Remove unused account_id from where clause
* Add UserMute to NewTestDB
* Update test/envparsing.sh with new and fixed cache stuff
* Address tobi's review comments
* Make compiledUserMuteListEntry.expired consistent with UserMute.Expired
* Make sure mute_expires_at is serialized as an explicit null for indefinite mutes
---------
Co-authored-by: tobi <tobi.smethurst@protonmail.com>
Diffstat (limited to 'internal/api/model/account.go')
| -rw-r--r-- | internal/api/model/account.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/internal/api/model/account.go b/internal/api/model/account.go index a2f7b46b6..b3a92d36f 100644 --- a/internal/api/model/account.go +++ b/internal/api/model/account.go @@ -86,9 +86,6 @@ type Account struct { Fields []Field `json:"fields"` // Account has been suspended by our instance. Suspended bool `json:"suspended,omitempty"` - // If this account has been muted, when will the mute expire (ISO 8601 Datetime). - // example: 2021-07-30T09:20:25+00:00 - MuteExpiresAt string `json:"mute_expires_at,omitempty"` // Extra profile information. Shown only if the requester owns the account being requested. Source *Source `json:"source,omitempty"` // Filename of user-selected CSS theme to include when rendering this account's profile or statuses. Eg., `blurple-light.css`. @@ -109,6 +106,17 @@ type Account struct { Moved *Account `json:"moved,omitempty"` } +// MutedAccount extends Account with a field used only by the muted user list. +// +// swagger:model mutedAccount +type MutedAccount struct { + Account + // If this account has been muted, when will the mute expire (ISO 8601 Datetime). + // If the mute is indefinite, this will be null. + // example: 2021-07-30T09:20:25+00:00 + MuteExpiresAt *string `json:"mute_expires_at"` +} + // AccountCreateRequest models account creation parameters. // // swagger:parameters accountCreate |