diff options
| author | Erik Johnston <erik@matrix.org> | 2016-12-16 10:40:10 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-12-16 10:40:10 +0000 |
| commit | f5a4001bb116c468cc5e8e0ae04a1c570e2cb171 (patch) | |
| tree | fce7147d9b4422f76b5cec8b53312bb34932d84f /synapse/handlers/presence.py | |
| parent | Merge pull request #1685 from matrix-org/rav/update_readme_for_tests (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-f5a4001bb116c468cc5e8e0ae04a1c570e2cb171.tar.xz | |
Merge branch 'release-v0.18.5' of github.com:matrix-org/synapse v0.18.5
Diffstat (limited to '')
| -rw-r--r-- | synapse/handlers/presence.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index b047ae2250..1b89dc6274 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -91,28 +91,29 @@ class PresenceHandler(object): self.store = hs.get_datastore() self.wheel_timer = WheelTimer() self.notifier = hs.get_notifier() - self.federation = hs.get_replication_layer() + self.replication = hs.get_replication_layer() + self.federation = hs.get_federation_sender() self.state = hs.get_state_handler() - self.federation.register_edu_handler( + self.replication.register_edu_handler( "m.presence", self.incoming_presence ) - self.federation.register_edu_handler( + self.replication.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.federation.register_edu_handler( + self.replication.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.federation.register_edu_handler( + self.replication.register_edu_handler( "m.presence_deny", lambda origin, content: self.deny_presence( observed_user=UserID.from_string(content["observed_user"]), |