diff options
author | Erik Johnston <erik@matrix.org> | 2016-09-02 14:54:07 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-09-02 14:54:07 +0100 |
commit | 3baf641a487f5adffd20a55cb93f36d4620c626c (patch) | |
tree | 737609506c74db37a83a3d18267a4defe707793d /synapse/notifier.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage (diff) | |
parent | Explicitly specify state_key for history_visibility fetching (diff) | |
download | synapse-3baf641a487f5adffd20a55cb93f36d4620c626c.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r-- | synapse/notifier.py | 3 |
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") |