diff options
| -rw-r--r-- | bot/exts/filtering/_filters/filter.py | 4 | ||||
| -rw-r--r-- | bot/exts/filtering/filtering.py | 4 | ||||
| -rw-r--r-- | tests/bot/exts/filtering/test_discord_token_filter.py | 2 | ||||
| -rw-r--r-- | tests/bot/exts/filtering/test_extension_filter.py | 2 | ||||
| -rw-r--r-- | tests/bot/exts/filtering/test_token_filter.py | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/bot/exts/filtering/_filters/filter.py b/bot/exts/filtering/_filters/filter.py index b5f4c127a..526d2fe67 100644 --- a/bot/exts/filtering/_filters/filter.py +++ b/bot/exts/filtering/_filters/filter.py @@ -31,7 +31,9 @@ class Filter(FieldRequiring): self.updated_at = arrow.get(filter_data["updated_at"]) self.actions, self.validations = create_settings(filter_data["settings"], defaults=defaults) if self.extra_fields_type: - self.extra_fields = self.extra_fields_type.parse_raw(filter_data["additional_field"] or "{}") # noqa: P103 + self.extra_fields = self.extra_fields_type.parse_raw( + filter_data["additional_settings"] or "{}" # noqa: P103 + ) else: self.extra_fields = None diff --git a/bot/exts/filtering/filtering.py b/bot/exts/filtering/filtering.py index 2a7f8f81f..efea57a6a 100644 --- a/bot/exts/filtering/filtering.py +++ b/bot/exts/filtering/filtering.py @@ -1177,7 +1177,7 @@ class Filtering(Cog): description = description or None payload = { "filter_list": list_id, "content": content, "description": description, - "additional_field": json.dumps(filter_settings), **settings + "additional_settings": json.dumps(filter_settings), **settings } response = await bot.instance.api_client.post('bot/filter/filters', json=to_serializable(payload)) new_filter = filter_list.add_filter(list_type, response) @@ -1220,7 +1220,7 @@ class Filtering(Cog): description = description or None payload = { "filter_list": list_id, "content": content, "description": description, - "additional_field": json.dumps(filter_settings), **settings + "additional_settings": json.dumps(filter_settings), **settings } response = await bot.instance.api_client.patch( f'bot/filter/filters/{filter_.id}', json=to_serializable(payload) diff --git a/tests/bot/exts/filtering/test_discord_token_filter.py b/tests/bot/exts/filtering/test_discord_token_filter.py index ef124e6ff..4d7e69bdc 100644 --- a/tests/bot/exts/filtering/test_discord_token_filter.py +++ b/tests/bot/exts/filtering/test_discord_token_filter.py @@ -22,7 +22,7 @@ class DiscordTokenFilterTests(unittest.IsolatedAsyncioTestCase): "content": "discord_token", "description": None, "settings": {}, - "additional_field": "{}", # noqa: P103 + "additional_settings": "{}", # noqa: P103 "created_at": now, "updated_at": now }) diff --git a/tests/bot/exts/filtering/test_extension_filter.py b/tests/bot/exts/filtering/test_extension_filter.py index 351daa0b4..52506d0be 100644 --- a/tests/bot/exts/filtering/test_extension_filter.py +++ b/tests/bot/exts/filtering/test_extension_filter.py @@ -25,7 +25,7 @@ class ExtensionsListTests(unittest.IsolatedAsyncioTestCase): for i, filter_content in enumerate(self.whitelist, start=1): filters.append({ "id": i, "content": filter_content, "description": None, "settings": {}, - "additional_field": "{}", "created_at": now, "updated_at": now # noqa: P103 + "additional_settings": "{}", "created_at": now, "updated_at": now # noqa: P103 }) self.filter_list.add_list({ "id": 1, diff --git a/tests/bot/exts/filtering/test_token_filter.py b/tests/bot/exts/filtering/test_token_filter.py index 0dfc8ae9f..82cc6b67e 100644 --- a/tests/bot/exts/filtering/test_token_filter.py +++ b/tests/bot/exts/filtering/test_token_filter.py @@ -40,7 +40,7 @@ class TokenFilterTests(unittest.IsolatedAsyncioTestCase): "content": pattern, "description": None, "settings": {}, - "additional_field": "{}", # noqa: P103 + "additional_settings": "{}", # noqa: P103 "created_at": now, "updated_at": now }) |