Pull from upstream/main and resolve conflicts.

4 files changed, 9 insertions, 8 deletions

diff --git a/pydis_site/apps/api/models/bot/documentation_link.py b/pydis_site/apps/api/models/bot/documentation_link.py
index 3dcc71fc..9941907c 100644
--- a/pydis_site/apps/api/models/bot/documentation_link.py
+++ b/pydis_site/apps/api/models/bot/documentation_link.py
@@ -30,6 +30,7 @@ class DocumentationLink(ModelReprMixin, models.Model):
             "The base URL from which documentation will be available for this project. "
             "Used to generate links to various symbols within this package."
         ),
+        blank=True,
         validators=(ends_with_slash_validator,)
     )
     inventory_url = models.URLField(
diff --git a/pydis_site/apps/api/models/bot/message_deletion_context.py b/pydis_site/apps/api/models/bot/message_deletion_context.py
index 1410250a..25741266 100644
--- a/pydis_site/apps/api/models/bot/message_deletion_context.py
+++ b/pydis_site/apps/api/models/bot/message_deletion_context.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django_hosts.resolvers import reverse
+from django.urls import reverse
 
 from pydis_site.apps.api.models.bot.user import User
 from pydis_site.apps.api.models.mixins import ModelReprMixin
@@ -33,7 +33,7 @@ class MessageDeletionContext(ModelReprMixin, models.Model):
     @property
     def log_url(self) -> str:
         """Create the url for the deleted message logs."""
-        return reverse('logs', host="staff", args=(self.id,))
+        return reverse('staff:logs', args=(self.id,))
 
     class Meta:
         """Set the ordering for list views to newest first."""
diff --git a/pydis_site/apps/api/models/bot/metricity.py b/pydis_site/apps/api/models/bot/metricity.py
index 5daa5c66..33fb7ad7 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 NotFound(Exception):
+class NotFoundError(Exception):
     """Raised when an entity cannot be found."""
 
     pass
@@ -37,7 +37,7 @@ class Metricity:
         values = self.cursor.fetchone()
 
         if not values:
-            raise NotFound()
+            raise NotFoundError()
 
         return dict(zip(columns, values))
 
@@ -58,7 +58,7 @@ class Metricity:
         values = self.cursor.fetchone()
 
         if not values:
-            raise NotFound()
+            raise NotFoundError()
 
         return values[0]
 
@@ -88,7 +88,7 @@ class Metricity:
         values = self.cursor.fetchone()
 
         if not values:
-            raise NotFound()
+            raise NotFoundError()
 
         return values[0]
 
@@ -127,6 +127,6 @@ class Metricity:
         values = self.cursor.fetchall()
 
         if not values:
-            raise NotFound()
+            raise NotFoundError()
 
         return values
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 582c069e..e9fec114 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."
     )