diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-11-04 17:31:01 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-11-04 17:31:01 +0000 |
| commit | 4e62ffdb21c17817a56c1d864d1f8dc91131b8ef (patch) | |
| tree | 21928f0803225e707532b477f581c6f4f1885ac9 /synapse/handlers/sync.py | |
| parent | Allow guests to register and call /events?room_id= (diff) | |
| parent | Merge pull request #339 from matrix-org/daniel/removesomelies (diff) | |
| download | synapse-4e62ffdb21c17817a56c1d864d1f8dc91131b8ef.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index d6527c1ae8..1c1ee34b1e 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -143,21 +143,8 @@ class SyncHandler(BaseHandler): def current_sync_callback(before_token, after_token): return self.current_sync_for_user(sync_config, since_token) - rm_handler = self.hs.get_handlers().room_member_handler - - app_service = yield self.store.get_app_service_by_user_id( - sync_config.user.to_string() - ) - if app_service: - rooms = yield self.store.get_app_service_rooms(app_service) - room_ids = set(r.room_id for r in rooms) - else: - room_ids = yield rm_handler.get_joined_rooms_for_user( - sync_config.user - ) - result = yield self.notifier.wait_for_events( - sync_config.user, room_ids, timeout, current_sync_callback, + sync_config.user, timeout, current_sync_callback, from_token=since_token ) defer.returnValue(result) @@ -403,7 +390,6 @@ class SyncHandler(BaseHandler): sync_config.user.to_string(), from_key=since_token.room_key, to_key=now_token.room_key, - room_id=None, limit=timeline_limit + 1, ) |