diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-05 17:27:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-09-05 17:27:46 +0100 |
| commit | 591d82f06b81738efe67c13cdeee0901c3b28946 (patch) | |
| tree | 018ec1d3caaa956d2173e9b11c74f78619aba0de /synapse/notifier.py | |
| parent | Fix test (diff) | |
| parent | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... (diff) | |
| download | synapse-591d82f06b81738efe67c13cdeee0901c3b28946.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_redactions
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): |