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

Try that again

Browse source
This commit is contained in:
Neil Alexander 2022-06-15 09:52:06 +01:00
parent 87e7d32665
commit e979667952
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -435,7 +435,7 @@ func (d *Database) Events(
func (d *Database) events( func (d *Database) events(
ctx context.Context, txn *sql.Tx, inputEventNIDs []types.EventNID, ctx context.Context, txn *sql.Tx, inputEventNIDs []types.EventNID,
) ([]types.Event, error) { ) ([]types.Event, error) {
results := make([]types.Event, len(inputEventNIDs)) results := make([]types.Event, 0, len(inputEventNIDs))
eventNIDs := make([]types.EventNID, 0, len(results)) eventNIDs := make([]types.EventNID, 0, len(results))
for _, nid := range inputEventNIDs { for _, nid := range inputEventNIDs {
if event, ok := d.Cache.GetRoomServerEvent(nid); ok && event != nil { if event, ok := d.Cache.GetRoomServerEvent(nid); ok && event != nil {
@ -482,19 +482,21 @@ func (d *Database) events(
for n, v := range dbRoomVersions { for n, v := range dbRoomVersions {
roomVersions[n] = v roomVersions[n] = v
} }
for i, eventJSON := range eventJSONs { for _, eventJSON := range eventJSONs {
result := &results[i] roomNID := roomNIDs[eventJSON.EventNID]
result.EventNID = eventJSON.EventNID
roomNID := roomNIDs[result.EventNID]
roomVersion := roomVersions[roomNID] roomVersion := roomVersions[roomNID]
result.Event, err = gomatrixserverlib.NewEventFromTrustedJSONWithEventID( event, err := gomatrixserverlib.NewEventFromTrustedJSONWithEventID(
eventIDs[eventJSON.EventNID], eventJSON.EventJSON, false, roomVersion, eventIDs[eventJSON.EventNID], eventJSON.EventJSON, false, roomVersion,
) )
if err != nil { if err != nil {
return nil, err return nil, err
} }
if result.Event != nil { results = append(results, types.Event{
d.Cache.StoreRoomServerEvent(result.EventNID, result.Event) EventNID: eventJSON.EventNID,
Event: event,
})
if event != nil {
d.Cache.StoreRoomServerEvent(eventJSON.EventNID, event)
} }
} }
if !redactionsArePermanent { if !redactionsArePermanent {