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

Fix backfill

Browse source
This commit is contained in:
Neil Alexander 2020-09-25 15:53:42 +01:00
parent 06b2f3a3b5
commit 572c2b0806
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/internal/perform/perform_backfill.go
View file

@ -329,7 +329,7 @@ func (b *backfillRequester) StateBeforeEvent(ctx context.Context, roomVer gomatr
event gomatrixserverlib.HeaderedEvent, eventIDs []string) (map[string]*gomatrixserverlib.Event, error) { event gomatrixserverlib.HeaderedEvent, eventIDs []string) (map[string]*gomatrixserverlib.Event, error) {
// try to fetch the events from the database first // try to fetch the events from the database first
events, err := b.ProvideEvents(roomVer, eventIDs) events, err := b.ProvideEvents(roomVer, eventIDs, "")
if err != nil { if err != nil {
// non-fatal, fallthrough // non-fatal, fallthrough
logrus.WithError(err).Info("Failed to fetch events") logrus.WithError(err).Info("Failed to fetch events")
@ -451,7 +451,7 @@ func (b *backfillRequester) Backfill(ctx context.Context, server gomatrixserverl
return tx, err return tx, err
} }
func (b *backfillRequester) ProvideEvents(roomVer gomatrixserverlib.RoomVersion, eventIDs []string) ([]gomatrixserverlib.Event, error) { func (b *backfillRequester) ProvideEvents(roomVer gomatrixserverlib.RoomVersion, eventIDs []string, _ gomatrixserverlib.ServerName) ([]gomatrixserverlib.Event, error) {
ctx := context.Background() ctx := context.Background()
nidMap, err := b.db.EventNIDs(ctx, eventIDs) nidMap, err := b.db.EventNIDs(ctx, eventIDs)
if err != nil { if err != nil {