From d061ab1c138c7cecf8d138226990bdcf0761a5db Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Wed, 19 May 2021 13:13:57 +0530
Subject: Add active field to OffTopicChannelName model.

---
 .../apps/api/migrations/0070_auto_20210519_0545.py | 23 ++++++++++++++++++++++
 .../apps/api/models/bot/off_topic_channel_name.py  |  7 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pydis_site/apps/api/migrations/0070_auto_20210519_0545.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0070_auto_20210519_0545.py b/pydis_site/apps/api/migrations/0070_auto_20210519_0545.py
new file mode 100644
index 00000000..dbd7ac91
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0070_auto_20210519_0545.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.14 on 2021-05-19 05:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0069_documentationlink_validators'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='offtopicchannelname',
+            name='active',
+            field=models.BooleanField(default=True, help_text='Whether or not this name should be considered for naming channels.'),
+        ),
+        migrations.AlterField(
+            model_name='offtopicchannelname',
+            name='used',
+            field=models.BooleanField(default=False, help_text='Whether or not this name has already been used during this rotation.'),
+        ),
+    ]
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 403c7465..582c069e 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
@@ -18,7 +18,12 @@ class OffTopicChannelName(ModelReprMixin, models.Model):
 
     used = models.BooleanField(
         default=False,
-        help_text="Whether or not this name has already been used during this rotation",
+        help_text="Whether or not this name has already been used during this rotation.",
+    )
+
+    active = models.BooleanField(
+        default=True,
+        help_text="Whether or not this name should be considered for naming channels."
     )
 
     def __str__(self):
-- 
cgit v1.2.3


From 8232b1115bdc308c7ca12f477c704957ec3e3ed1 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Wed, 19 May 2021 13:15:53 +0530
Subject: Serialize name and active attribute.

---
 pydis_site/apps/api/serializers.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index f47bedca..8f61073e 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -207,18 +207,7 @@ class OffTopicChannelNameSerializer(ModelSerializer):
         """Metadata defined for the Django REST Framework."""
 
         model = OffTopicChannelName
-        fields = ('name',)
-
-    def to_representation(self, obj: OffTopicChannelName) -> str:
-        """
-        Return the representation of this `OffTopicChannelName`.
-
-        This only returns the name of the off topic channel name. As the model
-        only has a single attribute, it is unnecessary to create a nested dictionary.
-        Additionally, this allows off topic channel name routes to simply return an
-        array of names instead of objects, saving on bandwidth.
-        """
-        return obj.name
+        fields = ('name', 'active')
 
 
 class ReminderSerializer(ModelSerializer):
-- 
cgit v1.2.3


From b2819a4cfe04b893d5cd638407e48ff6bd501a20 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Wed, 19 May 2021 13:16:21 +0530
Subject: Use ModelViewSet to add support for PUT and PATCH request.

---
 pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
index 826ad25e..194e96d2 100644
--- a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
+++ b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
@@ -3,16 +3,15 @@ from django.db.models.query import QuerySet
 from django.http.request import HttpRequest
 from django.shortcuts import get_object_or_404
 from rest_framework.exceptions import ParseError
-from rest_framework.mixins import DestroyModelMixin
 from rest_framework.response import Response
 from rest_framework.status import HTTP_201_CREATED
-from rest_framework.viewsets import ViewSet
+from rest_framework.viewsets import ModelViewSet
 
 from pydis_site.apps.api.models.bot.off_topic_channel_name import OffTopicChannelName
 from pydis_site.apps.api.serializers import OffTopicChannelNameSerializer
 
 
-class OffTopicChannelNameViewSet(DestroyModelMixin, ViewSet):
+class OffTopicChannelNameViewSet(ModelViewSet):
     """
     View of off-topic channel names used by the bot to rotate our off-topic names on a daily basis.
 
@@ -73,7 +72,7 @@ class OffTopicChannelNameViewSet(DestroyModelMixin, ViewSet):
         """Returns a queryset that covers the entire OffTopicChannelName table."""
         return OffTopicChannelName.objects.all()
 
-    def create(self, request: HttpRequest) -> Response:
+    def create(self, request: HttpRequest, *args, **kwargs) -> Response:
         """
         DRF method for creating a new OffTopicChannelName.
 
@@ -91,7 +90,7 @@ class OffTopicChannelNameViewSet(DestroyModelMixin, ViewSet):
                 'name': ["This query parameter is required."]
             })
 
-    def list(self, request: HttpRequest) -> Response:
+    def list(self, request: HttpRequest, *args, **kwargs) -> Response:
         """
         DRF method for listing OffTopicChannelName entries.
 
@@ -133,6 +132,4 @@ class OffTopicChannelNameViewSet(DestroyModelMixin, ViewSet):
             serialized = self.serializer_class(queryset, many=True)
             return Response(serialized.data)
 
-        queryset = self.get_queryset()
-        serialized = self.serializer_class(queryset, many=True)
-        return Response(serialized.data)
+        return super().list(self, request)
-- 
cgit v1.2.3


From 69f4dc119af4a8d46295abc2551bad24bee96066 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Mon, 31 May 2021 15:27:54 +0530
Subject: Return a list of ot-names only for GET request only to
 bot/off-topic-channel-names

---
 pydis_site/apps/api/serializers.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index 8f61073e..1acb4fb8 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -1,4 +1,6 @@
 """Converters from Django models to data interchange formats and back."""
+from typing import List
+
 from django.db.models.query import QuerySet
 from django.db.utils import IntegrityError
 from rest_framework.exceptions import NotFound
@@ -200,14 +202,29 @@ class ExpandedInfractionSerializer(InfractionSerializer):
         return ret
 
 
+class OffTopicChannelNameListSerializer(ListSerializer):
+    def update(self, instance, validated_data):
+        pass
+
+    def to_representation(self, objects: List[OffTopicChannelName]) -> List[str]:
+        """
+        Return the representation of this `OffTopicChannelName`.
+        This only returns the name of the off topic channel name. As the model
+        only has a single attribute, it is unnecessary to create a nested dictionary.
+        Additionally, this allows off topic channel name routes to simply return an
+        array of names instead of objects, saving on bandwidth.
+        """
+        return [obj.name for obj in objects]
+
+
 class OffTopicChannelNameSerializer(ModelSerializer):
     """A class providing (de-)serialization of `OffTopicChannelName` instances."""
 
     class Meta:
         """Metadata defined for the Django REST Framework."""
-
+        list_serializer_class = OffTopicChannelNameListSerializer
         model = OffTopicChannelName
-        fields = ('name', 'active')
+        fields = ('name', 'used', 'active')
 
 
 class ReminderSerializer(ModelSerializer):
-- 
cgit v1.2.3


From 87e25f77cbc900024e86d439abd9fde71181800d Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Fri, 4 Jun 2021 21:46:54 +0530
Subject: Query off topic names based on Active attribute.

---
 .../apps/api/viewsets/bot/off_topic_channel_name.py      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
index 194e96d2..0caf8088 100644
--- a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
+++ b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
@@ -1,9 +1,11 @@
+import json
+
 from django.db.models import Case, Value, When
 from django.db.models.query import QuerySet
-from django.http.request import HttpRequest
 from django.shortcuts import get_object_or_404
 from rest_framework.exceptions import ParseError
 from rest_framework.response import Response
+from rest_framework.request import Request
 from rest_framework.status import HTTP_201_CREATED
 from rest_framework.viewsets import ModelViewSet
 
@@ -68,11 +70,11 @@ class OffTopicChannelNameViewSet(ModelViewSet):
         name = self.kwargs[self.lookup_field]
         return get_object_or_404(queryset, name=name)
 
-    def get_queryset(self) -> QuerySet:
+    def get_queryset(self, active=True) -> QuerySet:
         """Returns a queryset that covers the entire OffTopicChannelName table."""
-        return OffTopicChannelName.objects.all()
+        return OffTopicChannelName.objects.filter(active=True)
 
-    def create(self, request: HttpRequest, *args, **kwargs) -> Response:
+    def create(self, request: Request, *args, **kwargs) -> Response:
         """
         DRF method for creating a new OffTopicChannelName.
 
@@ -90,7 +92,7 @@ class OffTopicChannelNameViewSet(ModelViewSet):
                 'name': ["This query parameter is required."]
             })
 
-    def list(self, request: HttpRequest, *args, **kwargs) -> Response:
+    def list(self, request: Request, *args, **kwargs) -> Response:
         """
         DRF method for listing OffTopicChannelName entries.
 
@@ -132,4 +134,6 @@ class OffTopicChannelNameViewSet(ModelViewSet):
             serialized = self.serializer_class(queryset, many=True)
             return Response(serialized.data)
 
-        return super().list(self, request)
+        queryset = self.get_queryset(active=bool(request.query_params.get("active", True)))
+        serialized = self.serializer_class(queryset, many=True)
+        return Response(serialized.data)
-- 
cgit v1.2.3


From da1056f36f77d98783b8fb53152fd4ebbc19c019 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Thu, 10 Jun 2021 02:08:54 +0530
Subject: Lint file and remove update() method declaration from
 OffTopicChannelNameListSerializer.

---
 pydis_site/apps/api/serializers.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index 1acb4fb8..0d505675 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -203,12 +203,12 @@ class ExpandedInfractionSerializer(InfractionSerializer):
 
 
 class OffTopicChannelNameListSerializer(ListSerializer):
-    def update(self, instance, validated_data):
-        pass
+    """Custom ListSerializer to override to_representation() when list views are triggered."""
 
     def to_representation(self, objects: List[OffTopicChannelName]) -> List[str]:
         """
         Return the representation of this `OffTopicChannelName`.
+
         This only returns the name of the off topic channel name. As the model
         only has a single attribute, it is unnecessary to create a nested dictionary.
         Additionally, this allows off topic channel name routes to simply return an
@@ -222,6 +222,7 @@ class OffTopicChannelNameSerializer(ModelSerializer):
 
     class Meta:
         """Metadata defined for the Django REST Framework."""
+
         list_serializer_class = OffTopicChannelNameListSerializer
         model = OffTopicChannelName
         fields = ('name', 'used', 'active')
-- 
cgit v1.2.3


