Skip to content

bridgev2/portal: fix avatar removal for ghosts with sentinel avatar IDs #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weebl2000 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −4
Open

bridgev2/portal: fix avatar removal for ghosts with sentinel avatar IDs #530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions bridgev2/portal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5063,10 +5063,13 @@ func (portal *Portal) UpdateInfoFromGhost(ctx context.Context, ghost *Ghost) (ch
}
changed = portal.updateName(ctx, ghost.Name, nil, time.Time{}, false) || changed
changed = portal.updateAvatar(ctx, &Avatar{
ID: ghost.AvatarID,
MXC: ghost.AvatarMXC,
Hash: ghost.AvatarHash,
Remove: ghost.AvatarID == "",
ID: ghost.AvatarID,
MXC: ghost.AvatarMXC,
Hash: ghost.AvatarHash,
// This avatar has no Get function, so an empty MXC can only mean the ghost has no
// avatar. Networks may use a non-empty sentinel ID for that case (e.g. mautrix-whatsapp
// uses "remove" and "unauthorized"), so checking the ID alone isn't enough.
Remove: ghost.AvatarID == "" || ghost.AvatarMXC == "",
}, nil, time.Time{}, false) || changed
return
}
Expand Down