seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix clearing avatars if contact ID is cleared

Browse source
This commit is contained in:
Tulir Asokan 2024-03-18 20:23:43 +02:00
parent 72d2fc8615
commit dad3dbc7e5
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
puppet.go
View file

@ -186,16 +186,20 @@ func (puppet *Puppet) DefaultIntent() *appservice.IntentAPI {
const MinAvatarUpdateInterval = 24 * time.Hour const MinAvatarUpdateInterval = 24 * time.Hour
func (puppet *Puppet) UpdateAvatar(ctx context.Context, source *User) bool { func (puppet *Puppet) UpdateAvatar(ctx context.Context, source *User) bool {
if (puppet.AvatarSet && time.Since(puppet.AvatarUpdateTS) < MinAvatarUpdateInterval) || puppet.ContactID == "" { if (puppet.AvatarSet && time.Since(puppet.AvatarUpdateTS) < MinAvatarUpdateInterval) || (puppet.ContactID == "" && puppet.AvatarMXC.IsEmpty()) {
return false return false
} }
resp, err := source.Client.GetParticipantThumbnail(puppet.ID) var resp *gmproto.GetThumbnailResponse
if err != nil { var err error
puppet.log.Err(err).Msg("Failed to get avatar thumbnail") if puppet.ContactID != "" {
return false resp, err = source.Client.GetParticipantThumbnail(puppet.ID)
if err != nil {
puppet.log.Err(err).Msg("Failed to get avatar thumbnail")
return false
}
} }
puppet.AvatarUpdateTS = time.Now() puppet.AvatarUpdateTS = time.Now()
if len(resp.Thumbnail) == 0 { if resp == nil || len(resp.Thumbnail) == 0 {
if puppet.AvatarHash == [32]byte{} && puppet.AvatarMXC.IsEmpty() && puppet.AvatarSet { if puppet.AvatarHash == [32]byte{} && puppet.AvatarMXC.IsEmpty() && puppet.AvatarSet {
return true return true
} }