mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-06 22:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix oops, add simple test

Browse source
This commit is contained in:
Till Faelligen 2023-09-22 16:00:07 +02:00
parent a2a4e96c9b
commit ab2c24c742
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
syncapi/synctypes/clientevent.go
View file

@ -145,7 +145,7 @@ func ToClientEvent(se gomatrixserverlib.PDU, format ClientEventFormat, userIDFor
// For compatibility with older clients, we keep the "redacts" top-level field.
// TODO: At which point do we remove "redacts" from the top-level?
if se.Type() == spec.MRoomRedaction && se.Version() == gomatrixserverlib.RoomVersionV11 && ce.Redacts != "" {
v11content, err := sjson.SetBytes(ce.Content, "content.redacts", ce.Redacts)
v11content, err := sjson.SetBytes(ce.Content, "redacts", ce.Redacts)
if err != nil {
logrus.WithError(err).Warn("failed to set content.redacts")
} else {

44
syncapi/synctypes/clientevent_test.go
View file

@ -154,6 +154,50 @@ func TestToClientEvent(t *testing.T) { // nolint: gocyclo
}
}
// Merely tests that the top-level "redacts" is copied to "content.redacts" and keeps the top-level
// one as is
func TestToClientEventRedactionV11(t *testing.T) { // nolint: gocyclo
ev, err := gomatrixserverlib.MustGetRoomVersion(gomatrixserverlib.RoomVersionV11).NewEventFromTrustedJSON([]byte(`{
"type": "m.room.redaction",
"state_key": "",
"event_id": "$test",
"room_id": "!test:localhost",
"sender": "@test:localhost",
"content": {
"reason": "Hello World"
},
"origin_server_ts": 123456,
"unsigned": {
"prev_content": {
"name": "Goodbye World"
}
},
"redacts": "$abc"
}`), false)
if err != nil {
t.Fatalf("failed to create Event: %s", err)
}
ce, err := ToClientEvent(ev, FormatAll, func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) {
return queryUserIDForSender(senderID)
})
if err != nil {
t.Fatalf("failed to create ClientEvent: %s", err)
}
j, err := json.Marshal(ce)
if err != nil {
t.Fatalf("failed to Marshal ClientEvent: %s", err)
}
// Marshal sorts keys in structs by the order they are defined in the struct, which is alphabetical
out := `{"content":{"reason":"Hello World","redacts":"$abc"},"event_id":"$test","origin_server_ts":123456,` +
`"room_id":"!test:localhost","sender":"@test:localhost","state_key":"","type":"m.room.redaction",` +
`"unsigned":{"prev_content":{"name":"Goodbye World"}},"redacts":"$abc"}`
if !bytes.Equal([]byte(out), j) {
t.Errorf("ClientEvent marshalled to wrong bytes: wanted \n%s, got \n%s", out, string(j))
}
}
func TestToClientFormatSync(t *testing.T) {
ev, err := gomatrixserverlib.MustGetRoomVersion(gomatrixserverlib.RoomVersionV1).NewEventFromTrustedJSON([]byte(`{
"type": "m.room.name",