Merge branch 'main' into new-filter-schema

10 files changed, 81 insertions, 179 deletions

diff --git a/pydis_site/apps/api/models/__init__.py b/pydis_site/apps/api/models/__init__.py
index 63087990..580c95a0 100644
--- a/pydis_site/apps/api/models/__init__.py
+++ b/pydis_site/apps/api/models/__init__.py
@@ -3,14 +3,18 @@ from .bot import (
     FilterList,
     Filter,
     BotSetting,
+    BumpedThread,
     DocumentationLink,
     DeletedMessage,
+    FilterList,
     Infraction,
     Message,
     MessageDeletionContext,
     Nomination,
     NominationEntry,
     OffensiveMessage,
+    AocAccountLink,
+    AocCompletionistBlock,
     OffTopicChannelName,
     Reminder,
     Role,
diff --git a/pydis_site/apps/api/models/bot/__init__.py b/pydis_site/apps/api/models/bot/__init__.py
index 9ba763a4..6f09473d 100644
--- a/pydis_site/apps/api/models/bot/__init__.py
+++ b/pydis_site/apps/api/models/bot/__init__.py
@@ -1,10 +1,13 @@
 # flake8: noqa
 from .filters import FilterList, Filter
 from .bot_setting import BotSetting
+from .bumped_thread import BumpedThread
 from .deleted_message import DeletedMessage
 from .documentation_link import DocumentationLink
 from .infraction import Infraction
 from .message import Message
+from .aoc_completionist_block import AocCompletionistBlock
+from .aoc_link import AocAccountLink
 from .message_deletion_context import MessageDeletionContext
 from .nomination import Nomination, NominationEntry
 from .off_topic_channel_name import OffTopicChannelName
diff --git a/pydis_site/apps/api/models/bot/aoc_completionist_block.py b/pydis_site/apps/api/models/bot/aoc_completionist_block.py
new file mode 100644
index 00000000..acbc0eba
--- /dev/null
+++ b/pydis_site/apps/api/models/bot/aoc_completionist_block.py
@@ -0,0 +1,26 @@
+from django.db import models
+
+from pydis_site.apps.api.models.bot.user import User
+from pydis_site.apps.api.models.mixins import ModelReprMixin
+
+
+class AocCompletionistBlock(ModelReprMixin, models.Model):
+    """A Discord user blocked from getting the AoC completionist Role."""
+
+    user = models.OneToOneField(
+        User,
+        on_delete=models.CASCADE,
+        help_text="The user that is blocked from getting the AoC Completionist Role",
+        primary_key=True
+    )
+
+    is_blocked = models.BooleanField(
+        default=True,
+        help_text="Whether this user is actively being blocked "
+                  "from getting the AoC Completionist Role",
+        verbose_name="Blocked"
+    )
+    reason = models.TextField(
+        null=True,
+        help_text="The reason for the AoC Completionist Role Block."
+    )
diff --git a/pydis_site/apps/api/models/bot/aoc_link.py b/pydis_site/apps/api/models/bot/aoc_link.py
new file mode 100644
index 00000000..4e9d4882
--- /dev/null
+++ b/pydis_site/apps/api/models/bot/aoc_link.py
@@ -0,0 +1,21 @@
+from django.db import models
+
+from pydis_site.apps.api.models.bot.user import User
+from pydis_site.apps.api.models.mixins import ModelReprMixin
+
+
+class AocAccountLink(ModelReprMixin, models.Model):
+    """An AoC account link for a Discord User."""
+
+    user = models.OneToOneField(
+        User,
+        on_delete=models.CASCADE,
+        help_text="The user that is blocked from getting the AoC Completionist Role",
+        primary_key=True
+    )
+
+    aoc_username = models.CharField(
+        max_length=120,
+        help_text="The AoC username associated with the Discord User.",
+        blank=False
+    )
diff --git a/pydis_site/apps/api/models/bot/bumped_thread.py b/pydis_site/apps/api/models/bot/bumped_thread.py
new file mode 100644
index 00000000..cdf9a950
--- /dev/null
+++ b/pydis_site/apps/api/models/bot/bumped_thread.py
@@ -0,0 +1,22 @@
+from django.core.validators import MinValueValidator
+from django.db import models
+
+from pydis_site.apps.api.models.mixins import ModelReprMixin
+
+
+class BumpedThread(ModelReprMixin, models.Model):
+    """A list of thread IDs to be bumped."""
+
+    thread_id = models.BigIntegerField(
+        primary_key=True,
+        help_text=(
+            "The thread ID that should be bumped."
+        ),
+        validators=(
+            MinValueValidator(
+                limit_value=0,
+                message="Thread IDs cannot be negative."
+            ),
+        ),
+        verbose_name="Thread ID",
+    )
diff --git a/pydis_site/apps/api/models/bot/infraction.py b/pydis_site/apps/api/models/bot/infraction.py
index 913631d4..c9303024 100644
--- a/pydis_site/apps/api/models/bot/infraction.py
+++ b/pydis_site/apps/api/models/bot/infraction.py
@@ -17,6 +17,7 @@ class Infraction(ModelReprMixin, models.Model):
         ("ban", "Ban"),
         ("superstar", "Superstar"),
         ("voice_ban", "Voice Ban"),
+        ("voice_mute", "Voice Mute"),
     )
     inserted_at = models.DateTimeField(
         default=timezone.now,
@@ -45,7 +46,7 @@ class Infraction(ModelReprMixin, models.Model):
         help_text="The user which applied the infraction."
     )
     type = models.CharField(
-        max_length=9,
+        max_length=10,
         choices=TYPE_CHOICES,
         help_text="The type of the infraction."
     )
