nonebot-plugin-maimaidx 3.0.8__tar.gz → 3.0.9__tar.gz

{nonebot_plugin_maimaidx-3.0.8 → nonebot_plugin_maimaidx-3.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaidx
-Version: 3.0.8
+Version: 3.0.9
 Summary: maimaidx plugin for nonebot2
 Author-email: Yuri-YuzuChaN <806235364@qq.com>
 License-Expression: MIT

{nonebot_plugin_maimaidx-3.0.8 → nonebot_plugin_maimaidx-3.0.9}/nonebot_plugin_maimaidx/commands/mai_search.py

@@ -3,11 +3,10 @@ from re import Match
 
 from nonebot import on_regex
 from nonebot.adapters.onebot.v11 import MessageSegment
-from nonebot.exception import FinishedException
 from nonebot.params import Depends, RegexMatched
 
 from ..core.clients.yuzuchan.client import YuzuChaNAPI
-from ..core.clients.yuzuchan.models import StatusEnum
+from ..core.clients.yuzuchan.models import AliasStatus, Songs, StatusEnum
 from ..core.database.qq import User
 from ..core.handler import draw_chart_info, draw_song_list
 from ..core.merge.alias import yuzu_alias_to_alias
@@ -59,19 +58,20 @@ async def _(
     # 别名
     alias_data = mai.total_alias_list.by_alias(name)
     if not alias_data:
+        api = YuzuChaNAPI()
         try:
-            api = YuzuChaNAPI()
             obj = await api.get_songs(name)
-            if obj.type == StatusEnum.ONGOING:
-                msg = f"未找到别名为「{name}」的歌曲，但找到与此相同别名的投票：\n"
-                for _s in obj.data:
-                    msg += f"- {_s.tag}\n    ID {_s.song_id}: {_s.name}\n"
-                msg += "※ 可以使用指令「同意别名 XXXXX」进行投票"
-                await search_alias_song.finish(msg.strip(), reply_message=True)
-            else:
-                alias_data = yuzu_alias_to_alias(obj.data)
-        except FinishedException:
-            raise
+            if isinstance(obj, Songs):
+                if obj.type == StatusEnum.ONGOING and isinstance(
+                    obj.data[0], AliasStatus
+                ):
+                    msg = f"未找到别名为「{name}」的歌曲，但找到与此相同别名的投票：\n"
+                    for _s in obj.data:
+                        msg += f"- {_s.tag}\n    ID {_s.song_id}: {_s.name}\n"
+                    msg += "※ 可以使用指令「同意别名 XXXXX」进行投票"
+                    await search_alias_song.finish(msg.strip(), reply_message=True)
+                else:
+                    alias_data = yuzu_alias_to_alias(obj.data)
         except Exception:
             pass
 

{nonebot_plugin_maimaidx-3.0.8 → nonebot_plugin_maimaidx-3.0.9}/nonebot_plugin_maimaidx/commands/mai_table.py

@@ -21,7 +21,7 @@ from ..core.handler import (
 from ..core.image.tools import image_to_base64
 from ..core.image.update_table import UpdateTable
 from ..core.merge.models import Category
-from ..resources import pic_dir
+from ..resources import pic_dir, rating_table_dir
 from .depend import GetUserAndAuth
 
 RATING_PATTERN = r"^([0-9]+\+?)((s+|ap|fc|fs|fdx)\+?)?\s?完成表$"
@@ -74,7 +74,12 @@ async def _(match: Match[str] = RegexMatched()):
     if rating in LEVEL_LIST[:6]:
         result = "只支持查询lv7-15的定数表。"
     elif rating in LEVEL_LIST[6:]:
-        result = draw_rating_table_text(rating)
+        if rating == "15":
+            result = MessageSegment.image(
+                image_to_base64(Image.open(rating_table_dir / "15.png"))
+            )
+        else:
+            result = draw_rating_table_text(rating)
     else:
         result = "无法识别的定数。"
     await rating_table.send(result, reply_message=True)

{nonebot_plugin_maimaidx-3.0.8 → nonebot_plugin_maimaidx-3.0.9}/nonebot_plugin_maimaidx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaidx
-Version: 3.0.8
+Version: 3.0.9
 Summary: maimaidx plugin for nonebot2
 Author-email: Yuri-YuzuChaN <806235364@qq.com>
 License-Expression: MIT

{nonebot_plugin_maimaidx-3.0.8 → nonebot_plugin_maimaidx-3.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-maimaidx"
-version = "3.0.8"
+version = "3.0.9"
 authors = [
   { name="Yuri-YuzuChaN", email="806235364@qq.com" },
 ]