summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-02 14:54:07 +0100
committerErik Johnston <erik@matrix.org>2016-09-02 14:54:07 +0100
commit3baf641a487f5adffd20a55cb93f36d4620c626c (patch)
tree737609506c74db37a83a3d18267a4defe707793d /synapse/notifier.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage (diff)
parentExplicitly specify state_key for history_visibility fetching (diff)
downloadsynapse-3baf641a487f5adffd20a55cb93f36d4620c626c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to '')
-rw-r--r--synapse/notifier.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py

index b86648f5e4..48653ae843 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py
@@ -423,7 +423,8 @@ class Notifier(object): def _is_world_readable(self, room_id): state = yield self.state_handler.get_current_state( room_id, - EventTypes.RoomHistoryVisibility + EventTypes.RoomHistoryVisibility, + "", ) if state and "history_visibility" in state.content: defer.returnValue(state.content["history_visibility"] == "world_readable")