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

Make sure we're using the right NIDs

Browse source
This commit is contained in:
Neil Alexander 2020-12-03 15:57:38 +00:00
parent a735f9f6bb
commit 144c3c49c6
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -323,7 +323,7 @@ func (d *Database) Events(
roomVersion, _ = d.Cache.GetRoomVersion(roomID) roomVersion, _ = d.Cache.GetRoomVersion(roomID)
} }
eventID := "" 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 eventID = id
} }
if roomVersion == "" { if roomVersion == "" {
@ -938,7 +938,7 @@ func (d *Database) GetBulkStateContent(ctx context.Context, roomIDs []string, tu
for i := range events { for i := range events {
roomVer := eventNIDToVer[events[i].EventNID] roomVer := eventNIDToVer[events[i].EventNID]
eventID := "" 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 eventID = id
} }
ev, err := gomatrixserverlib.NewEventFromStoredJSON(eventID, events[i].EventJSON, false, roomVer) ev, err := gomatrixserverlib.NewEventFromStoredJSON(eventID, events[i].EventJSON, false, roomVer)