diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-05-22 11:56:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 11:56:09 +0100 |
| commit | 8aeb529262ca686b149576f514958a62fb961af1 (patch) | |
| tree | 794a25f36f274fa857a7bcd5b7c73a2b09723d09 /synapse/handlers | |
| parent | Merge pull request #3258 from matrix-org/erikj/fixup_logcontext_rusage (diff) | |
| parent | Stub out ServerNoticesSender on the workers (diff) | |
| download | synapse-8aeb529262ca686b149576f514958a62fb961af1.tar.xz | |
Merge pull request #3236 from matrix-org/rav/consent_notice
Send users a server notice about consent
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/events.py | 5 | ||||
| -rw-r--r-- | synapse/handlers/presence.py | 6 |
2 files changed, 10 insertions, 1 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() diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 91218e40e6..500a131874 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -87,6 +87,11 @@ assert LAST_ACTIVE_GRANULARITY < IDLE_TIMER class PresenceHandler(object): def __init__(self, hs): + """ + + Args: + hs (synapse.server.HomeServer): + """ self.is_mine = hs.is_mine self.is_mine_id = hs.is_mine_id self.clock = hs.get_clock() @@ -94,7 +99,6 @@ class PresenceHandler(object): self.wheel_timer = WheelTimer() self.notifier = hs.get_notifier() self.federation = hs.get_federation_sender() - self.state = hs.get_state_handler() federation_registry = hs.get_federation_registry() |