aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site
diff options
context:
space:
mode:
authorGravatar mbaruh <[email protected]>2022-11-09 21:27:26 +0200
committerGravatar mbaruh <[email protected]>2022-11-09 21:27:26 +0200
commitc39ae63d407663f47bf2d824a259335234066801 (patch)
tree175307fbb243cce7611cb21c677f7288d50e985c /pydis_site
parentDisable everyone filter in code jam categories (diff)
Rename delete_messages to the more generic remove_context
Diffstat (limited to 'pydis_site')
-rw-r--r--pydis_site/apps/api/migrations/0085_new_filter_schema.py8
-rw-r--r--pydis_site/apps/api/migrations/0086_unique_constraint_filters.py2
-rw-r--r--pydis_site/apps/api/migrations/0087_unique_filter_list.py8
-rw-r--r--pydis_site/apps/api/migrations/0088_antispam_filter_list.py2
-rw-r--r--pydis_site/apps/api/models/bot/filters.py8
-rw-r--r--pydis_site/apps/api/serializers.py4
-rw-r--r--pydis_site/apps/api/tests/test_filters.py8
-rw-r--r--pydis_site/apps/api/viewsets/bot/filters.py12
8 files changed, 26 insertions, 26 deletions
diff --git a/pydis_site/apps/api/migrations/0085_new_filter_schema.py b/pydis_site/apps/api/migrations/0085_new_filter_schema.py
index d902be7f..96d03bf4 100644
--- a/pydis_site/apps/api/migrations/0085_new_filter_schema.py
+++ b/pydis_site/apps/api/migrations/0085_new_filter_schema.py
@@ -41,7 +41,7 @@ def forward(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:
guild_pings=(["Moderators"] if name != "FILE_FORMAT" else []),
filter_dm=True,
dm_pings=[],
- delete_messages=(True if name != "FILTER_TOKEN" else False),
+ remove_context=(True if name != "FILTER_TOKEN" else False),
bypass_roles=["Helpers"],
enabled=True,
dm_content=dm_content,
@@ -68,7 +68,7 @@ def forward(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:
guild_pings=None,
filter_dm=None,
dm_pings=None,
- delete_messages=None,
+ remove_context=None,
bypass_roles=None,
enabled=None,
dm_content=None,
@@ -109,7 +109,7 @@ class Migration(migrations.Migration):
('guild_pings', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text='Who to ping when this filter triggers.', size=None, null=True)),
('filter_dm', models.BooleanField(help_text='Whether DMs should be filtered.', null=True)),
('dm_pings', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text='Who to ping when this filter triggers on a DM.', size=None, null=True)),
- ('delete_messages', models.BooleanField(help_text='Whether this filter should delete messages triggering it.', null=True)),
+ ('remove_context', models.BooleanField(help_text='Whether this filter should remove the context (such as a message) triggering it.', null=True)),
('bypass_roles', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text='Roles and users who can bypass this filter.', size=None, null=True)),
('enabled', models.BooleanField(help_text='Whether this filter is currently enabled.', null=True)),
('dm_content', models.CharField(help_text='The DM to send to a user triggering this filter.', max_length=1000, null=True, blank=True)),
@@ -136,7 +136,7 @@ class Migration(migrations.Migration):
('guild_pings', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text='Who to ping when this filter triggers.', size=None)),
('filter_dm', models.BooleanField(help_text='Whether DMs should be filtered.')),
('dm_pings', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text='Who to ping when this filter triggers on a DM.', size=None)),
- ('delete_messages', models.BooleanField(help_text='Whether this filter should delete messages triggering it.')),
+ ('remove_context', models.BooleanField(help_text='Whether this filter should remove the context (such as a message) triggering it.')),
('bypass_roles', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text='Roles and users who can bypass this filter.', size=None)),
('enabled', models.BooleanField(help_text='Whether this filter is currently enabled.')),
('dm_content', models.CharField(help_text='The DM to send to a user triggering this filter.', max_length=1000, blank=True)),
diff --git a/pydis_site/apps/api/migrations/0086_unique_constraint_filters.py b/pydis_site/apps/api/migrations/0086_unique_constraint_filters.py
index 6fa99e9e..b83e395c 100644
--- a/pydis_site/apps/api/migrations/0086_unique_constraint_filters.py
+++ b/pydis_site/apps/api/migrations/0086_unique_constraint_filters.py
@@ -25,7 +25,7 @@ class Migration(migrations.Migration):
'guild_pings',
'filter_dm',
'dm_pings',
- 'delete_messages',
+ 'remove_context',
'bypass_roles',
'enabled',
'send_alert',
diff --git a/pydis_site/apps/api/migrations/0087_unique_filter_list.py b/pydis_site/apps/api/migrations/0087_unique_filter_list.py
index 96c2b17a..b8087d9c 100644
--- a/pydis_site/apps/api/migrations/0087_unique_filter_list.py
+++ b/pydis_site/apps/api/migrations/0087_unique_filter_list.py
@@ -17,7 +17,7 @@ def create_unique_list(apps: Apps, _):
guild_pings=[],
filter_dm=True,
dm_pings=[],
- delete_messages=False,
+ remove_context=False,
bypass_roles=[],
enabled=True,
dm_content="",
@@ -37,7 +37,7 @@ def create_unique_list(apps: Apps, _):
content="everyone",
filter_list=list_,
description="",
- delete_messages=True,
+ remove_context=True,
bypass_roles=["Helpers"],
dm_content=(
"Please don't try to ping `@everyone` or `@here`. Your message has been removed. "
@@ -51,7 +51,7 @@ def create_unique_list(apps: Apps, _):
content="webhook",
filter_list=list_,
description="",
- delete_messages=True,
+ remove_context=True,
dm_content=(
"Looks like you posted a Discord webhook URL. "
"Therefore, your message has been removed, and your webhook has been deleted. "
@@ -74,7 +74,7 @@ def create_unique_list(apps: Apps, _):
content="discord_token",
filter_list=list_,
filter_dm=False,
- delete_messages=True,
+ remove_context=True,
dm_content=(
"I noticed you posted a seemingly valid Discord API "
"token in your message and have removed your message. "
diff --git a/pydis_site/apps/api/migrations/0088_antispam_filter_list.py b/pydis_site/apps/api/migrations/0088_antispam_filter_list.py
index 354e4520..fcb56781 100644
--- a/pydis_site/apps/api/migrations/0088_antispam_filter_list.py
+++ b/pydis_site/apps/api/migrations/0088_antispam_filter_list.py
@@ -17,7 +17,7 @@ def create_antispam_list(apps: Apps, _):
guild_pings=["Moderators"],
filter_dm=False,
dm_pings=[],
- delete_messages=True,
+ remove_context=True,
bypass_roles=["Helpers"],
enabled=True,
dm_content="",
diff --git a/pydis_site/apps/api/models/bot/filters.py b/pydis_site/apps/api/models/bot/filters.py
index 1ea21a48..4d8a4025 100644
--- a/pydis_site/apps/api/models/bot/filters.py
+++ b/pydis_site/apps/api/models/bot/filters.py
@@ -75,8 +75,8 @@ class FilterList(ModelTimestampMixin, ModelReprMixin, models.Model):
help_text="Who to ping when this filter triggers on a DM.",
null=False
)
- delete_messages = models.BooleanField(
- help_text="Whether this filter should delete messages triggering it.",
+ remove_context = models.BooleanField(
+ help_text="Whether this filter should remove the context (such as a message) triggering it.",
null=False
)
bypass_roles = ArrayField(
@@ -185,8 +185,8 @@ class FilterBase(ModelTimestampMixin, ModelReprMixin, models.Model):
help_text="Who to ping when this filter triggers on a DM.",
null=True
)
- delete_messages = models.BooleanField(
- help_text="Whether this filter should delete messages triggering it.",
+ remove_context = models.BooleanField(
+ help_text="Whether this filter should remove the context (such as a message) triggering it.",
null=True
)
bypass_roles = ArrayField(
diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index d6bae2cb..eabca66e 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -154,7 +154,7 @@ SETTINGS_FIELDS = (
'guild_pings',
'filter_dm',
'dm_pings',
- 'delete_messages',
+ 'remove_context',
'send_alert',
'bypass_roles',
'enabled',
@@ -187,7 +187,7 @@ BASE_SETTINGS_FIELDS = (
"bypass_roles",
"filter_dm",
"enabled",
- "delete_messages",
+ "remove_context",
"send_alert"
)
INFRACTION_AND_NOTIFICATION_FIELDS = (
diff --git a/pydis_site/apps/api/tests/test_filters.py b/pydis_site/apps/api/tests/test_filters.py
index 5f40c6f9..f3afdaeb 100644
--- a/pydis_site/apps/api/tests/test_filters.py
+++ b/pydis_site/apps/api/tests/test_filters.py
@@ -49,7 +49,7 @@ def get_test_sequences() -> Dict[str, TestSequence]:
ping_type=[],
filter_dm=False,
dm_ping_type=[],
- delete_messages=False,
+ remove_context=False,
bypass_roles=[],
enabled=False,
default_action=FilterAction(
@@ -76,7 +76,7 @@ def get_test_sequences() -> Dict[str, TestSequence]:
"ping_type": ["onduty"],
"filter_dm": True,
"dm_ping_type": ["123456"],
- "delete_messages": True,
+ "remove_context": True,
"bypass_roles": [123456],
"enabled": True,
"default_action": FilterAction(
@@ -130,7 +130,7 @@ def get_test_sequences() -> Dict[str, TestSequence]:
ping_type=[],
filter_dm=False,
dm_ping_type=[],
- delete_messages=False,
+ remove_context=False,
bypass_roles=[],
enabled=False,
default_action=FilterAction(
@@ -157,7 +157,7 @@ def get_test_sequences() -> Dict[str, TestSequence]:
"ping_type": ["everyone"],
"filter_dm": False,
"dm_ping_type": ["here"],
- "delete_messages": False,
+ "remove_context": False,
"bypass_roles": [9876],
"enabled": True,
"filter_action": None,
diff --git a/pydis_site/apps/api/viewsets/bot/filters.py b/pydis_site/apps/api/viewsets/bot/filters.py
index dd9a7d87..1eb05053 100644
--- a/pydis_site/apps/api/viewsets/bot/filters.py
+++ b/pydis_site/apps/api/viewsets/bot/filters.py
@@ -36,7 +36,7 @@ class FilterListViewSet(ModelViewSet):
... "filter_dm": None,
... "enabled": None
... "send_alert": True,
- ... "delete_messages": None
+ ... "remove_context": None
... "infraction_and_notification": {
... "infraction_type": None,
... "infraction_reason": "",
@@ -64,7 +64,7 @@ class FilterListViewSet(ModelViewSet):
... ],
... "filter_dm": True,
... "enabled": True
- ... "delete_messages": True,
+ ... "remove_context": True,
... "send_alert": True
... "infraction_and_notification": {
... "infraction_type": "",
@@ -111,7 +111,7 @@ class FilterListViewSet(ModelViewSet):
... "bypass_roles": None
... "filter_dm": None,
... "enabled": None
- ... "delete_messages": None,
+ ... "remove_context": None,
... "send_alert": None
... "infraction_and_notification": {
... "infraction_type": None,
@@ -140,7 +140,7 @@ class FilterListViewSet(ModelViewSet):
... ],
... "filter_dm": True,
... "enabled": True
- ... "delete_messages": True
+ ... "remove_context": True
... "send_alert": True
... "infraction_and_notification": {
... "infraction_type": "",
@@ -198,7 +198,7 @@ class FilterViewSet(ModelViewSet):
... "bypass_roles": None
... "filter_dm": None,
... "enabled": None
- ... "delete_messages": True,
+ ... "remove_context": True,
... "send_alert": True
... "infraction": {
... "infraction_type": None,
@@ -237,7 +237,7 @@ class FilterViewSet(ModelViewSet):
... "bypass_roles": None
... "filter_dm": None,
... "enabled": None
- ... "delete_messages": True,
+ ... "remove_context": True,
... "send_alert": True
... "infraction": {
... "infraction_type": None,