hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-07 04:13:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable IncrementalSync stuff and re-assess

Browse source
This commit is contained in:
Eric Eastwood 2021-01-06 04:01:41 -06:00
parent c7328cee41
commit 783fba2d6a
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -821,8 +821,10 @@ func (d *Database) getResponseWithPDUsForCompleteSync(
res.Rooms.Join[roomID] = *jr res.Rooms.Join[roomID] = *jr
} }
if filter.Room.IncludeLeave {
var leaveRoomIDs []string
// Extract room state and recent events for all rooms the user has left // Extract room state and recent events for all rooms the user has left
leaveRoomIDs, err := d.CurrentRoomState.SelectRoomIDsWithMembership(ctx, txn, userID, gomatrixserverlib.Leave) leaveRoomIDs, err = d.CurrentRoomState.SelectRoomIDsWithMembership(ctx, txn, userID, gomatrixserverlib.Leave)
if err != nil { if err != nil {
return return
} }
@ -838,6 +840,7 @@ func (d *Database) getResponseWithPDUsForCompleteSync(
res.Rooms.Leave[roomID] = *lr res.Rooms.Leave[roomID] = *lr
} }
}
// Add peeked rooms. // Add peeked rooms.
peeks, err := d.Peeks.SelectPeeksInRange(ctx, txn, userID, device.ID, r) peeks, err := d.Peeks.SelectPeeksInRange(ctx, txn, userID, device.ID, r)
@ -909,7 +912,7 @@ func (d *Database) filterStreamEventsAccordingToHistoryVisibility(
} }
// Default to spanning the rest of the array // Default to spanning the rest of the array
sliceEnd := len(recentStreamEvents) sliceEnd := len(recentStreamEvents)
// If there is a leaveEvent, then cut all events after the person left (exclude the leave itself too) // If there is a leaveEvent, then cut all events after the person left (exclude the leave event too)
if leaveEventIndex != -1 { if leaveEventIndex != -1 {
sliceEnd = leaveEventIndex sliceEnd = leaveEventIndex
} }
@ -1225,10 +1228,11 @@ func (d *Database) addRoomDeltaToResponse(
// "recentStreamEvents": fmt.Sprintf("%+v", events), // "recentStreamEvents": fmt.Sprintf("%+v", events),
// }).Info("isync addRoomDeltaToResponse before") // }).Info("isync addRoomDeltaToResponse before")
recentStreamEvents, limited, err = d.filterStreamEventsAccordingToHistoryVisibility(recentStreamEvents, device, limited) // // asdf
if err != nil { // recentStreamEvents, limited, err = d.filterStreamEventsAccordingToHistoryVisibility(recentStreamEvents, device, limited)
return err // if err != nil {
} // return err
// }
// events = make([]somematrixevent, len(recentStreamEvents)) // events = make([]somematrixevent, len(recentStreamEvents))
// for i, v := range recentStreamEvents { // for i, v := range recentStreamEvents {