summaryrefslogtreecommitdiff
path: root/internal/api/model/account.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2024-07-21 14:22:08 +0200
committerLibravatar GitHub <noreply@github.com>2024-07-21 14:22:08 +0200
commit027a93facc73b78e3c3747ab796f4a14b1b4936f (patch)
tree51838cd9fdf607ad46fdfa77a9424fdd8f5cd98d /internal/api/model/account.go
parent[bugfix] update common get target account / status doing refresh async (#3124) (diff)
downloadgotosocial-027a93facc73b78e3c3747ab796f4a14b1b4936f.tar.xz
[feature/frontend] Respect `prefers-reduced-motion` for avatars, headers, and emojis (#3118)
* [feature/frontend] Respect `prefers-reduced-motion` for avatars, headers, and emojis * go fmt * fix tests * use static version of instance thumbnail when appropriate * use prefers-reduced-motion * simplify account conversion a bit * fix c&p error
Diffstat (limited to 'internal/api/model/account.go')
-rw-r--r--internal/api/model/account.go24
1 files changed, 17 insertions, 7 deletions
diff --git a/internal/api/model/account.go b/internal/api/model/account.go
index cf39dd08e..c5b629db0 100644
--- a/internal/api/model/account.go
+++ b/internal/api/model/account.go
@@ -110,17 +110,27 @@ type Account struct {
// If set, indicates that this account is currently inactive, and has migrated to the given account.
// Key/value omitted for accounts that haven't moved, and for suspended accounts.
Moved *Account `json:"moved,omitempty"`
+}
- // Additional fields not exposed via JSON
- // (used only internally for templating etc).
+// WebAccount is like Account, but with
+// additional fields not exposed via JSON;
+// used only internally for templating etc.
+//
+// swagger:ignore
+type WebAccount struct {
+ *Account
// Proper attachment model for the avatar.
//
- // Only set if this model was converted via
- // AccountToWebAccount, AND this account had
- // an avatar set (and not just the default
- // "blank" avatar image.)
- AvatarAttachment *Attachment `json:"-"`
+ // Only set if this account had an avatar set
+ // (and not just the default "blank" image.)
+ AvatarAttachment *WebAttachment `json:"-"`
+
+ // Proper attachment model for the header.
+ //
+ // Only set if this account had a header set
+ // (and not just the default "blank" image.)
+ HeaderAttachment *WebAttachment `json:"-"`
}
// MutedAccount extends Account with a field used only by the muted user list.