commit ba2f350c0353e6ef3d3416624e61db8f770ec5bb
Author: Wim <wim@42.be>
Date: Sun Nov 29 15:26:45 2020 +0000
Refactor handleTextMessage (whatsapp)
diff --git a/bridge/whatsapp/handlers.go b/bridge/whatsapp/handlers.go
index 0692f78..a08cba7 100644
--- a/bridge/whatsapp/handlers.go
+++ b/bridge/whatsapp/handlers.go
@@ -7912 +7910 @@ func (b *Bwhatsapp) HandleTextMessage(message whatsapp.TextMessage) {
return
}
- messageTime := time.Unix(int64(message.Info.Timestamp), 0) // TODO check how behaves between timezones
groupJID := message.Info.RemoteJid
-
senderJID := message.Info.SenderJid
+
if len(senderJID) == 0 {
- // TODO workaround till https://github.com/Rhymen/go-whatsapp/issues/86 resolved
if message.Info.Source != nil && message.Info.Source.Participant != nil {
senderJID = *message.Info.Source.Participant
}
@@ -11317 +11114 @@ func (b *Bwhatsapp) HandleTextMessage(message whatsapp.TextMessage) {
}
}
- b.Log.Debugf("<= Sending message from %s on %s to gateway", senderJID, b.Account)
-
rmsg := config.Message{
- UserID: senderJID,
- Username: senderName,
- Text: message.Text,
- Timestamp: messageTime,
- Channel: groupJID,
- Account: b.Account,
- Protocol: b.Protocol,
- Extra: make(map[string][]interface{}),
+ UserID: senderJID,
+ Username: senderName,
+ Text: message.Text,
+ Channel: groupJID,
+ Account: b.Account,
+ Protocol: b.Protocol,
+ Extra: make(map[string][]interface{}),
// ParentID: TODO, // TODO handle thread replies // map from Info.QuotedMessageID string
ID: message.Info.Id,
}
@@ -1326 +1277 @@ func (b *Bwhatsapp) HandleTextMessage(message whatsapp.TextMessage) {
rmsg.Avatar = avatarURL
}
+ b.Log.Debugf("<= Sending message from %s on %s to gateway", senderJID, b.Account)
b.Log.Debugf("<= Message is %#v", rmsg)
b.Remote <- rmsg
