diff options
| author | David Baker <dave@matrix.org> | 2016-01-19 18:17:23 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-01-19 18:17:23 +0000 |
| commit | afb7b377f23b275bf0274d6cbbfae462362cfc8c (patch) | |
| tree | 212e275af6f3d52dba6e4367553ea649d9965d33 /synapse/handlers/federation.py | |
| parent | Use the unread notification count to send accurate badge counts in push notif... (diff) | |
| parent | Merge pull request #505 from matrix-org/erikj/push_fast (diff) | |
| download | synapse-afb7b377f23b275bf0274d6cbbfae462362cfc8c.tar.xz | |
Merge branch 'develop' into push_badge_counts
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 5dee24e21d..6c19d6ae8c 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -245,7 +245,7 @@ class FederationHandler(BaseHandler): yield user_joined_room(self.distributor, user, event.room_id) if not backfilled and not event.internal_metadata.is_outlier(): - action_generator = ActionGenerator(self.store) + action_generator = ActionGenerator(self.hs) yield action_generator.handle_push_actions_for_event( event, self ) @@ -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): |