diff --git a/pydis_site/apps/api/models/bot/message.py b/pydis_site/apps/api/models/bot/message.py
index bab3368d..bfa54721 100644
--- a/pydis_site/apps/api/models/bot/message.py
+++ b/pydis_site/apps/api/models/bot/message.py
@@ -7,7 +7,6 @@ from django.utils import timezone
 
 from pydis_site.apps.api.models.bot.user import User
 from pydis_site.apps.api.models.mixins import ModelReprMixin
-from pydis_site.apps.api.models.utils import validate_embed
 
 
 class Message(ModelReprMixin, models.Model):
@@ -48,9 +47,7 @@ class Message(ModelReprMixin, models.Model):
         blank=True
     )
     embeds = pgfields.ArrayField(
-        models.JSONField(
-            validators=(validate_embed,)
-        ),
+        models.JSONField(),
         blank=True,
         help_text="Embeds attached to this message."
     )
diff --git a/pydis_site/apps/api/models/bot/metricity.py b/pydis_site/apps/api/models/bot/metricity.py
index 901f191a..abd25ef0 100644
--- a/pydis_site/apps/api/models/bot/metricity.py
+++ b/pydis_site/apps/api/models/bot/metricity.py
@@ -10,7 +10,7 @@ EXCLUDE_CHANNELS = (
 )
 
 
-class NotFoundError(Exception):
+class NotFoundError(Exception):  # noqa: N818
     """Raised when an entity cannot be found."""
 
     pass
diff --git a/pydis_site/apps/api/models/bot/off_topic_channel_name.py b/pydis_site/apps/api/models/bot/off_topic_channel_name.py
index e9fec114..b380efad 100644
--- a/pydis_site/apps/api/models/bot/off_topic_channel_name.py
+++ b/pydis_site/apps/api/models/bot/off_topic_channel_name.py
@@ -11,7 +11,7 @@ class OffTopicChannelName(ModelReprMixin, models.Model):
         primary_key=True,
         max_length=96,
         validators=(
-            RegexValidator(regex=r"^[a-z0-9\U0001d5a0-\U0001d5b9-ǃ？’'＜＞]+$"),
+            RegexValidator(regex=r"^[a-z0-9\U0001d5a0-\U0001d5b9-ǃ？’'＜＞⧹⧸]+$"),
         ),
         help_text="The actual channel name that will be used on our Discord server."
     )
