lug/matterbridge
10
0
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup (whatsapp)

Browse Source
This commit is contained in:
Iiro Laiho
2022-11-29 18:14:26 +02:00
parent ffd9ec1e05
commit a975b145da
2 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bridge/whatsappmulti/handlers.go
View File

@@ -51,7 +51,7 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto.
senderJID := messageInfo.Sender senderJID := messageInfo.Sender
channel := messageInfo.Chat channel := messageInfo.Chat
senderName := b.getSenderName(messageInfo.Sender, messageInfo.PushName) senderName := b.getSenderName(messageInfo)
if senderName == "" { if senderName == "" {
senderName = "Someone" // don't expose telephone number senderName = "Someone" // don't expose telephone number
} }
@@ -118,7 +118,7 @@ func (b *Bwhatsapp) handleImageMessage(msg *events.Message) {
imsg := msg.Message.GetImageMessage() imsg := msg.Message.GetImageMessage()
senderJID := msg.Info.Sender senderJID := msg.Info.Sender
senderName := b.getSenderName(senderJID, msg.Info.PushName) senderName := b.getSenderName(msg.Info)
ci := imsg.GetContextInfo() ci := imsg.GetContextInfo()
if senderJID == (types.JID{}) && ci.Participant != nil { if senderJID == (types.JID{}) && ci.Participant != nil {
@@ -181,7 +181,7 @@ func (b *Bwhatsapp) handleVideoMessage(msg *events.Message) {
imsg := msg.Message.GetVideoMessage() imsg := msg.Message.GetVideoMessage()
senderJID := msg.Info.Sender senderJID := msg.Info.Sender
senderName := b.getSenderName(senderJID, msg.Info.PushName) senderName := b.getSenderName(msg.Info)
ci := imsg.GetContextInfo() ci := imsg.GetContextInfo()
if senderJID == (types.JID{}) && ci.Participant != nil { if senderJID == (types.JID{}) && ci.Participant != nil {
@@ -238,7 +238,7 @@ func (b *Bwhatsapp) handleAudioMessage(msg *events.Message) {
imsg := msg.Message.GetAudioMessage() imsg := msg.Message.GetAudioMessage()
senderJID := msg.Info.Sender senderJID := msg.Info.Sender
senderName := b.getSenderName(senderJID, msg.Info.PushName) senderName := b.getSenderName(msg.Info)
ci := imsg.GetContextInfo() ci := imsg.GetContextInfo()
if senderJID == (types.JID{}) && ci.Participant != nil { if senderJID == (types.JID{}) && ci.Participant != nil {
@@ -295,7 +295,7 @@ func (b *Bwhatsapp) handleDocumentMessage(msg *events.Message) {
imsg := msg.Message.GetDocumentMessage() imsg := msg.Message.GetDocumentMessage()
senderJID := msg.Info.Sender senderJID := msg.Info.Sender
senderName := b.getSenderName(senderJID, msg.Info.PushName) senderName := b.getSenderName(msg.Info)
ci := imsg.GetContextInfo() ci := imsg.GetContextInfo()
if senderJID == (types.JID{}) && ci.Participant != nil { if senderJID == (types.JID{}) && ci.Participant != nil {

70
bridge/whatsappmulti/helpers.go
View File

@@ -18,55 +18,47 @@ type ProfilePicInfo struct {
Status int16 `json:"status"` Status int16 `json:"status"`
} }
func (b *Bwhatsapp) getSenderName(senderJid types.JID, AltName string) string { func (b *Bwhatsapp) getSenderName(info types.MessageInfo) string {
if sender, exists := b.contacts[senderJid]; exists { // Parse AD JID
if sender.FullName != "" { var senderJid types.JID
return sender.FullName senderJid.User, senderJid.Server = info.Sender.User, info.Sender.Server
for i := 0; i < 2; i++ {
if sender, exists := b.contacts[senderJid]; exists {
if sender.FullName != "" {
return sender.FullName
}
} }
// 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
if sender.PushName != "" { if info.PushName != "" {
return sender.PushName return info.PushName
} }
if sender.FirstName != "" { if sender, exists := b.contacts[senderJid]; exists {
return sender.FirstName if sender.FirstName != "" {
} return sender.FirstName
} }
// try to reload this contact
if _, err := b.wc.Store.Contacts.GetAllContacts(); err != nil {
b.Log.Errorf("error on update of contacts: %v", err)
}
allcontacts, err := b.wc.Store.Contacts.GetAllContacts()
if err != nil {
b.Log.Errorf("error on update of contacts: %v", err)
}
if len(allcontacts) > 0 {
b.contacts = allcontacts
}
if sender, exists := b.contacts[senderJid]; exists {
if sender.FullName != "" {
return sender.FullName
}
// if user is not in phone contacts
// 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
if sender.PushName != "" {
return sender.PushName
} }
if sender.FirstName != "" { if i > 0 {
return sender.FirstName break
} }
}
if AltName != "" { // try to reload this contact
return AltName if _, err := b.wc.Store.Contacts.GetAllContacts(); err != nil {
b.Log.Errorf("error on update of contacts: %v", err)
}
allcontacts, err := b.wc.Store.Contacts.GetAllContacts()
if err != nil {
b.Log.Errorf("error on update of contacts: %v", err)
}
if len(allcontacts) > 0 {
b.contacts = allcontacts
}
} }
return "Someone" return "Someone"