diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-03-15 17:44:39 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-03-15 17:44:39 +0000 |
| commit | 6df1c79c226c9207321122080fcc1d67f260aa3e (patch) | |
| tree | b6316d84c8ae70a23c071492cd608c8341ee7d3d /synapse/handlers/federation.py | |
| parent | Hook up adding a pusher to the notifier for replication. (diff) | |
| parent | Merge pull request #646 from matrix-org/erikj/reject_invite_federation (diff) | |
| download | synapse-6df1c79c226c9207321122080fcc1d67f260aa3e.tar.xz | |
Merge branch 'develop' into markjh/pushers_stream
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 27f2b40bfe..f599e817aa 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -813,7 +813,22 @@ class FederationHandler(BaseHandler): target_hosts, signed_event ) - defer.returnValue(None) + + context = yield self.state_handler.compute_event_context(event) + + event_stream_id, max_stream_id = yield self.store.persist_event( + event, + context=context, + backfilled=False, + ) + + target_user = UserID.from_string(event.state_key) + self.notifier.on_new_room_event( + event, event_stream_id, max_stream_id, + extra_users=[target_user], + ) + + defer.returnValue(event) @defer.inlineCallbacks def _make_and_verify_event(self, target_hosts, room_id, user_id, membership, |