summary refs log tree commit diff
path: root/synapse/handlers/room_member.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-05-11 13:00:28 +0200
committerMark Haines <mjark@negativecurvature.net>2016-05-11 13:00:28 +0200
commita284a32d78be0cb90228b7e566328c4b08fbfb69 (patch)
treef627fe432311bd0081902369eb6f3ebf1a9aa64f /synapse/handlers/room_member.py
parentPass through _get_state_group_for_events (diff)
parentFix typo (diff)
downloadsynapse-a284a32d78be0cb90228b7e566328c4b08fbfb69.tar.xz
Merge pull request #774 from matrix-org/markjh/shuffle_base_handler
Shuffle some methods out of base handler
Diffstat (limited to 'synapse/handlers/room_member.py')
-rw-r--r--synapse/handlers/room_member.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index ed2cda837f..b44e52a515 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -113,7 +113,7 @@ class RoomMemberHandler(BaseHandler):
             prev_event_ids=prev_event_ids,
         )
 
-        yield self.handle_new_client_event(
+        yield msg_handler.handle_new_client_event(
             requester,
             event,
             context,
@@ -357,7 +357,7 @@ class RoomMemberHandler(BaseHandler):
                 # so don't really fit into the general auth process.
                 raise AuthError(403, "Guest access not allowed")
 
-        yield self.handle_new_client_event(
+        yield message_handler.handle_new_client_event(
             requester,
             event,
             context,