From f0534b8e1ed55c18416372f23bb5a1f2e0862e38 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Thu, 10 Jun 2021 02:09:22 +0530
Subject: Fix bug: Do not force active param.

---
 .../apps/api/viewsets/bot/off_topic_channel_name.py       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
index 0caf8088..18ee84ea 100644
--- a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
+++ b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
@@ -1,11 +1,9 @@
-import json
-
 from django.db.models import Case, Value, When
 from django.db.models.query import QuerySet
 from django.shortcuts import get_object_or_404
 from rest_framework.exceptions import ParseError
-from rest_framework.response import Response
 from rest_framework.request import Request
+from rest_framework.response import Response
 from rest_framework.status import HTTP_201_CREATED
 from rest_framework.viewsets import ModelViewSet
 
@@ -70,9 +68,9 @@ class OffTopicChannelNameViewSet(ModelViewSet):
         name = self.kwargs[self.lookup_field]
         return get_object_or_404(queryset, name=name)
 
-    def get_queryset(self, active=True) -> QuerySet:
+    def get_queryset(self, **kwargs) -> QuerySet:
         """Returns a queryset that covers the entire OffTopicChannelName table."""
-        return OffTopicChannelName.objects.filter(active=True)
+        return OffTopicChannelName.objects.filter(**kwargs)
 
     def create(self, request: Request, *args, **kwargs) -> Response:
         """
@@ -134,6 +132,11 @@ class OffTopicChannelNameViewSet(ModelViewSet):
             serialized = self.serializer_class(queryset, many=True)
             return Response(serialized.data)
 
-        queryset = self.get_queryset(active=bool(request.query_params.get("active", True)))
+        params = {}
+
+        if active_param := request.query_params.get("active"):
+            params["active"] = active_param.lower() == "true"
+
+        queryset = self.get_queryset(**params)
         serialized = self.serializer_class(queryset, many=True)
         return Response(serialized.data)
-- 
cgit v1.2.3


From 832880cfac4206aaba0e7de8f005c6425da7a8f3 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Thu, 10 Jun 2021 02:11:40 +0530
Subject: Add tests for active params.

---
 .../apps/api/tests/test_off_topic_channel_names.py | 38 +++++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_off_topic_channel_names.py b/pydis_site/apps/api/tests/test_off_topic_channel_names.py
index 3ab8b22d..a407654c 100644
--- a/pydis_site/apps/api/tests/test_off_topic_channel_names.py
+++ b/pydis_site/apps/api/tests/test_off_topic_channel_names.py
@@ -65,8 +65,15 @@ class EmptyDatabaseTests(APISubdomainTestCase):
 class ListTests(APISubdomainTestCase):
     @classmethod
     def setUpTestData(cls):
-        cls.test_name = OffTopicChannelName.objects.create(name='lemons-lemonade-stand', used=False)
-        cls.test_name_2 = OffTopicChannelName.objects.create(name='bbq-with-bisk', used=True)
+        cls.test_name = OffTopicChannelName.objects.create(
+            name='lemons-lemonade-stand', used=False, active=True
+        )
+        cls.test_name_2 = OffTopicChannelName.objects.create(
+            name='bbq-with-bisk', used=True, active=True
+        )
+        cls.test_name_3 = OffTopicChannelName.objects.create(
+            name="frozen-with-iceman", used=True, active=False
+        )
 
     def test_returns_name_in_list(self):
         """Return all off-topic channel names."""
@@ -78,7 +85,8 @@ class ListTests(APISubdomainTestCase):
             response.json(),
             [
                 self.test_name.name,
-                self.test_name_2.name
+                self.test_name_2.name,
+                self.test_name_3.name
             ]
         )
 
@@ -97,7 +105,29 @@ class ListTests(APISubdomainTestCase):
         response = self.client.get(f'{url}?random_items=2')
 
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), [self.test_name.name, self.test_name_2.name])
+        self.assertEqual(response.json(), [self.test_name.name, self.test_name_3.name])
+
+    def test_returns_inactive_ot_names(self):
+        """Return inactive off topic names."""
+        url = reverse('bot:offtopicchannelname-list', host="api")
+        response = self.client.get(f"{url}?active=false")
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(
+            response.json(),
+            [self.test_name_3.name]
+        )
+
+    def test_returns_active_ot_names(self):
+        """Return active off topic names."""
+        url = reverse('bot:offtopicchannelname-list', host="api")
+        response = self.client.get(f"{url}?active=true")
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(
+            response.json(),
+            [self.test_name.name, self.test_name_2.name]
+        )
 
 
 class CreationTests(APISubdomainTestCase):
-- 
cgit v1.2.3


From 3795b6d6de005f0ed00c37cf042eaca01d0a4769 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Thu, 10 Jun 2021 02:32:17 +0530
Subject: Use assertListEqual where applicable instead of assertEqual.

---
 .../apps/api/tests/test_off_topic_channel_names.py     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_off_topic_channel_names.py b/pydis_site/apps/api/tests/test_off_topic_channel_names.py
index a407654c..ebb1224a 100644
--- a/pydis_site/apps/api/tests/test_off_topic_channel_names.py
+++ b/pydis_site/apps/api/tests/test_off_topic_channel_names.py
@@ -69,7 +69,7 @@ class ListTests(APISubdomainTestCase):
             name='lemons-lemonade-stand', used=False, active=True
         )
         cls.test_name_2 = OffTopicChannelName.objects.create(
-            name='bbq-with-bisk', used=True, active=True
+            name='bbq-with-bisk', used=False, active=True
         )
         cls.test_name_3 = OffTopicChannelName.objects.create(
             name="frozen-with-iceman", used=True, active=False
@@ -81,7 +81,7 @@ class ListTests(APISubdomainTestCase):
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(
+        self.assertListEqual(
             response.json(),
             [
                 self.test_name.name,
@@ -90,22 +90,24 @@ class ListTests(APISubdomainTestCase):
             ]
         )
 
-    def test_returns_single_item_with_random_items_param_set_to_1(self):
+    def test_returns_two_items_with_random_items_param_set_to_2(self):
         """Return not-used name instead used."""
         url = reverse('bot:offtopicchannelname-list', host='api')
-        response = self.client.get(f'{url}?random_items=1')
+        response = self.client.get(f'{url}?random_items=2')
 
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.json()), 1)
-        self.assertEqual(response.json(), [self.test_name.name])
+        self.assertEqual(len(response.json()), 2)
+        self.assertEqual(response.json(), [self.test_name.name, self.test_name_2.name])
 
     def test_running_out_of_names_with_random_parameter(self):
         """Reset names `used` parameter to `False` when running out of names."""
         url = reverse('bot:offtopicchannelname-list', host='api')
-        response = self.client.get(f'{url}?random_items=2')
+        response = self.client.get(f'{url}?random_items=3')
 
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), [self.test_name.name, self.test_name_3.name])
+        self.assertListEqual(
+            response.json(), [self.test_name.name, self.test_name_2.name, self.test_name_3.name]
+        )
 
     def test_returns_inactive_ot_names(self):
         """Return inactive off topic names."""
-- 
cgit v1.2.3


From 8fdabfb4c08931b1e2352e98b307b3bfa3a121f1 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Thu, 10 Jun 2021 02:45:55 +0530
Subject: Use sets to compare 2 un-ordered lists.

---
 .../apps/api/tests/test_off_topic_channel_names.py    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_off_topic_channel_names.py b/pydis_site/apps/api/tests/test_off_topic_channel_names.py
index ebb1224a..34dde7c6 100644
--- a/pydis_site/apps/api/tests/test_off_topic_channel_names.py
+++ b/pydis_site/apps/api/tests/test_off_topic_channel_names.py
@@ -81,13 +81,13 @@ class ListTests(APISubdomainTestCase):
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, 200)
-        self.assertListEqual(
-            response.json(),
-            [
+        self.assertEqual(
+            set(response.json()),
+            {
                 self.test_name.name,
                 self.test_name_2.name,
                 self.test_name_3.name
-            ]
+            }
         )
 
     def test_returns_two_items_with_random_items_param_set_to_2(self):
@@ -97,7 +97,7 @@ class ListTests(APISubdomainTestCase):
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.json()), 2)
-        self.assertEqual(response.json(), [self.test_name.name, self.test_name_2.name])
+        self.assertEqual(set(response.json()), {self.test_name.name, self.test_name_2.name})
 
     def test_running_out_of_names_with_random_parameter(self):
         """Reset names `used` parameter to `False` when running out of names."""
@@ -105,8 +105,9 @@ class ListTests(APISubdomainTestCase):
         response = self.client.get(f'{url}?random_items=3')
 
         self.assertEqual(response.status_code, 200)
-        self.assertListEqual(
-            response.json(), [self.test_name.name, self.test_name_2.name, self.test_name_3.name]
+        self.assertEqual(
+            set(response.json()),
+            {self.test_name.name, self.test_name_2.name, self.test_name_3.name}
         )
 
     def test_returns_inactive_ot_names(self):
@@ -127,8 +128,8 @@ class ListTests(APISubdomainTestCase):
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(
-            response.json(),
-            [self.test_name.name, self.test_name_2.name]
+            set(response.json()),
+            {self.test_name.name, self.test_name_2.name}
         )
 
 
-- 
cgit v1.2.3


From e7b4da7955c100d42536e298ffc9966dd9f95c48 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Thu, 22 Jul 2021 13:51:28 +0530
Subject: Update docstring.

---
 pydis_site/apps/api/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index 0d505675..957c85f3 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -207,7 +207,7 @@ class OffTopicChannelNameListSerializer(ListSerializer):
 
     def to_representation(self, objects: List[OffTopicChannelName]) -> List[str]:
         """
-        Return the representation of this `OffTopicChannelName`.
+        Return a list representing a list of `OffTopicChannelName`.
 
         This only returns the name of the off topic channel name. As the model
         only has a single attribute, it is unnecessary to create a nested dictionary.
-- 
cgit v1.2.3


From d52f21c1fefbb396762dd74609b9957ae029dfc3 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Sat, 24 Jul 2021 19:26:36 +0530
Subject: fix CommandError: Conflicting migrations detected.

---
 pydis_site/apps/api/migrations/0072_merge_20210724_1354.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pydis_site/apps/api/migrations/0072_merge_20210724_1354.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0072_merge_20210724_1354.py b/pydis_site/apps/api/migrations/0072_merge_20210724_1354.py
