Fix newly added lint rules from new ruff versionforms

5 files changed, 93 insertions, 12 deletions

diff --git a/pydis_site/apps/api/models/__init__.py b/pydis_site/apps/api/models/__init__.py
index 7ac463b1..04c8485d 100644
--- a/pydis_site/apps/api/models/__init__.py
+++ b/pydis_site/apps/api/models/__init__.py
@@ -1,11 +1,12 @@
-# flake8: noqa
 from .bot import (
-    FilterList,
-    Filter,
+    AocAccountLink,
+    AocCompletionistBlock,
     BotSetting,
     BumpedThread,
-    DocumentationLink,
     DeletedMessage,
+    DocumentationLink,
+    Filter,
+    FilterList,
     Infraction,
     MailingList,
     MailingListSeenItem,
@@ -14,11 +15,33 @@ from .bot import (
     Nomination,
     NominationEntry,
     OffensiveMessage,
-    AocAccountLink,
-    AocCompletionistBlock,
     OffTopicChannelName,
     Reminder,
     Role,
     User,
-    UserAltRelationship
+    UserAltRelationship,
+)
+
+__all__ = (
+    "AocAccountLink",
+    "AocCompletionistBlock",
+    "BotSetting",
+    "BumpedThread",
+    "DeletedMessage",
+    "DocumentationLink",
+    "Filter",
+    "FilterList",
+    "Infraction",
+    "MailingList",
+    "MailingListSeenItem",
+    "Message",
+    "MessageDeletionContext",
+    "Nomination",
+    "NominationEntry",
+    "OffTopicChannelName",
+    "OffensiveMessage",
+    "Reminder",
+    "Role",
+    "User",
+    "UserAltRelationship"
 )
diff --git a/pydis_site/apps/api/models/bot/__init__.py b/pydis_site/apps/api/models/bot/__init__.py
index a17c70ff..42082d27 100644
--- a/pydis_site/apps/api/models/bot/__init__.py
+++ b/pydis_site/apps/api/models/bot/__init__.py
@@ -1,4 +1,3 @@
-# flake8: noqa
 from .filters import FilterList, Filter
 from .bot_setting import BotSetting
 from .bumped_thread import BumpedThread
@@ -17,3 +16,27 @@ from .offensive_message import OffensiveMessage
 from .reminder import Reminder
 from .role import Role
 from .user import User, UserAltRelationship
+
+__all__ = (
+    "AocAccountLink",
+    "AocCompletionistBlock",
+    "BotSetting",
+    "BumpedThread",
+    "DeletedMessage",
+    "DocumentationLink",
+    "Filter",
+    "FilterList",
+    "Infraction",
+    "MailingList",
+    "MailingListSeenItem",
+    "Message",
+    "MessageDeletionContext",
+    "Nomination",
+    "NominationEntry",
+    "OffTopicChannelName",
+    "OffensiveMessage",
+    "Reminder",
+    "Role",
+    "User",
+    "UserAltRelationship",
+)
diff --git a/pydis_site/apps/api/viewsets/__init__.py b/pydis_site/apps/api/viewsets/__init__.py
index a28fa8e3..867d07ae 100644
--- a/pydis_site/apps/api/viewsets/__init__.py
+++ b/pydis_site/apps/api/viewsets/__init__.py
@@ -1,4 +1,3 @@
-# flake8: noqa
 from .bot import (
     AocAccountLinkViewSet,
     AocCompletionistBlockViewSet,
@@ -7,7 +6,6 @@ from .bot import (
     DeletedMessageViewSet,
     DocumentationLinkViewSet,
     FilterListViewSet,
-    FilterListViewSet,
     FilterViewSet,
     InfractionViewSet,
     MailingListViewSet,
@@ -18,3 +16,22 @@ from .bot import (
     RoleViewSet,
     UserViewSet
 )
+
+__all__ = (
+    "AocAccountLinkViewSet",
+    "AocCompletionistBlockViewSet",
+    "BotSettingViewSet",
+    "BumpedThreadViewSet",
+    "DeletedMessageViewSet",
+    "DocumentationLinkViewSet",
+    "FilterListViewSet",
+    "FilterViewSet",
+    "InfractionViewSet",
+    "MailingListViewSet",
+    "NominationViewSet",
+    "OffTopicChannelNameViewSet",
+    "OffensiveMessageViewSet",
+    "ReminderViewSet",
+    "RoleViewSet",
+    "UserViewSet",
+)
diff --git a/pydis_site/apps/api/viewsets/bot/__init__.py b/pydis_site/apps/api/viewsets/bot/__init__.py
index bb26cb11..8cac6866 100644
--- a/pydis_site/apps/api/viewsets/bot/__init__.py
+++ b/pydis_site/apps/api/viewsets/bot/__init__.py
@@ -1,4 +1,3 @@
-# flake8: noqa
 from .aoc_completionist_block import AocCompletionistBlockViewSet
 from .aoc_link import AocAccountLinkViewSet
 from .bot_setting import BotSettingViewSet
@@ -14,3 +13,22 @@ from .offensive_message import OffensiveMessageViewSet
 from .reminder import ReminderViewSet
 from .role import RoleViewSet
 from .user import UserViewSet
+
+__all__ = (
+    "AocAccountLinkViewSet",
+    "AocCompletionistBlockViewSet",
+    "BotSettingViewSet",
+    "BumpedThreadViewSet",
+    "DeletedMessageViewSet",
+    "DocumentationLinkViewSet",
+    "FilterListViewSet",
+    "FilterViewSet",
+    "InfractionViewSet",
+    "MailingListViewSet",
+    "NominationViewSet",
+    "OffTopicChannelNameViewSet",
+    "OffensiveMessageViewSet",
+    "ReminderViewSet",
+    "RoleViewSet",
+    "UserViewSet",
+)
diff --git a/pydis_site/apps/api/viewsets/bot/user.py b/pydis_site/apps/api/viewsets/bot/user.py
index 79e867c3..ab0a1091 100644
--- a/pydis_site/apps/api/viewsets/bot/user.py
+++ b/pydis_site/apps/api/viewsets/bot/user.py
@@ -531,6 +531,6 @@ class UserViewSet(ModelViewSet):
         with Metricity() as metricity:
             data = metricity.total_messages_in_past_n_days(user_ids, days)
 
-        default_data = {user_id: 0 for user_id in user_ids}
+        default_data = dict.fromkeys(user_ids, 0)
         response_data = default_data | dict(data)
         return Response(response_data, status=status.HTTP_200_OK)