diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 19:12:29 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 19:12:29 -0400 |
commit | faf72a4c403000f7815d171feb8bf1a83b353584 (patch) | |
tree | d150b317ef4d0cf2245b664a37e51d76c0870352 /synapse/notifier.py | |
parent | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys (diff) | |
parent | Remove bind_email and bind_msisdn (#5964) (diff) | |
download | synapse-faf72a4c403000f7815d171feb8bf1a83b353584.tar.xz |
Merge branch 'develop' into cross-signing_keys
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r-- | synapse/notifier.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index bd80c801b6..4e091314e6 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -472,11 +472,11 @@ class Notifier(object): joined_room_ids = yield self.store.get_rooms_for_user(user.to_string()) if explicit_room_id: if explicit_room_id in joined_room_ids: - return ([explicit_room_id], True) + return [explicit_room_id], True if (yield self._is_world_readable(explicit_room_id)): - return ([explicit_room_id], False) + return [explicit_room_id], False raise AuthError(403, "Non-joined access not allowed") - return (joined_room_ids, True) + return joined_room_ids, True @defer.inlineCallbacks def _is_world_readable(self, room_id): |