new file mode 100644
index 00000000..f12efab5
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0072_merge_20210724_1354.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.14 on 2021-07-24 13:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0071_increase_message_content_4000'),
+        ('api', '0070_auto_20210519_0545'),
+    ]
+
+    operations = [
+    ]
-- 
cgit v1.2.3


From f0676fe56000e82036c6b178bd1ea55170c3d789 Mon Sep 17 00:00:00 2001
From: Vivaan Verma <vivaan.verma@gmail.com>
Date: Thu, 12 Aug 2021 15:20:59 +0100
Subject: lint: Add a NOQA for the N818 linting error

This newly added rule enforces exception names to end with Error or Exception, causing the code to not pass linting.

I preferred ignoring this error instead of fixing it to keep the style consistent with rest_framework.NotFound.
---
 pydis_site/apps/api/models/bot/metricity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/models/bot/metricity.py b/pydis_site/apps/api/models/bot/metricity.py
index 5daa5c66..00076248 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 NotFound(Exception):  # noqa: N818
     """Raised when an entity cannot be found."""
 
     pass
-- 
cgit v1.2.3


From 53bbaac0eb515febb74a7a8f97dd9483df9a8568 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 9 Oct 2021 22:36:14 +0300
Subject: Implement voice mute + migration from voice mute -> voice ban

---
 pydis_site/apps/api/migrations/0074_voice_mute.py | 36 +++++++++++++++++++++++
 pydis_site/apps/api/models/bot/infraction.py      |  3 +-
 pydis_site/apps/api/serializers.py                |  2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 pydis_site/apps/api/migrations/0074_voice_mute.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0074_voice_mute.py b/pydis_site/apps/api/migrations/0074_voice_mute.py
new file mode 100644
index 00000000..937557bc
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0074_voice_mute.py
@@ -0,0 +1,36 @@
+# Generated by Django 3.0.14 on 2021-10-09 18:52
+from django.apps.registry import Apps
+from django.db import migrations, models
+from django.db.backends.base.schema import BaseDatabaseSchemaEditor
+
+
+def migrate_infractions(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:
+    Infraction = apps.get_model("api", "Infraction")
+
+    for infraction in Infraction.objects.filter(type="voice_ban"):
+        infraction.type = "voice_mute"
+        infraction.save()
+
+
+def unmigrate_infractions(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:
+    Infraction = apps.get_model("api", "Infraction")
+
+    for infraction in Infraction.objects.filter(type="voice_mute"):
+        infraction.type = "voice_ban"
+        infraction.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0073_otn_allow_GT_and_LT'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='infraction',
+            name='type',
+            field=models.CharField(choices=[('note', 'Note'), ('warning', 'Warning'), ('watch', 'Watch'), ('mute', 'Mute'), ('kick', 'Kick'), ('ban', 'Ban'), ('superstar', 'Superstar'), ('voice_ban', 'Voice Ban'), ('voice_mute', 'Voice Mute')], help_text='The type of the infraction.', max_length=10),
+        ),
+        migrations.RunPython(migrate_infractions, unmigrate_infractions)
+    ]
diff --git a/pydis_site/apps/api/models/bot/infraction.py b/pydis_site/apps/api/models/bot/infraction.py
index 60c1e8dd..63745490 100644
--- a/pydis_site/apps/api/models/bot/infraction.py
+++ b/pydis_site/apps/api/models/bot/infraction.py
@@ -17,6 +17,7 @@ class Infraction(ModelReprMixin, models.Model):
         ("ban", "Ban"),
         ("superstar", "Superstar"),
         ("voice_ban", "Voice Ban"),
+        ("voice_mute", "Voice Mute"),
     )
     inserted_at = models.DateTimeField(
         default=timezone.now,
@@ -45,7 +46,7 @@ class Infraction(ModelReprMixin, models.Model):
         help_text="The user which applied the infraction."
     )
     type = models.CharField(
-        max_length=9,
+        max_length=10,
         choices=TYPE_CHOICES,
         help_text="The type of the infraction."
     )
diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index f47bedca..8484e561 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -168,7 +168,7 @@ class InfractionSerializer(ModelSerializer):
             raise ValidationError({'expires_at': [f'{infr_type} infractions cannot expire.']})
 
         hidden = attrs.get('hidden')
-        if hidden and infr_type in ('superstar', 'warning', 'voice_ban'):
+        if hidden and infr_type in ('superstar', 'warning', 'voice_ban', 'voice_mute'):
             raise ValidationError({'hidden': [f'{infr_type} infractions cannot be hidden.']})
 
         if not hidden and infr_type in ('note', ):
-- 
cgit v1.2.3


From 2b95db672e649d9fc1159b3e2211dcb72560d8f6 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Fri, 5 Nov 2021 10:49:30 +0530
Subject: Fix: Conflicting migrations.

---
 pydis_site/apps/api/migrations/0074_merge_20211105_0518.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pydis_site/apps/api/migrations/0074_merge_20211105_0518.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0074_merge_20211105_0518.py b/pydis_site/apps/api/migrations/0074_merge_20211105_0518.py
new file mode 100644
index 00000000..ebf5ae15
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0074_merge_20211105_0518.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.14 on 2021-11-05 05:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0072_merge_20210724_1354'),
+        ('api', '0073_otn_allow_GT_and_LT'),
+    ]
+
+    operations = [
+    ]
-- 
cgit v1.2.3


From 876daaf6eb34e620710473c0311e23f36fd4e7eb Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Fri, 5 Nov 2021 10:55:09 +0530
Subject: Update test cases to adhere to recent changes made that removed
 hosts.

---
 pydis_site/apps/api/tests/test_off_topic_channel_names.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_off_topic_channel_names.py b/pydis_site/apps/api/tests/test_off_topic_channel_names.py
index 354cda9c..2d273756 100644
--- a/pydis_site/apps/api/tests/test_off_topic_channel_names.py
+++ b/pydis_site/apps/api/tests/test_off_topic_channel_names.py
@@ -112,7 +112,7 @@ class ListTests(AuthenticatedAPITestCase):
 
     def test_returns_inactive_ot_names(self):
         """Return inactive off topic names."""
-        url = reverse('bot:offtopicchannelname-list')
+        url = reverse('api:bot:offtopicchannelname-list')
         response = self.client.get(f"{url}?active=false")
 
         self.assertEqual(response.status_code, 200)
@@ -123,7 +123,7 @@ class ListTests(AuthenticatedAPITestCase):
 
     def test_returns_active_ot_names(self):
         """Return active off topic names."""
-        url = reverse('bot:offtopicchannelname-list')
+        url = reverse('api:bot:offtopicchannelname-list')
         response = self.client.get(f"{url}?active=true")
 
         self.assertEqual(response.status_code, 200)
-- 
cgit v1.2.3


From 41ec1fd7e3d5bd7b0c16a32b5977d46ce5b3e89e Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Fri, 5 Nov 2021 10:56:01 +0530
Subject: Eliminate usage of typing module and update docstrings.

---
 pydis_site/apps/api/serializers.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index 957c85f3..9b351be2 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -1,6 +1,4 @@
 """Converters from Django models to data interchange formats and back."""
-from typing import List
-
 from django.db.models.query import QuerySet
 from django.db.utils import IntegrityError
 from rest_framework.exceptions import NotFound
@@ -205,12 +203,12 @@ class ExpandedInfractionSerializer(InfractionSerializer):
 class OffTopicChannelNameListSerializer(ListSerializer):
     """Custom ListSerializer to override to_representation() when list views are triggered."""
 
-    def to_representation(self, objects: List[OffTopicChannelName]) -> List[str]:
+    def to_representation(self, objects: list[OffTopicChannelName]) -> list[str]:
         """
-        Return a list representing a list of `OffTopicChannelName`.
+        Return a list with all `OffTopicChannelName`s in the database.
 
-        This only returns the name of the off topic channel name. As the model
-        only has a single attribute, it is unnecessary to create a nested dictionary.
+        This returns the list of off topic channel names. We want to only return
+        the name attribute, hence it is unnecessary to create a nested dictionary.
         Additionally, this allows off topic channel name routes to simply return an
         array of names instead of objects, saving on bandwidth.
         """
-- 
cgit v1.2.3


From 6e1d38d6ceb97f287f0d347e974bc795dda38ffe Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Fri, 5 Nov 2021 10:56:34 +0530
Subject: Use framework defination of  method.

---
 pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
index 7151d29b..27eabec9 100644
--- a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
+++ b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
@@ -70,7 +70,7 @@ class OffTopicChannelNameViewSet(ModelViewSet):
 
     def get_queryset(self, **kwargs) -> QuerySet:
         """Returns a queryset that covers the entire OffTopicChannelName table."""
-        return OffTopicChannelName.objects.filter(**kwargs)
+        return OffTopicChannelName.objects.all()
 
     def create(self, request: Request, *args, **kwargs) -> Response:
         """
@@ -137,6 +137,6 @@ class OffTopicChannelNameViewSet(ModelViewSet):
         if active_param := request.query_params.get("active"):
             params["active"] = active_param.lower() == "true"
 
-        queryset = self.get_queryset(**params)
+        queryset = self.get_queryset().filter(**params)
         serialized = self.serializer_class(queryset, many=True)
         return Response(serialized.data)
-- 
cgit v1.2.3


From 4377c6d960e3fbf3a416230d1ad7de972019898e Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Sat, 6 Nov 2021 14:43:17 +0530
Subject: Remove get_queryset() and add new class variable .

---
 pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
index 27eabec9..78f8c340 100644
--- a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
+++ b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
@@ -57,6 +57,7 @@ class OffTopicChannelNameViewSet(ModelViewSet):
 
     lookup_field = 'name'
     serializer_class = OffTopicChannelNameSerializer
+    queryset = OffTopicChannelName.objects.all()
 
     def get_object(self) -> OffTopicChannelName:
         """
