diff options
author | David Baker <dave@matrix.org> | 2016-01-06 11:38:09 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-01-06 11:38:09 +0000 |
commit | c79f221192044203b9d32cfbd416a7fefeb34cd5 (patch) | |
tree | 4465211af0ca7add866429dcb224017bb5d9962c /synapse/handlers/federation.py | |
parent | Merge remote-tracking branch 'origin/develop' into store_event_actions (diff) | |
download | synapse-c79f221192044203b9d32cfbd416a7fefeb34cd5.tar.xz |
Add is_guest flag to users db to track whether a user is a guest user or not. Use this so we can run _filter_events_for_client when calculating event_push_actions.
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 764709b424..075b9e21c3 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -32,7 +32,7 @@ from synapse.crypto.event_signing import ( ) from synapse.types import UserID -from synapse.events.utils import prune_event, serialize_event +from synapse.events.utils import prune_event from synapse.util.retryutils import NotRetryingDestination @@ -246,8 +246,8 @@ class FederationHandler(BaseHandler): if not backfilled and not event.internal_metadata.is_outlier(): action_generator = ActionGenerator(self.store) - yield action_generator.handle_push_actions_for_event(serialize_event( - event, self.clock.time_msec()) + yield action_generator.handle_push_actions_for_event( + event, self ) @defer.inlineCallbacks |