nonebot-plugin-osubot 7.2.2__tar.gz → 7.2.4__tar.gz

{nonebot_plugin_osubot-7.2.2 → nonebot_plugin_osubot-7.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot_plugin_osubot
-Version: 7.2.2
+Version: 7.2.4
 Summary: OSUbot in NoneBot2
 Author: yaowan233
 Author-email: yaowan233 <572473053@qq.com>
@@ -24,7 +24,7 @@ Requires-Dist: matplotlib>=3.7.1
 Requires-Dist: nonebot-plugin-htmlrender>=0.3.1
 Requires-Dist: nonebot-plugin-waiter>=0.6.1
 Requires-Dist: nonebot-adapter-onebot>=2.4.6
-Requires-Dist: osu-tools-py>=0.1.2
+Requires-Dist: osu-tools-py>=0.1.3
 Requires-Dist: rhythmgame-tools>=2.0.0
 Requires-Python: >=3.10, <3.14
 Project-URL: Homepage, https://github.com/yaowan233/nonebot-plugin-osubot

{nonebot_plugin_osubot-7.2.2 → nonebot_plugin_osubot-7.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot_plugin_osubot"
-version = "7.2.2"
+version = "7.2.4"
 description = "OSUbot in NoneBot2"
 authors = [
     {name = "yaowan233", email = "572473053@qq.com"},
@@ -22,7 +22,7 @@ dependencies = [
     "nonebot-plugin-htmlrender>=0.3.1",
     "nonebot-plugin-waiter>=0.6.1",
     "nonebot-adapter-onebot>=2.4.6",
-    "osu-tools-py>=0.1.2",
+    "osu-tools-py>=0.1.3",
     "rhythmgame-tools>=2.0.0",
 ]
 requires-python = ">=3.10,<3.14"

{nonebot_plugin_osubot-7.2.2 → nonebot_plugin_osubot-7.2.4}/src/nonebot_plugin_osubot/agent_tools.py

@@ -73,7 +73,7 @@ def _clean_user_id(value: str | int | None) -> str | None:
     if value is None:
         return None
     value = str(value).strip()
-    if not value or value.lower() in {"none", "null", "nil", "undefined"}:
+    if not value or value.lower() in {"none", "null", "nil", "undefined", "all"}:
         return None
     return value
 
@@ -82,7 +82,14 @@ def _extract_mentioned_user_id(ctx: AgentToolContext) -> str | None:
     if not ctx.event:
         return None
 
-    bot_ids = {user_id for user_id in (ctx.bot_id, getattr(ctx.event, "self_id", None)) if user_id}
+    bot_ids = {
+        user_id
+        for user_id in (
+            _clean_user_id(ctx.bot_id),
+            _clean_user_id(getattr(ctx.event, "self_id", None)),
+        )
+        if user_id
+    }
     try:
         message = ctx.event.get_message()
     except Exception:

{nonebot_plugin_osubot-7.2.2 → nonebot_plugin_osubot-7.2.4}/src/nonebot_plugin_osubot/draw/score.py

@@ -290,7 +290,7 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     # if info.is_supporter:
     #     im.alpha_composite(SupporterBg.resize((40, 40)), (250, 640))
     # 处理mania转谱cs
-    if score_info.ruleset_id == 3 and mapinfo.mode == 0:
+    if score_info.ruleset_id == 3 and mapinfo.mode == "osu":
         temp_accuracy = mapinfo.accuracy
         convert = (mapinfo.count_sliders + mapinfo.count_spinners) / (
             mapinfo.count_circles + mapinfo.count_sliders + mapinfo.count_spinners