diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-02-19 12:00:16 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-02-19 12:00:16 +0000 |
| commit | 05aee12652e687adf8926314a69362b5a7183d5e (patch) | |
| tree | 0cf5695e5042ab107065489b07a695c707b837f8 /synapse/handlers/federation.py | |
| parent | Allow guest users access to messages in rooms they have joined (diff) | |
| parent | Add presence metric (diff) | |
| download | synapse-05aee12652e687adf8926314a69362b5a7183d5e.tar.xz | |
Merge branch 'develop' into rav/guest_access_after_room_join
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 da55d43541..ac15f9e5dd 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1658,7 +1658,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.send_membership_event(event, context) + yield member_handler.send_membership_event(event, context, from_client=False) else: destinations = set([x.split(":", 1)[-1] for x in (sender, room_id)]) yield self.replication_layer.forward_third_party_invite( @@ -1687,7 +1687,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) + yield member_handler.send_membership_event(event, context, from_client=False) @defer.inlineCallbacks def add_display_name_to_third_party_invite(self, event_dict, event, context): |