summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-04-08 11:39:34 +0100
committerMark Haines <mjark@negativecurvature.net>2016-04-08 11:39:34 +0100
commitd63b49137a473164d5de13be0da62cf03af8a90e (patch)
treea7a8bac8d9fd7277bd19907dfe25c24f7c48524c /synapse/handlers/room.py
parentMerge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data (diff)
parentMove all the wrapper functions for distributor.fire (diff)
downloadsynapse-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/room.py')
-rw-r--r--synapse/handlers/room.py15
1 files changed, 0 insertions, 15 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 3e1d9282d7..ea306cd42a 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -25,7 +25,6 @@ from synapse.api.constants import (
 from synapse.api.errors import AuthError, StoreError, SynapseError
 from synapse.util import stringutils
 from synapse.util.async import concurrently_execute
-from synapse.util.logcontext import preserve_context_over_fn
 from synapse.util.caches.response_cache import ResponseCache
 
 from collections import OrderedDict
@@ -39,20 +38,6 @@ logger = logging.getLogger(__name__)
 id_server_scheme = "https://"
 
 
-def user_left_room(distributor, user, room_id):
-    return preserve_context_over_fn(
-        distributor.fire,
-        "user_left_room", user=user, room_id=room_id
-    )
-
-
-def user_joined_room(distributor, user, room_id):
-    return preserve_context_over_fn(
-        distributor.fire,
-        "user_joined_room", user=user, room_id=room_id
-    )
-
-
 class RoomCreationHandler(BaseHandler):
 
     PRESETS_DICT = {