diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-01-15 16:27:29 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-01-15 16:27:29 +0000 |
| commit | 5de1563997e62811f8c04033c0a86c12343c5e4a (patch) | |
| tree | a280a81a343ec93900470c7f6ebf3280161ed7d2 /synapse/handlers/federation.py | |
| parent | Merge pull request #500 from matrix-org/daniel/cleanup (diff) | |
| parent | Require unbanning before other membership changes (diff) | |
| download | synapse-5de1563997e62811f8c04033c0a86c12343c5e4a.tar.xz | |
Merge pull request #501 from matrix-org/daniel/unban
Require unbanning before other membership changes
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 2f6359c768..26402ea9cd 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1693,7 +1693,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( @@ -1722,7 +1722,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): |