diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-03-04 14:44:34 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-03-04 14:44:34 +0000 |
commit | ec7460b4f2da70ae3ea4ddaa4a198d9dd193a045 (patch) | |
tree | 2dddf9f52591a392295bbace7a9494ab423c7cfd /synapse/handlers/federation.py | |
parent | Hook up the push rules stream to account_data in /sync (diff) | |
parent | Merge pull request #598 from Rugvip/invite-state (diff) | |
download | synapse-ec7460b4f2da70ae3ea4ddaa4a198d9dd193a045.tar.xz |
Merge branch 'develop' into markjh/pushrule_stream
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): |