🔖 1.0.0.a12

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

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',
@@ -91,7 +93,7 @@ async def _(bot: Bot, event: Event, matcher: Matcher, account: User):
         command_args=[],
     )
     try:
-        await matcher.send(await proc.handle_bind(platform=get_platform(bot), account=event.get_user_id()))
+        await matcher.finish(await proc.handle_bind(platform=get_platform(bot), account=event.get_user_id()))
     except NeedCatchError as e:
         await matcher.send(str(e))
         raise HandleNotFinishedError from e
@@ -115,7 +117,7 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me):
         command_args=[],
     )
     try:
-        await matcher.send(message + await proc.handle_query())
+        await matcher.finish(message + await proc.handle_query())
     except NeedCatchError as e:
         await matcher.send(str(e))
         raise HandleNotFinishedError from e
@@ -129,7 +131,7 @@ async def _(event: Event, matcher: Matcher, account: User):
         command_args=[],
     )
     try:
-        await matcher.send(await proc.handle_query())
+        await matcher.finish(await proc.handle_query())
     except NeedCatchError as e:
         await matcher.send(str(e))
         raise HandleNotFinishedError from e

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)

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)

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()
 
 

nonebot_plugin_tetris_stats/game_data_processor/top_data_processor/__init__.py

@@ -74,7 +74,7 @@ async def _(bot: Bot, event: Event, matcher: Matcher, account: User):
         command_args=[],
     )
     try:
-        await matcher.send(await proc.handle_bind(platform=get_platform(bot), account=event.get_user_id()))
+        await matcher.finish(await proc.handle_bind(platform=get_platform(bot), account=event.get_user_id()))
     except NeedCatchError as e:
         await matcher.send(str(e))
         raise HandleNotFinishedError from e
@@ -98,7 +98,7 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me):
         command_args=[],
     )
     try:
-        await matcher.send(message + await proc.handle_query())
+        await matcher.finish(message + await proc.handle_query())
     except NeedCatchError as e:
         await matcher.send(str(e))
         raise HandleNotFinishedError from e
@@ -112,7 +112,7 @@ async def _(event: Event, matcher: Matcher, account: User):
         command_args=[],
     )
     try:
-        await matcher.send(await proc.handle_query())
+        await matcher.finish(await proc.handle_query())
     except NeedCatchError as e:
         await matcher.send(str(e))
         raise HandleNotFinishedError from e

nonebot_plugin_tetris_stats/game_data_processor/tos_data_processor/__init__.py

@@ -94,6 +94,7 @@ try:
             command_args=[],
         )
         await finish_special_query(matcher, proc)
+
 except ImportError:
     pass
 
@@ -108,6 +109,7 @@ try:
             command_args=[],
         )
         await finish_special_query(matcher, proc)
+
 except ImportError:
     pass
 
@@ -122,6 +124,7 @@ try:
             command_args=[],
         )
         await finish_special_query(matcher, proc)
+
 except ImportError:
     pass
 
@@ -134,7 +137,7 @@ async def _(bot: Bot, event: Event, matcher: Matcher, account: User):
         command_args=[],
     )
     try:
-        await matcher.send(await proc.handle_bind(platform=get_platform(bot), account=event.get_user_id()))
+        await matcher.finish(await proc.handle_bind(platform=get_platform(bot), account=event.get_user_id()))
     except NeedCatchError as e:
         await matcher.send(str(e))
         raise HandleNotFinishedError from e
@@ -158,7 +161,7 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me):
         command_args=[],
     )
     try:
-        await matcher.send(message + await proc.handle_query())
+        await matcher.finish(message + await proc.handle_query())
     except NeedCatchError as e:
         await matcher.send(str(e))
         raise HandleNotFinishedError from e
@@ -172,7 +175,7 @@ async def _(event: Event, matcher: Matcher, account: User):
         command_args=[],
     )
     try:
-        await matcher.send(await proc.handle_query())
+        await matcher.finish(await proc.handle_query())
     except NeedCatchError as e:
         await matcher.send(str(e))
         raise HandleNotFinishedError from e

nonebot_plugin_tetris_stats/game_data_processor/tos_data_processor/processor.py

@@ -202,11 +202,7 @@ class Processor(ProcessorMeta):
             message += f"\nL'PM: {game_data.lpm} ( {game_data.pps} pps )"
             message += f'\nAPM: {game_data.apm} ( x{game_data.apl} )'
             message += f'\nADPM: {game_data.adpm} ( x{game_data.adpl} ) ( {game_data.vs}vs )'
-        message += (
-            f'\n40L: {float(user_info.pb_sprint)/1000:.2f}s'
-            if user_info.pb_sprint != 2147483647  # noqa: PLR2004
-            else ''
-        )
-        message += f'\nMarathon: {user_info.pb_marathon}' if user_info.pb_marathon != 0 else ''
-        message += f'\nChallenge: {user_info.pb_challenge}' if user_info.pb_challenge != 0 else ''
+        message += f'\n40L: {float(user_info.pb_sprint)/1000:.2f}s' if user_info.pb_sprint != '2147483647' else ''
+        message += f'\nMarathon: {user_info.pb_marathon}' if user_info.pb_marathon != '0' else ''
+        message += f'\nChallenge: {user_info.pb_challenge}' if user_info.pb_challenge != '0' else ''
         return message

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()
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'nonebot-plugin-tetris-stats'
-version = '1.0.0.a10'
+version = '1.0.0.a12'
 description = '一款基于 NoneBot2 的用于查询 Tetris 相关游戏数据的插件'
 authors = ['scdhh <wallfjjd@gmail.com>']
 readme = 'README.md'