char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sync bug fixes (#1394) 

* Sync bug fixes

* Remove logging
main
Neil Alexander 2020-09-04 11:20:47 +01:00 committed by GitHub
parent 2570418f42
commit c63abc8660
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
syncapi/storage/shared/syncserver.go
View File

@ -743,8 +743,10 @@ func (d *Database) addInvitesToResponse(
res.Rooms.Invite[roomID] = *ir res.Rooms.Invite[roomID] = *ir
} }
for roomID := range retiredInvites { for roomID := range retiredInvites {
lr := types.NewLeaveResponse() if _, ok := res.Rooms.Join[roomID]; !ok {
res.Rooms.Leave[roomID] = *lr lr := types.NewLeaveResponse()
res.Rooms.Leave[roomID] = *lr
}
} }
return nil return nil
} }
@ -996,26 +998,8 @@ func (d *Database) getStateDeltasForFullStateSync(
r types.Range, userID string, r types.Range, userID string,
stateFilter *gomatrixserverlib.StateFilter, stateFilter *gomatrixserverlib.StateFilter,
) ([]stateDelta, []string, error) { ) ([]stateDelta, []string, error) {
joinedRoomIDs, err := d.CurrentRoomState.SelectRoomIDsWithMembership(ctx, txn, userID, gomatrixserverlib.Join)
if err != nil {
return nil, nil, err
}
// Use a reasonable initial capacity // Use a reasonable initial capacity
deltas := make([]stateDelta, 0, len(joinedRoomIDs)) deltas := make(map[string]stateDelta)
// Add full states for all joined rooms
for _, joinedRoomID := range joinedRoomIDs {
s, stateErr := d.currentStateStreamEventsForRoom(ctx, txn, joinedRoomID, stateFilter)
if stateErr != nil {
return nil, nil, stateErr
}
deltas = append(deltas, stateDelta{
membership: gomatrixserverlib.Join,
stateEvents: d.StreamEventsToEvents(device, s),
roomID: joinedRoomID,
})
}
// Get all the state events ever between these two positions // Get all the state events ever between these two positions
stateNeeded, eventMap, err := d.OutputEvents.SelectStateInRange(ctx, txn, r, stateFilter) stateNeeded, eventMap, err := d.OutputEvents.SelectStateInRange(ctx, txn, r, stateFilter)
@ -1031,12 +1015,12 @@ func (d *Database) getStateDeltasForFullStateSync(
for _, ev := range stateStreamEvents { for _, ev := range stateStreamEvents {
if membership := getMembershipFromEvent(&ev.Event, userID); membership != "" { if membership := getMembershipFromEvent(&ev.Event, userID); membership != "" {
if membership != gomatrixserverlib.Join { // We've already added full state for all joined rooms above. if membership != gomatrixserverlib.Join { // We've already added full state for all joined rooms above.
deltas = append(deltas, stateDelta{ deltas[roomID] = stateDelta{
membership: membership, membership: membership,
membershipPos: ev.StreamPosition, membershipPos: ev.StreamPosition,
stateEvents: d.StreamEventsToEvents(device, stateStreamEvents), stateEvents: d.StreamEventsToEvents(device, stateStreamEvents),
roomID: roomID, roomID: roomID,
}) }
} }
break break
@ -1044,7 +1028,33 @@ func (d *Database) getStateDeltasForFullStateSync(
} }
} }
return deltas, joinedRoomIDs, nil joinedRoomIDs, err := d.CurrentRoomState.SelectRoomIDsWithMembership(ctx, txn, userID, gomatrixserverlib.Join)
if err != nil {
return nil, nil, err
}
// Add full states for all joined rooms
for _, joinedRoomID := range joinedRoomIDs {
s, stateErr := d.currentStateStreamEventsForRoom(ctx, txn, joinedRoomID, stateFilter)
if stateErr != nil {
return nil, nil, stateErr
}
deltas[joinedRoomID] = stateDelta{
membership: gomatrixserverlib.Join,
stateEvents: d.StreamEventsToEvents(device, s),
roomID: joinedRoomID,
}
}
// Create a response array.
result := make([]stateDelta, len(deltas))
i := 0
for _, delta := range deltas {
result[i] = delta
i++
}
return result, joinedRoomIDs, nil
} }
func (d *Database) currentStateStreamEventsForRoom( func (d *Database) currentStateStreamEventsForRoom(