Merge branch 'master' into feat/deps/344/django-3.0

2 files changed, 24 insertions, 12 deletions

diff --git a/pydis_site/apps/api/models/bot/bot_setting.py b/pydis_site/apps/api/models/bot/bot_setting.py
index b1c3e47c..8d48eac7 100644
--- a/pydis_site/apps/api/models/bot/bot_setting.py
+++ b/pydis_site/apps/api/models/bot/bot_setting.py
@@ -9,6 +9,7 @@ def validate_bot_setting_name(name: str) -> None:
     """Raises a ValidationError if the given name is not a known setting."""
     known_settings = (
         'defcon',
+        'news',
     )
 
     if name not in known_settings:
diff --git a/pydis_site/apps/api/models/bot/user.py b/pydis_site/apps/api/models/bot/user.py
index 5140d2bf..bff4d642 100644
--- a/pydis_site/apps/api/models/bot/user.py
+++ b/pydis_site/apps/api/models/bot/user.py
@@ -1,3 +1,5 @@
+from django.contrib.postgres.fields import ArrayField
+from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 
@@ -5,6 +7,14 @@ from pydis_site.apps.api.models.bot.role import Role
 from pydis_site.apps.api.models.utils import ModelReprMixin
 
 
+def _validate_existing_role(value: int) -> None:
+    """Validate that a role exists when given in to the user model."""
+    role = Role.objects.filter(id=value)
+
+    if not role:
+        raise ValidationError(f"Role with ID {value} does not exist")
+
+
 class User(ModelReprMixin, models.Model):
     """A Discord user."""
 
@@ -31,17 +41,18 @@ class User(ModelReprMixin, models.Model):
         ),
         help_text="The discriminator of this user, taken from Discord."
     )
-    avatar_hash = models.CharField(
-        max_length=100,
-        help_text=(
-            "The user's avatar hash, taken from Discord. "
-            "Null if the user does not have any custom avatar."
+    roles = ArrayField(
+        models.BigIntegerField(
+            validators=(
+                MinValueValidator(
+                    limit_value=0,
+                    message="Role IDs cannot be negative."
+                ),
+                _validate_existing_role
+            )
         ),
-        null=True
-    )
-    roles = models.ManyToManyField(
-        Role,
-        help_text="Any roles this user has on our server."
+        default=list,
+        help_text="IDs of roles the user has on the server"
     )
     in_guild = models.BooleanField(
         default=True,
@@ -59,7 +70,7 @@ class User(ModelReprMixin, models.Model):
 
         This will fall back to the Developers role if the user does not have any roles.
         """
-        roles = self.roles.all()
+        roles = Role.objects.filter(id__in=self.roles)
         if not roles:
             return Role.objects.get(name="Developers")
-        return max(self.roles.all())
+        return max(roles)