diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2020-08-05 17:04:03 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2020-08-05 17:04:03 -0400 |
commit | 460ebc558a2550a423ed859bdd0f74b22cba1859 (patch) | |
tree | 3ab978e67490cd5bc175cee767015d16d79f4aea /synapse/notifier.py | |
parent | maybe this will make lint happy? (diff) | |
parent | Rename database classes to make some sense (#8033) (diff) | |
download | synapse-460ebc558a2550a423ed859bdd0f74b22cba1859.tar.xz |
Merge remote-tracking branch 'origin/develop' into dehydration
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r-- | synapse/notifier.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index bd41f77852..22ab4a9da5 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -320,7 +320,7 @@ class Notifier(object): """ user_stream = self.user_to_user_stream.get(user_id) if user_stream is None: - current_token = await self.event_sources.get_current_token() + current_token = self.event_sources.get_current_token() if room_ids is None: room_ids = await self.store.get_rooms_for_user(user_id) user_stream = _NotifierUserStream( @@ -397,7 +397,7 @@ class Notifier(object): """ from_token = pagination_config.from_token if not from_token: - from_token = await self.event_sources.get_current_token() + from_token = self.event_sources.get_current_token() limit = pagination_config.limit |