summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-28 14:24:08 +0100
committerErik Johnston <erik@matrix.org>2015-04-28 14:24:08 +0100
commit9fbcf191889b655d5c93d01a738e5137aa94a354 (patch)
tree8a403e4b27825447695fe09b54bb2440df734ed5 /synapse/handlers/room.py
parentMerge pull request #126 from matrix-org/csauth (diff)
parentRemove unused imports (diff)
downloadsynapse-9fbcf191889b655d5c93d01a738e5137aa94a354.tar.xz
Merge pull request #123 from matrix-org/postgres
Postgres
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py19
1 files changed, 0 insertions, 19 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py

index 1226b23bc7..47456a28e9 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -312,25 +312,6 @@ class RoomMemberHandler(BaseHandler): defer.returnValue(chunk_data) @defer.inlineCallbacks - def get_room_member(self, room_id, member_user_id, auth_user_id): - """Retrieve a room member from a room. - - Args: - room_id : The room the member is in. - member_user_id : The member's user ID - auth_user_id : The user ID of the user making this request. - Returns: - The room member, or None if this member does not exist. - Raises: - SynapseError if something goes wrong. - """ - yield self.auth.check_joined_room(room_id, auth_user_id) - - member = yield self.store.get_room_member(user_id=member_user_id, - room_id=room_id) - defer.returnValue(member) - - @defer.inlineCallbacks def change_membership(self, event, context, do_auth=True): """ Change the membership status of a user in a room.