Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
454 changes: 231 additions & 223 deletions poetry.lock

Large diffs are not rendered by default.

25 changes: 24 additions & 1 deletion pydis_site/apps/api/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# flake8: noqa
from .bot import (
FilterList,
Filter,
Expand All @@ -22,3 +21,27 @@
User,
UserAltRelationship
)

__all__ = (
"AocAccountLink",
"AocCompletionistBlock",
"BotSetting",
"BumpedThread",
"DeletedMessage",
"DocumentationLink",
"Filter",
"FilterList",
"Infraction",
"MailingList",
"MailingListSeenItem",
"Message",
"MessageDeletionContext",
"Nomination",
"NominationEntry",
"OffTopicChannelName",
"OffensiveMessage",
"Reminder",
"Role",
"User",
"UserAltRelationship"
)
25 changes: 24 additions & 1 deletion pydis_site/apps/api/models/bot/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# flake8: noqa
from .filters import FilterList, Filter
from .bot_setting import BotSetting
from .bumped_thread import BumpedThread
Expand All @@ -17,3 +16,27 @@
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"
)
21 changes: 19 additions & 2 deletions pydis_site/apps/api/viewsets/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# flake8: noqa
from .bot import (
AocAccountLinkViewSet,
AocCompletionistBlockViewSet,
Expand All @@ -7,7 +6,6 @@
DeletedMessageViewSet,
DocumentationLinkViewSet,
FilterListViewSet,
FilterListViewSet,
FilterViewSet,
InfractionViewSet,
MailingListViewSet,
Expand All @@ -18,3 +16,22 @@
RoleViewSet,
UserViewSet
)

__all__ = (
"AocAccountLinkViewSet",
"AocCompletionistBlockViewSet",
"BotSettingViewSet",
"BumpedThreadViewSet",
"DeletedMessageViewSet",
"DocumentationLinkViewSet",
"FilterListViewSet",
"FilterViewSet",
"InfractionViewSet",
"MailingListViewSet",
"NominationViewSet",
"OffTopicChannelNameViewSet",
"OffensiveMessageViewSet",
"ReminderViewSet",
"RoleViewSet",
"UserViewSet"
)
20 changes: 19 additions & 1 deletion pydis_site/apps/api/viewsets/bot/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# flake8: noqa
from .aoc_completionist_block import AocCompletionistBlockViewSet
from .aoc_link import AocAccountLinkViewSet
from .bot_setting import BotSettingViewSet
Expand All @@ -14,3 +13,22 @@
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",
)
2 changes: 1 addition & 1 deletion pydis_site/apps/api/viewsets/bot/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,6 @@ def metricity_activity_data(self, request: Request) -> Response:
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)
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ whitenoise = "6.9.0"
[tool.poetry.group.dev.dependencies]
python-dotenv = "1.1.0"
taskipy = "1.14.1"
ruff = "0.9.10"
ruff = "0.12.2"

[tool.poetry.group.lint.dependencies]
pre-commit = "4.2.0"
Expand Down