diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-02-18 23:13:29 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-02-18 23:21:44 +0000 |
commit | b58d17e44f9d9ff7e70578e0f4e328bb9113ec7e (patch) | |
tree | 9c22ec4950ef8785198683afdc951053bfee0c65 /synapse/handlers/typing.py | |
parent | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939) (diff) | |
download | synapse-b58d17e44f9d9ff7e70578e0f4e328bb9113ec7e.tar.xz |
Refactor the membership check methods in Auth
these were getting a bit unwieldy, so let's combine `check_joined_room` and `check_user_was_in_room` into a single `check_user_in_room`.
Diffstat (limited to 'synapse/handlers/typing.py')
-rw-r--r-- | synapse/handlers/typing.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py index d5ca9cb07b..5406618431 100644 --- a/synapse/handlers/typing.py +++ b/synapse/handlers/typing.py @@ -125,7 +125,7 @@ class TypingHandler(object): if target_user_id != auth_user_id: raise AuthError(400, "Cannot set another user's typing state") - yield self.auth.check_joined_room(room_id, target_user_id) + yield self.auth.check_user_in_room(room_id, target_user_id) logger.debug("%s has started typing in %s", target_user_id, room_id) @@ -155,7 +155,7 @@ class TypingHandler(object): if target_user_id != auth_user_id: raise AuthError(400, "Cannot set another user's typing state") - yield self.auth.check_joined_room(room_id, target_user_id) + yield self.auth.check_user_in_room(room_id, target_user_id) logger.debug("%s has stopped typing in %s", target_user_id, room_id) |