mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-08 14:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

aaaaargh

Browse source
This commit is contained in:
Neil Alexander 2022-06-15 10:20:56 +01:00
parent 9b2dc10254
commit caccf7c663
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
roomserver/storage/shared/storage.go
View file

@ -487,29 +487,20 @@ func (d *Database) events(
roomVersions[n] = v roomVersions[n] = v
} }
for _, eventJSON := range eventJSONs { for _, eventJSON := range eventJSONs {
result := types.Event{ eventNID := eventJSON.EventNID
EventNID: eventJSON.EventNID, result := &results[positions[eventNID]]
} result.EventNID = eventNID
roomNID := roomNIDs[result.EventNID] roomNID := roomNIDs[eventNID]
result.Event, err = gomatrixserverlib.NewEventFromTrustedJSONWithEventID( result.Event, err = gomatrixserverlib.NewEventFromTrustedJSONWithEventID(
eventIDs[result.EventNID], eventJSON.EventJSON, false, roomVersions[roomNID], eventIDs[eventNID], eventJSON.EventJSON, false, roomVersions[roomNID],
) )
if err != nil { if err != nil {
return nil, err return nil, err
} }
pos, ok := positions[result.EventNID]
if !ok {
panic("should have position")
}
delete(positions, result.EventNID)
results[pos] = result
if result.Event != nil { if result.Event != nil {
d.Cache.StoreRoomServerEvent(result.EventNID, result.Event) d.Cache.StoreRoomServerEvent(eventNID, result.Event)
} }
} }
if len(positions) > 0 {
panic("unsatisfied events")
}
if !redactionsArePermanent { if !redactionsArePermanent {
d.applyRedactions(results) d.applyRedactions(results)
} }