Merge pull request #229 from python-discord/low-hanging-merge-fruit

Minor Merges from master

15 files changed, 0 insertions, 110 deletions

diff --git a/pydis_site/apps/api/models/__init__.py b/pydis_site/apps/api/models/__init__.py
index 4645bda2..a7eccb04 100644
--- a/pydis_site/apps/api/models/__init__.py
+++ b/pydis_site/apps/api/models/__init__.py
@@ -9,10 +9,6 @@ from .bot import (  # noqa
     OffTopicChannelName,
     Reminder,
     Role,
-    SnakeFact,
-    SnakeIdiom,
-    SnakeName,
-    SpecialSnake,
     Tag,
     User
 )
diff --git a/pydis_site/apps/api/models/bot/__init__.py b/pydis_site/apps/api/models/bot/__init__.py
index fb313193..b805924a 100644
--- a/pydis_site/apps/api/models/bot/__init__.py
+++ b/pydis_site/apps/api/models/bot/__init__.py
@@ -8,9 +8,5 @@ from .nomination import Nomination  # noqa
 from .off_topic_channel_name import OffTopicChannelName  # noqa
 from .reminder import Reminder  # noqa
 from .role import Role  # noqa
-from .snake_fact import SnakeFact  # noqa
-from .snake_idiom import SnakeIdiom  # noqa
-from .snake_name import SnakeName  # noqa
-from .special_snake import SpecialSnake  # noqa
 from .tag import Tag  # noqa
 from .user import User  # noqa
diff --git a/pydis_site/apps/api/models/bot/bot_setting.py b/pydis_site/apps/api/models/bot/bot_setting.py
index ee9838b7..a52f3e34 100644
--- a/pydis_site/apps/api/models/bot/bot_setting.py
+++ b/pydis_site/apps/api/models/bot/bot_setting.py
@@ -7,7 +7,6 @@ from pydis_site.apps.api.models.utils import ModelReprMixin
 
 def validate_bot_setting_name(name):
     """Raises a ValidationError if the given name is not a known setting."""
-
     known_settings = (
         'defcon',
     )
diff --git a/pydis_site/apps/api/models/bot/documentation_link.py b/pydis_site/apps/api/models/bot/documentation_link.py
index 30379396..f844ae04 100644
--- a/pydis_site/apps/api/models/bot/documentation_link.py
+++ b/pydis_site/apps/api/models/bot/documentation_link.py
@@ -23,5 +23,4 @@ class DocumentationLink(ModelReprMixin, models.Model):
 
     def __str__(self):
         """Returns the package and URL for the current documentation link, for display purposes."""
-
         return f"{self.package} - {self.base_url}"
diff --git a/pydis_site/apps/api/models/bot/infraction.py b/pydis_site/apps/api/models/bot/infraction.py
index 7669352f..da91d6c2 100644
--- a/pydis_site/apps/api/models/bot/infraction.py
+++ b/pydis_site/apps/api/models/bot/infraction.py
@@ -60,7 +60,6 @@ class Infraction(ModelReprMixin, models.Model):
 
     def __str__(self):
         """Returns some info on the current infraction, for display purposes."""
-
         s = f"#{self.id}: {self.type} on {self.user_id}"
         if self.expires_at:
             s += f" until {self.expires_at}"
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 2f55a131..0891f811 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
@@ -16,5 +16,4 @@ class OffTopicChannelName(ModelReprMixin, models.Model):
 
     def __str__(self):
         """Returns the current off-topic name, for display purposes."""
-
         return self.name
diff --git a/pydis_site/apps/api/models/bot/reminder.py b/pydis_site/apps/api/models/bot/reminder.py
index ae45b5de..decc9391 100644
--- a/pydis_site/apps/api/models/bot/reminder.py
+++ b/pydis_site/apps/api/models/bot/reminder.py
@@ -42,5 +42,4 @@ class Reminder(ModelReprMixin, models.Model):
 
     def __str__(self):
         """Returns some info on the current reminder, for display purposes."""
-
         return f"{self.content} on {self.expiration} by {self.author}"
diff --git a/pydis_site/apps/api/models/bot/role.py b/pydis_site/apps/api/models/bot/role.py
index ad043bd6..34e74009 100644
--- a/pydis_site/apps/api/models/bot/role.py
+++ b/pydis_site/apps/api/models/bot/role.py
@@ -46,5 +46,4 @@ class Role(ModelReprMixin, models.Model):
 
     def __str__(self):
         """Returns the name of the current role, for display purposes."""
-
         return self.name
