From 144c3c49c6e6f8b5e74ab732c487b4cb284e99c5 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 3 Dec 2020 15:57:38 +0000 Subject: [PATCH] Make sure we're using the right NIDs --- roomserver/storage/shared/storage.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go index 81aa1bf28..11d163a18 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -323,7 +323,7 @@ func (d *Database) Events( roomVersion, _ = d.Cache.GetRoomVersion(roomID) } eventID := "" - if id, ierr := d.EventsTable.SelectEventID(ctx, nil, eventNIDs[i]); ierr == nil { + if id, ierr := d.EventsTable.SelectEventID(ctx, nil, eventJSON.EventNID); ierr == nil { eventID = id } if roomVersion == "" { @@ -938,7 +938,7 @@ func (d *Database) GetBulkStateContent(ctx context.Context, roomIDs []string, tu for i := range events { roomVer := eventNIDToVer[events[i].EventNID] eventID := "" - if id, err := d.EventsTable.SelectEventID(ctx, nil, eventNIDs[i]); err == nil { + if id, err := d.EventsTable.SelectEventID(ctx, nil, events[i].EventNID); err == nil { eventID = id } ev, err := gomatrixserverlib.NewEventFromStoredJSON(eventID, events[i].EventJSON, false, roomVer)