From 72ea8efcfaf9054aa6355cb7ca8cb70d4b57f25d Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 23 Jan 2020 15:42:49 +0000 Subject: [PATCH] Revert to topology tokens in addRoomDeltaToResponse etc --- syncapi/storage/postgres/syncserver.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/syncapi/storage/postgres/syncserver.go b/syncapi/storage/postgres/syncserver.go index 1da26bb62..492242652 100644 --- a/syncapi/storage/postgres/syncserver.go +++ b/syncapi/storage/postgres/syncserver.go @@ -627,7 +627,7 @@ func (d *SyncServerDatasource) getResponseWithPDUsForCompleteSync( stateEvents = removeDuplicates(stateEvents, recentEvents) jr := types.NewJoinResponse() jr.Timeline.PrevBatch = types.NewPaginationTokenFromTypeAndPosition( - types.PaginationTokenTypeStream, backwardTopologyPos, 0, + types.PaginationTokenTypeTopology, backwardTopologyPos, 0, ).String() jr.Timeline.Events = gomatrixserverlib.ToClientEvents(recentEvents, gomatrixserverlib.FormatSync) jr.Timeline.Limited = true @@ -842,7 +842,7 @@ func (d *SyncServerDatasource) addRoomDeltaToResponse( jr := types.NewJoinResponse() jr.Timeline.PrevBatch = types.NewPaginationTokenFromTypeAndPosition( - types.PaginationTokenTypeStream, backwardTopologyPos, 0, + types.types.PaginationTokenTypeTopology, backwardTopologyPos, 0, ).String() jr.Timeline.Events = gomatrixserverlib.ToClientEvents(recentEvents, gomatrixserverlib.FormatSync) jr.Timeline.Limited = false // TODO: if len(events) >= numRecents + 1 and then set limited:true @@ -855,7 +855,7 @@ func (d *SyncServerDatasource) addRoomDeltaToResponse( // no longer in the room. lr := types.NewLeaveResponse() lr.Timeline.PrevBatch = types.NewPaginationTokenFromTypeAndPosition( - types.PaginationTokenTypeStream, backwardTopologyPos, 0, + types.types.PaginationTokenTypeTopology, backwardTopologyPos, 0, ).String() lr.Timeline.Events = gomatrixserverlib.ToClientEvents(recentEvents, gomatrixserverlib.FormatSync) lr.Timeline.Limited = false // TODO: if len(events) >= numRecents + 1 and then set limited:true