diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index efeec72fd8..4c6cc22a26 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -121,7 +121,7 @@ class SyncResult(collections.namedtuple("SyncResult", [
events.
"""
return bool(
- self.presence or self.joined or self.invited or self.archived
+ self.presence or self.joined or self.invited or self.archived or self.account_data
)
@@ -645,7 +645,6 @@ class SyncHandler(BaseHandler):
recents = yield self._filter_events_for_client(
sync_config.user.to_string(),
recents,
- is_peeking=sync_config.is_guest,
)
else:
recents = []
@@ -667,7 +666,6 @@ class SyncHandler(BaseHandler):
loaded_recents = yield self._filter_events_for_client(
sync_config.user.to_string(),
loaded_recents,
- is_peeking=sync_config.is_guest,
)
loaded_recents.extend(recents)
recents = loaded_recents
@@ -845,16 +843,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 +875,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
)
|
