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

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

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

{nonebot_plugin_maimaidx-3.0.6 → nonebot_plugin_maimaidx-3.0.8}/nonebot_plugin_maimaidx/commands/depend.py

@@ -171,7 +171,7 @@ async def process_regex(
             if cmd == "曲师":
                 result = mai.total_list.filter(artist=name)
             else:
-                result = mai.total_list.filter(charter=name)
+                result = mai.total_list.filter(charter=name, all_diff=False)
         case _:
             await matcher.finish("指令错误", reply_message=True)
 

{nonebot_plugin_maimaidx-3.0.6 → nonebot_plugin_maimaidx-3.0.8}/nonebot_plugin_maimaidx/commands/mai_alias.py

@@ -232,4 +232,4 @@ async def _(bot: Bot, match: Match[str] = RegexMatched()):
         await alias.alias_global_change(False, group_id)
         await alias_global_switch.finish("已全局关闭maimai别名推送")
     else:
-        await alias_global_switch.finish()
+        return

{nonebot_plugin_maimaidx-3.0.6 → nonebot_plugin_maimaidx-3.0.8}/nonebot_plugin_maimaidx/commands/mai_guess.py

@@ -71,9 +71,9 @@ async def _(event: GroupMessageEvent):
                         event.group_id not in guess.switch.enable
                         or guess._group[gid].end
                     ):
-                        await guess_music_start.finish()
+                        return
                 else:
-                    await guess_music_start.finish()
+                    return
             guess._group[gid].end = True
             answer = MessageSegment.text("答案是：\n") + await draw_chart_info(
                 guess._group[gid].song
@@ -103,9 +103,9 @@ async def _(event: GroupMessageEvent):
         await asyncio.sleep(1)
         if gid in guess._group:
             if gid not in guess.switch.enable or guess._group[gid].end:
-                await guess_music_pic.finish()
+                return
         else:
-            await guess_music_pic.finish()
+            return
     guess._group[gid].end = True
     answer = MessageSegment.text("答案是：\n") + await draw_chart_info(
         guess._group[gid].song
@@ -118,7 +118,7 @@ async def _(event: GroupMessageEvent):
 async def _(event: GroupMessageEvent):
     gid = event.group_id
     if gid not in guess._group:
-        await guess_music_solve.finish()
+        return
     ans = event.get_plaintext().strip()
     if ans.lower() in guess._group[gid].answer:
         guess._group[gid].end = True

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

@@ -40,7 +40,7 @@ async def _(
             r += f"{f'「{song.song_id}」':<7} {song.song_name}\n"
         image = MessageSegment.text(r)
     else:
-        image = await draw_song_list(songs, page)
+        image = draw_song_list(songs, page)
     await search.send(image, reply_message=True)
 
 
@@ -123,7 +123,7 @@ async def _(
         msg = (
             f"未找到别名为「{name}」的歌曲，但找到「{len(result)}」个相似标题的曲目：\n"
         )
-        msg += await draw_song_list(result, int(page))
+        msg += draw_song_list(result, int(page))
     await search_alias_song.finish(msg, reply_message=True)
 
 

{nonebot_plugin_maimaidx-3.0.6 → nonebot_plugin_maimaidx-3.0.8}/nonebot_plugin_maimaidx/core/handler.py

@@ -320,7 +320,7 @@ def draw_rating_table_text(rating: str) -> MessageSegment:
     return MessageSegment.image(image)
 
 
-async def draw_song_list(songs: list[Song], page: int) -> MessageSegment:
+def draw_song_list(songs: list[Song], page: int) -> MessageSegment:
     """
     绘制曲目列表
 

{nonebot_plugin_maimaidx-3.0.6 → nonebot_plugin_maimaidx-3.0.8}/nonebot_plugin_maimaidx/core/image/song.py

@@ -43,9 +43,7 @@ def song_list(songs: list[Song], page: int) -> str:
     pattern = assets._pattern_bg.resize((1000, 256))
     for h in range((height // 256) + 1):
         _im.alpha_composite(pattern, (0, (256 + 6) * h))
-    _im.alpha_composite(
-        assets._rainbow_bg.resize((550, 288)), (225, height - 435)
-    )
+    _im.alpha_composite(assets._rainbow_bg.resize((550, 288)), (225, height - 435))
     _im.alpha_composite(
         assets._rainbow_bottom_bg.resize((786, 164)),
         (107, height - 260),
@@ -86,9 +84,7 @@ def song_list(songs: list[Song], page: int) -> str:
         im.alpha_composite(cover, (x + 10, y + 10))
         im.alpha_composite(version, (x + 315, y - 30))
         im.alpha_composite(
-            assets._sl_diff_utg
-            if song.song_id > 100000
-            else assets._sl_diff_bg,
+            assets._sl_diff_utg if song.song_id > 100000 else assets._sl_diff_bg,
             (x + 100, y + 95),
         )
         im.alpha_composite(type_, (x + 50, y + 75))
@@ -151,8 +147,8 @@ def song_list(songs: list[Song], page: int) -> str:
     )
     fot.draw(
         500,
-        height - 50,
-        20,
+        height - 30,
+        18,
         f"Designed by Yuri-YuzuChaN & BlueDeer233. Generated by {maiconfig.bot_name} BOT",
         AssetsImage._default_text_color,
         "mm",

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

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

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

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