Merge branch 'dewikification' into guides-app

8 files changed, 59 insertions, 13 deletions

diff --git a/pydis_site/apps/api/models/bot/deleted_message.py b/pydis_site/apps/api/models/bot/deleted_message.py
index 1eb4516e..50b70d8c 100644
--- a/pydis_site/apps/api/models/bot/deleted_message.py
+++ b/pydis_site/apps/api/models/bot/deleted_message.py
@@ -14,6 +14,6 @@ class DeletedMessage(Message):
     )
 
     class Meta:
-        """Sets the default ordering for list views to oldest first."""
+        """Sets the default ordering for list views to newest first."""
 
-        ordering = ["id"]
+        ordering = ("-id",)
diff --git a/pydis_site/apps/api/models/bot/documentation_link.py b/pydis_site/apps/api/models/bot/documentation_link.py
index 5a46460b..2a0ce751 100644
--- a/pydis_site/apps/api/models/bot/documentation_link.py
+++ b/pydis_site/apps/api/models/bot/documentation_link.py
@@ -24,3 +24,8 @@ 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}"
+
+    class Meta:
+        """Defines the meta options for the documentation link model."""
+
+        ordering = ['package']
diff --git a/pydis_site/apps/api/models/bot/message.py b/pydis_site/apps/api/models/bot/message.py
index f6ae55a5..ff06de21 100644
--- a/pydis_site/apps/api/models/bot/message.py
+++ b/pydis_site/apps/api/models/bot/message.py
@@ -21,7 +21,8 @@ class Message(ModelReprMixin, models.Model):
                 limit_value=0,
                 message="Message IDs cannot be negative."
             ),
-        )
+        ),
+        verbose_name="ID"
     )
     author = models.ForeignKey(
         User,
@@ -38,7 +39,8 @@ class Message(ModelReprMixin, models.Model):
                 limit_value=0,
                 message="Channel IDs cannot be negative."
             ),
-        )
+        ),
+        verbose_name="Channel ID"
     )
     content = models.CharField(
         max_length=2_000,
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 04ae8d34..1410250a 100644
--- a/pydis_site/apps/api/models/bot/message_deletion_context.py
+++ b/pydis_site/apps/api/models/bot/message_deletion_context.py
@@ -1,4 +1,5 @@
 from django.db import models
+from django_hosts.resolvers import reverse
 
 from pydis_site.apps.api.models.bot.user import User
 from pydis_site.apps.api.models.mixins import ModelReprMixin
@@ -28,3 +29,13 @@ class MessageDeletionContext(ModelReprMixin, models.Model):
         # the deletion context does not take place in the future.
         help_text="When this deletion took place."
     )
+
+    @property
+    def log_url(self) -> str:
+        """Create the url for the deleted message logs."""
+        return reverse('logs', host="staff", args=(self.id,))
+
+    class Meta:
+        """Set the ordering for list views to newest first."""
+
+        ordering = ("-creation",)
diff --git a/pydis_site/apps/api/models/bot/nomination.py b/pydis_site/apps/api/models/bot/nomination.py
index 21e34e87..11b9e36e 100644
--- a/pydis_site/apps/api/models/bot/nomination.py
+++ b/pydis_site/apps/api/models/bot/nomination.py
@@ -18,7 +18,9 @@ class Nomination(ModelReprMixin, models.Model):
         related_name='nomination_set'
     )
     reason = models.TextField(
-        help_text="Why this user was nominated."
+        help_text="Why this user was nominated.",
+        null=True,
+        blank=True
     )
     user = models.ForeignKey(
         User,
@@ -32,7 +34,8 @@ class Nomination(ModelReprMixin, models.Model):
     )
     end_reason = models.TextField(
         help_text="Why the nomination was ended.",
-        default=""
+        default="",
+        blank=True
     )
     ended_at = models.DateTimeField(
         auto_now_add=False,
@@ -44,3 +47,8 @@ class Nomination(ModelReprMixin, models.Model):
         """Representation that makes the target and state of the nomination immediately evident."""
         status = "active" if self.active else "ended"
         return f"Nomination of {self.user} ({status})"
+
+    class Meta:
+        """Set the ordering of nominations to most recent first."""
+
+        ordering = ("-inserted_at",)
diff --git a/pydis_site/apps/api/models/bot/offensive_message.py b/pydis_site/apps/api/models/bot/offensive_message.py
index 6c0e5ffb..74dab59b 100644
--- a/pydis_site/apps/api/models/bot/offensive_message.py
+++ b/pydis_site/apps/api/models/bot/offensive_message.py
@@ -24,7 +24,8 @@ class OffensiveMessage(ModelReprMixin, models.Model):
                 limit_value=0,
                 message="Message IDs cannot be negative."
             ),
