nonebot-plugin-maimaidx 2.0.2__tar.gz → 2.0.4__tar.gz

{nonebot_plugin_maimaidx-2.0.2 → nonebot_plugin_maimaidx-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaidx
-Version: 2.0.2
+Version: 2.0.4
 Summary: maimaidx plugin for nonebot2
 Author-email: Yuri-YuzuChaN <806235364@qq.com>
 License-Expression: MIT
@@ -61,7 +61,7 @@ Dynamic: license-file
         ```
     
 2. 安装 `PhantomJS`，前往 https://phantomjs.org/download.html 下载对应平台支持
-3. 安装 `微软雅黑` 字体，解决使用 `ginfo` 指令字体不渲染，例如 `ubuntu`：`apt install fonts-wqy-microhei`
+3. 安装 `微软雅黑` 字体，解决使用 `ginfo` 指令字体不渲染的问题，例如 `ubuntu`：`apt install fonts-wqy-microhei`
 
 > [!WARNING]
 > 未配置 `PhantomJS` 支持的Bot，在使用 `ginfo` 指令时会被强制关闭 Bot 进程
@@ -72,7 +72,7 @@ Dynamic: license-file
 
    - [私人云盘](https://cloud.yuzuchan.moe/f/1bUn/Resource.7z)
    - [AList网盘](https://share.yuzuchan.moe/p/Resource.7z?sign=EvCwaGwJrneyD1Olq00NG3HXNK7fQKpx_sa3Ck9Uzjs=:0)
-   - [onedrive](https://yuzuai-my.sharepoint.com/:u:/g/personal/yuzuchan_yuzuai_onmicrosoft_com/EdGUKRSo-VpHjT2noa_9EroBVO27iYMSQO3oFnZjpYTbqA?e=FE4KXY)
+   - [onedrive](https://yuzuai-my.sharepoint.com/:u:/g/personal/yuzu_yuzuchan_moe/EdGUKRSo-VpHjT2noa_9EroBdFZci-tqWjVZzKZRTEeZkw?e=a1TM40)
 
 2. 在 `.env` 文件中配置静态文件绝对路径 `MAIMAIDXPATH`
 

{nonebot_plugin_maimaidx-2.0.2 → nonebot_plugin_maimaidx-2.0.4}/README.md

@@ -36,7 +36,7 @@
         ```
     
 2. 安装 `PhantomJS`，前往 https://phantomjs.org/download.html 下载对应平台支持
-3. 安装 `微软雅黑` 字体，解决使用 `ginfo` 指令字体不渲染，例如 `ubuntu`：`apt install fonts-wqy-microhei`
+3. 安装 `微软雅黑` 字体，解决使用 `ginfo` 指令字体不渲染的问题，例如 `ubuntu`：`apt install fonts-wqy-microhei`
 
 > [!WARNING]
 > 未配置 `PhantomJS` 支持的Bot，在使用 `ginfo` 指令时会被强制关闭 Bot 进程
@@ -47,7 +47,7 @@
 
    - [私人云盘](https://cloud.yuzuchan.moe/f/1bUn/Resource.7z)
    - [AList网盘](https://share.yuzuchan.moe/p/Resource.7z?sign=EvCwaGwJrneyD1Olq00NG3HXNK7fQKpx_sa3Ck9Uzjs=:0)
-   - [onedrive](https://yuzuai-my.sharepoint.com/:u:/g/personal/yuzuchan_yuzuai_onmicrosoft_com/EdGUKRSo-VpHjT2noa_9EroBVO27iYMSQO3oFnZjpYTbqA?e=FE4KXY)
+   - [onedrive](https://yuzuai-my.sharepoint.com/:u:/g/personal/yuzu_yuzuchan_moe/EdGUKRSo-VpHjT2noa_9EroBdFZci-tqWjVZzKZRTEeZkw?e=a1TM40)
 
 2. 在 `.env` 文件中配置静态文件绝对路径 `MAIMAIDXPATH`
 

{nonebot_plugin_maimaidx-2.0.2 → nonebot_plugin_maimaidx-2.0.4}/nonebot_plugin_maimaidx/command/mai_alias.py

@@ -29,8 +29,8 @@ alias_local_apply   = on_command('添加本地别名', aliases={'添加本地别
 alias_apply         = on_command('添加别名', aliases={'增加别名', '增添别名', '添加别称'})
 alias_agree         = on_command('同意别名', aliases={'同意别称'})
 alias_status        = on_command('当前投票', aliases={'当前别名投票', '当前别称投票'})
-alias_switch        = on_endswith(
-    ('别名推送', '别称推送'), 
+alias_switch        = on_regex(
+    r'^([开启关闭]+)别名推送$',
     permission=SUPERUSER | GROUP_OWNER | GROUP_ADMIN
 )
 alias_global_switch = on_regex(r'^全局([开启关闭]+)别名推送$', permission=SUPERUSER)
@@ -200,11 +200,10 @@ async def _(match = RegexMatched()):
 
 
 @alias_switch.handle()
-async def _(event: GroupMessageEvent, end: str = Endswith()):
-    args = event.get_plaintext().lower()[0:-len(end)].strip()
-    if args == '开启':
+async def _(event: GroupMessageEvent, match = RegexMatched()):
+    if match.group(1) == '开启':
         msg = await alias.on(event.group_id)
-    elif args == '关闭':
+    elif match.group(1) == '关闭':
         msg = await alias.off(event.group_id)
     else:
         raise ValueError('matcher type error')
@@ -215,10 +214,10 @@ async def _(event: GroupMessageEvent, end: str = Endswith()):
 @alias_global_switch.handle()
 async def _(match = RegexMatched()):
     if match.group(1) == '开启':
-        alias.alias_global_change(True)
+        await alias.alias_global_change(True)
         await alias_global_switch.finish('已全局开启maimai别名推送')
     elif match.group(1) == '关闭':
-        alias.alias_global_change(False)
+        await alias.alias_global_change(False)
         await alias_global_switch.finish('已全局关闭maimai别名推送')
     else:
         await alias_global_switch.finish()

{nonebot_plugin_maimaidx-2.0.2 → nonebot_plugin_maimaidx-2.0.4}/nonebot_plugin_maimaidx/command/mai_score.py

@@ -147,11 +147,11 @@ async def _(message: Message = CommandArg()):
             reduce = 101 - line
             if reduce <= 0 or reduce >= 101:
                 raise ValueError
-            msg = dedent(f'''\
+            msg = dedent(f'''
                 {music.title} {level_labels2[level_index]}
                 分数线 {line}% 允许的最多 TAP GREAT 数量为 {(total_score * reduce / 10000):.2f}(每个-{10000 / total_score:.4f}%),
                 BREAK 50落(一共{brk}个)等价于 {(break_50_reduce / 100):.3f} 个 TAP GREAT(-{break_50_reduce / total_score * 100:.4f}%)''')
-            await score.finish(MessageSegment.image(text_to_bytes_io(msg)), reply_message=True)
+            await score.finish(msg.strip(), reply_message=True)
         except (AttributeError, ValueError) as e:
             log.exception(e)
             await score.finish('格式错误，输入“分数线 帮助”以查看帮助信息', reply_message=True)

{nonebot_plugin_maimaidx-2.0.2 → nonebot_plugin_maimaidx-2.0.4}/nonebot_plugin_maimaidx/command/mai_search.py

@@ -70,27 +70,21 @@ async def _(event: GroupMessageEvent, message: Message = CommandArg()):
 @search_base.handle()
 async def _(message: Message = CommandArg()):
     args = message.extract_plain_text().strip().split()
-    if len(args) > 2 or len(args) == 0:
+    if len(args) > 3 or len(args) == 0:
         await search_base.finish('命令格式：\n定数查歌 「定数」「页数」\n定数查歌 「定数下限」「定数上限」「页数」')
     page = 1
     if len(args) == 1:
-        result = song_level(float(args[0]), float(args[0]))
+        ds1, ds2 = args[0], args[0]
     elif len(args) == 2:
-        try:
-            result = song_level(float(args[0]), float(args[1]))
-        except:
-            page = int(args[1]) if args[1].isdigit() else 1
-            result = song_level(float(args[0]), float(args[0]))
-    elif len(args) == 3:
-        try:
-            page = int(args[2]) if args[2].isdigit() else 1
-            result = song_level(float(args[0]), float(args[1]))
-        except:
-            page = int(args[2]) if args[2].isdigit() else 1
-            result = song_level(float(args[0]), float(args[0]))
+        if '.' in args[1]:
+            ds1, ds2 = args
+        else:
+            ds1, ds2 = args[0], args[0]
+            page = args[1]
     else:
-        result = song_level(float(args[0]), float(args[1]))
-        page = int(args[2]) if args[2].isdigit() else 1
+        ds1, ds2, page = args
+    page = int(page)
+    result = song_level(float(ds1), float(ds2))
     if not result:
         await search_base.finish('没有找到这样的乐曲。', reply_message=True)
     

{nonebot_plugin_maimaidx-2.0.2 → nonebot_plugin_maimaidx-2.0.4}/nonebot_plugin_maimaidx/libraries/maimaidx_music.py

@@ -547,7 +547,7 @@ class GroupAlias:
             self.push.enable.append(gid)
         if gid in self.push.disable:
             self.push.disable.remove(gid)
-        await writefile(group_alias_file, self.push.model_dump())
+        await writefile(group_alias_file, self.push.model_dump(by_alias=True))
         return '群别名推送功能已开启'
 
     async def off(self, gid: int) -> str:
@@ -556,13 +556,13 @@ class GroupAlias:
             self.push.disable.append(gid)
         if gid in self.push.enable:
             self.push.enable.remove(gid)
-        await writefile(group_alias_file, self.push.model_dump())
+        await writefile(group_alias_file, self.push.model_dump(by_alias=True))
         return '群别名推送功能已关闭'
 
     async def alias_global_change(self, set: bool):
         """修改全局开关"""
         self.push.global_switch = set
-        await writefile(group_alias_file, self.push.model_dump())
+        await writefile(group_alias_file, self.push.model_dump(by_alias=True))
 
 
 alias = GroupAlias()

{nonebot_plugin_maimaidx-2.0.2 → nonebot_plugin_maimaidx-2.0.4}/nonebot_plugin_maimaidx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaidx
-Version: 2.0.2
+Version: 2.0.4
 Summary: maimaidx plugin for nonebot2
 Author-email: Yuri-YuzuChaN <806235364@qq.com>
 License-Expression: MIT
@@ -61,7 +61,7 @@ Dynamic: license-file
         ```
     
 2. 安装 `PhantomJS`，前往 https://phantomjs.org/download.html 下载对应平台支持
-3. 安装 `微软雅黑` 字体，解决使用 `ginfo` 指令字体不渲染，例如 `ubuntu`：`apt install fonts-wqy-microhei`
+3. 安装 `微软雅黑` 字体，解决使用 `ginfo` 指令字体不渲染的问题，例如 `ubuntu`：`apt install fonts-wqy-microhei`
 
 > [!WARNING]
 > 未配置 `PhantomJS` 支持的Bot，在使用 `ginfo` 指令时会被强制关闭 Bot 进程
@@ -72,7 +72,7 @@ Dynamic: license-file
 
    - [私人云盘](https://cloud.yuzuchan.moe/f/1bUn/Resource.7z)
    - [AList网盘](https://share.yuzuchan.moe/p/Resource.7z?sign=EvCwaGwJrneyD1Olq00NG3HXNK7fQKpx_sa3Ck9Uzjs=:0)
-   - [onedrive](https://yuzuai-my.sharepoint.com/:u:/g/personal/yuzuchan_yuzuai_onmicrosoft_com/EdGUKRSo-VpHjT2noa_9EroBVO27iYMSQO3oFnZjpYTbqA?e=FE4KXY)
+   - [onedrive](https://yuzuai-my.sharepoint.com/:u:/g/personal/yuzu_yuzuchan_moe/EdGUKRSo-VpHjT2noa_9EroBdFZci-tqWjVZzKZRTEeZkw?e=a1TM40)
 
 2. 在 `.env` 文件中配置静态文件绝对路径 `MAIMAIDXPATH`
 

{nonebot_plugin_maimaidx-2.0.2 → nonebot_plugin_maimaidx-2.0.4}/pyproject.toml

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