diff options
| author | Erik Johnston <erik@matrix.org> | 2018-05-23 10:54:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-05-23 10:54:14 +0100 |
| commit | 6e11803ed3669fb897fe61da168eb033ad495198 (patch) | |
| tree | 936c98227c65d687318c3d573a4c4a5a5fdb1e33 /synapse/handlers/events.py | |
| parent | Merge pull request #3226 from matrix-org/erikj/chunk_base (diff) | |
| parent | Merge pull request #3265 from matrix-org/erikj/limit_pagination (diff) | |
| download | synapse-6e11803ed3669fb897fe61da168eb033ad495198.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_chunks
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index d3685fb12a..8bc642675f 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -48,6 +48,7 @@ class EventStreamHandler(BaseHandler): self.notifier = hs.get_notifier() self.state = hs.get_state_handler() + self._server_notices_sender = hs.get_server_notices_sender() @defer.inlineCallbacks @log_function @@ -58,6 +59,10 @@ class EventStreamHandler(BaseHandler): If `only_keys` is not None, events from keys will be sent down. """ + + # send any outstanding server notices to the user. + yield self._server_notices_sender.on_user_syncing(auth_user_id) + auth_user = UserID.from_string(auth_user_id) presence_handler = self.hs.get_presence_handler() |