@@ -64,11 +65,10 @@ class OffTopicChannelNameViewSet(ModelViewSet):
 
         If it doesn't, a HTTP 404 is returned by way of throwing an exception.
         """
-        queryset = self.get_queryset()
         name = self.kwargs[self.lookup_field]
-        return get_object_or_404(queryset, name=name)
+        return get_object_or_404(self.queryset, name=name)
 
-    def get_queryset(self, **kwargs) -> QuerySet:
+    def get_queryset(self) -> QuerySet:
         """Returns a queryset that covers the entire OffTopicChannelName table."""
         return OffTopicChannelName.objects.all()
 
@@ -108,13 +108,13 @@ class OffTopicChannelNameViewSet(ModelViewSet):
                     'random_items': ["Must be a positive integer."]
                 })
 
-            queryset = self.get_queryset().order_by('used', '?')[:random_count]
+            queryset = self.queryset.order_by('used', '?')[:random_count]
 
             # When any name is used in our listing then this means we reached end of round
             # and we need to reset all other names `used` to False
             if any(offtopic_name.used for offtopic_name in queryset):
                 # These names that we just got have to be excluded from updating used to False
-                self.get_queryset().update(
+                self.queryset.update(
                     used=Case(
                         When(
                             name__in=(offtopic_name.name for offtopic_name in queryset),
@@ -125,7 +125,7 @@ class OffTopicChannelNameViewSet(ModelViewSet):
                 )
             else:
                 # Otherwise mark selected names `used` to True
-                self.get_queryset().filter(
+                self.queryset.filter(
                     name__in=(offtopic_name.name for offtopic_name in queryset)
                 ).update(used=True)
 
@@ -137,6 +137,6 @@ class OffTopicChannelNameViewSet(ModelViewSet):
         if active_param := request.query_params.get("active"):
             params["active"] = active_param.lower() == "true"
 
-        queryset = self.get_queryset().filter(**params)
+        queryset = self.queryset.filter(**params)
         serialized = self.serializer_class(queryset, many=True)
         return Response(serialized.data)
-- 
cgit v1.2.3


From 7353e1ed7003a1198fb00a1e40251b95cf2fdf7e Mon Sep 17 00:00:00 2001
From: Hassan Abouelela <hassan@hassanamr.com>
Date: Wed, 17 Nov 2021 14:27:45 +0400
Subject: Adds Redirect Filter List

Adds a new filter list for URLs which should be treated as
redirects and unfurled.

Signed-off-by: Hassan Abouelela <hassan@hassanamr.com>
---
 .../apps/api/migrations/0075_add_redirects_filter.py   | 18 ++++++++++++++++++
 pydis_site/apps/api/models/bot/filter_list.py          |  1 +
 pydis_site/apps/api/viewsets/bot/filter_list.py        |  3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 pydis_site/apps/api/migrations/0075_add_redirects_filter.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0075_add_redirects_filter.py b/pydis_site/apps/api/migrations/0075_add_redirects_filter.py
new file mode 100644
index 00000000..23dc176f
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0075_add_redirects_filter.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.14 on 2021-11-17 10:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0074_reminder_failures'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='filterlist',
+            name='type',
+            field=models.CharField(choices=[('GUILD_INVITE', 'Guild Invite'), ('FILE_FORMAT', 'File Format'), ('DOMAIN_NAME', 'Domain Name'), ('FILTER_TOKEN', 'Filter Token'), ('REDIRECT', 'Redirect')], help_text='The type of allowlist this is on.', max_length=50),
+        ),
+    ]
diff --git a/pydis_site/apps/api/models/bot/filter_list.py b/pydis_site/apps/api/models/bot/filter_list.py
index d279e137..d30f7213 100644
--- a/pydis_site/apps/api/models/bot/filter_list.py
+++ b/pydis_site/apps/api/models/bot/filter_list.py
@@ -12,6 +12,7 @@ class FilterList(ModelTimestampMixin, ModelReprMixin, models.Model):
         'FILE_FORMAT '
         'DOMAIN_NAME '
         'FILTER_TOKEN '
+        'REDIRECT '
     )
     type = models.CharField(
         max_length=50,
diff --git a/pydis_site/apps/api/viewsets/bot/filter_list.py b/pydis_site/apps/api/viewsets/bot/filter_list.py
index 2cb21ab9..4b05acee 100644
--- a/pydis_site/apps/api/viewsets/bot/filter_list.py
+++ b/pydis_site/apps/api/viewsets/bot/filter_list.py
@@ -59,7 +59,8 @@ class FilterListViewSet(ModelViewSet):
     ...     ["GUILD_INVITE","Guild Invite"],
     ...     ["FILE_FORMAT","File Format"],
     ...     ["DOMAIN_NAME","Domain Name"],
-    ...     ["FILTER_TOKEN","Filter Token"]
+    ...     ["FILTER_TOKEN","Filter Token"],
+    ...     ["REDIRECT", "Redirect"]
     ... ]
 
     #### Status codes
-- 
cgit v1.2.3


From 855bf5e7c7e54e9f8e4544545026c47092b52a11 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Mon, 22 Nov 2021 20:36:21 +0000
Subject: Only calc activity blocks when <1k messages

We only truly care about how many activity blocks a user has when they have a small number of messages, as we only use this for the voice gate.

If a user has more than say 1k messages, then we really don't need to calculate their activity blocks, as it's quite an expensive query with many messages.
---
 pydis_site/apps/api/viewsets/bot/user.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/viewsets/bot/user.py b/pydis_site/apps/api/viewsets/bot/user.py
index 22d13dc4..ed661323 100644
--- a/pydis_site/apps/api/viewsets/bot/user.py
+++ b/pydis_site/apps/api/viewsets/bot/user.py
@@ -271,9 +271,15 @@ class UserViewSet(ModelViewSet):
         with Metricity() as metricity:
             try:
                 data = metricity.user(user.id)
+
                 data["total_messages"] = metricity.total_messages(user.id)
+                if data["total_messages"] < 1000:
+                    # Only calculate and return activity_blocks if the user has a small amount
+                    # of messages, as calculating activity_blocks is expensive.
+                    # 1000 message chosen as an arbitrarily large number.
+                    data["activity_blocks"] = metricity.total_message_blocks(user.id)
+
                 data["voice_banned"] = voice_banned
-                data["activity_blocks"] = metricity.total_message_blocks(user.id)
                 return Response(data, status=status.HTTP_200_OK)
             except NotFoundError:
                 return Response(dict(detail="User not found in metricity"),
-- 
cgit v1.2.3


From c8d1513b8f8cb21482180ce19d69a107adefe4e2 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Mon, 22 Nov 2021 20:38:41 +0000
Subject: Make metricity test order insensitive

We only actually care that thee key:value pairs are equal, the order of them isn't actually important.

The naming of `assertCountEqual` is a little misleading, since it actually tests that the first sequence contains the same elements as second, regardless of their order. See https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertCountEqual
---
 pydis_site/apps/api/tests/test_users.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py
index 295bcf64..550c7240 100644
--- a/pydis_site/apps/api/tests/test_users.py
+++ b/pydis_site/apps/api/tests/test_users.py
@@ -408,7 +408,7 @@ class UserMetricityTests(AuthenticatedAPITestCase):
             in_guild=True,
         )
 
-    def test_get_metricity_data(self):
+    def test_get_metricity_data_under_1k(self):
         # Given
         joined_at = "foo"
         total_messages = 1
@@ -421,7 +421,7 @@ class UserMetricityTests(AuthenticatedAPITestCase):
 
         # Then
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), {
+        self.assertCountEqual(response.json(), {
             "joined_at": joined_at,
             "total_messages": total_messages,
             "voice_banned": False,
-- 
cgit v1.2.3


From 78b2f3b8ed46d23015ab2f765504572f672f4567 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Mon, 22 Nov 2021 20:38:58 +0000
Subject: Add metricity test for users >1k messages

---
 pydis_site/apps/api/tests/test_users.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py
index 550c7240..81bfd43b 100644
--- a/pydis_site/apps/api/tests/test_users.py
+++ b/pydis_site/apps/api/tests/test_users.py
@@ -428,6 +428,25 @@ class UserMetricityTests(AuthenticatedAPITestCase):
             "activity_blocks": total_blocks
         })
 
+    def test_get_metricity_data_over_1k(self):
+        # Given
+        joined_at = "foo"
+        total_messages = 1001
+        total_blocks = 1001
+        self.mock_metricity_user(joined_at, total_messages, total_blocks, [])
+
+        # When
+        url = reverse('api:bot:user-metricity-data', args=[0])
+        response = self.client.get(url)
+
+        # Then
+        self.assertEqual(response.status_code, 200)
+        self.assertCountEqual(response.json(), {
+            "joined_at": joined_at,
+            "total_messages": total_messages,
+            "voice_banned": False,
+        })
+
     def test_no_metricity_user(self):
         # Given
         self.mock_no_metricity_user()
-- 
cgit v1.2.3


From 5b1bb82165d188a571c8999f17ef52f3856c9518 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Tue, 23 Nov 2021 16:29:06 +0000
Subject: Alter message query to leverage index

Previously this query would convert each row to an array just to check if it matched or not. By changing EXCLUDE_CHANNELS to a tuple instead of a list, it doesn't get passed as an array, so we can do a simple NOT IN check.

This will also allow us to add an index with this condition to speed it up further.
---
 pydis_site/apps/api/models/bot/metricity.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/models/bot/metricity.py b/pydis_site/apps/api/models/bot/metricity.py
index 33fb7ad7..901f191a 100644
--- a/pydis_site/apps/api/models/bot/metricity.py
+++ b/pydis_site/apps/api/models/bot/metricity.py
@@ -4,10 +4,10 @@ from django.db import connections
 
 BLOCK_INTERVAL = 10 * 60  # 10 minute blocks
 
-EXCLUDE_CHANNELS = [
+EXCLUDE_CHANNELS = (
     "267659945086812160",  # Bot commands
     "607247579608121354"  # SeasonalBot commands
-]
+)
 
 
 class NotFoundError(Exception):
@@ -46,12 +46,12 @@ class Metricity:
         self.cursor.execute(
             """
             SELECT
-              COUNT(*)
+                COUNT(*)
             FROM messages
             WHERE
