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 failing test

Browse source
This commit is contained in:
Kegan Dougal 2020-10-02 12:10:39 +01:00
parent 3b365b1dc6
commit 6754aaf68a
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
syncapi/storage/shared/syncserver.go
View file

@ -670,7 +670,7 @@ func (d *Database) RedactEvent(ctx context.Context, redactedEventID string, reda
// nolint:nakedret // nolint:nakedret
func (d *Database) getResponseWithPDUsForCompleteSync( func (d *Database) getResponseWithPDUsForCompleteSync(
ctx context.Context, res *types.Response, ctx context.Context, res *types.Response,
userID string, deviceID string, userID string, device userapi.Device,
numRecentEventsPerRoom int, numRecentEventsPerRoom int,
) ( ) (
toPos types.StreamingToken, toPos types.StreamingToken,
@ -712,7 +712,7 @@ func (d *Database) getResponseWithPDUsForCompleteSync(
for _, roomID := range joinedRoomIDs { for _, roomID := range joinedRoomIDs {
var jr *types.JoinResponse var jr *types.JoinResponse
jr, err = d.getJoinResponseForCompleteSync( jr, err = d.getJoinResponseForCompleteSync(
ctx, txn, roomID, r, &stateFilter, numRecentEventsPerRoom, ctx, txn, roomID, r, &stateFilter, numRecentEventsPerRoom, device,
) )
if err != nil { if err != nil {
return return
@ -721,7 +721,7 @@ func (d *Database) getResponseWithPDUsForCompleteSync(
} }
// Add peeked rooms. // Add peeked rooms.
peeks, err := d.Peeks.SelectPeeksInRange(ctx, txn, userID, deviceID, r) peeks, err := d.Peeks.SelectPeeksInRange(ctx, txn, userID, device.ID, r)
if err != nil { if err != nil {
return return
} }
@ -729,7 +729,7 @@ func (d *Database) getResponseWithPDUsForCompleteSync(
if !peek.Deleted { if !peek.Deleted {
var jr *types.JoinResponse var jr *types.JoinResponse
jr, err = d.getJoinResponseForCompleteSync( jr, err = d.getJoinResponseForCompleteSync(
ctx, txn, peek.RoomID, r, &stateFilter, numRecentEventsPerRoom, ctx, txn, peek.RoomID, r, &stateFilter, numRecentEventsPerRoom, device,
) )
if err != nil { if err != nil {
return return
@ -751,7 +751,7 @@ func (d *Database) getJoinResponseForCompleteSync(
roomID string, roomID string,
r types.Range, r types.Range,
stateFilter *gomatrixserverlib.StateFilter, stateFilter *gomatrixserverlib.StateFilter,
numRecentEventsPerRoom int, numRecentEventsPerRoom int, device userapi.Device,
) (jr *types.JoinResponse, err error) { ) (jr *types.JoinResponse, err error) {
var stateEvents []gomatrixserverlib.HeaderedEvent var stateEvents []gomatrixserverlib.HeaderedEvent
stateEvents, err = d.CurrentRoomState.SelectCurrentState(ctx, txn, roomID, stateFilter) stateEvents, err = d.CurrentRoomState.SelectCurrentState(ctx, txn, roomID, stateFilter)
@ -784,8 +784,9 @@ func (d *Database) getJoinResponseForCompleteSync(
} }
// We don't include a device here as we don't need to send down // We don't include a device here as we don't need to send down
// transaction IDs for complete syncs // transaction IDs for complete syncs, but we do it anyway because Sytest demands it for:
recentEvents := d.StreamEventsToEvents(nil, recentStreamEvents) // "Can sync a room with a message with a transaction id" - which does a complete sync to check.
recentEvents := d.StreamEventsToEvents(&device, recentStreamEvents)
stateEvents = removeDuplicates(stateEvents, recentEvents) stateEvents = removeDuplicates(stateEvents, recentEvents)
jr = types.NewJoinResponse() jr = types.NewJoinResponse()
jr.Timeline.PrevBatch = prevBatchStr jr.Timeline.PrevBatch = prevBatchStr
@ -800,7 +801,7 @@ func (d *Database) CompleteSync(
device userapi.Device, numRecentEventsPerRoom int, device userapi.Device, numRecentEventsPerRoom int,
) (*types.Response, error) { ) (*types.Response, error) {
toPos, joinedRoomIDs, err := d.getResponseWithPDUsForCompleteSync( toPos, joinedRoomIDs, err := d.getResponseWithPDUsForCompleteSync(
ctx, res, device.UserID, device.ID, numRecentEventsPerRoom, ctx, res, device.UserID, device, numRecentEventsPerRoom,
) )
if err != nil { if err != nil {
return nil, fmt.Errorf("d.getResponseWithPDUsForCompleteSync: %w", err) return nil, fmt.Errorf("d.getResponseWithPDUsForCompleteSync: %w", err)