-        )
+        ),
+        verbose_name="Message ID"
     )
     channel_id = models.BigIntegerField(
         help_text=(
@@ -36,11 +37,13 @@ class OffensiveMessage(ModelReprMixin, models.Model):
                 limit_value=0,
                 message="Channel IDs cannot be negative."
             ),
-        )
+        ),
+        verbose_name="Channel ID"
     )
     delete_date = models.DateTimeField(
         help_text="The date on which the message will be auto-deleted.",
-        validators=(future_date_validator,)
+        validators=(future_date_validator,),
+        verbose_name="To Be Deleted"
     )
 
     def __str__(self):
diff --git a/pydis_site/apps/api/models/bot/role.py b/pydis_site/apps/api/models/bot/role.py
index 721e4815..cfadfec4 100644
--- a/pydis_site/apps/api/models/bot/role.py
+++ b/pydis_site/apps/api/models/bot/role.py
@@ -22,7 +22,8 @@ class Role(ModelReprMixin, models.Model):
                 message="Role IDs cannot be negative."
             ),
         ),
-        help_text="The role ID, taken from Discord."
+        help_text="The role ID, taken from Discord.",
+        verbose_name="ID"
     )
     name = models.CharField(
         max_length=100,
@@ -65,3 +66,8 @@ class Role(ModelReprMixin, models.Model):
     def __le__(self, other: Role) -> bool:
         """Compares the roles based on their position in the role hierarchy of the guild."""
         return self.position <= other.position
+
+    class Meta:
+        """Set role ordering from highest to lowest position."""
+
+        ordering = ("-position",)
diff --git a/pydis_site/apps/api/models/bot/user.py b/pydis_site/apps/api/models/bot/user.py
index cd2d58b9..afc5ba1e 100644
--- a/pydis_site/apps/api/models/bot/user.py
+++ b/pydis_site/apps/api/models/bot/user.py
@@ -26,11 +26,12 @@ class User(ModelReprMixin, models.Model):
                 message="User IDs cannot be negative."
             ),
         ),
+        verbose_name="ID",
         help_text="The ID of this user, taken from Discord."
     )
     name = models.CharField(
         max_length=32,
-        help_text="The username, taken from Discord."
+        help_text="The username, taken from Discord.",
     )
     discriminator = models.PositiveSmallIntegerField(
         validators=(
@@ -57,12 +58,13 @@ class User(ModelReprMixin, models.Model):
     )
     in_guild = models.BooleanField(
         default=True,
-        help_text="Whether this user is in our server."
+        help_text="Whether this user is in our server.",
+        verbose_name="In Guild"
     )
 
     def __str__(self):
         """Returns the name and discriminator for the current user, for display purposes."""
-        return f"{self.name}#{self.discriminator:0>4}"
+        return f"{self.name}#{self.discriminator:04d}"
 
     @property
     def top_role(self) -> Role:
@@ -75,3 +77,12 @@ class User(ModelReprMixin, models.Model):
         if not roles:
             return Role.objects.get(name="Developers")
         return max(roles)
+
+    @property
+    def username(self) -> str:
+        """
+        Returns the display version with name and discriminator as a standard attribute.
+
+        For usability in read-only fields such as Django Admin.
+        """
+        return str(self)