Switch to ruff for linting

16 files changed, 125 insertions, 115 deletions

diff --git a/pydis_site/apps/api/tests/base.py b/pydis_site/apps/api/tests/base.py
index c9f3cb7e..704b22cf 100644
--- a/pydis_site/apps/api/tests/base.py
+++ b/pydis_site/apps/api/tests/base.py
@@ -61,6 +61,7 @@ class AuthenticatedAPITestCase(APITestCase):
     ...         self.assertEqual(response.status_code, 200)
     """
 
-    def setUp(self):
+    def setUp(self) -> None:
+        """Bootstrap the user and authenticate it."""
         super().setUp()
         self.client.force_authenticate(test_user)
diff --git a/pydis_site/apps/api/tests/test_bumped_threads.py b/pydis_site/apps/api/tests/test_bumped_threads.py
index 316e3f0b..2e3892c7 100644
--- a/pydis_site/apps/api/tests/test_bumped_threads.py
+++ b/pydis_site/apps/api/tests/test_bumped_threads.py
@@ -1,7 +1,7 @@
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import BumpedThread
+from pydis_site.apps.api.models import BumpedThread
 
 
 class UnauthedBumpedThreadAPITests(AuthenticatedAPITestCase):
diff --git a/pydis_site/apps/api/tests/test_deleted_messages.py b/pydis_site/apps/api/tests/test_deleted_messages.py
index 1eb535d8..62d17e58 100644
--- a/pydis_site/apps/api/tests/test_deleted_messages.py
+++ b/pydis_site/apps/api/tests/test_deleted_messages.py
@@ -1,10 +1,9 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 from django.urls import reverse
-from django.utils import timezone
 
 from .base import AuthenticatedAPITestCase
-from ..models import MessageDeletionContext, User
+from pydis_site.apps.api.models import MessageDeletionContext, User
 
 
 class DeletedMessagesWithoutActorTests(AuthenticatedAPITestCase):
@@ -18,7 +17,7 @@ class DeletedMessagesWithoutActorTests(AuthenticatedAPITestCase):
 
         cls.data = {
             'actor': None,
-            'creation': datetime.utcnow().isoformat(),
+            'creation': datetime.now(tz=timezone.utc).isoformat(),
             'deletedmessage_set': [
                 {
                     'author': cls.author.id,
@@ -58,7 +57,7 @@ class DeletedMessagesWithActorTests(AuthenticatedAPITestCase):
 
         cls.data = {
             'actor': cls.actor.id,
-            'creation': datetime.utcnow().isoformat(),
+            'creation': datetime.now(tz=timezone.utc).isoformat(),
             'deletedmessage_set': [
                 {
                     'author': cls.author.id,
@@ -90,7 +89,7 @@ class DeletedMessagesLogURLTests(AuthenticatedAPITestCase):
 
         cls.deletion_context = MessageDeletionContext.objects.create(
             actor=cls.actor,
-            creation=timezone.now()
+            creation=datetime.now(tz=timezone.utc),
         )
 
     def test_valid_log_url(self):
diff --git a/pydis_site/apps/api/tests/test_documentation_links.py b/pydis_site/apps/api/tests/test_documentation_links.py
index 4e238cbb..f4a332cb 100644
--- a/pydis_site/apps/api/tests/test_documentation_links.py
+++ b/pydis_site/apps/api/tests/test_documentation_links.py
@@ -1,7 +1,7 @@
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import DocumentationLink
+from pydis_site.apps.api.models import DocumentationLink
 
 
 class UnauthedDocumentationLinkAPITests(AuthenticatedAPITestCase):
diff --git a/pydis_site/apps/api/tests/test_filters.py b/pydis_site/apps/api/tests/test_filters.py
index 5059d651..4cef1c8f 100644
--- a/pydis_site/apps/api/tests/test_filters.py
+++ b/pydis_site/apps/api/tests/test_filters.py
@@ -1,7 +1,7 @@
 import contextlib
 from dataclasses import dataclass
 from datetime import timedelta
-from typing import Any, Dict, Tuple, Type
+from typing import Any
 
 from django.db.models import Model
 from django.urls import reverse
@@ -12,22 +12,22 @@ from pydis_site.apps.api.tests.base import AuthenticatedAPITestCase
 
 @dataclass()
 class TestSequence:
-    model: Type[Model]
+    model: type[Model]
     route: str
-    object: Dict[str, Any]
-    ignored_fields: Tuple[str, ...] = ()
+    object: dict[str, Any]
+    ignored_fields: tuple[str, ...] = ()
 
     def url(self, detail: bool = False) -> str:
         return reverse(f'api:bot:{self.route}-{"detail" if detail else "list"}')
 
 
-FK_FIELDS: Dict[Type[Model], Tuple[str, ...]] = {
+FK_FIELDS: dict[type[Model], tuple[str, ...]] = {
     FilterList: (),
     Filter: ("filter_list",),
 }
 
 
-def get_test_sequences() -> Dict[str, TestSequence]:
+def get_test_sequences() -> dict[str, TestSequence]:
     filter_list1_deny_dict = {
         "name": "testname",
         "list_type": 0,
diff --git a/pydis_site/apps/api/tests/test_github_utils.py b/pydis_site/apps/api/tests/test_github_utils.py
index 95bafec0..34fae875 100644
--- a/pydis_site/apps/api/tests/test_github_utils.py
+++ b/pydis_site/apps/api/tests/test_github_utils.py
@@ -12,7 +12,7 @@ import rest_framework.test
 from django.urls import reverse
 
 from pydis_site import settings
-from .. import github_utils
+from pydis_site.apps.api import github_utils
 
 
 class GeneralUtilityTests(unittest.TestCase):
@@ -39,7 +39,8 @@ class GeneralUtilityTests(unittest.TestCase):
 
         delta = datetime.timedelta(minutes=10)
         self.assertAlmostEqual(decoded["exp"] - decoded["iat"], delta.total_seconds())
-        self.assertLess(decoded["exp"], (datetime.datetime.now() + delta).timestamp())
+        then = datetime.datetime.now(tz=datetime.timezone.utc) + delta
+        self.assertLess(decoded["exp"], then.timestamp())
 
 
 class CheckRunTests(unittest.TestCase):
@@ -50,7 +51,7 @@ class CheckRunTests(unittest.TestCase):
         "head_sha": "sha",
         "status": "completed",
         "conclusion": "success",
-        "created_at": datetime.datetime.utcnow().strftime(settings.GITHUB_TIMESTAMP_FORMAT),
+        "created_at": datetime.datetime.now(tz=datetime.timezone.utc).strftime(settings.GITHUB_TIMESTAMP_FORMAT),
         "artifacts_url": "url",
     }
 
@@ -74,7 +75,8 @@ class CheckRunTests(unittest.TestCase):
         # Set the creation time to well before the MAX_RUN_TIME
         # to guarantee the right conclusion
         kwargs["created_at"] = (
-            datetime.datetime.utcnow() - github_utils.MAX_RUN_TIME - datetime.timedelta(minutes=10)
+            datetime.datetime.now(tz=datetime.timezone.utc)
+            - github_utils.MAX_RUN_TIME - datetime.timedelta(minutes=10)
         ).strftime(settings.GITHUB_TIMESTAMP_FORMAT)
 
         with self.assertRaises(github_utils.RunTimeoutError):
@@ -103,29 +105,26 @@ def get_response_authorize(_: httpx.Client, request: httpx.Request, **__) -> htt
                     "account": {"login": "VALID_OWNER"},
                     "access_tokens_url": "https://example.com/ACCESS_TOKEN_URL"
                 }])
-            else:
-                return httpx.Response(
-                    401, json={"error": "auth app/installations"}, request=request
-                )
+            return httpx.Response(
+                401, json={"error": "auth app/installations"}, request=request
+            )
 
-        elif path == "/installation/repositories":
+        elif path == "/installation/repositories":  # noqa: RET505
             if auth == "bearer app access token":
                 return httpx.Response(200, request=request, json={
                     "repositories": [{
                         "name": "VALID_REPO"
                     }]
                 })
-            else:  # pragma: no cover
-                return httpx.Response(
-                    401, json={"error": "auth installation/repositories"}, request=request
-                )
+        return httpx.Response(  # pragma: no cover
+            401, json={"error": "auth installation/repositories"}, request=request
+        )
 
-    elif request.method == "POST":
+    elif request.method == "POST":  # noqa: RET505
         if path == "/ACCESS_TOKEN_URL":
             if auth == "bearer JWT initial token":
                 return httpx.Response(200, request=request, json={"token": "app access token"})
-            else:  # pragma: no cover
-                return httpx.Response(401, json={"error": "auth access_token"}, request=request)
+            return httpx.Response(401, json={"error": "auth access_token"}, request=request)  # pragma: no cover
 
     # Reaching this point means something has gone wrong
     return httpx.Response(500, request=request)  # pragma: no cover
@@ -138,7 +137,7 @@ class AuthorizeTests(unittest.TestCase):
 
     def test_invalid_apps_auth(self):
         """Test that an exception is raised if authorization was attempted with an invalid token."""
-        with mock.patch.object(github_utils, "generate_token", return_value="Invalid token"):
+        with mock.patch.object(github_utils, "generate_token", return_value="Invalid token"):  # noqa: SIM117
             with self.assertRaises(httpx.HTTPStatusError) as error:
                 github_utils.authorize("VALID_OWNER", "VALID_REPO")
 
@@ -179,7 +178,11 @@ class ArtifactFetcherTests(unittest.TestCase):
                 run = github_utils.WorkflowRun(
                     name="action_name",
                     head_sha="action_sha",
-                    created_at=datetime.datetime.now().strftime(settings.GITHUB_TIMESTAMP_FORMAT),
+                    created_at=(
+                        datetime.datetime
+                        .now(tz=datetime.timezone.utc)
+                        .strftime(settings.GITHUB_TIMESTAMP_FORMAT)
+                    ),
                     status="completed",
                     conclusion="success",
                     artifacts_url="artifacts_url"
@@ -187,7 +190,7 @@ class ArtifactFetcherTests(unittest.TestCase):
                 return httpx.Response(
                     200, request=request, json={"workflow_runs": [dataclasses.asdict(run)]}
                 )
-            elif path == "/artifact_url":
+            elif path == "/artifact_url":  # noqa: RET505
                 return httpx.Response(
                     200, request=request, json={"artifacts": [{
                         "name": "artifact_name",
diff --git a/pydis_site/apps/api/tests/test_infractions.py b/pydis_site/apps/api/tests/test_infractions.py
index ceb5591b..71611ee9 100644
--- a/pydis_site/apps/api/tests/test_infractions.py
+++ b/pydis_site/apps/api/tests/test_infractions.py
@@ -8,8 +8,8 @@ from django.db.utils import IntegrityError
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import Infraction, User
-from ..serializers import InfractionSerializer
+from pydis_site.apps.api.models import Infraction, User
+from pydis_site.apps.api.serializers import InfractionSerializer
 
 
 class UnauthenticatedTests(AuthenticatedAPITestCase):
@@ -152,8 +152,8 @@ class InfractionTests(AuthenticatedAPITestCase):
 
     def test_filter_after(self):
         url = reverse('api:bot:infraction-list')
-        target_time = datetime.datetime.utcnow() + datetime.timedelta(hours=5)
-        response = self.client.get(f'{url}?type=superstar&expires_after={target_time.isoformat()}')
+        target_time = datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(hours=5)
+        response = self.client.get(url, {'type': 'superstar', 'expires_after': target_time.isoformat()})
 
         self.assertEqual(response.status_code, 200)
         infractions = response.json()
@@ -161,8 +161,8 @@ class InfractionTests(AuthenticatedAPITestCase):
 
     def test_filter_before(self):
         url = reverse('api:bot:infraction-list')
-        target_time = datetime.datetime.utcnow() + datetime.timedelta(hours=5)
-        response = self.client.get(f'{url}?type=superstar&expires_before={target_time.isoformat()}')
+        target_time = datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(hours=5)
+        response = self.client.get(url, {'type': 'superstar', 'expires_before': target_time.isoformat()})
 
         self.assertEqual(response.status_code, 200)
         infractions = response.json()
@@ -185,11 +185,12 @@ class InfractionTests(AuthenticatedAPITestCase):
 
     def test_after_before_before(self):
         url = reverse('api:bot:infraction-list')
-        target_time = datetime.datetime.utcnow() + datetime.timedelta(hours=4)
-        target_time_late = datetime.datetime.utcnow() + datetime.timedelta(hours=6)
+        target_time = datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(hours=4)
+        target_time_late = datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(hours=6)
         response = self.client.get(
-            f'{url}?expires_before={target_time_late.isoformat()}'
-            f'&expires_after={target_time.isoformat()}'
+            url,
+            {'expires_before': target_time_late.isoformat(),
+             'expires_after': target_time.isoformat()},
         )
 
         self.assertEqual(response.status_code, 200)
@@ -198,11 +199,12 @@ class InfractionTests(AuthenticatedAPITestCase):
 
     def test_after_after_before_invalid(self):
         url = reverse('api:bot:infraction-list')
-        target_time = datetime.datetime.utcnow() + datetime.timedelta(hours=5)
-        target_time_late = datetime.datetime.utcnow() + datetime.timedelta(hours=9)
+        target_time = datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(hours=5)
+        target_time_late = datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(hours=9)
         response = self.client.get(
-            f'{url}?expires_before={target_time.isoformat()}'
-            f'&expires_after={target_time_late.isoformat()}'
+            url,
+            {'expires_before': target_time.isoformat(),
+             'expires_after': target_time_late.isoformat()},
         )
 
         self.assertEqual(response.status_code, 400)
@@ -212,8 +214,11 @@ class InfractionTests(AuthenticatedAPITestCase):
 
     def test_permanent_after_invalid(self):
         url = reverse('api:bot:infraction-list')
-        target_time = datetime.datetime.utcnow() + datetime.timedelta(hours=5)
-        response = self.client.get(f'{url}?permanent=true&expires_after={target_time.isoformat()}')
+        target_time = datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(hours=5)
+        response = self.client.get(
+            url,
+            {'permanent': 'true', 'expires_after': target_time.isoformat()},
+        )
 
         self.assertEqual(response.status_code, 400)
         errors = list(response.json())
@@ -221,8 +226,11 @@ class InfractionTests(AuthenticatedAPITestCase):
 
     def test_permanent_before_invalid(self):
         url = reverse('api:bot:infraction-list')
-        target_time = datetime.datetime.utcnow() + datetime.timedelta(hours=5)
-        response = self.client.get(f'{url}?permanent=true&expires_before={target_time.isoformat()}')
+        target_time = datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(hours=5)
+        response = self.client.get(
+            url,
+            {'permanent': 'true', 'expires_before': target_time.isoformat()},
+        )
 
         self.assertEqual(response.status_code, 400)
         errors = list(response.json())
@@ -230,9 +238,10 @@ class InfractionTests(AuthenticatedAPITestCase):
 
     def test_nonpermanent_before(self):
         url = reverse('api:bot:infraction-list')
-        target_time = datetime.datetime.utcnow() + datetime.timedelta(hours=6)
+        target_time = datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(hours=6)
         response = self.client.get(
-            f'{url}?permanent=false&expires_before={target_time.isoformat()}'
+            url,
+            {'permanent': 'false', 'expires_before': target_time.isoformat()},
         )
 
         self.assertEqual(response.status_code, 200)
@@ -522,39 +531,38 @@ class CreationTests(AuthenticatedAPITestCase):
         active_infraction_types = ('timeout', 'ban', 'superstar')
 
         for infraction_type in active_infraction_types:
-            with self.subTest(infraction_type=infraction_type):
-                with transaction.atomic():
-                    first_active_infraction = {
-                        'user': self.user.id,
-                        'actor': self.user.id,
-                        'type': infraction_type,
-                        'reason': 'Take me on!',
-                        'active': True,
-                        'expires_at': '2019-10-04T12:52:00+00:00'
-                    }
+            with self.subTest(infraction_type=infraction_type), transaction.atomic():
+                first_active_infraction = {
+                    'user': self.user.id,
+                    'actor': self.user.id,
+                    'type': infraction_type,
+                    'reason': 'Take me on!',
+                    'active': True,
+                    'expires_at': '2019-10-04T12:52:00+00:00'
+                }
+
+                # Post the first active infraction of a type and confirm it's accepted.
+                first_response = self.client.post(url, data=first_active_infraction)
+                self.assertEqual(first_response.status_code, 201)
 
-                    # Post the first active infraction of a type and confirm it's accepted.
-                    first_response = self.client.post(url, data=first_active_infraction)
-                    self.assertEqual(first_response.status_code, 201)
-
-                    second_active_infraction = {
-                        'user': self.user.id,
-                        'actor': self.user.id,
-                        'type': infraction_type,
-                        'reason': 'Take on me!',
-                        'active': True,
-                        'expires_at': '2019-10-04T12:52:00+00:00'
+                second_active_infraction = {
+                    'user': self.user.id,
+                    'actor': self.user.id,
+                    'type': infraction_type,
+                    'reason': 'Take on me!',
+                    'active': True,
+                    'expires_at': '2019-10-04T12:52:00+00:00'
+                }
+                second_response = self.client.post(url, data=second_active_infraction)
+                self.assertEqual(second_response.status_code, 400)
+                self.assertEqual(
+                    second_response.json(),
+                    {
+                        'non_field_errors': [
+                            'This user already has an active infraction of this type.'
+                        ]
                     }
-                    second_response = self.client.post(url, data=second_active_infraction)
-                    self.assertEqual(second_response.status_code, 400)
-                    self.assertEqual(
-                        second_response.json(),
-                        {
-                            'non_field_errors': [
-                                'This user already has an active infraction of this type.'
-                            ]
-                        }
-                    )
+                )
 
     def test_returns_201_for_second_active_infraction_of_different_type(self):
         """Test if the API accepts a second active infraction of a different type than the first."""
diff --git a/pydis_site/apps/api/tests/test_models.py b/pydis_site/apps/api/tests/test_models.py
index d3341b35..1cca133d 100644
--- a/pydis_site/apps/api/tests/test_models.py
+++ b/pydis_site/apps/api/tests/test_models.py
@@ -118,7 +118,7 @@ class StringDunderMethodTests(SimpleTestCase):
             OffensiveMessage(
                 id=602951077675139072,
                 channel_id=291284109232308226,
-                delete_date=dt(3000, 1, 1)
+                delete_date=dt(3000, 1, 1, tzinfo=timezone.utc)
             ),
             OffTopicChannelName(name='bob-the-builders-playground'),
             Role(
@@ -132,7 +132,7 @@ class StringDunderMethodTests(SimpleTestCase):
                     name='shawn',
                     discriminator=555,
                 ),
-                creation=dt.utcnow()
+                creation=dt.now(tz=timezone.utc)
             ),
             User(
                 id=5,
diff --git a/pydis_site/apps/api/tests/test_nominations.py b/pydis_site/apps/api/tests/test_nominations.py
index b3742cdd..ee6b1fbd 100644
--- a/pydis_site/apps/api/tests/test_nominations.py
+++ b/pydis_site/apps/api/tests/test_nominations.py
@@ -3,7 +3,7 @@ from datetime import datetime as dt, timedelta, timezone
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import Nomination, NominationEntry, User
+from pydis_site.apps.api.models import Nomination, NominationEntry, User
 
 
 class CreationTests(AuthenticatedAPITestCase):
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 34098c92..315f707d 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
@@ -1,7 +1,7 @@
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import OffTopicChannelName
+from pydis_site.apps.api.models import OffTopicChannelName
 
 
 class UnauthenticatedTests(AuthenticatedAPITestCase):
diff --git a/pydis_site/apps/api/tests/test_offensive_message.py b/pydis_site/apps/api/tests/test_offensive_message.py
index 3cf95b75..53f9cb48 100644
--- a/pydis_site/apps/api/tests/test_offensive_message.py
+++ b/pydis_site/apps/api/tests/test_offensive_message.py
@@ -3,13 +3,13 @@ import datetime
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import OffensiveMessage
+from pydis_site.apps.api.models import OffensiveMessage
 
 
 class CreationTests(AuthenticatedAPITestCase):
     def test_accept_valid_data(self):
         url = reverse('api:bot:offensivemessage-list')
-        delete_at = datetime.datetime.now() + datetime.timedelta(days=1)
+        delete_at = datetime.datetime.now() + datetime.timedelta(days=1)  # noqa: DTZ005
         data = {
             'id': '602951077675139072',
             'channel_id': '291284109232308226',
@@ -32,7 +32,7 @@ class CreationTests(AuthenticatedAPITestCase):
 
     def test_returns_400_on_non_future_date(self):
         url = reverse('api:bot:offensivemessage-list')
-        delete_at = datetime.datetime.now() - datetime.timedelta(days=1)
+        delete_at = datetime.datetime.now() - datetime.timedelta(days=1)  # noqa: DTZ005
         data = {
             'id': '602951077675139072',
             'channel_id': '291284109232308226',
@@ -46,7 +46,7 @@ class CreationTests(AuthenticatedAPITestCase):
 
     def test_returns_400_on_negative_id_or_channel_id(self):
         url = reverse('api:bot:offensivemessage-list')
-        delete_at = datetime.datetime.now() + datetime.timedelta(days=1)
+        delete_at = datetime.datetime.now() + datetime.timedelta(days=1)  # noqa: DTZ005
         data = {
             'id': '602951077675139072',
             'channel_id': '291284109232308226',
@@ -72,7 +72,7 @@ class CreationTests(AuthenticatedAPITestCase):
 class ListTests(AuthenticatedAPITestCase):
     @classmethod
     def setUpTestData(cls):
-        delete_at = datetime.datetime.now() + datetime.timedelta(days=1)
+        delete_at = datetime.datetime.now() + datetime.timedelta(days=1)  # noqa: DTZ005
         aware_delete_at = delete_at.replace(tzinfo=datetime.timezone.utc)
 
         cls.messages = [
diff --git a/pydis_site/apps/api/tests/test_reminders.py b/pydis_site/apps/api/tests/test_reminders.py
index e17569f0..9bb5fe4d 100644
--- a/pydis_site/apps/api/tests/test_reminders.py
+++ b/pydis_site/apps/api/tests/test_reminders.py
@@ -4,7 +4,7 @@ from django.forms.models import model_to_dict
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import Reminder, User
+from pydis_site.apps.api.models import Reminder, User
 
 
 class UnauthedReminderAPITests(AuthenticatedAPITestCase):
@@ -59,7 +59,7 @@ class ReminderCreationTests(AuthenticatedAPITestCase):
         data = {
             'author': self.author.id,
             'content': 'Remember to...wait what was it again?',
-            'expiration': datetime.utcnow().isoformat(),
+            'expiration': datetime.now(tz=timezone.utc).isoformat(),
             'jump_url': "https://www.google.com",
             'channel_id': 123,
             'mentions': [8888, 9999],
diff --git a/pydis_site/apps/api/tests/test_roles.py b/pydis_site/apps/api/tests/test_roles.py
index 73c80c77..d3031990 100644
--- a/pydis_site/apps/api/tests/test_roles.py
+++ b/pydis_site/apps/api/tests/test_roles.py
@@ -1,7 +1,7 @@
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import Role, User
+from pydis_site.apps.api.models import Role, User
 
 
 class CreationTests(AuthenticatedAPITestCase):
diff --git a/pydis_site/apps/api/tests/test_rules.py b/pydis_site/apps/api/tests/test_rules.py
index 3ee2d4e0..662fb8e9 100644
--- a/pydis_site/apps/api/tests/test_rules.py
+++ b/pydis_site/apps/api/tests/test_rules.py
@@ -5,7 +5,7 @@ from pathlib import Path
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..views import RulesView
+from pydis_site.apps.api.views import RulesView
 
 
 class RuleAPITests(AuthenticatedAPITestCase):
diff --git a/pydis_site/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py
index d86e80bb..cff4a825 100644
--- a/pydis_site/apps/api/tests/test_users.py
+++ b/pydis_site/apps/api/tests/test_users.py
@@ -4,9 +4,9 @@ from unittest.mock import Mock, patch
 from django.urls import reverse
 
 from .base import AuthenticatedAPITestCase
-from ..models import Infraction, Role, User
-from ..models.bot.metricity import NotFoundError
-from ..viewsets.bot.user import UserListPagination
+from pydis_site.apps.api.models import Infraction, Role, User
+from pydis_site.apps.api.models.bot.metricity import NotFoundError
+from pydis_site.apps.api.viewsets.bot.user import UserListPagination
 
 
 class UnauthedUserAPITests(AuthenticatedAPITestCase):
@@ -469,18 +469,17 @@ class UserMetricityTests(AuthenticatedAPITestCase):
             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_gate_blocked"],
-                        case["voice_gate_blocked"]
-                    )
+            ), 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_gate_blocked"],
+                    case["voice_gate_blocked"]
+                )
 
     def test_metricity_review_data(self):
         # Given
diff --git a/pydis_site/apps/api/tests/test_validators.py b/pydis_site/apps/api/tests/test_validators.py
index 8c46fcbc..a7ec6e38 100644
--- a/pydis_site/apps/api/tests/test_validators.py
+++ b/pydis_site/apps/api/tests/test_validators.py
@@ -3,8 +3,8 @@ from datetime import datetime, timezone
 from django.core.exceptions import ValidationError
 from django.test import TestCase
 
-from ..models.bot.bot_setting import validate_bot_setting_name
-from ..models.bot.offensive_message import future_date_validator
+from pydis_site.apps.api.models.bot.bot_setting import validate_bot_setting_name
+from pydis_site.apps.api.models.bot.offensive_message import future_date_validator
 
 
 REQUIRED_KEYS = (