MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2024-06-17 02:19:49 +02:00
Code Issues Projects Releases Wiki Activity

Fix receiving messages in notes to self chat

Browse source
This commit is contained in:
Tulir Asokan 2023-01-10 16:14:03 +02:00
parent acb056c894
commit ee3ce9b020
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
portal.go
View file

@ -651,12 +651,9 @@ func (portal *Portal) handleUndecryptableMessage(source *User, evt *events.Undec
"messageID": evt.Info.ID, "messageID": evt.Info.ID,
"undecryptableType": metricType, "undecryptableType": metricType,
}) })
intent := portal.getMessageIntent(source, &evt.Info) intent := portal.getMessageIntent(source, &evt.Info, "undecryptable")
if intent == nil { if intent == nil {
return return
} else if !intent.IsCustomPuppet && portal.IsPrivateChat() && evt.Info.Sender.User == portal.Key.Receiver.User {
portal.log.Debugfln("Not handling %s (undecryptable): user doesn't have double puppeting enabled", evt.Info.ID)
return
} }
content := undecryptableMessageContent content := undecryptableMessageContent
resp, err := portal.sendMessage(intent, event.EventMessage, &content, nil, evt.Info.Timestamp.UnixMilli()) resp, err := portal.sendMessage(intent, event.EventMessage, &content, nil, evt.Info.Timestamp.UnixMilli())
@ -676,7 +673,7 @@ func (portal *Portal) handleFakeMessage(msg fakeMessage) {
return return
} }
intent := portal.bridge.GetPuppetByJID(msg.Sender).IntentFor(portal) intent := portal.bridge.GetPuppetByJID(msg.Sender).IntentFor(portal)
if !intent.IsCustomPuppet && portal.IsPrivateChat() && msg.Sender.User == portal.Key.Receiver.User { if !intent.IsCustomPuppet && portal.IsPrivateChat() && msg.Sender.User == portal.Key.Receiver.User && portal.Key.Receiver != portal.Key.JID {
portal.log.Debugfln("Not handling %s (fake): user doesn't have double puppeting enabled", msg.ID) portal.log.Debugfln("Not handling %s (fake): user doesn't have double puppeting enabled", msg.ID)
return return
} }
@ -743,12 +740,9 @@ func (portal *Portal) handleMessage(source *User, evt *events.Message) {
evt.Message = evt.Message.GetProtocolMessage().GetEditedMessage() evt.Message = evt.Message.GetProtocolMessage().GetEditedMessage()
} }
intent := portal.getMessageIntent(source, &evt.Info) intent := portal.getMessageIntent(source, &evt.Info, msgType)
if intent == nil { if intent == nil {
return return
} else if !intent.IsCustomPuppet && portal.IsPrivateChat() && evt.Info.Sender.User == portal.Key.Receiver.User {
portal.log.Debugfln("Not handling %s (%s): user doesn't have double puppeting enabled", msgID, msgType)
return
} }
converted := portal.convertMessage(intent, source, &evt.Info, evt.Message, false) converted := portal.convertMessage(intent, source, &evt.Info, evt.Message, false)
if converted != nil { if converted != nil {
@ -906,12 +900,17 @@ func (portal *Portal) getMessagePuppet(user *User, info *types.MessageInfo) (pup
return puppet return puppet
} }
func (portal *Portal) getMessageIntent(user *User, info *types.MessageInfo) *appservice.IntentAPI { func (portal *Portal) getMessageIntent(user *User, info *types.MessageInfo, msgType string) *appservice.IntentAPI {
puppet := portal.getMessagePuppet(user, info) puppet := portal.getMessagePuppet(user, info)
if puppet == nil { if puppet == nil {
return nil return nil
} }
return puppet.IntentFor(portal) intent := puppet.IntentFor(portal)
if !intent.IsCustomPuppet && portal.IsPrivateChat() && info.Sender.User == portal.Key.Receiver.User && portal.Key.Receiver != portal.Key.JID {
portal.log.Debugfln("Not handling %s (%s): user doesn't have double puppeting enabled", info.ID, msgType)
return nil
}
return intent
} }
func (portal *Portal) finishHandling(existing *database.Message, message *types.MessageInfo, mxid id.EventID, msgType database.MessageType, errType database.MessageErrorType) { func (portal *Portal) finishHandling(existing *database.Message, message *types.MessageInfo, mxid id.EventID, msgType database.MessageType, errType database.MessageErrorType) {