diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-01-20 15:34:18 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-01-20 15:34:18 +0000 |
| commit | a2ae01cc0fca9815c90028c49536dec58bd1dc64 (patch) | |
| tree | e0352a71a18f9ab5cdd52aa3e49d9cfcfd99c87d /synapse/handlers/sync.py | |
| parent | Merge branch 'dbkr/no_push_for_own_events' into develop (diff) | |
| parent | Allow non-guests to peek on rooms using /events (diff) | |
| download | synapse-a2ae01cc0fca9815c90028c49536dec58bd1dc64.tar.xz | |
Merge pull request #510 from matrix-org/daniel/nonguestpeeking
Allow non-guests to peek on rooms using /events
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index aca200c1e7..53e1eb0508 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -150,7 +150,7 @@ class SyncHandler(BaseHandler): return self.current_sync_for_user(sync_config, since_token) result = yield self.notifier.wait_for_events( - sync_config.user, timeout, current_sync_callback, + sync_config.user.to_string(), timeout, current_sync_callback, from_token=since_token ) defer.returnValue(result) @@ -640,7 +640,7 @@ class SyncHandler(BaseHandler): loaded_recents = yield self._filter_events_for_client( sync_config.user.to_string(), loaded_recents, - is_guest=sync_config.is_guest, + is_peeking=sync_config.is_guest, ) loaded_recents.extend(recents) recents = loaded_recents |