-              author_id = '%s'
-              AND NOT is_deleted
-              AND NOT %s::varchar[] @> ARRAY[channel_id]
+                author_id = '%s'
+                AND NOT is_deleted
+                AND channel_id NOT IN %s
             """,
             [user_id, EXCLUDE_CHANNELS]
         )
@@ -79,7 +79,7 @@ class Metricity:
                 WHERE
                     author_id='%s'
                     AND NOT is_deleted
-                    AND NOT %s::varchar[] @> ARRAY[channel_id]
+                    AND channel_id NOT IN %s
                 GROUP BY interval
             ) block_query;
             """,
-- 
cgit v1.2.3


From 61f9daed8d71046351e60c57ccdbf34443085561 Mon Sep 17 00:00:00 2001
From: Izan <tizzysaurus@gmail.com>
Date: Wed, 10 Nov 2021 22:44:20 +0000
Subject: Add `dm_sent` field to infractions model & serializer

---
 .../apps/api/migrations/0075_infraction_dm_sent.py     | 18 ++++++++++++++++++
 pydis_site/apps/api/models/bot/infraction.py           |  4 ++++
 pydis_site/apps/api/serializers.py                     |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pydis_site/apps/api/migrations/0075_infraction_dm_sent.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0075_infraction_dm_sent.py b/pydis_site/apps/api/migrations/0075_infraction_dm_sent.py
new file mode 100644
index 00000000..c0ac709d
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0075_infraction_dm_sent.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.14 on 2021-11-10 22:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0074_reminder_failures'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='infraction',
+            name='dm_sent',
+            field=models.BooleanField(help_text='Whether a DM was sent to the user when infraction was applied.', null=True),
+        ),
+    ]
diff --git a/pydis_site/apps/api/models/bot/infraction.py b/pydis_site/apps/api/models/bot/infraction.py
index 60c1e8dd..913631d4 100644
--- a/pydis_site/apps/api/models/bot/infraction.py
+++ b/pydis_site/apps/api/models/bot/infraction.py
@@ -57,6 +57,10 @@ class Infraction(ModelReprMixin, models.Model):
         default=False,
         help_text="Whether the infraction is a shadow infraction."
     )
+    dm_sent = models.BooleanField(
+        null=True,
+        help_text="Whether a DM was sent to the user when infraction was applied."
+    )
 
     def __str__(self):
         """Returns some info on the current infraction, for display purposes."""
diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index 3e213d43..f6801597 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -145,7 +145,7 @@ class InfractionSerializer(ModelSerializer):
 
         model = Infraction
         fields = (
-            'id', 'inserted_at', 'expires_at', 'active', 'user', 'actor', 'type', 'reason', 'hidden'
+            'id', 'inserted_at', 'expires_at', 'active', 'user', 'actor', 'type', 'reason', 'hidden', 'dm_sent'
         )
         validators = [
             UniqueTogetherValidator(
-- 
cgit v1.2.3


From 1e3725d8f6ef1a601c12054db3d913e447b51866 Mon Sep 17 00:00:00 2001
From: Izan <tizzysaurus@gmail.com>
Date: Fri, 12 Nov 2021 14:31:52 +0000
Subject: Update documentation to include `dm_sent` field

---
 pydis_site/apps/api/viewsets/bot/infraction.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/viewsets/bot/infraction.py b/pydis_site/apps/api/viewsets/bot/infraction.py
index f8b0cb9d..8a48ed1f 100644
--- a/pydis_site/apps/api/viewsets/bot/infraction.py
+++ b/pydis_site/apps/api/viewsets/bot/infraction.py
@@ -70,7 +70,8 @@ class InfractionViewSet(
     ...         'actor': 125435062127820800,
     ...         'type': 'ban',
     ...         'reason': 'He terk my jerb!',
-    ...         'hidden': True
+    ...         'hidden': True,
+    ...         'dm_sent': True
     ...     }
     ... ]
 
@@ -100,7 +101,8 @@ class InfractionViewSet(
     ...     'hidden': True,
     ...     'type': 'ban',
     ...     'reason': 'He terk my jerb!',
-    ...     'user': 172395097705414656
+    ...     'user': 172395097705414656,
+    ...     'dm_sent': False
     ... }
 
     #### Response format
@@ -118,7 +120,8 @@ class InfractionViewSet(
     >>> {
     ...     'active': True,
     ...     'expires_at': '4143-02-15T21:04:31+00:00',
-    ...     'reason': 'durka derr'
+    ...     'reason': 'durka derr',
+    ...     'dm_sent': True
     ... }
 
     #### Response format
-- 
cgit v1.2.3


From 546a2d18bb52a0b4f1fc31de765119623a97f7fa Mon Sep 17 00:00:00 2001
From: Izan <tizzysaurus@gmail.com>
Date: Thu, 25 Nov 2021 10:44:06 +0000
Subject: Fix linting

---
 pydis_site/apps/api/serializers.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index f6801597..de2fccff 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -145,7 +145,16 @@ class InfractionSerializer(ModelSerializer):
 
         model = Infraction
         fields = (
-            'id', 'inserted_at', 'expires_at', 'active', 'user', 'actor', 'type', 'reason', 'hidden', 'dm_sent'
+            'id',
+            'inserted_at',
+            'expires_at',
+            'active',
+            'user',
+            'actor',
+            'type',
+            'reason',
+            'hidden',
+            'dm_sent'
         )
         validators = [
             UniqueTogetherValidator(
-- 
cgit v1.2.3


From 454ad492229253ae675f4ba956c74edf32f41c2a Mon Sep 17 00:00:00 2001
From: Johannes Christ <jc@jchri.st>
Date: Thu, 25 Nov 2021 20:41:16 +0100
Subject: Merge migrations with upstream

---
 pydis_site/apps/api/migrations/0076_merge_20211125_1941.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pydis_site/apps/api/migrations/0076_merge_20211125_1941.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0076_merge_20211125_1941.py b/pydis_site/apps/api/migrations/0076_merge_20211125_1941.py
new file mode 100644
index 00000000..097d0a0c
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0076_merge_20211125_1941.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.14 on 2021-11-25 19:41
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0075_infraction_dm_sent'),
+        ('api', '0075_add_redirects_filter'),
+    ]
+
+    operations = [
+    ]
-- 
cgit v1.2.3


From f093907393b4f479f62409286831b938ba65c558 Mon Sep 17 00:00:00 2001
From: D0rs4n <41237606+D0rs4n@users.noreply.github.com>
Date: Tue, 31 Aug 2021 16:27:18 +0200
Subject: Create a signal to unassign roles from user when deleted

Add a signal to the api app that automatically unassigns
deleted roles from users that have them
---
 pydis_site/apps/api/__init__.py |  1 +
 pydis_site/apps/api/apps.py     | 10 +++++++++-
 pydis_site/apps/api/signals.py  | 12 ++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pydis_site/apps/api/signals.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/__init__.py b/pydis_site/apps/api/__init__.py
index e69de29b..afa5b4d5 100644
--- a/pydis_site/apps/api/__init__.py
+++ b/pydis_site/apps/api/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'pydis_site.apps.api.apps.ApiConfig'
diff --git a/pydis_site/apps/api/apps.py b/pydis_site/apps/api/apps.py
index 76810b2e..18eda9e3 100644
--- a/pydis_site/apps/api/apps.py
+++ b/pydis_site/apps/api/apps.py
@@ -4,4 +4,12 @@ from django.apps import AppConfig
 class ApiConfig(AppConfig):
     """Django AppConfig for the API app."""
 
-    name = 'api'
+    name = 'pydis_site.apps.api'
+
+    def ready(self) -> None:
+        """
+        Gets called as soon as the registry is fully populated.
+
+        https://docs.djangoproject.com/en/3.2/ref/applications/#django.apps.AppConfig.ready
+        """
+        import pydis_site.apps.api.signals  # noqa: F401
diff --git a/pydis_site/apps/api/signals.py b/pydis_site/apps/api/signals.py
new file mode 100644
index 00000000..c69704b1
--- /dev/null
+++ b/pydis_site/apps/api/signals.py
@@ -0,0 +1,12 @@
+from django.db.models.signals import pre_delete
+from django.dispatch import receiver
+
+from pydis_site.apps.api.models.bot import Role, User
+
+
+@receiver(signal=pre_delete, sender=Role)
+def delete_role_from_user(sender: Role, instance: Role, **kwargs) -> None:
+    """Unassigns the Role (instance) that is being deleted from every user that has it."""
+    for user in User.objects.filter(roles__contains=[instance.id]):
+        del user.roles[user.roles.index(instance.id)]
+        user.save()
-- 
cgit v1.2.3


From 0f24bdcd0ba261da045ac73e8567239eb63c6fc6 Mon Sep 17 00:00:00 2001
From: D0rs4n <41237606+D0rs4n@users.noreply.github.com>
Date: Tue, 31 Aug 2021 17:54:39 +0200
Subject: Add test to check role unassignment

Create a test that checks if a role gets deleted it will also get unassigned from the user
---
 pydis_site/apps/api/tests/test_roles.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_roles.py b/pydis_site/apps/api/tests/test_roles.py
index d39cea4d..7c968852 100644
--- a/pydis_site/apps/api/tests/test_roles.py
+++ b/pydis_site/apps/api/tests/test_roles.py
@@ -1,7 +1,8 @@
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import Role
+from ..models import Role, User
+
 
 
 class CreationTests(AuthenticatedAPITestCase):
@@ -35,6 +36,20 @@ class CreationTests(AuthenticatedAPITestCase):
             permissions=6,
             position=0,
         )
+        cls.role_to_delete = Role.objects.create(
+            id=7,
+            name="role to delete",
+            colour=7,
+            permissions=7,
+            position=0,
+        )
+        cls.role_unassigned_test_user = User.objects.create(
+            id=8,
+            name="role_unassigned_test_user",
+            discriminator="0000",
+            roles=[cls.role_to_delete.id],
+            in_guild=True
+        )
 
     def _validate_roledict(self, role_dict: dict) -> None:
         """Helper method to validate a dict representing a role."""
@@ -181,6 +196,11 @@ class CreationTests(AuthenticatedAPITestCase):
         response = self.client.delete(url)
         self.assertEqual(response.status_code, 204)
 
+    def test_role_delete_unassigned(self):
+        """Tests if the deleted Role gets unassigned from the user."""
+        self.role_to_delete.delete()
+        self.assertEqual(self.role_unassigned_test_user.roles, [])
+
     def test_role_detail_404_all_methods(self):
         """Tests detail view with non-existing ID."""
         url = reverse('api:bot:role-detail', args=(20190815,))
-- 
cgit v1.2.3


From 9d255dcf3daafde71071ad75b000077a861da659 Mon Sep 17 00:00:00 2001
From: D0rs4n <41237606+D0rs4n@users.noreply.github.com>
Date: Tue, 31 Aug 2021 18:49:21 +0200
Subject: Patch roles test to use fresh instance from the DB

---
 pydis_site/apps/api/tests/test_roles.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_roles.py b/pydis_site/apps/api/tests/test_roles.py
index 7c968852..88c0256b 100644
--- a/pydis_site/apps/api/tests/test_roles.py
+++ b/pydis_site/apps/api/tests/test_roles.py
@@ -199,6 +199,7 @@ class CreationTests(AuthenticatedAPITestCase):
     def test_role_delete_unassigned(self):
         """Tests if the deleted Role gets unassigned from the user."""
         self.role_to_delete.delete()
+        self.role_unassigned_test_user.refresh_from_db()
         self.assertEqual(self.role_unassigned_test_user.roles, [])
 
     def test_role_detail_404_all_methods(self):
-- 
cgit v1.2.3


From f34a52016bd5a7d50c1146d6fbd213ce889f58c7 Mon Sep 17 00:00:00 2001
From: D0rs4n <41237606+D0rs4n@users.noreply.github.com>
Date: Tue, 31 Aug 2021 19:21:36 +0200
Subject: Patch signals to use post_delete, instead of pre_delete

From now on the signal will only get executed after the Role has been deleted
The commit also introduces minor changes in the tests of roles
---
 pydis_site/apps/api/signals.py          | 4 ++--
 pydis_site/apps/api/tests/test_roles.py | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/signals.py b/pydis_site/apps/api/signals.py
index c69704b1..5c26bfb6 100644
--- a/pydis_site/apps/api/signals.py
+++ b/pydis_site/apps/api/signals.py
@@ -1,10 +1,10 @@
-from django.db.models.signals import pre_delete
+from django.db.models.signals import post_delete
 from django.dispatch import receiver
 
 from pydis_site.apps.api.models.bot import Role, User
 
 
-@receiver(signal=pre_delete, sender=Role)
+@receiver(signal=post_delete, sender=Role)
 def delete_role_from_user(sender: Role, instance: Role, **kwargs) -> None:
     """Unassigns the Role (instance) that is being deleted from every user that has it."""
     for user in User.objects.filter(roles__contains=[instance.id]):
diff --git a/pydis_site/apps/api/tests/test_roles.py b/pydis_site/apps/api/tests/test_roles.py
index 88c0256b..73c80c77 100644
--- a/pydis_site/apps/api/tests/test_roles.py
+++ b/pydis_site/apps/api/tests/test_roles.py
@@ -4,7 +4,6 @@ from .base import AuthenticatedAPITestCase
 from ..models import Role, User
 
 
-
 class CreationTests(AuthenticatedAPITestCase):
     @classmethod
     def setUpTestData(cls):
@@ -96,11 +95,11 @@ class CreationTests(AuthenticatedAPITestCase):
         url = reverse('api:bot:role-list')
 
         response = self.client.get(url)
-        self.assertContains(response, text="id", count=4, status_code=200)
+        self.assertContains(response, text="id", count=5, status_code=200)
 
         roles = response.json()
         self.assertIsInstance(roles, list)
-        self.assertEqual(len(roles), 4)
+        self.assertEqual(len(roles), 5)
 
         for role in roles:
             self._validate_roledict(role)
-- 
cgit v1.2.3


From 3f4adf3768123c870f9da38a23b189862a7b9502 Mon Sep 17 00:00:00 2001
From: Johannes Christ <jc@jchri.st>
Date: Sat, 27 Nov 2021 13:28:23 +0100
Subject: Migrate to generic `JSONField`

---
 .../api/migrations/0077_use_generic_jsonfield.py   | 25 ++++++++++++++++++++++
 pydis_site/apps/api/models/bot/bot_setting.py      |  3 +--
 pydis_site/apps/api/models/bot/message.py          |  2 +-
 pydis_site/apps/api/models/utils.py                |  3 +--
 4 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 pydis_site/apps/api/migrations/0077_use_generic_jsonfield.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0077_use_generic_jsonfield.py b/pydis_site/apps/api/migrations/0077_use_generic_jsonfield.py
new file mode 100644
index 00000000..9e8f2fb9
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0077_use_generic_jsonfield.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.1.13 on 2021-11-27 12:27
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+import pydis_site.apps.api.models.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0076_merge_20211125_1941'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='botsetting',
+            name='data',
+            field=models.JSONField(help_text='The actual settings of this setting.'),
+        ),
+        migrations.AlterField(
+            model_name='deletedmessage',
+            name='embeds',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.JSONField(validators=[pydis_site.apps.api.models.utils.validate_embed]), blank=True, help_text='Embeds attached to this message.', size=None),
+        ),
+    ]
diff --git a/pydis_site/apps/api/models/bot/bot_setting.py b/pydis_site/apps/api/models/bot/bot_setting.py
index 2a3944f8..1bcb1ae6 100644
--- a/pydis_site/apps/api/models/bot/bot_setting.py
+++ b/pydis_site/apps/api/models/bot/bot_setting.py
@@ -1,4 +1,3 @@
-from django.contrib.postgres import fields as pgfields
 from django.core.exceptions import ValidationError
 from django.db import models
 
