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

Apply patch to work around the "Someone" nickname problem

Browse Source
This commit is contained in:
Iiro Laiho
2022-11-29 12:06:53 +02:00
parent 0a6d64ab48
commit ffd9ec1e05
2 changed files with 10 additions and 6 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) senderName := b.getSenderName(messageInfo.Sender, messageInfo.PushName)
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) senderName := b.getSenderName(senderJID, msg.Info.PushName)
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) senderName := b.getSenderName(senderJID, msg.Info.PushName)
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) senderName := b.getSenderName(senderJID, msg.Info.PushName)
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) senderName := b.getSenderName(senderJID, msg.Info.PushName)
ci := imsg.GetContextInfo() ci := imsg.GetContextInfo()
if senderJID == (types.JID{}) && ci.Participant != nil { if senderJID == (types.JID{}) && ci.Participant != nil {

6
bridge/whatsappmulti/helpers.go
View File

@@ -18,7 +18,7 @@ type ProfilePicInfo struct {
Status int16 `json:"status"` Status int16 `json:"status"`
} }
func (b *Bwhatsapp) getSenderName(senderJid types.JID) string { func (b *Bwhatsapp) getSenderName(senderJid types.JID, AltName string) string {
if sender, exists := b.contacts[senderJid]; exists { if sender, exists := b.contacts[senderJid]; exists {
if sender.FullName != "" { if sender.FullName != "" {
return sender.FullName return sender.FullName
@@ -65,6 +65,10 @@ func (b *Bwhatsapp) getSenderName(senderJid types.JID) string {
} }
} }
if AltName != "" {
return AltName
}
return "Someone" return "Someone"
} }