aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site
diff options
context:
space:
mode:
authorGravatar mbaruh <[email protected]>2023-02-11 13:32:46 +0200
committerGravatar mbaruh <[email protected]>2023-02-11 13:32:46 +0200
commit4eecda92e16ffe97fabb5d2e07790357140f7bbb (patch)
tree667c430024b972abef860cb9ea5dae25bce5cac1 /pydis_site
parentUpdate viewsets, fix linting (diff)
Fix documentation and import
Co-authored-by: wookie184 <[email protected]>
Diffstat (limited to 'pydis_site')
-rw-r--r--pydis_site/apps/api/migrations/0086_new_filter_schema.py8
-rw-r--r--pydis_site/apps/api/models/bot/filters.py5
-rw-r--r--pydis_site/apps/api/viewsets/bot/filters.py4
3 files changed, 8 insertions, 9 deletions
diff --git a/pydis_site/apps/api/migrations/0086_new_filter_schema.py b/pydis_site/apps/api/migrations/0086_new_filter_schema.py
index 9067a380..5da3a3b1 100644
--- a/pydis_site/apps/api/migrations/0086_new_filter_schema.py
+++ b/pydis_site/apps/api/migrations/0086_new_filter_schema.py
@@ -1,4 +1,4 @@
-# Modified migration file to migrate existing filters to the new one
+"""Modified migration file to migrate existing filters to the new system."""
from datetime import timedelta
import django.contrib.postgres.fields
@@ -8,7 +8,7 @@ from django.db import migrations, models
import django.db.models.deletion
from django.db.backends.base.schema import BaseDatabaseSchemaEditor
-import pydis_site.apps.api.models.bot.filters
+import pydis_site.apps.api.models
OLD_LIST_NAMES = (('GUILD_INVITE', True), ('GUILD_INVITE', False), ('FILE_FORMAT', True), ('DOMAIN_NAME', False), ('FILTER_TOKEN', False), ('REDIRECT', False))
change_map = {
@@ -116,7 +116,7 @@ class Migration(migrations.Migration):
('dm_embed', models.CharField(help_text='The content of the DM embed', max_length=2000, null=True, blank=True)),
('infraction_type', models.CharField(choices=[('NONE', 'None'), ('NOTE', 'Note'), ('WARNING', 'Warning'), ('WATCH', 'Watch'), ('MUTE', 'Mute'), ('KICK', 'Kick'), ('BAN', 'Ban'), ('SUPERSTAR', 'Superstar'), ('VOICE_BAN', 'Voice Ban'), ('VOICE_MUTE', 'Voice Mute')], help_text='The infraction to apply to this user.', max_length=10, null=True)),
('infraction_reason', models.CharField(help_text='The reason to give for the infraction.', max_length=1000, null=True, blank=True)),
- ('infraction_duration', models.DurationField(help_text='The duration of the infraction. Null if permanent.', null=True)),
+ ('infraction_duration', models.DurationField(help_text='The duration of the infraction. 0 for permanent.', null=True)),
('infraction_channel', models.BigIntegerField(validators=(MinValueValidator(limit_value=0, message="Channel IDs cannot be negative."),), help_text="Channel in which to send the infraction.", null=True)),
('disabled_channels', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text="Channels in which to not run the filter.", null=True, size=None)),
('disabled_categories', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text="Categories in which to not run the filter.", null=True, size=None)),
@@ -143,7 +143,7 @@ class Migration(migrations.Migration):
('dm_embed', models.CharField(help_text='The content of the DM embed', max_length=2000, blank=True)),
('infraction_type', models.CharField(choices=[('NONE', 'None'), ('NOTE', 'Note'), ('WARNING', 'Warning'), ('WATCH', 'Watch'), ('MUTE', 'Mute'), ('KICK', 'Kick'), ('BAN', 'Ban'), ('SUPERSTAR', 'Superstar'), ('VOICE_BAN', 'Voice Ban'), ('VOICE_MUTE', 'Voice Mute')], help_text='The infraction to apply to this user.', max_length=10)),
('infraction_reason', models.CharField(help_text='The reason to give for the infraction.', max_length=1000, blank=True)),
- ('infraction_duration', models.DurationField(help_text='The duration of the infraction. Null if permanent.')),
+ ('infraction_duration', models.DurationField(help_text='The duration of the infraction. 0 for permanent.')),
('infraction_channel', models.BigIntegerField(validators=(MinValueValidator(limit_value=0, message="Channel IDs cannot be negative."),), help_text="Channel in which to send the infraction.")),
('disabled_channels', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text="Channels in which to not run the filter.", size=None)),
('disabled_categories', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text="Categories in which to not run the filter.", size=None)),
diff --git a/pydis_site/apps/api/models/bot/filters.py b/pydis_site/apps/api/models/bot/filters.py
index 1eab79ba..584ee726 100644
--- a/pydis_site/apps/api/models/bot/filters.py
+++ b/pydis_site/apps/api/models/bot/filters.py
@@ -52,7 +52,7 @@ class FilterList(ModelTimestampMixin, ModelReprMixin, models.Model):
)
infraction_duration = models.DurationField(
null=False,
- help_text="The duration of the infraction. Null if permanent."
+ help_text="The duration of the infraction. 0 for permanent."
)
infraction_channel = models.BigIntegerField(
validators=(
@@ -165,7 +165,7 @@ class FilterBase(ModelTimestampMixin, ModelReprMixin, models.Model):
)
infraction_duration = models.DurationField(
null=True,
- help_text="The duration of the infraction. Null if permanent."
+ help_text="The duration of the infraction. 0 for permanent."
)
infraction_channel = models.BigIntegerField(
validators=(
@@ -209,7 +209,6 @@ class FilterBase(ModelTimestampMixin, ModelReprMixin, models.Model):
null=True
)
- # Check FilterList model for information about these properties.
enabled_channels = ArrayField(
models.CharField(max_length=100),
help_text="Channels in which to run the filter even if it's disabled in the category.",
diff --git a/pydis_site/apps/api/viewsets/bot/filters.py b/pydis_site/apps/api/viewsets/bot/filters.py
index 8e677612..c84da909 100644
--- a/pydis_site/apps/api/viewsets/bot/filters.py
+++ b/pydis_site/apps/api/viewsets/bot/filters.py
@@ -311,7 +311,7 @@ class FilterListViewSet(ModelViewSet):
#### Status codes
- 204: returned on success
- - 404: if a tag with the given `id` does not exist
+ - 404: if a FilterList with the given `id` does not exist
"""
serializer_class = FilterListSerializer
@@ -492,7 +492,7 @@ class FilterViewSet(ModelViewSet):
#### Status codes
- 204: returned on success
- - 404: if a tag with the given `id` does not exist
+ - 404: if a Filter with the given `id` does not exist
"""
serializer_class = FilterSerializer