@@ -24,6 +23,6 @@ class BotSetting(ModelReprMixin, models.Model):
         max_length=50,
         validators=(validate_bot_setting_name,)
     )
-    data = pgfields.JSONField(
+    data = models.JSONField(
         help_text="The actual settings of this setting."
     )
diff --git a/pydis_site/apps/api/models/bot/message.py b/pydis_site/apps/api/models/bot/message.py
index 60e2a553..bab3368d 100644
--- a/pydis_site/apps/api/models/bot/message.py
+++ b/pydis_site/apps/api/models/bot/message.py
@@ -48,7 +48,7 @@ class Message(ModelReprMixin, models.Model):
         blank=True
     )
     embeds = pgfields.ArrayField(
-        pgfields.JSONField(
+        models.JSONField(
             validators=(validate_embed,)
         ),
         blank=True,
diff --git a/pydis_site/apps/api/models/utils.py b/pydis_site/apps/api/models/utils.py
index 0e220a1d..859394d2 100644
--- a/pydis_site/apps/api/models/utils.py
+++ b/pydis_site/apps/api/models/utils.py
@@ -103,11 +103,10 @@ def validate_embed(embed: Any) -> None:
 
     Example:
 
-        >>> from django.contrib.postgres import fields as pgfields
         >>> from django.db import models
         >>> from pydis_site.apps.api.models.utils import validate_embed
         >>> class MyMessage(models.Model):
-        ...     embed = pgfields.JSONField(
+        ...     embed = models.JSONField(
         ...         validators=(
         ...             validate_embed,
         ...         )
-- 
cgit v1.2.3


From 953f232d47ff4e07baeaffa8add7912ff05d6457 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Sat, 11 Dec 2021 13:59:40 +0000
Subject: Use new approx message count view

We have added a new view to metricity that will keep track of an approximate message count, updating every 10 seconds.

By doing this, we avoid running a query against the whole message table every time we want to get a user's messages.
---
 pydis_site/apps/api/models/bot/metricity.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/models/bot/metricity.py b/pydis_site/apps/api/models/bot/metricity.py
index 901f191a..52e946ac 100644
--- a/pydis_site/apps/api/models/bot/metricity.py
+++ b/pydis_site/apps/api/models/bot/metricity.py
@@ -46,14 +46,12 @@ class Metricity:
         self.cursor.execute(
             """
             SELECT
-                COUNT(*)
-            FROM messages
+                message_count
+            FROM user_has_approx_message_count
             WHERE
                 author_id = '%s'
-                AND NOT is_deleted
-                AND channel_id NOT IN %s
             """,
-            [user_id, EXCLUDE_CHANNELS]
+            [user_id]
         )
         values = self.cursor.fetchone()
 
-- 
cgit v1.2.3


From 1261efd75c10bf2031a2019475d4b32c5859d807 Mon Sep 17 00:00:00 2001
From: RohanJnr <rohanjnr44@gmail.com>
Date: Mon, 13 Dec 2021 11:25:27 +0530
Subject: Merge migrations to avoid conflicts.

---
 pydis_site/apps/api/migrations/0078_merge_20211213_0552.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pydis_site/apps/api/migrations/0078_merge_20211213_0552.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0078_merge_20211213_0552.py b/pydis_site/apps/api/migrations/0078_merge_20211213_0552.py
new file mode 100644
index 00000000..5ce0e871
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0078_merge_20211213_0552.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.14 on 2021-12-13 05:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0077_use_generic_jsonfield'),
+        ('api', '0074_merge_20211105_0518'),
+    ]
+
+    operations = [
+    ]
-- 
cgit v1.2.3


From f65184b5e454437c3c524d1236041f170fff3ea4 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Tue, 14 Dec 2021 18:59:49 +0000
Subject: Query message count directly from messages

This was changed due to performance reasons, but after some tweaking in the database, such as increasing work memory and adding an index, this query runs much faster now.

To test this, I want to revert this change, so that we can stop the materialised view from refreshing, to see if the act of refreshing is what's causing this query to seem faster when runing against the database.
---
 pydis_site/apps/api/models/bot/metricity.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/models/bot/metricity.py b/pydis_site/apps/api/models/bot/metricity.py
index 52e946ac..901f191a 100644
--- a/pydis_site/apps/api/models/bot/metricity.py
+++ b/pydis_site/apps/api/models/bot/metricity.py
@@ -46,12 +46,14 @@ class Metricity:
         self.cursor.execute(
             """
             SELECT
-                message_count
-            FROM user_has_approx_message_count
+                COUNT(*)
+            FROM messages
             WHERE
                 author_id = '%s'
+                AND NOT is_deleted
+                AND channel_id NOT IN %s
             """,
-            [user_id]
+            [user_id, EXCLUDE_CHANNELS]
         )
         values = self.cursor.fetchone()
 
-- 
cgit v1.2.3


From 59e4a5c8316464e116630a329064decac4c2a075 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Thu, 16 Dec 2021 22:29:11 +0000
Subject: Always include metricity message blocks

Thanks to a recent database maintenance (https://pythondiscord.freshstatus.io/incident/139811) querying out metricity message data is far cheaper. So there is no longer a reason to only fetch blocks if the member has a low message count.
---
 pydis_site/apps/api/tests/test_users.py  | 21 +--------------------
 pydis_site/apps/api/viewsets/bot/user.py |  6 +-----
 2 files changed, 2 insertions(+), 25 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py
index 81bfd43b..9b91380b 100644
--- a/pydis_site/apps/api/tests/test_users.py
+++ b/pydis_site/apps/api/tests/test_users.py
@@ -408,7 +408,7 @@ class UserMetricityTests(AuthenticatedAPITestCase):
             in_guild=True,
         )
 
-    def test_get_metricity_data_under_1k(self):
+    def test_get_metricity_data(self):
         # Given
         joined_at = "foo"
         total_messages = 1
@@ -428,25 +428,6 @@ class UserMetricityTests(AuthenticatedAPITestCase):
             "activity_blocks": total_blocks
         })
 
-    def test_get_metricity_data_over_1k(self):
-        # Given
-        joined_at = "foo"
-        total_messages = 1001
-        total_blocks = 1001
-        self.mock_metricity_user(joined_at, total_messages, total_blocks, [])
-
-        # When
-        url = reverse('api:bot:user-metricity-data', args=[0])
-        response = self.client.get(url)
-
-        # Then
-        self.assertEqual(response.status_code, 200)
-        self.assertCountEqual(response.json(), {
-            "joined_at": joined_at,
-            "total_messages": total_messages,
-            "voice_banned": False,
-        })
-
     def test_no_metricity_user(self):
         # Given
         self.mock_no_metricity_user()
diff --git a/pydis_site/apps/api/viewsets/bot/user.py b/pydis_site/apps/api/viewsets/bot/user.py
index ed661323..1a5e79f8 100644
--- a/pydis_site/apps/api/viewsets/bot/user.py
+++ b/pydis_site/apps/api/viewsets/bot/user.py
@@ -273,11 +273,7 @@ class UserViewSet(ModelViewSet):
                 data = metricity.user(user.id)
 
                 data["total_messages"] = metricity.total_messages(user.id)
-                if data["total_messages"] < 1000:
-                    # Only calculate and return activity_blocks if the user has a small amount
-                    # of messages, as calculating activity_blocks is expensive.
-                    # 1000 message chosen as an arbitrarily large number.
-                    data["activity_blocks"] = metricity.total_message_blocks(user.id)
+                data["activity_blocks"] = metricity.total_message_blocks(user.id)
 
                 data["voice_banned"] = voice_banned
                 return Response(data, status=status.HTTP_200_OK)
-- 
cgit v1.2.3


From 6b0741c560ebe74e1003c5d19e2889d2d8fa8847 Mon Sep 17 00:00:00 2001
From: Boris Muratov <8bee278@gmail.com>
Date: Fri, 31 Dec 2021 00:16:42 +0200
Subject: Fix faulty regex filters in migration 59

Migration 59 populated the filters table with regex filters, some of which were faulty because the `\b` character wasn't escaped. This is fixed in this PR by making all patterns raw strings.
---
 .../api/migrations/0059_populate_filterlists.py    | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0059_populate_filterlists.py b/pydis_site/apps/api/migrations/0059_populate_filterlists.py
index 8c550191..273db3d1 100644
--- a/pydis_site/apps/api/migrations/0059_populate_filterlists.py
+++ b/pydis_site/apps/api/migrations/0059_populate_filterlists.py
@@ -60,35 +60,35 @@ domain_name_blacklist = [
 ]
 
 filter_token_blacklist = [
-    ("\bgoo+ks*\b", None, False),
-    ("\bky+s+\b", None, False),
-    ("\bki+ke+s*\b", None, False),
-    ("\bbeaner+s?\b", None, False),
-    ("\bcoo+ns*\b", None, False),
-    ("\bnig+lets*\b", None, False),
-    ("\bslant-eyes*\b", None, False),
-    ("\btowe?l-?head+s*\b", None, False),
-    ("\bchi*n+k+s*\b", None, False),
-    ("\bspick*s*\b", None, False),
-    ("\bkill* +(?:yo)?urself+\b", None, False),
-    ("\bjew+s*\b", None, False),
-    ("\bsuicide\b", None, False),
-    ("\brape\b", None, False),
-    ("\b(re+)tar+(d+|t+)(ed)?\b", None, False),
-    ("\bta+r+d+\b", None, False),
-    ("\bcunts*\b", None, False),
-    ("\btrann*y\b", None, False),
-    ("\bshemale\b", None, False),
-    ("fa+g+s*", None, False),
-    ("卐", None, False),
-    ("卍", None, False),
-    ("࿖", None, False),
-    ("࿕", None, False),
-    ("࿘", None, False),
-    ("࿗", None, False),
-    ("cuck(?!oo+)", None, False),
-    ("nigg+(?:e*r+|a+h*?|u+h+)s?", None, False),
-    ("fag+o+t+s*", None, False),
+    (r"\bgoo+ks*\b", None, False),
+    (r"\bky+s+\b", None, False),
+    (r"\bki+ke+s*\b", None, False),
+    (r"\bbeaner+s?\b", None, False),
+    (r"\bcoo+ns*\b", None, False),
+    (r"\bnig+lets*\b", None, False),
+    (r"\bslant-eyes*\b", None, False),
+    (r"\btowe?l-?head+s*\b", None, False),
+    (r"\bchi*n+k+s*\b", None, False),
+    (r"\bspick*s*\b", None, False),
+    (r"\bkill* +(?:yo)?urself+\b", None, False),
+    (r"\bjew+s*\b", None, False),
+    (r"\bsuicide\b", None, False),
+    (r"\brape\b", None, False),
+    (r"\b(re+)tar+(d+|t+)(ed)?\b", None, False),
+    (r"\bta+r+d+\b", None, False),
+    (r"\bcunts*\b", None, False),
+    (r"\btrann*y\b", None, False),
+    (r"\bshemale\b", None, False),
+    (r"fa+g+s*", None, False),
+    (r"卐", None, False),
+    (r"卍", None, False),
+    (r"࿖", None, False),
+    (r"࿕", None, False),
+    (r"࿘", None, False),
+    (r"࿗", None, False),
+    (r"cuck(?!oo+)", None, False),
+    (r"nigg+(?:e*r+|a+h*?|u+h+)s?", None, False),
+    (r"fag+o+t+s*", None, False),
 ]
 
 file_format_whitelist = [
-- 
cgit v1.2.3


From f390517fd1552e93320149032b63fbe3cff65055 Mon Sep 17 00:00:00 2001
From: Karlis Suvi <45097959+ks129@users.noreply.github.com>
Date: Tue, 25 Jan 2022 20:24:06 +0200
Subject: Try to add merge migration

---
 pydis_site/apps/api/migrations/0079_merge_20220125_2022.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pydis_site/apps/api/migrations/0079_merge_20220125_2022.py

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/migrations/0079_merge_20220125_2022.py b/pydis_site/apps/api/migrations/0079_merge_20220125_2022.py
new file mode 100644
index 00000000..9b9d9326
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0079_merge_20220125_2022.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.14 on 2022-01-25 20:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0078_merge_20211213_0552'),
+        ('api', '0074_voice_mute'),
+    ]
+
+    operations = [
+    ]
-- 
cgit v1.2.3


From 3e10b0cf19916f10be0aed9c8d60c9dfd7a016a5 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Thu, 27 Jan 2022 20:30:16 +0000
Subject: Use voice_mute and voice_ban to determine voice_gate

Previously only voice_ban was used, but now having either of these infractions should mean the user is blocked from reciving the role.
---
 pydis_site/apps/api/viewsets/bot/user.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/viewsets/bot/user.py b/pydis_site/apps/api/viewsets/bot/user.py
index 1a5e79f8..a867a80f 100644
--- a/pydis_site/apps/api/viewsets/bot/user.py
+++ b/pydis_site/apps/api/viewsets/bot/user.py
@@ -1,7 +1,7 @@
 import typing
 from collections import OrderedDict
 
-from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import Q
 from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.pagination import PageNumberPagination
@@ -261,12 +261,10 @@ class UserViewSet(ModelViewSet):
         """Request handler for metricity_data endpoint."""
         user = self.get_object()
 
-        try:
-            Infraction.objects.get(user__id=user.id, active=True, type="voice_ban")
-        except ObjectDoesNotExist:
-            voice_banned = False
-        else:
-            voice_banned = True
+        has_voice_infraction = Infraction.objects.filter(
+            Q(user__id=user.id, active=True),
+            Q(type="voice_ban") | Q(type="voice_mute")
+        ).exists()
 
         with Metricity() as metricity:
             try:
@@ -275,7 +273,7 @@ class UserViewSet(ModelViewSet):
                 data["total_messages"] = metricity.total_messages(user.id)
                 data["activity_blocks"] = metricity.total_message_blocks(user.id)
 
-                data["voice_banned"] = voice_banned
+                data["voice_gate_blocked"] = has_voice_infraction
                 return Response(data, status=status.HTTP_200_OK)
             except NotFoundError:
                 return Response(dict(detail="User not found in metricity"),
-- 
cgit v1.2.3


From 1b5e7eba8c00f357595b7dccb909a608c7df216f Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Thu, 27 Jan 2022 20:54:43 +0000
Subject: Update metricity tests to test new voice_gate_blocked behaviour

---
 pydis_site/apps/api/tests/test_users.py | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py
index 9b91380b..e21bb32b 100644
--- a/pydis_site/apps/api/tests/test_users.py
+++ b/pydis_site/apps/api/tests/test_users.py
@@ -1,10 +1,9 @@
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
-from django.core.exceptions import ObjectDoesNotExist
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import Role, User
+from ..models import Infraction, Role, User
 from ..models.bot.metricity import NotFoundError
 from ..viewsets.bot.user import UserListPagination
 
@@ -424,7 +423,7 @@ class UserMetricityTests(AuthenticatedAPITestCase):
         self.assertCountEqual(response.json(), {
             "joined_at": joined_at,
             "total_messages": total_messages,
-            "voice_banned": False,
+            "voice_gate_blocked": False,
             "activity_blocks": total_blocks
         })
 
@@ -451,23 +450,36 @@ class UserMetricityTests(AuthenticatedAPITestCase):
         self.assertEqual(response.status_code, 404)
 
     def test_metricity_voice_banned(self):
+        queryset_with_values = Mock(spec=Infraction.objects)
+        queryset_with_values.filter.return_value = queryset_with_values
+        queryset_with_values.exists.return_value = True
+
+        queryset_without_values = Mock(spec=Infraction.objects)
+        queryset_without_values.filter.return_value = queryset_without_values
+        queryset_without_values.exists.return_value = False
         cases = [
-            {'exception': None, 'voice_banned': True},
-            {'exception': ObjectDoesNotExist, 'voice_banned': False},
+            {'voice_infractions': queryset_with_values, 'voice_gate_blocked': True},
+            {'voice_infractions': queryset_without_values, 'voice_gate_blocked': False},
         ]
 
         self.mock_metricity_user("foo", 1, 1, [["bar", 1]])
 
         for case in cases:
-            with self.subTest(exception=case['exception'], voice_banned=case['voice_banned']):
-                with patch("pydis_site.apps.api.viewsets.bot.user.Infraction.objects.get") as p:
-                    p.side_effect = case['exception']
+            with self.subTest(
+                voice_infractions=case['voice_infractions'],
+                voice_gate_blocked=case['voice_gate_blocked']
+            ):
+                with patch("pydis_site.apps.api.viewsets.bot.user.Infraction.objects.filter") as p:
+                    p.return_value = case['voice_infractions']
 
                     url = reverse('api:bot:user-metricity-data', args=[0])
                     response = self.client.get(url)
 
                     self.assertEqual(response.status_code, 200)
-                    self.assertEqual(response.json()["voice_banned"], case["voice_banned"])
+                    self.assertEqual(
+                        response.json()["voice_gate_blocked"],
+                        case["voice_gate_blocked"]
+                    )
 
     def test_metricity_review_data(self):
         # Given
-- 
cgit v1.2.3


From 6c9fb075dc52d5674f90698cb74138712f7d99e1 Mon Sep 17 00:00:00 2001
From: Johannes Christ <jc@jchri.st>
Date: Sun, 30 Jan 2022 15:34:04 +0100
Subject: Allow searching users by username and discriminator

A test case is added to demonstrate this functionality.

Closes #578.

Co-authored-by: Boris Muratov <8bee278@gmail.com>
---
 pydis_site/apps/api/tests/test_users.py  | 43 ++++++++++++++++++++++++++++++++
 pydis_site/apps/api/viewsets/bot/user.py |  5 ++++
 2 files changed, 48 insertions(+)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py
index e21bb32b..5d10069d 100644
--- a/pydis_site/apps/api/tests/test_users.py
+++ b/pydis_site/apps/api/tests/test_users.py
@@ -1,3 +1,4 @@
+import random
 from unittest.mock import Mock, patch
 
 from django.urls import reverse
@@ -520,3 +521,45 @@ class UserMetricityTests(AuthenticatedAPITestCase):
         self.metricity.total_messages.side_effect = NotFoundError()
         self.metricity.total_message_blocks.side_effect = NotFoundError()
         self.metricity.top_channel_activity.side_effect = NotFoundError()
+
+
+class UserViewSetTests(AuthenticatedAPITestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.searched_user = User.objects.create(
+            id=12095219,
+            name=f"Test user {random.randint(100, 1000)}",
+            discriminator=random.randint(1, 9999),
+            in_guild=True,
+        )
+        cls.other_user = User.objects.create(
+            id=18259125,
+            name=f"Test user {random.randint(100, 1000)}",
+            discriminator=random.randint(1, 9999),
+            in_guild=True,
+        )
+
+    def test_search_lookup_of_wanted_user(self) -> None:
+        """Searching a user by name and discriminator should return that user."""
+        url = reverse('api:bot:user-list')
+        params = {
+            'username': self.searched_user.name,
+            'discriminator': self.searched_user.discriminator,
+        }
+        response = self.client.get(url, params)
+        result = response.json()
+        self.assertEqual(result['count'], 1)
+        [user] = result['results']
+        self.assertEqual(user['id'], self.searched_user.id)
+
+    def test_search_lookup_of_unknown_user(self) -> None:
+        """Searching an unknown user should return no results."""
+        url = reverse('api:bot:user-list')
+        params = {
+            'username': "f-string enjoyer",
+            'discriminator': 1245,
+        }
+        response = self.client.get(url, params)
+        result = response.json()
+        self.assertEqual(result['count'], 0)
+        self.assertEqual(result['results'], [])
diff --git a/pydis_site/apps/api/viewsets/bot/user.py b/pydis_site/apps/api/viewsets/bot/user.py
index a867a80f..3318b2b9 100644
--- a/pydis_site/apps/api/viewsets/bot/user.py
+++ b/pydis_site/apps/api/viewsets/bot/user.py
@@ -2,6 +2,7 @@ import typing
 from collections import OrderedDict
 
 from django.db.models import Q
+from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.pagination import PageNumberPagination
@@ -77,6 +78,8 @@ class UserViewSet(ModelViewSet):
     ... }
 
     #### Optional Query Parameters
+    - username: username to search for
+    - discriminator: discriminator to search for
     - page_size: number of Users in one page, defaults to 10,000
     - page: page number
 
@@ -233,6 +236,8 @@ class UserViewSet(ModelViewSet):
     serializer_class = UserSerializer
     queryset = User.objects.all().order_by("id")
     pagination_class = UserListPagination
+    filter_backends = (DjangoFilterBackend,)
+    filter_fields = ('name', 'discriminator')
 
     def get_serializer(self, *args, **kwargs) -> ModelSerializer:
         """Set Serializer many attribute to True if request body contains a list."""
-- 
cgit v1.2.3


From 15cac33dd74219a762d3c066efca383552f666b0 Mon Sep 17 00:00:00 2001
From: Rohan Reddy Alleti <rohanjnr44@gmail.com>
Date: Thu, 17 Feb 2022 02:55:28 +0530
Subject: Return random off topic names which are Active only (#644)

Co-authored-by: Xithrius <15021300+Xithrius@users.noreply.github.com>
---
 .../apps/api/tests/test_off_topic_channel_names.py | 35 +++++++++++++++++-----
 .../api/viewsets/bot/off_topic_channel_name.py     |  3 +-
 2 files changed, 29 insertions(+), 9 deletions(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/tests/test_off_topic_channel_names.py b/pydis_site/apps/api/tests/test_off_topic_channel_names.py
index 2d273756..34098c92 100644
--- a/pydis_site/apps/api/tests/test_off_topic_channel_names.py
+++ b/pydis_site/apps/api/tests/test_off_topic_channel_names.py
@@ -74,6 +74,9 @@ class ListTests(AuthenticatedAPITestCase):
         cls.test_name_3 = OffTopicChannelName.objects.create(
             name="frozen-with-iceman", used=True, active=False
         )
+        cls.test_name_4 = OffTopicChannelName.objects.create(
+            name="xith-is-cool", used=True, active=True
+        )
 
     def test_returns_name_in_list(self):
         """Return all off-topic channel names."""
@@ -86,28 +89,46 @@ class ListTests(AuthenticatedAPITestCase):
             {
                 self.test_name.name,
                 self.test_name_2.name,
-                self.test_name_3.name
+                self.test_name_3.name,
+                self.test_name_4.name
             }
         )
 
-    def test_returns_two_items_with_random_items_param_set_to_2(self):
-        """Return not-used name instead used."""
+    def test_returns_two_active_items_with_random_items_param_set_to_2(self):
+        """Return not-used active names instead used."""
         url = reverse('api:bot:offtopicchannelname-list')
         response = self.client.get(f'{url}?random_items=2')
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.json()), 2)
-        self.assertEqual(set(response.json()), {self.test_name.name, self.test_name_2.name})
+        self.assertTrue(
+            all(
+                item in (self.test_name.name, self.test_name_2.name, self.test_name_4.name)
+                for item in response.json()
+            )
+        )
+
+    def test_returns_three_active_items_with_random_items_param_set_to_3(self):
+        """Return not-used active names instead used."""
+        url = reverse('api:bot:offtopicchannelname-list')
+        response = self.client.get(f'{url}?random_items=3')
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.json()), 3)
+        self.assertEqual(
+            set(response.json()),
+            {self.test_name.name, self.test_name_2.name, self.test_name_4.name}
+        )
 
     def test_running_out_of_names_with_random_parameter(self):
