diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-24 14:44:16 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-24 14:44:16 +0100 |
| commit | 14d49c51dbbf1222477e076eb4d8d79c0181f901 (patch) | |
| tree | a5516dfd3ffe4ec5db6d699a3e113486710d6733 | |
| parent | Merge pull request #3754 from matrix-org/erikj/fix_whitelist (diff) | |
| download | synapse-14d49c51dbbf1222477e076eb4d8d79c0181f901.tar.xz | |
Make content of tag an empty object rather than null
| -rw-r--r-- | synapse/server_notices/resource_limits_server_notices.py | 2 | ||||
| -rw-r--r-- | synapse/server_notices/server_notices_manager.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/server_notices/resource_limits_server_notices.py b/synapse/server_notices/resource_limits_server_notices.py index 98495ddbf9..7144dfcbc2 100644 --- a/synapse/server_notices/resource_limits_server_notices.py +++ b/synapse/server_notices/resource_limits_server_notices.py @@ -153,7 +153,7 @@ class ResourceLimitsServerNotices(object): need_to_set_tag = False if need_to_set_tag: yield self._store.add_tag_to_room( - user_id, room_id, SERVER_NOTICE_ROOM_TAG, None + user_id, room_id, SERVER_NOTICE_ROOM_TAG, {} ) @defer.inlineCallbacks diff --git a/synapse/server_notices/server_notices_manager.py b/synapse/server_notices/server_notices_manager.py index 5968104a99..a5e4728859 100644 --- a/synapse/server_notices/server_notices_manager.py +++ b/synapse/server_notices/server_notices_manager.py @@ -154,7 +154,7 @@ class ServerNoticesManager(object): ) room_id = info['room_id'] yield self._store.add_tag_to_room( - user_id, room_id, SERVER_NOTICE_ROOM_TAG, None + user_id, room_id, SERVER_NOTICE_ROOM_TAG, {}, ) logger.info("Created server notices room %s for %s", room_id, user_id) |