diff options
author | Erik Johnston <erik@matrix.org> | 2018-03-13 13:17:08 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-03-13 13:17:08 +0000 |
commit | bf8e97bd3c11a4bdae9dcf255922b1ac2d03f5b3 (patch) | |
tree | 42423f71093a796415971f66ec4a24712bab42c2 /synapse/handlers/presence.py | |
parent | Add docstring (diff) | |
parent | Merge pull request #2980 from matrix-org/erikj/rm_priv (diff) | |
download | synapse-bf8e97bd3c11a4bdae9dcf255922b1ac2d03f5b3.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_remote_leave
Diffstat (limited to 'synapse/handlers/presence.py')
-rw-r--r-- | synapse/handlers/presence.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index cb158ba962..b11ae78350 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -98,24 +98,26 @@ class PresenceHandler(object): self.state = hs.get_state_handler() - self.replication.register_edu_handler( + federation_registry = hs.get_federation_registry() + + federation_registry.register_edu_handler( "m.presence", self.incoming_presence ) - self.replication.register_edu_handler( + federation_registry.register_edu_handler( "m.presence_invite", lambda origin, content: self.invite_presence( observed_user=UserID.from_string(content["observed_user"]), observer_user=UserID.from_string(content["observer_user"]), ) ) - self.replication.register_edu_handler( + federation_registry.register_edu_handler( "m.presence_accept", lambda origin, content: self.accept_presence( observed_user=UserID.from_string(content["observed_user"]), observer_user=UserID.from_string(content["observer_user"]), ) ) - self.replication.register_edu_handler( + federation_registry.register_edu_handler( "m.presence_deny", lambda origin, content: self.deny_presence( observed_user=UserID.from_string(content["observed_user"]), |