Support streaming peek

1 files changed, 10 insertions, 4 deletions

diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 04bb1616c0..625f2f2583 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -779,13 +779,19 @@ class SyncHandler(object):
                         if include_all_tags and r.room_id in all_tags:
                             r.always_include = True
                             continue
-                        r.full_state = True
-                        r.would_require_resync = True
                         if r.room_id in include_map:
-                            r.always_include = True
+                            since = include_map[r.room_id].get("since", None)
+                            r.since_token = since
+                            if not since:
+                                r.always_include = True
+                                r.full_state = True
+                                r.would_require_resync = True
                             r.events = None
-                            r.since_token = None
                             r.upto_token = now_token
+                        else:
+                            r.full_state = True
+                            r.would_require_resync = True
+
         elif pagination_config and include_all_tags:
             all_tags = yield self.store.get_tags_for_user(user_id)