diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-24 17:00:37 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-24 17:00:37 +0100 |
| commit | 9db24769914f5c9a3081f549cbff92ef96042578 (patch) | |
| tree | 5eb84f8afc267ba3af4199e3da3f9a4d17bbdb0b /synapse | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #3756 from matrix-org/erikj/fix_tags_server_notices (diff) | |
| download | synapse-9db24769914f5c9a3081f549cbff92ef96042578.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/server_notices/resource_limits_server_notices.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/server_notices/resource_limits_server_notices.py b/synapse/server_notices/resource_limits_server_notices.py index c584c8f907..af15cba0ee 100644 --- a/synapse/server_notices/resource_limits_server_notices.py +++ b/synapse/server_notices/resource_limits_server_notices.py @@ -146,11 +146,10 @@ class ResourceLimitsServerNotices(object): user_id(str): the user in question room_id(str): the server notices room for that user """ - tags = yield self._store.get_tags_for_user(user_id) - server_notices_tags = tags.get(room_id) + tags = yield self._store.get_tags_for_room(user_id, room_id) need_to_set_tag = True - if server_notices_tags: - if server_notices_tags.get(SERVER_NOTICE_ROOM_TAG): + if tags: + if SERVER_NOTICE_ROOM_TAG in tags: # tag already present, nothing to do here need_to_set_tag = False if need_to_set_tag: |