mirror of
https://github.com/42wim/matterbridge.git
synced 2024-11-15 00:19:24 +01:00
Reload user information when a new contact is detected (whatsapp) (#1160)
Before returning an empty string, we refresh the WhatsApp contacts and if we found the one we wanted, we can return a real name. Fixes #796
This commit is contained in:
parent
a41accd033
commit
1fee323247
@ -80,8 +80,33 @@ func (b *Bwhatsapp) getSenderName(senderJid string) string {
|
|||||||
// if user is not in phone contacts
|
// if user is not in phone contacts
|
||||||
// it is the most obvious scenario unless you sync your phone contacts with some remote updated source
|
// it is the most obvious scenario unless you sync your phone contacts with some remote updated source
|
||||||
// users can change it in their WhatsApp settings -> profile -> click on Avatar
|
// users can change it in their WhatsApp settings -> profile -> click on Avatar
|
||||||
return sender.Notify
|
if sender.Notify != "" {
|
||||||
|
return sender.Notify
|
||||||
|
}
|
||||||
|
|
||||||
|
if sender.Short != "" {
|
||||||
|
return sender.Short
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// try to reload this contact
|
||||||
|
_, err := b.conn.Contacts()
|
||||||
|
if err != nil {
|
||||||
|
b.Log.Errorf("error on update of contacts: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if contact, exists := b.conn.Store.Contacts[senderJid]; exists {
|
||||||
|
// Add it to the user map
|
||||||
|
b.users[senderJid] = contact
|
||||||
|
|
||||||
|
if contact.Name != "" {
|
||||||
|
return contact.Name
|
||||||
|
}
|
||||||
|
// if user is not in phone contacts
|
||||||
|
// same as above
|
||||||
|
return contact.Notify
|
||||||
|
}
|
||||||
|
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user