diff --git a/nonebot_plugin_tetris_stats/game_data_processor/__init__.py b/nonebot_plugin_tetris_stats/game_data_processor/__init__.py index ba2b0a1..2146c3c 100644 --- a/nonebot_plugin_tetris_stats/game_data_processor/__init__.py +++ b/nonebot_plugin_tetris_stats/game_data_processor/__init__.py @@ -1,5 +1,5 @@ from abc import ABC, abstractmethod -from datetime import UTC, datetime +from datetime import datetime, timezone from typing import Any from nonebot.matcher import Matcher @@ -12,6 +12,8 @@ from .schemas import BaseProcessedData as ProcessedData from .schemas import BaseRawResponse as RawResponse from .schemas import BaseUser as User +UTC = timezone.utc + class Processor(ABC): event_id: int diff --git a/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/__init__.py b/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/__init__.py index 08f2010..2179c63 100644 --- a/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/__init__.py +++ b/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/__init__.py @@ -1,4 +1,4 @@ -from datetime import UTC, datetime, timedelta +from datetime import datetime, timedelta, timezone from zoneinfo import ZoneInfo from arclet.alconna import Alconna, AllParam, Arg, ArgFlag, Args, CommandMeta, Option @@ -20,6 +20,8 @@ from .model import IORank from .processor import Processor, User, identify_user_info from .typing import Rank +UTC = timezone.utc + alc = on_alconna( Alconna( 'io', diff --git a/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/cache.py b/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/cache.py index 7887a38..0de4d41 100644 --- a/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/cache.py +++ b/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/cache.py @@ -1,4 +1,4 @@ -from datetime import UTC, datetime +from datetime import datetime, timezone from aiocache import Cache as ACache # type: ignore[import-untyped] from nonebot.log import logger @@ -7,6 +7,8 @@ from pydantic import parse_raw_as from ...utils.request import Request from .schemas.base import FailedModel, SuccessModel +UTC = timezone.utc + class Cache: cache = ACache(ACache.MEMORY) diff --git a/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/model.py b/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/model.py index a2a3bf1..5d5651f 100644 --- a/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/model.py +++ b/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/model.py @@ -1,4 +1,4 @@ -from datetime import UTC, datetime +from datetime import datetime, timezone from nonebot_plugin_orm import Model from sqlalchemy import JSON, DateTime, String @@ -6,6 +6,8 @@ from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column from .typing import Rank +UTC = timezone.utc + class IORank(MappedAsDataclass, Model): id: Mapped[int] = mapped_column(init=False, primary_key=True) diff --git a/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/processor.py b/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/processor.py index 3d7b29f..611c12b 100644 --- a/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/processor.py +++ b/nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/processor.py @@ -1,6 +1,6 @@ from collections import defaultdict from collections.abc import Callable -from datetime import UTC, datetime, timedelta +from datetime import datetime, timedelta, timezone from math import floor from re import match from statistics import mean @@ -33,6 +33,8 @@ from .schemas.user_records import SoloRecord, UserRecords from .schemas.user_records import SuccessModel as RecordsSuccess from .typing import Rank +UTC = timezone.utc + driver = get_driver() diff --git a/nonebot_plugin_tetris_stats/utils/recorder.py b/nonebot_plugin_tetris_stats/utils/recorder.py index 512b8ac..6d7cba3 100644 --- a/nonebot_plugin_tetris_stats/utils/recorder.py +++ b/nonebot_plugin_tetris_stats/utils/recorder.py @@ -1,4 +1,4 @@ -from datetime import UTC, datetime +from datetime import datetime, timezone from typing import ClassVar from nonebot import get_driver, get_plugin @@ -9,6 +9,8 @@ from nonebot_plugin_orm import get_session from ..db.models import HistoricalData +UTC = timezone.utc + driver = get_driver()