diff --git a/pydis_site/apps/api/models/utils.py b/pydis_site/apps/api/models/utils.py
deleted file mode 100644
index 859394d2..00000000
--- a/pydis_site/apps/api/models/utils.py
+++ /dev/null
@@ -1,172 +0,0 @@
-from collections.abc import Mapping
-from typing import Any, Dict
-
-from django.core.exceptions import ValidationError
-from django.core.validators import MaxLengthValidator, MinLengthValidator
-
-
-def is_bool_validator(value: Any) -> None:
-    """Validates if a given value is of type bool."""
-    if not isinstance(value, bool):
-        raise ValidationError(f"This field must be of type bool, not {type(value)}.")
-
-
-def validate_embed_fields(fields: dict) -> None:
-    """Raises a ValidationError if any of the given embed fields is invalid."""
-    field_validators = {
-        'name': (MaxLengthValidator(limit_value=256),),
-        'value': (MaxLengthValidator(limit_value=1024),),
-        'inline': (is_bool_validator,),
-    }
-
-    required_fields = ('name', 'value')
-
-    for field in fields:
-        if not isinstance(field, Mapping):
-            raise ValidationError("Embed fields must be a mapping.")
-
-        if not all(required_field in field for required_field in required_fields):
-            raise ValidationError(
-                f"Embed fields must contain the following fields: {', '.join(required_fields)}."
-            )
-
-        for field_name, value in field.items():
-            if field_name not in field_validators:
-                raise ValidationError(f"Unknown embed field field: {field_name!r}.")
-
-            for validator in field_validators[field_name]:
-                validator(value)
-
-
-def validate_embed_footer(footer: Dict[str, str]) -> None:
-    """Raises a ValidationError if the given footer is invalid."""
-    field_validators = {
-        'text': (
-            MinLengthValidator(
-                limit_value=1,
-                message="Footer text must not be empty."
-            ),
-            MaxLengthValidator(limit_value=2048)
-        ),
-        'icon_url': (),
-        'proxy_icon_url': ()
-    }
-
-    if not isinstance(footer, Mapping):
-        raise ValidationError("Embed footer must be a mapping.")
-
-    for field_name, value in footer.items():
-        if field_name not in field_validators:
-            raise ValidationError(f"Unknown embed footer field: {field_name!r}.")
-
-        for validator in field_validators[field_name]:
-            validator(value)
-
-
-def validate_embed_author(author: Any) -> None:
-    """Raises a ValidationError if the given author is invalid."""
-    field_validators = {
-        'name': (
-            MinLengthValidator(
-                limit_value=1,
-                message="Embed author name must not be empty."
-            ),
-            MaxLengthValidator(limit_value=256)
-        ),
-        'url': (),
-        'icon_url': (),
-        'proxy_icon_url': ()
-    }
-
-    if not isinstance(author, Mapping):
-        raise ValidationError("Embed author must be a mapping.")
-
-    for field_name, value in author.items():
-        if field_name not in field_validators:
-            raise ValidationError(f"Unknown embed author field: {field_name!r}.")
-
-        for validator in field_validators[field_name]:
-            validator(value)
-
-
-def validate_embed(embed: Any) -> None:
-    """
-    Validate a JSON document containing an embed as possible to send on Discord.
-
-    This attempts to rebuild the validation used by Discord
-    as well as possible by checking for various embed limits so we can
-    ensure that any embed we store here will also be accepted as a
-    valid embed by the Discord API.
-
-    Using this directly is possible, although not intended - you usually
-    stick this onto the `validators` keyword argument of model fields.
-
-    Example:
-
-        >>> from django.db import models
-        >>> from pydis_site.apps.api.models.utils import validate_embed
-        >>> class MyMessage(models.Model):
-        ...     embed = models.JSONField(
-        ...         validators=(
-        ...             validate_embed,
-        ...         )
-        ...     )
-        ...     # ...
-        ...
-
-    Args:
-        embed (Any):
-            A dictionary describing the contents of this embed.
-            See the official documentation for a full reference
-            of accepted keys by this dictionary:
-                https://discordapp.com/developers/docs/resources/channel#embed-object
-
-    Raises:
-        ValidationError:
-            In case the given embed is deemed invalid, a `ValidationError`
-            is raised which in turn will allow Django to display errors
-            as appropriate.
-    """
-    all_keys = {
-        'title', 'type', 'description', 'url', 'timestamp',
-        'color', 'footer', 'image', 'thumbnail', 'video',
-        'provider', 'author', 'fields'
-    }
-    one_required_of = {'description', 'fields', 'image', 'title', 'video'}
-    field_validators = {
-        'title': (
-            MinLengthValidator(
-                limit_value=1,
-                message="Embed title must not be empty."
-            ),
-            MaxLengthValidator(limit_value=256)
-        ),
-        'description': (MaxLengthValidator(limit_value=4096),),
-        'fields': (
-            MaxLengthValidator(limit_value=25),
-            validate_embed_fields
-        ),
-        'footer': (validate_embed_footer,),
-        'author': (validate_embed_author,)
-    }
-
-    if not embed:
-        raise ValidationError("Tag embed must not be empty.")
-
-    elif not isinstance(embed, Mapping):
-        raise ValidationError("Tag embed must be a mapping.")
-
-    elif not any(field in embed for field in one_required_of):
-        raise ValidationError(f"Tag embed must contain one of the fields {one_required_of}.")
-
-    for required_key in one_required_of:
-        if required_key in embed and not embed[required_key]:
-            raise ValidationError(f"Key {required_key!r} must not be empty.")
-
-    for field_name, value in embed.items():
-        if field_name not in all_keys:
-            raise ValidationError(f"Unknown field name: {field_name!r}")
-
-        if field_name in field_validators:
-            for validator in field_validators[field_name]:
-                validator(value)