-        """Reset names `used` parameter to `False` when running out of names."""
+        """Reset names `used` parameter to `False` when running out of active names."""
         url = reverse('api:bot:offtopicchannelname-list')
         response = self.client.get(f'{url}?random_items=3')
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(
             set(response.json()),
-            {self.test_name.name, self.test_name_2.name, self.test_name_3.name}
+            {self.test_name.name, self.test_name_2.name, self.test_name_4.name}
         )
 
     def test_returns_inactive_ot_names(self):
@@ -129,7 +150,7 @@ class ListTests(AuthenticatedAPITestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(
             set(response.json()),
-            {self.test_name.name, self.test_name_2.name}
+            {self.test_name.name, self.test_name_2.name, self.test_name_4.name}
         )
 
 
diff --git a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
index 78f8c340..d0519e86 100644
--- a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
+++ b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
@@ -108,7 +108,7 @@ class OffTopicChannelNameViewSet(ModelViewSet):
                     'random_items': ["Must be a positive integer."]
                 })
 
-            queryset = self.queryset.order_by('used', '?')[:random_count]
+            queryset = self.queryset.filter(active=True).order_by('used', '?')[:random_count]
 
             # When any name is used in our listing then this means we reached end of round
             # and we need to reset all other names `used` to False
@@ -133,7 +133,6 @@ class OffTopicChannelNameViewSet(ModelViewSet):
             return Response(serialized.data)
 
         params = {}
-
         if active_param := request.query_params.get("active"):
             params["active"] = active_param.lower() == "true"
 
-- 
cgit v1.2.3