deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 22:35:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bridgev2/status: add avatar_keys to remote profile

Browse source
This commit is contained in:
Tulir Asokan 2025-08-26 15:56:27 +03:00
commit e9d4eeb332
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bridgev2/status/bridgestate.go
View file

@ -22,6 +22,7 @@ import (
"go.mau.fi/util/ptr"
"maunium.net/go/mautrix"
"maunium.net/go/mautrix/crypto/attachment"
"maunium.net/go/mautrix/id"
)
@ -87,6 +88,9 @@ type RemoteProfile struct {
Username string `json:"username,omitempty"`
Name string `json:"name,omitempty"`
Avatar id.ContentURIString `json:"avatar,omitempty"`
// Only used for backups of local bridge states
AvatarKeys *attachment.EncryptedFile `json:"avatar_keys,omitempty"`
}
func coalesce[T ~string](a, b T) T {
@ -102,6 +106,9 @@ func (rp *RemoteProfile) Merge(other RemoteProfile) RemoteProfile {
other.Username = coalesce(rp.Username, other.Username)
other.Name = coalesce(rp.Name, other.Name)
other.Avatar = coalesce(rp.Avatar, other.Avatar)
if rp.AvatarKeys != nil {
other.AvatarKeys = rp.AvatarKeys
}
return other
}