diff --git a/pydis_site/apps/api/models/bot/snake_fact.py b/pydis_site/apps/api/models/bot/snake_fact.py
deleted file mode 100644
index c960cbc4..00000000
--- a/pydis_site/apps/api/models/bot/snake_fact.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from django.db import models
-
-from pydis_site.apps.api.models.utils import ModelReprMixin
-
-
-class SnakeFact(ModelReprMixin, models.Model):
-    """A snake fact used by the bot's snake cog."""
-
-    fact = models.CharField(
-        primary_key=True,
-        max_length=200,
-        help_text="A fact about snakes."
-    )
-
-    def __str__(self):
-        """Returns the current snake fact, for display purposes."""
-
-        return self.fact
diff --git a/pydis_site/apps/api/models/bot/snake_idiom.py b/pydis_site/apps/api/models/bot/snake_idiom.py
deleted file mode 100644
index 0e8f5e94..00000000
--- a/pydis_site/apps/api/models/bot/snake_idiom.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from django.db import models
-
-from pydis_site.apps.api.models.utils import ModelReprMixin
-
-
-class SnakeIdiom(ModelReprMixin, models.Model):
-    """A snake idiom used by the snake cog."""
-
-    idiom = models.CharField(
-        primary_key=True,
-        max_length=140,
-        help_text="A saying about a snake."
-    )
-
-    def __str__(self):
-        """Returns the current idiom, for display purposes."""
-
-        return self.idiom
diff --git a/pydis_site/apps/api/models/bot/snake_name.py b/pydis_site/apps/api/models/bot/snake_name.py
deleted file mode 100644
index b6ea6202..00000000
--- a/pydis_site/apps/api/models/bot/snake_name.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from django.core.validators import RegexValidator
-from django.db import models
-
-from pydis_site.apps.api.models.utils import ModelReprMixin
-
-
-class SnakeName(ModelReprMixin, models.Model):
-    """A snake name used by the bot's snake cog."""
-
-    name = models.CharField(
-        primary_key=True,
-        max_length=100,
-        help_text="The regular name for this snake, e.g. 'Python'.",
-        validators=[RegexValidator(regex=r'^([^0-9])+$')]
-    )
-    scientific = models.CharField(
-        max_length=150,
-        help_text="The scientific name for this snake, e.g. 'Python bivittatus'.",
-        validators=[RegexValidator(regex=r'^([^0-9])+$')]
-    )
-
-    def __str__(self):
-        """Returns the regular and scientific name of the current snake, for display purposes."""
-
-        return f"{self.name} ({self.scientific})"
diff --git a/pydis_site/apps/api/models/bot/special_snake.py b/pydis_site/apps/api/models/bot/special_snake.py
deleted file mode 100644
index 662ff8e3..00000000
--- a/pydis_site/apps/api/models/bot/special_snake.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from django.contrib.postgres import fields as pgfields
-from django.core.validators import RegexValidator
-from django.db import models
-
-from pydis_site.apps.api.models.utils import ModelReprMixin
-
-
-class SpecialSnake(ModelReprMixin, models.Model):
-    """A special snake's name, info and image from our database used by the bot's snake cog."""
-
-    name = models.CharField(
-        max_length=140,
-        primary_key=True,
-        help_text='A special snake name.',
-        validators=[RegexValidator(regex=r'^([^0-9])+$')]
-    )
-    info = models.TextField(
-        help_text='Info about a special snake.'
-    )
-    images = pgfields.ArrayField(
-        models.URLField(),
-        help_text='Images displaying this special snake.'
-    )
-
-    def __str__(self):
-        """Returns the name of the current snake, for display purposes."""
-
-        return self.name
diff --git a/pydis_site/apps/api/models/bot/tag.py b/pydis_site/apps/api/models/bot/tag.py
index 99819e42..01b49525 100644
--- a/pydis_site/apps/api/models/bot/tag.py
+++ b/pydis_site/apps/api/models/bot/tag.py
@@ -10,7 +10,6 @@ from pydis_site.apps.api.models.utils import ModelReprMixin
 
 def validate_tag_embed_fields(fields):
     """Raises a ValidationError if any of the given embed fields is invalid."""
-
     field_validators = {
         'name': (MaxLengthValidator(limit_value=256),),
         'value': (MaxLengthValidator(limit_value=1024),)
@@ -30,7 +29,6 @@ def validate_tag_embed_fields(fields):
 
 def validate_tag_embed_footer(footer):
     """Raises a ValidationError if the given footer is invalid."""
-
     field_validators = {
         'text': (
             MinLengthValidator(
@@ -56,7 +54,6 @@ def validate_tag_embed_footer(footer):
 
 def validate_tag_embed_author(author):
     """Raises a ValidationError if the given author is invalid."""
-
     field_validators = {
         'name': (
             MinLengthValidator(
@@ -120,7 +117,6 @@ def validate_tag_embed(embed):
             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',
@@ -184,5 +180,4 @@ class Tag(ModelReprMixin, models.Model):
 
     def __str__(self):
         """Returns the title of this tag, for display purposes."""
-
         return self.title
diff --git a/pydis_site/apps/api/models/bot/user.py b/pydis_site/apps/api/models/bot/user.py
index 8b995b59..d4deb630 100644
--- a/pydis_site/apps/api/models/bot/user.py
+++ b/pydis_site/apps/api/models/bot/user.py
@@ -50,5 +50,4 @@ class User(ModelReprMixin, models.Model):
 
     def __str__(self):
         """Returns the name and discriminator for the current user, for display purposes."""
-
         return f"{self.name}#{self.discriminator}"
diff --git a/pydis_site/apps/api/models/utils.py b/pydis_site/apps/api/models/utils.py
index 8f590392..0540c4de 100644
--- a/pydis_site/apps/api/models/utils.py
+++ b/pydis_site/apps/api/models/utils.py
@@ -6,7 +6,6 @@ class ModelReprMixin:
 
     def __repr__(self):
         """Returns the current model class name and initialisation parameters."""
-
         attributes = ' '.join(
             f'{attribute}={value!r}'
             for attribute, value in sorted(