mirror of
https://github.com/tulir/mautrix-whatsapp
synced 2024-06-26 14:58:20 +02:00
Only clear custom keys for encrypted events
This commit is contained in:
parent
eee404c62d
commit
d257c80327
11
portal.go
11
portal.go
|
@ -1476,10 +1476,13 @@ func (portal *Portal) sendMessage(intent *appservice.IntentAPI, eventType event.
|
|||
return nil, err
|
||||
}
|
||||
|
||||
if intent.IsCustomPuppet {
|
||||
wrappedContent.Raw = map[string]interface{}{doublePuppetKey: doublePuppetValue}
|
||||
} else {
|
||||
wrappedContent.Raw = nil
|
||||
if eventType == event.EventEncrypted {
|
||||
// Clear other custom keys if the event was encrypted, but keep the double puppet identifier
|
||||
if intent.IsCustomPuppet {
|
||||
wrappedContent.Raw = map[string]interface{}{doublePuppetKey: doublePuppetValue}
|
||||
} else {
|
||||
wrappedContent.Raw = nil
|
||||
}
|
||||
}
|
||||
|
||||
_, _ = intent.UserTyping(portal.MXID, false, 0)
|
||||
|
|
Loading…
Reference in a new issue