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

Fix sync

Browse source
This commit is contained in:
Neil Alexander 2020-05-28 15:52:41 +01:00
parent 581e5929e1
commit 587108fe31
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
syncapi/sync/requestpool.go
View file

@ -257,7 +257,6 @@ func (rp *RequestPool) appendSendToDeviceMessages(
for _, event := range events { for _, event := range events {
data.ToDevice.Events = append(data.ToDevice.Events, event.SendToDeviceEvent) data.ToDevice.Events = append(data.ToDevice.Events, event.SendToDeviceEvent)
} }
return data, nil return data, nil
} }

6
syncapi/types/types.go
View file

@ -247,7 +247,7 @@ func NewStreamTokenFromString(tok string) (token StreamingToken, err error) {
err = fmt.Errorf("token %s is not a streaming token", tok) err = fmt.Errorf("token %s is not a streaming token", tok)
return return
} }
if len(t.Positions) != 3 { if len(t.Positions) != 2 {
err = fmt.Errorf("token %s wrong number of values, got %d want 2", tok, len(t.Positions)) err = fmt.Errorf("token %s wrong number of values, got %d want 2", tok, len(t.Positions))
return return
} }
@ -318,6 +318,7 @@ func NewResponse(token StreamingToken) *Response {
// This also applies to NewJoinResponse, NewInviteResponse and NewLeaveResponse. // This also applies to NewJoinResponse, NewInviteResponse and NewLeaveResponse.
res.AccountData.Events = make([]gomatrixserverlib.ClientEvent, 0) res.AccountData.Events = make([]gomatrixserverlib.ClientEvent, 0)
res.Presence.Events = make([]gomatrixserverlib.ClientEvent, 0) res.Presence.Events = make([]gomatrixserverlib.ClientEvent, 0)
res.ToDevice.Events = make([]gomatrixserverlib.SendToDeviceEvent, 0)
return &res return &res
} }
@ -329,7 +330,8 @@ func (r *Response) IsEmpty() bool {
len(r.Rooms.Invite) == 0 && len(r.Rooms.Invite) == 0 &&
len(r.Rooms.Leave) == 0 && len(r.Rooms.Leave) == 0 &&
len(r.AccountData.Events) == 0 && len(r.AccountData.Events) == 0 &&
len(r.Presence.Events) == 0 len(r.Presence.Events) == 0 &&
len(r.ToDevice.Events) == 0
} }
// JoinResponse represents a /sync response for a room which is under the 'join' key. // JoinResponse represents a /sync response for a room which is under the 'join' key.