diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-04-08 11:39:34 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-08 11:39:34 +0100 |
| commit | d63b49137a473164d5de13be0da62cf03af8a90e (patch) | |
| tree | a7a8bac8d9fd7277bd19907dfe25c24f7c48524c /synapse/handlers/federation.py | |
| parent | Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data (diff) | |
| parent | Move all the wrapper functions for distributor.fire (diff) | |
| download | synapse-d63b49137a473164d5de13be0da62cf03af8a90e.tar.xz | |
Merge pull request #710 from matrix-org/markjh/move_fire
Move all the wrapper functions for distributor.fire
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index eb02f0e000..c28226f840 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -40,6 +40,7 @@ from synapse.events.utils import prune_event from synapse.util.retryutils import NotRetryingDestination from synapse.push.action_generator import ActionGenerator +from synapse.util.distributor import user_joined_room from twisted.internet import defer @@ -49,10 +50,6 @@ import logging logger = logging.getLogger(__name__) -def user_joined_room(distributor, user, room_id): - return distributor.fire("user_joined_room", user, room_id) - - class FederationHandler(BaseHandler): """Handles events that originated from federation. Responsible for: |