Merge branch 'master' into off-topic-non-random

7 files changed, 188 insertions, 45 deletions

diff --git a/pydis_site/apps/api/tests/test_deleted_messages.py b/pydis_site/apps/api/tests/test_deleted_messages.py
index fb93cae6..f079a8dd 100644
--- a/pydis_site/apps/api/tests/test_deleted_messages.py
+++ b/pydis_site/apps/api/tests/test_deleted_messages.py
@@ -13,7 +13,6 @@ class DeletedMessagesWithoutActorTests(APISubdomainTestCase):
             id=55,
             name='Robbie Rotten',
             discriminator=55,
-            avatar_hash=None
         )
 
         cls.data = {
@@ -54,7 +53,6 @@ class DeletedMessagesWithActorTests(APISubdomainTestCase):
             id=12904,
             name='Joe Armstrong',
             discriminator=1245,
-            avatar_hash=None
         )
 
         cls.data = {
diff --git a/pydis_site/apps/api/tests/test_filterlists.py b/pydis_site/apps/api/tests/test_filterlists.py
new file mode 100644
index 00000000..188c0fff
--- /dev/null
+++ b/pydis_site/apps/api/tests/test_filterlists.py
@@ -0,0 +1,122 @@
+from django_hosts.resolvers import reverse
+
+from pydis_site.apps.api.models import FilterList
+from pydis_site.apps.api.tests.base import APISubdomainTestCase
+
+URL = reverse('bot:filterlist-list', host='api')
+JPEG_ALLOWLIST = {
+    "type": 'FILE_FORMAT',
+    "allowed": True,
+    "content": ".jpeg",
+}
+PNG_ALLOWLIST = {
+    "type": 'FILE_FORMAT',
+    "allowed": True,
+    "content": ".png",
+}
+
+
+class UnauthenticatedTests(APISubdomainTestCase):
+    def setUp(self):
+        super().setUp()
+        self.client.force_authenticate(user=None)
+
+    def test_cannot_read_allowedlist_list(self):
+        response = self.client.get(URL)
+
+        self.assertEqual(response.status_code, 401)
+
+
+class EmptyDatabaseTests(APISubdomainTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        FilterList.objects.all().delete()
+
+    def test_returns_empty_object(self):
+        response = self.client.get(URL)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), [])
+
+
+class FetchTests(APISubdomainTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        FilterList.objects.all().delete()
+        cls.jpeg_format = FilterList.objects.create(**JPEG_ALLOWLIST)
+        cls.png_format = FilterList.objects.create(**PNG_ALLOWLIST)
+
+    def test_returns_name_in_list(self):
+        response = self.client.get(URL)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json()[0]["content"], self.jpeg_format.content)
+        self.assertEqual(response.json()[1]["content"], self.png_format.content)
+
+    def test_returns_single_item_by_id(self):
+        response = self.client.get(f'{URL}/{self.jpeg_format.id}')
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json().get("content"), self.jpeg_format.content)
+
+    def test_returns_filter_list_types(self):
+        response = self.client.get(f'{URL}/get-types')
+
+        self.assertEqual(response.status_code, 200)
+        for api_type, model_type in zip(response.json(), FilterList.FilterListType.choices):
+            self.assertEquals(api_type[0], model_type[0])
+            self.assertEquals(api_type[1], model_type[1])
+
+
+class CreationTests(APISubdomainTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        FilterList.objects.all().delete()
+
+    def test_returns_400_for_missing_params(self):
+        no_type_json = {
+            "allowed": True,
+            "content": ".jpeg"
+        }
+        no_allowed_json = {
+            "type": "FILE_FORMAT",
+            "content": ".jpeg"
+        }
+        no_content_json = {
+            "allowed": True,
+            "type": "FILE_FORMAT"
+        }
+        cases = [{}, no_type_json, no_allowed_json, no_content_json]
+
+        for case in cases:
+            with self.subTest(case=case):
+                response = self.client.post(URL, data=case)
+                self.assertEqual(response.status_code, 400)
+
+    def test_returns_201_for_successful_creation(self):
+        response = self.client.post(URL, data=JPEG_ALLOWLIST)
+        self.assertEqual(response.status_code, 201)
+
+    def test_returns_400_for_duplicate_creation(self):
+        self.client.post(URL, data=JPEG_ALLOWLIST)
+        response = self.client.post(URL, data=JPEG_ALLOWLIST)
+        self.assertEqual(response.status_code, 400)
+
+
+class DeletionTests(APISubdomainTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        FilterList.objects.all().delete()
+        cls.jpeg_format = FilterList.objects.create(**JPEG_ALLOWLIST)
+        cls.png_format = FilterList.objects.create(**PNG_ALLOWLIST)
+
+    def test_deleting_unknown_id_returns_404(self):
+        response = self.client.delete(f"{URL}/200")
+        self.assertEqual(response.status_code, 404)
+
+    def test_deleting_known_id_returns_204(self):
+        response = self.client.delete(f"{URL}/{self.jpeg_format.id}")
+        self.assertEqual(response.status_code, 204)
+
+        response = self.client.get(f"{URL}/{self.jpeg_format.id}")
+        self.assertNotIn(self.png_format.content, response.json())
diff --git a/pydis_site/apps/api/tests/test_infractions.py b/pydis_site/apps/api/tests/test_infractions.py
index bc258b77..93ef8171 100644
--- a/pydis_site/apps/api/tests/test_infractions.py
+++ b/pydis_site/apps/api/tests/test_infractions.py
@@ -47,7 +47,6 @@ class InfractionTests(APISubdomainTestCase):
             id=5,
             name='james',
             discriminator=1,
-            avatar_hash=None
         )
         cls.ban_hidden = Infraction.objects.create(
             user_id=cls.user.id,
@@ -169,13 +168,11 @@ class CreationTests(APISubdomainTestCase):
             id=5,
             name='james',
             discriminator=1,
-            avatar_hash=None
         )
         cls.second_user = User.objects.create(
             id=6,
             name='carl',
             discriminator=2,
-            avatar_hash=None
         )
 
     def test_accepts_valid_data(self):
@@ -522,7 +519,6 @@ class ExpandedTests(APISubdomainTestCase):
             id=5,
             name='james',
             discriminator=1,
-            avatar_hash=None
         )
         cls.kick = Infraction.objects.create(
             user_id=cls.user.id,
@@ -540,7 +536,7 @@ class ExpandedTests(APISubdomainTestCase):
     def check_expanded_fields(self, infraction):
         for key in ('user', 'actor'):
             obj = infraction[key]
-            for field in ('id', 'name', 'discriminator', 'avatar_hash', 'roles', 'in_guild'):
+            for field in ('id', 'name', 'discriminator', 'roles', 'in_guild'):
                 self.assertTrue(field in obj, msg=f'field "{field}" missing from {key}')
 
     def test_list_expanded(self):
@@ -599,7 +595,6 @@ class SerializerTests(APISubdomainTestCase):
             id=5,
             name='james',
             discriminator=1,
-            avatar_hash=None
         )
 
     def create_infraction(self, _type: str, active: bool):
