MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2024-12-14 17:33:48 +01:00
Code Issues Projects Releases Wiki Activity

Backport fixing custom fields leaking in history sync

Browse source
This commit is contained in:
Tulir Asokan 2022-04-16 23:16:05 +03:00
parent 2142f92089
commit a58cae16cd
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
historysync.go
View file

@ -478,6 +478,13 @@ func (portal *Portal) wrapBatchEvent(info *types.MessageInfo, intent *appservice
if err != nil { if err != nil {
return nil, err return nil, err
} }
if newEventType == event.EventEncrypted {
// Clear other custom keys if the event was encrypted, but keep the double puppet identifier
wrappedContent.Raw = map[string]interface{}{backfillIDField: info.ID}
if intent.IsCustomPuppet {
wrappedContent.Raw[doublePuppetKey] = doublePuppetValue
}
}
return &event.Event{ return &event.Event{
Sender: intent.UserID, Sender: intent.UserID,
Type: newEventType, Type: newEventType,