diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-03-03 19:05:54 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-03-03 19:05:54 +0000 |
| commit | a85179aff3bf2bc1b132e9918cd8222a61a8bcc2 (patch) | |
| tree | aac1ff9e5bdca7ddc0fdc9d2cae5a5dcf13e8733 /synapse/handlers/federation.py | |
| parent | Empty commit (diff) | |
| parent | Merge pull request #621 from matrix-org/daniel/ratelimiting (diff) | |
| download | synapse-a85179aff3bf2bc1b132e9918cd8222a61a8bcc2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/SYN-642
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 3655b9e5e2..6e50b0963e 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1657,7 +1657,7 @@ class FederationHandler(BaseHandler): self.auth.check(event, context.current_state) yield self._check_signature(event, auth_events=context.current_state) member_handler = self.hs.get_handlers().room_member_handler - yield member_handler.send_membership_event(event, context, from_client=False) + yield member_handler.send_membership_event(None, event, context) else: destinations = set(x.split(":", 1)[-1] for x in (sender_user_id, room_id)) yield self.replication_layer.forward_third_party_invite( @@ -1686,7 +1686,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.send_membership_event(event, context, from_client=False) + yield member_handler.send_membership_event(None, event, context) @defer.inlineCallbacks def add_display_name_to_third_party_invite(self, event_dict, event, context): |