diff --git a/pydis_site/apps/api/tests/test_models.py b/pydis_site/apps/api/tests/test_models.py
index a97d3251..e0e347bb 100644
--- a/pydis_site/apps/api/tests/test_models.py
+++ b/pydis_site/apps/api/tests/test_models.py
@@ -3,13 +3,12 @@ from datetime import datetime as dt
 from django.test import SimpleTestCase
 from django.utils import timezone
 
-from ..models import (
+from pydis_site.apps.api.models import (
     DeletedMessage,
     DocumentationLink,
     Infraction,
     Message,
     MessageDeletionContext,
-    ModelReprMixin,
     Nomination,
     OffTopicChannelName,
     OffensiveMessage,
@@ -18,6 +17,7 @@ from ..models import (
     Tag,
     User
 )
+from pydis_site.apps.api.models.mixins import ModelReprMixin
 
 
 class SimpleClass(ModelReprMixin):
@@ -39,12 +39,14 @@ class StringDunderMethodTests(SimpleTestCase):
         self.nomination = Nomination(
             id=123,
             actor=User(
-                id=9876, name='Mr. Hemlock',
-                discriminator=6666, avatar_hash=None
+                id=9876,
+                name='Mr. Hemlock',
+                discriminator=6666,
             ),
             user=User(
-                id=9876, name="Hemlock's Cat",
-                discriminator=7777, avatar_hash=None
+                id=9876,
+                name="Hemlock's Cat",
+                discriminator=7777,
             ),
             reason="He purrrrs like the best!",
         )
@@ -53,15 +55,17 @@ class StringDunderMethodTests(SimpleTestCase):
             DeletedMessage(
                 id=45,
                 author=User(
-                    id=444, name='bill',
-                    discriminator=5, avatar_hash=None
+                    id=444,
+                    name='bill',
+                    discriminator=5,
                 ),
                 channel_id=666,
                 content="wooey",
                 deletion_context=MessageDeletionContext(
                     actor=User(
-                        id=5555, name='shawn',
-                        discriminator=555, avatar_hash=None
+                        id=5555,
+                        name='shawn',
+                        discriminator=555,
                     ),
                     creation=dt.utcnow()
                 ),
@@ -84,8 +88,9 @@ class StringDunderMethodTests(SimpleTestCase):
             Message(
                 id=45,
                 author=User(
-                    id=444, name='bill',
-                    discriminator=5, avatar_hash=None
+                    id=444,
+                    name='bill',
+                    discriminator=5,
                 ),
                 channel_id=666,
                 content="wooey",
@@ -93,8 +98,9 @@ class StringDunderMethodTests(SimpleTestCase):
             ),
             MessageDeletionContext(
                 actor=User(
-                    id=5555, name='shawn',
-                    discriminator=555, avatar_hash=None
+                    id=5555,
+                    name='shawn',
+                    discriminator=555,
                 ),
                 creation=dt.utcnow()
             ),
@@ -103,22 +109,29 @@ class StringDunderMethodTests(SimpleTestCase):
                 embed={'content': "the builder"}
             ),
             User(
-                id=5, name='bob',
-                discriminator=1, avatar_hash=None
+                id=5,
+                name='bob',
+                discriminator=1,
             ),
             Infraction(
-                user_id=5, actor_id=5,
-                type='kick', reason='He terk my jerb!'
+                user_id=5,
+                actor_id=5,
+                type='kick',
+                reason='He terk my jerb!'
             ),
             Infraction(
-                user_id=5, actor_id=5, hidden=True,
-                type='kick', reason='He terk my jerb!',
+                user_id=5,
+                actor_id=5,
+                hidden=True,
+                type='kick',
+                reason='He terk my jerb!',
                 expires_at=dt(5018, 11, 20, 15, 52, tzinfo=timezone.utc)
             ),
             Reminder(
                 author=User(
-                    id=452, name='billy',
-                    discriminator=5, avatar_hash=None
+                    id=452,
+                    name='billy',
+                    discriminator=5,
                 ),
                 channel_id=555,
                 jump_url=(
diff --git a/pydis_site/apps/api/tests/test_nominations.py b/pydis_site/apps/api/tests/test_nominations.py
index 76cb4112..92c62c87 100644
--- a/pydis_site/apps/api/tests/test_nominations.py
+++ b/pydis_site/apps/api/tests/test_nominations.py
@@ -13,7 +13,6 @@ class CreationTests(APISubdomainTestCase):
             id=1234,
             name='joe dart',
             discriminator=1111,
-            avatar_hash=None
         )
 
     def test_accepts_valid_data(self):
@@ -190,7 +189,6 @@ class NominationTests(APISubdomainTestCase):
             id=1234,
             name='joe dart',
             discriminator=1111,
-            avatar_hash=None
         )
 
         cls.active_nomination = Nomination.objects.create(
diff --git a/pydis_site/apps/api/tests/test_reminders.py b/pydis_site/apps/api/tests/test_reminders.py
index 3441e0cc..9dffb668 100644
--- a/pydis_site/apps/api/tests/test_reminders.py
+++ b/pydis_site/apps/api/tests/test_reminders.py
@@ -53,7 +53,6 @@ class ReminderCreationTests(APISubdomainTestCase):
             id=1234,
             name='Mermaid Man',
             discriminator=1234,
-            avatar_hash=None,
         )
 
     def test_accepts_valid_data(self):
@@ -63,6 +62,7 @@ class ReminderCreationTests(APISubdomainTestCase):
             'expiration': datetime.utcnow().isoformat(),
             'jump_url': "https://www.google.com",
             'channel_id': 123,
+            'mentions': [8888, 9999],
         }
         url = reverse('bot:reminder-list', host='api')
         response = self.client.post(url, data=data)
@@ -86,7 +86,6 @@ class ReminderDeletionTests(APISubdomainTestCase):
             id=6789,
             name='Barnacle Boy',
             discriminator=6789,
-            avatar_hash=None,
         )
 
         cls.reminder = Reminder.objects.create(
@@ -118,7 +117,6 @@ class ReminderListTests(APISubdomainTestCase):
             id=6789,
             name='Patrick Star',
             discriminator=6789,
-            avatar_hash=None,
         )
 
         cls.reminder_one = Reminder.objects.create(
@@ -165,6 +163,34 @@ class ReminderListTests(APISubdomainTestCase):
         self.assertEqual(response.json(), [self.rem_dict_one])
 
 
+class ReminderRetrieveTests(APISubdomainTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.author = User.objects.create(
+            id=6789,
+            name='Reminder author',
+            discriminator=6789,
+        )
+
+        cls.reminder = Reminder.objects.create(
+            author=cls.author,
+            content="Reminder content",
+            expiration=datetime.utcnow().isoformat(),
+            jump_url="http://example.com/",
+            channel_id=123
+        )
+
+    def test_retrieve_unknown_returns_404(self):
+        url = reverse('bot:reminder-detail', args=("not_an_id",), host='api')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+
+    def test_retrieve_known_returns_200(self):
+        url = reverse('bot:reminder-detail', args=(self.reminder.id,), host='api')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+
 class ReminderUpdateTests(APISubdomainTestCase):
     @classmethod
     def setUpTestData(cls):
@@ -172,7 +198,6 @@ class ReminderUpdateTests(APISubdomainTestCase):
             id=666,
             name='Man Ray',
             discriminator=666,
-            avatar_hash=None,
         )
 
         cls.reminder = Reminder.objects.create(
diff --git a/pydis_site/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py
index 86799f19..4c0f6e27 100644
--- a/pydis_site/apps/api/tests/test_users.py
+++ b/pydis_site/apps/api/tests/test_users.py
@@ -49,7 +49,6 @@ class CreationTests(APISubdomainTestCase):
         url = reverse('bot:user-list', host='api')
         data = {
             'id': 42,
-            'avatar_hash': "validavatarhashiswear",
             'name': "Test",
             'discriminator': 42,
             'roles': [
@@ -63,7 +62,6 @@ class CreationTests(APISubdomainTestCase):
         self.assertEqual(response.json(), data)
 
         user = User.objects.get(id=42)
-        self.assertEqual(user.avatar_hash, data['avatar_hash'])
         self.assertEqual(user.name, data['name'])
         self.assertEqual(user.discriminator, data['discriminator'])
         self.assertEqual(user.in_guild, data['in_guild'])
@@ -73,7 +71,6 @@ class CreationTests(APISubdomainTestCase):
         data = [
             {
                 'id': 5,
-                'avatar_hash': "hahayes",
                 'name': "test man",
                 'discriminator': 42,
                 'roles': [
@@ -83,7 +80,6 @@ class CreationTests(APISubdomainTestCase):
             },
             {
                 'id': 8,
-                'avatar_hash': "maybenot",
                 'name': "another test man",
                 'discriminator': 555,
                 'roles': [],
@@ -99,7 +95,6 @@ class CreationTests(APISubdomainTestCase):
         url = reverse('bot:user-list', host='api')
         data = {
             'id': 5,
-            'avatar_hash': "hahayes",
             'name': "test man",
             'discriminator': 42,
             'roles': [
@@ -114,7 +109,6 @@ class CreationTests(APISubdomainTestCase):
         url = reverse('bot:user-list', host='api')
         data = {
             'id': True,
-            'avatar_hash': 1902831,
             'discriminator': "totally!"
         }
 
@@ -148,16 +142,14 @@ class UserModelTests(APISubdomainTestCase):
         )
         cls.user_with_roles = User.objects.create(
             id=1,
-            avatar_hash="coolavatarhash",
             name="Test User with two roles",
             discriminator=1111,
             in_guild=True,
         )
-        cls.user_with_roles.roles.add(cls.role_bottom, cls.role_top)
+        cls.user_with_roles.roles.extend([cls.role_bottom.id, cls.role_top.id])
 
         cls.user_without_roles = User.objects.create(
             id=2,
-            avatar_hash="coolavatarhash",
             name="Test User without roles",
             discriminator=2222,
             in_guild=True,