diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-19 11:37:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-19 11:37:05 +0000 |
| commit | 9a8949f0221b0487e42830c57873bddae40c056a (patch) | |
| tree | bc6d459a0e5ea88432af7d253daf7e0e46c1f645 /synapse/handlers/federation.py | |
| parent | Change default pushrules back to notifying for all messages. (diff) | |
| parent | Merge pull request #502 from matrix-org/erikj/push_notif_perf (diff) | |
| download | synapse-9a8949f0221b0487e42830c57873bddae40c056a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into default_notify
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 5dee24e21d..4b94940e99 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1692,7 +1692,7 @@ class FederationHandler(BaseHandler): self.auth.check(event, context.current_state) yield self._validate_keyserver(event, auth_events=context.current_state) member_handler = self.hs.get_handlers().room_member_handler - yield member_handler.change_membership(event, context) + yield member_handler.send_membership_event(event, context) else: destinations = set([x.split(":", 1)[-1] for x in (sender, room_id)]) yield self.replication_layer.forward_third_party_invite( @@ -1721,7 +1721,7 @@ class FederationHandler(BaseHandler): # TODO: Make sure the signatures actually are correct. event.signatures.update(returned_invite.signatures) member_handler = self.hs.get_handlers().room_member_handler - yield member_handler.change_membership(event, context) + yield member_handler.send_membership_event(event, context) @defer.inlineCallbacks def add_display_name_to_third_party_invite(self, event_dict, event, context): |