deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 14:25:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

crypto/encryptmegolm: add fallback for copying m.relates_to
Some checks failed
Go / Lint (latest) (push) Has been cancelled
Details
Go / Build (old, libolm) (push) Has been cancelled
Details
Go / Build (latest, libolm) (push) Has been cancelled
Details
Go / Build (old, goolm) (push) Has been cancelled
Details
Go / Build (latest, goolm) (push) Has been cancelled
Details

Browse source
This commit is contained in:
Tulir Asokan 2025-08-19 19:44:51 +03:00
commit baf54f57b6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crypto/encryptmegolm.go
View file

@ -41,7 +41,7 @@ func getRawJSON[T any](content json.RawMessage, path ...string) *T {
return &result
}
func getRelatesTo(content any) *event.RelatesTo {
func getRelatesTo(content any, plaintext json.RawMessage) *event.RelatesTo {
contentJSON, ok := content.(json.RawMessage)
if ok {
return getRawJSON[event.RelatesTo](contentJSON, "m.relates_to")
@ -54,7 +54,7 @@ func getRelatesTo(content any) *event.RelatesTo {
if ok {
return relatable.OptionalGetRelatesTo()
}
return nil
return getRawJSON[event.RelatesTo](plaintext, "content", "m.relates_to")
}
func getMentions(content any) *event.Mentions {
@ -158,7 +158,7 @@ func (mach *OlmMachine) EncryptMegolmEventWithStateKey(ctx context.Context, room
Algorithm: id.AlgorithmMegolmV1,
SessionID: session.ID(),
MegolmCiphertext: ciphertext,
RelatesTo: getRelatesTo(content),
RelatesTo: getRelatesTo(content, plaintext),
// These are deprecated
SenderKey: mach.account.IdentityKey(),