mirror of
https://github.com/tulir/mautrix-whatsapp
synced 2024-05-29 01:03:53 +02:00
Switch to ParseWebMessage from whatsmeow
This commit is contained in:
Tulir Asokan
parent
c00f74af3b
commit
6f14475667
2
go.mod
2
go.mod
|
|
@ -10,7 +10,7 @@ require (
|
|||
github.com/prometheus/client_golang v1.11.1
|
||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
|
||||
github.com/tidwall/gjson v1.14.1
|
||||
go.mau.fi/whatsmeow v0.0.0-20220511113019-fd17667ead01
|
||||
go.mau.fi/whatsmeow v0.0.0-20220513125336-055e2d469662
|
||||
golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9
|
||||
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
|
||||
google.golang.org/protobuf v1.28.0
|
||||
|
|
|
|||
4
go.sum
4
go.sum
|
|
@ -120,8 +120,8 @@ github.com/yuin/goldmark v1.4.12 h1:6hffw6vALvEDqJ19dOJvJKOoAOKe4NDaTqvd2sktGN0=
|
|||
github.com/yuin/goldmark v1.4.12/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||
go.mau.fi/libsignal v0.0.0-20220425070825-c40c839ee6a0 h1:3IQF2bgAyibdo77hTejwuJe4jlypj9QaE4xCQuxrThM=
|
||||
go.mau.fi/libsignal v0.0.0-20220425070825-c40c839ee6a0/go.mod h1:kBOXTvYyDG/q1Ihgvd4J6WenGPh7wtEGvPKF6vmf5ak=
|
||||
go.mau.fi/whatsmeow v0.0.0-20220511113019-fd17667ead01 h1:/TvWAVN7KCHBHbT+0WZmTjGWjqAEnh2hCSVZ0Ucip2s=
|
||||
go.mau.fi/whatsmeow v0.0.0-20220511113019-fd17667ead01/go.mod h1:iUBgOLNaqShLrR17u0kIiRptIGFH+nbT1tRhaWBEX/c=
|
||||
go.mau.fi/whatsmeow v0.0.0-20220513125336-055e2d469662 h1:TJoeSOj9UBzGX582dLIWFpLkms2I1SQ1srHxuewDeI8=
|
||||
go.mau.fi/whatsmeow v0.0.0-20220513125336-055e2d469662/go.mod h1:iUBgOLNaqShLrR17u0kIiRptIGFH+nbT1tRhaWBEX/c=
|
||||
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
|
|
|
|||
|
|
@ -325,28 +325,24 @@ func (user *User) handleHistorySync(reCheckQueue chan bool, evt *waProto.History
|
|||
|
||||
for _, rawMsg := range conv.GetMessages() {
|
||||
// Don't store messages that will just be skipped.
|
||||
wmi := rawMsg.GetMessage()
|
||||
msg := wmi.GetMessage()
|
||||
if msg.GetEphemeralMessage().GetMessage() != nil {
|
||||
msg = msg.GetEphemeralMessage().GetMessage()
|
||||
}
|
||||
if msg.GetViewOnceMessage().GetMessage() != nil {
|
||||
msg = msg.GetViewOnceMessage().GetMessage()
|
||||
msgEvt, err := user.Client.ParseWebMessage(portal.Key.JID, rawMsg.GetMessage())
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
|
||||
msgType := getMessageType(msg)
|
||||
msgType := getMessageType(msgEvt.Message)
|
||||
if msgType == "unknown" || msgType == "ignore" || msgType == "unknown_protocol" {
|
||||
continue
|
||||
}
|
||||
|
||||
// Don't store unsupported messages.
|
||||
if !containsSupportedMessage(msg) {
|
||||
if !containsSupportedMessage(msgEvt.Message) {
|
||||
continue
|
||||
}
|
||||
|
||||
message, err := user.bridge.DB.HistorySync.NewMessageWithValues(user.MXID, conv.GetId(), wmi.GetKey().GetId(), rawMsg)
|
||||
message, err := user.bridge.DB.HistorySync.NewMessageWithValues(user.MXID, conv.GetId(), msgEvt.Info.ID, rawMsg)
|
||||
if err != nil {
|
||||
user.log.Warnfln("Failed to save message %s in %s. Error: %+v", wmi.GetKey().Id, conv.GetId(), err)
|
||||
user.log.Warnfln("Failed to save message %s in %s. Error: %+v", msgEvt.Info.ID, conv.GetId(), err)
|
||||
continue
|
||||
}
|
||||
message.Insert()
|
||||
|
|
@ -497,45 +493,38 @@ func (portal *Portal) backfill(source *User, messages []*waProto.WebMessageInfo,
|
|||
// The messages are ordered newest to oldest, so iterate them in reverse order.
|
||||
for i := len(messages) - 1; i >= 0; i-- {
|
||||
webMsg := messages[i]
|
||||
msg := webMsg.GetMessage()
|
||||
if msg.GetEphemeralMessage().GetMessage() != nil {
|
||||
msg = msg.GetEphemeralMessage().GetMessage()
|
||||
}
|
||||
if msg.GetViewOnceMessage().GetMessage() != nil {
|
||||
msg = msg.GetViewOnceMessage().GetMessage()
|
||||
}
|
||||
|
||||
msgType := getMessageType(msg)
|
||||
if msgType == "unknown" || msgType == "ignore" || msgType == "unknown_protocol" {
|
||||
if msgType != "ignore" {
|
||||
portal.log.Debugfln("Skipping message %s with unknown type in backfill", webMsg.GetKey().GetId())
|
||||
}
|
||||
msgEvt, err := source.Client.ParseWebMessage(portal.Key.JID, webMsg)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
info := portal.parseWebMessageInfo(source, webMsg)
|
||||
if info == nil {
|
||||
|
||||
msgType := getMessageType(msgEvt.Message)
|
||||
if msgType == "unknown" || msgType == "ignore" || msgType == "unknown_protocol" {
|
||||
if msgType != "ignore" {
|
||||
portal.log.Debugfln("Skipping message %s with unknown type in backfill", msgEvt.Info.ID)
|
||||
}
|
||||
continue
|
||||
}
|
||||
if webMsg.GetPushName() != "" && webMsg.GetPushName() != "-" {
|
||||
existingContact, _ := source.Client.Store.Contacts.GetContact(info.Sender)
|
||||
existingContact, _ := source.Client.Store.Contacts.GetContact(msgEvt.Info.Sender)
|
||||
if !existingContact.Found || existingContact.PushName == "" {
|
||||
changed, _, err := source.Client.Store.Contacts.PutPushName(info.Sender, webMsg.GetPushName())
|
||||
changed, _, err := source.Client.Store.Contacts.PutPushName(msgEvt.Info.Sender, webMsg.GetPushName())
|
||||
if err != nil {
|
||||
source.log.Errorfln("Failed to save push name of %s from historical message in device store: %v", info.Sender, err)
|
||||
source.log.Errorfln("Failed to save push name of %s from historical message in device store: %v", msgEvt.Info.Sender, err)
|
||||
} else if changed {
|
||||
source.log.Debugfln("Got push name %s for %s from historical message", webMsg.GetPushName(), info.Sender)
|
||||
source.log.Debugfln("Got push name %s for %s from historical message", webMsg.GetPushName(), msgEvt.Info.Sender)
|
||||
}
|
||||
}
|
||||
}
|
||||
puppet := portal.getMessagePuppet(source, info)
|
||||
puppet := portal.getMessagePuppet(source, &msgEvt.Info)
|
||||
intent := puppet.IntentFor(portal)
|
||||
if intent.IsCustomPuppet && !portal.bridge.Config.CanDoublePuppetBackfill(puppet.CustomMXID) {
|
||||
intent = puppet.DefaultIntent()
|
||||
}
|
||||
|
||||
converted := portal.convertMessage(intent, source, info, msg, true)
|
||||
converted := portal.convertMessage(intent, source, &msgEvt.Info, msgEvt.Message, true)
|
||||
if converted == nil {
|
||||
portal.log.Debugfln("Skipping unsupported message %s in backfill", info.ID)
|
||||
portal.log.Debugfln("Skipping unsupported message %s in backfill", msgEvt.Info.ID)
|
||||
continue
|
||||
}
|
||||
if !intent.IsCustomPuppet && !portal.bridge.StateStore.IsInRoom(portal.MXID, puppet.MXID) {
|
||||
|
|
@ -545,9 +534,9 @@ func (portal *Portal) backfill(source *User, messages []*waProto.WebMessageInfo,
|
|||
if len(converted.ReplyTo) > 0 {
|
||||
portal.SetReply(converted.Content, converted.ReplyTo)
|
||||
}
|
||||
err := portal.appendBatchEvents(converted, info, webMsg.GetEphemeralStartTimestamp(), &req.Events, &infos)
|
||||
err = portal.appendBatchEvents(converted, &msgEvt.Info, webMsg.GetEphemeralStartTimestamp(), &req.Events, &infos)
|
||||
if err != nil {
|
||||
portal.log.Errorfln("Error handling message %s during backfill: %v", info.ID, err)
|
||||
portal.log.Errorfln("Error handling message %s during backfill: %v", msgEvt.Info.ID, err)
|
||||
}
|
||||
}
|
||||
portal.log.Infofln("Made %d Matrix events from messages in batch", len(req.Events))
|
||||
|
|
@ -598,34 +587,6 @@ func (portal *Portal) requestMediaRetries(source *User, eventIDs []id.EventID, i
|
|||
}
|
||||
}
|
||||
|
||||
func (portal *Portal) parseWebMessageInfo(source *User, webMsg *waProto.WebMessageInfo) *types.MessageInfo {
|
||||
info := types.MessageInfo{
|
||||
MessageSource: types.MessageSource{
|
||||
Chat: portal.Key.JID,
|
||||
IsFromMe: webMsg.GetKey().GetFromMe(),
|
||||
IsGroup: portal.Key.JID.Server == types.GroupServer,
|
||||
},
|
||||
ID: webMsg.GetKey().GetId(),
|
||||
PushName: webMsg.GetPushName(),
|
||||
Timestamp: time.Unix(int64(webMsg.GetMessageTimestamp()), 0),
|
||||
}
|
||||
var err error
|
||||
if info.IsFromMe {
|
||||
info.Sender = source.JID.ToNonAD()
|
||||
} else if portal.IsPrivateChat() {
|
||||
info.Sender = portal.Key.JID
|
||||
} else if webMsg.GetParticipant() != "" {
|
||||
info.Sender, err = types.ParseJID(webMsg.GetParticipant())
|
||||
} else if webMsg.GetKey().GetParticipant() != "" {
|
||||
info.Sender, err = types.ParseJID(webMsg.GetKey().GetParticipant())
|
||||
}
|
||||
if info.Sender.IsEmpty() {
|
||||
portal.log.Warnfln("Failed to get sender of message %s (parse error: %v)", info.ID, err)
|
||||
return nil
|
||||
}
|
||||
return &info
|
||||
}
|
||||
|
||||
func (portal *Portal) appendBatchEvents(converted *ConvertedMessage, info *types.MessageInfo, expirationStart uint64, eventsArray *[]*event.Event, infoArray *[]*wrappedInfo) error {
|
||||
mainEvt, err := portal.wrapBatchEvent(info, converted.Intent, converted.Type, converted.Content, converted.Extra)
|
||||
if err != nil {
|
||||
|
|
|
|||
Loading…
Reference in a new issue