1 files changed, 12 insertions, 4 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index efeec72fd8..558c7bacb9 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -845,16 +845,20 @@ class SyncHandler(BaseHandler):
# TODO(mjark) Check for new redactions in the state events.
with Measure(self.clock, "compute_state_delta"):
- current_state = yield self.get_state_at(
- room_id, stream_position=now_token
- )
-
if full_state:
if batch:
+ current_state = yield self.store.get_state_for_event(
+ batch.events[-1].event_id
+ )
+
state = yield self.store.get_state_for_event(
batch.events[0].event_id
)
else:
+ current_state = yield self.get_state_at(
+ room_id, stream_position=now_token
+ )
+
state = current_state
timeline_state = {
@@ -873,6 +877,10 @@ class SyncHandler(BaseHandler):
room_id, stream_position=since_token
)
+ current_state = yield self.store.get_state_for_event(
+ batch.events[-1].event_id
+ )
+
state_at_timeline_start = yield self.store.get_state_for_event(
batch.events[0].event_id
)
|
