nonebot-plugin-maimaidx 2.1.0__tar.gz → 2.1.2__tar.gz

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaidx
-Version: 2.1.0
+Version: 2.1.2
 Summary: maimaidx plugin for nonebot2
 Author-email: Yuri-YuzuChaN <806235364@qq.com>
 License-Expression: MIT
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://github.com/Yuri-YuzuChaN/nonebot-plugin-maimaidx
 Project-URL: Bug Tracker, https://github.com/Yuri-YuzuChaN/nonebot-plugin-maimaidx/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: <3.13,>=3.9
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nonebot2<3.0.0,>=2.0.0
@@ -16,12 +16,14 @@ Requires-Dist: nonebot-adapter-onebot<3.0.0,>=2.2.2
 Requires-Dist: nonebot-plugin-apscheduler<1.0.0,>=0.3.0
 Requires-Dist: aiofiles<24.0.0,>=23.2.1
 Requires-Dist: httpx<1.0.0,>=0.23.1
-Requires-Dist: pillow<11.0.0,>=10.0.0
 Requires-Dist: pydantic<3.0.0,>=2.0.0
 Requires-Dist: pyecharts<3.0.0,>=2.0.0
-Requires-Dist: pytest-playwright<0.7.0
-Requires-Dist: numpy<2.0.0,>=1.26.0
+Requires-Dist: playwright>=1.52.0
 Requires-Dist: httpx-ws<1.0.0,>=0.7.2
+Requires-Dist: pillow<11.0.0,>=10.0.0; python_version < "3.13"
+Requires-Dist: pillow<12.0.0,>=11.0.0; python_version >= "3.13"
+Requires-Dist: numpy==1.26.0; python_version < "3.10"
+Requires-Dist: numpy<3.0.0,>=2.0.0; python_version >= "3.10"
 Dynamic: license-file
 
 <div align='center'>
@@ -59,7 +61,7 @@ Dynamic: license-file
         ```
     
 2. 安装 `chromium`，**相关依赖已安装，请直接使用该指令执行**
-   
+
     ``` shell
     playwright install --with-deps chromium
     ```

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/README.md

@@ -33,7 +33,7 @@
         ```
     
 2. 安装 `chromium`，**相关依赖已安装，请直接使用该指令执行**
-   
+
     ``` shell
     playwright install --with-deps chromium
     ```

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/nonebot_plugin_maimaidx/command/mai_alias.py

@@ -46,10 +46,10 @@ async def _(event: PrivateMessageEvent):
     try:
         await mai.get_music_alias()
         log.info('手动更新别名库成功')
-        await update_alias.finish('手动更新别名库成功')
+        await update_alias.send('手动更新别名库成功')
     except:
         log.error('手动更新别名库失败')
-        await update_alias.finish('手动更新别名库失败')
+        await update_alias.send('手动更新别名库失败')
 
 
 @alias_local_apply.handle()
@@ -225,7 +225,7 @@ async def push_alias(push: PushAliasStatus):
     music = mai.total_list.by_id(song_id)
     
     if push.Type == 'Approved':
-        message = MessageSegment.at(push.Status.ApplyUID) + dedent(f'''\
+        message = MessageSegment.at(push.Status.ApplyUID) + '\n' + dedent(f'''\
             您申请的别名已通过审核
             =================
             {push.Status.Tag}：
@@ -237,6 +237,16 @@ async def push_alias(push: PushAliasStatus):
         ''').strip() + await draw_music_info(music)
         await bot.send_group_msg(group_id=push.Status.GroupID, message=message)
         return
+    if push.Type == 'Reject':
+        message = MessageSegment.at(push.Status.ApplyUID) + '\n' + dedent(f'''\
+            您申请的别名被拒绝
+            =================
+            ID：{song_id}
+            标题：{push.Status.Name}
+            别名：{alias_name}
+        ''').strip() + await draw_music_info(music)
+        await bot.send_group_msg(group_id=push.Status.GroupID, message=message)
+        return
 
     if not alias.push.global_switch:
         await mai.get_music_alias()

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/nonebot_plugin_maimaidx/command/mai_score.py

@@ -28,7 +28,7 @@ async def _(
     user_id: Optional[int] = Depends(get_at_qq)
 ):
     qqid = user_id or event.user_id
-    username = message.extract_plain_text()
+    username = message.extract_plain_text().strip()
     await best50.finish(await generate(qqid, username), reply_message=True)
 
 

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/nonebot_plugin_maimaidx/config.py

@@ -27,12 +27,6 @@ vote_url: str = 'https://www.yuzuchan.moe/vote'
 # ws
 UUID = uuid.uuid1()
 
-# echartsjs
-SNAPSHOT_JS = (
-    "echarts.getInstanceByDom(document.querySelector('div[_echarts_instance_]'))."
-    "getDataURL({type: 'PNG', pixelRatio: 2, excludeComponents: ['toolbox']})"
-)
-
 
 # echartsjs
 SNAPSHOT_JS = (

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/nonebot_plugin_maimaidx/libraries/maimaidx_model.py

@@ -76,33 +76,33 @@ class Alias(BaseModel):
     Alias: List[str]
 
 
-class Approved(BaseModel):
+class StatusBase(BaseModel):
     
+    SongID: int
     ApplyUID: int
+    ApplyAlias: str
+
+
+class Approved(StatusBase):
+    
     Tag: str
-    SongID: int
     Name: str
-    ApplyAlias: str
-    GroupID: int
-    WSUUID: str
+    GroupID: int | None = None
+    WSUUID: str | None = None
 
 
-class AliasStatus(BaseModel):
+class AliasStatus(StatusBase):
     
-    ApplyUID: int
     Tag: str
-    SongID: int
     Name: str
-    ApplyAlias: str
     Time: str
     AgreeVotes: Optional[int] = 0
     Votes: int
 
-class Reviewed(BaseModel):
+class Reviewed(StatusBase):
 
-    SongID: int
-    ApplyUID: int
-    ApplyAlias: str
+    Tag: str
+    Name: str
 
 
 class PushAliasStatus(BaseModel):

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/nonebot_plugin_maimaidx/libraries/maimaidx_music.py

@@ -98,6 +98,8 @@ class MusicList(List[Music]):
         for music in self:
             if level not in music.level:
                 continue
+            if int(music.id) >= 100000:
+                continue
             if music.level.count(level) > 1: # 同曲有相同等级
                 lv[music.id] = { 
                     index: create_ra_music(music, index)

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/nonebot_plugin_maimaidx/libraries/maimaidx_music_info.py

@@ -39,7 +39,7 @@ async def draw_music_info(
                 player = await maiApi.query_user_b50(qqid=qqid)
             else:
                 player = user
-            if music.basic_info.version in list(plate_to_dx_version.values())[-2]:
+            if music.basic_info.version in list(plate_to_dx_version.values())[-1]:
                 bestlist = player.charts.dx
                 isfull = bool(len(bestlist) == 15)
             else:

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/nonebot_plugin_maimaidx/libraries/maimaidx_update_plate.py

@@ -29,11 +29,11 @@ async def update_rating_table() -> str:
                 lines += r
 
             if '+' in lv:
-                f = 3
+                f = 4
             elif lv == '6':
                 f = 10
             else:
-                f = 7
+                f = 6
 
             linesheight = 85 * lines
             """
@@ -119,18 +119,7 @@ async def update_plate_table() -> str:
         for _v in version:
             if _v in platecn:
                 _v = platecn[_v]
-            if _v in ['熊', '华', '華']:
-                _ver = '熊&华'
-            elif _v in ['爽', '煌']:
-                _ver = '爽&煌'
-            elif _v in ['宙', '星']:
-                _ver = '宙&星'
-            elif _v in ['祭', '祝']:
-                _ver = '祭&祝'
-            elif _v in ['双', '宴']:
-                _ver = '双&宴'
-            else:
-                _ver = _v
+            ver, _ver = version_map.get(_v, ([plate_to_dx_version.get(_v)], _v))
             
             music_id_list = mai.total_plate_id_list[_ver]
             music = mai.total_list.by_id_list(music_id_list)

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/nonebot_plugin_maimaidx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaidx
-Version: 2.1.0
+Version: 2.1.2
 Summary: maimaidx plugin for nonebot2
 Author-email: Yuri-YuzuChaN <806235364@qq.com>
 License-Expression: MIT
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://github.com/Yuri-YuzuChaN/nonebot-plugin-maimaidx
 Project-URL: Bug Tracker, https://github.com/Yuri-YuzuChaN/nonebot-plugin-maimaidx/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: <3.13,>=3.9
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nonebot2<3.0.0,>=2.0.0
@@ -16,12 +16,14 @@ Requires-Dist: nonebot-adapter-onebot<3.0.0,>=2.2.2
 Requires-Dist: nonebot-plugin-apscheduler<1.0.0,>=0.3.0
 Requires-Dist: aiofiles<24.0.0,>=23.2.1
 Requires-Dist: httpx<1.0.0,>=0.23.1
-Requires-Dist: pillow<11.0.0,>=10.0.0
 Requires-Dist: pydantic<3.0.0,>=2.0.0
 Requires-Dist: pyecharts<3.0.0,>=2.0.0
-Requires-Dist: pytest-playwright<0.7.0
-Requires-Dist: numpy<2.0.0,>=1.26.0
+Requires-Dist: playwright>=1.52.0
 Requires-Dist: httpx-ws<1.0.0,>=0.7.2
+Requires-Dist: pillow<11.0.0,>=10.0.0; python_version < "3.13"
+Requires-Dist: pillow<12.0.0,>=11.0.0; python_version >= "3.13"
+Requires-Dist: numpy==1.26.0; python_version < "3.10"
+Requires-Dist: numpy<3.0.0,>=2.0.0; python_version >= "3.10"
 Dynamic: license-file
 
 <div align='center'>
@@ -59,7 +61,7 @@ Dynamic: license-file
         ```
     
 2. 安装 `chromium`，**相关依赖已安装，请直接使用该指令执行**
-   
+
     ``` shell
     playwright install --with-deps chromium
     ```

{nonebot_plugin_maimaidx-2.1.0 → nonebot_plugin_maimaidx-2.1.2}/nonebot_plugin_maimaidx.egg-info/requires.txt

@@ -3,9 +3,19 @@ nonebot-adapter-onebot<3.0.0,>=2.2.2
 nonebot-plugin-apscheduler<1.0.0,>=0.3.0
 aiofiles<24.0.0,>=23.2.1
 httpx<1.0.0,>=0.23.1
-pillow<11.0.0,>=10.0.0
 pydantic<3.0.0,>=2.0.0
 pyecharts<3.0.0,>=2.0.0
-pytest-playwright<0.7.0
-numpy<2.0.0,>=1.26.0
+playwright>=1.52.0
 httpx-ws<1.0.0,>=0.7.2
+
+[:python_version < "3.10"]
+numpy==1.26.0
+
+[:python_version < "3.13"]
+pillow<11.0.0,>=10.0.0
+
+[:python_version >= "3.10"]
+numpy<3.0.0,>=2.0.0
+
+[:python_version >= "3.13"]
+pillow<12.0.0,>=11.0.0

nonebot_plugin_maimaidx-2.1.2/pyproject.toml

@@ -0,0 +1,38 @@
+[project]
+name = "nonebot-plugin-maimaidx"
+version = "2.1.2"
+authors = [
+  { name="Yuri-YuzuChaN", email="806235364@qq.com" },
+]
+description = "maimaidx plugin for nonebot2"
+readme = "README.md"
+requires-python = ">=3.9"
+license = "MIT"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+    "nonebot2>=2.0.0,<3.0.0",
+    "nonebot-adapter-onebot>=2.2.2,<3.0.0",
+    "nonebot-plugin-apscheduler>=0.3.0,<1.0.0",
+    "aiofiles>=23.2.1,<24.0.0",
+    "httpx>=0.23.1,<1.0.0",
+    "pydantic>=2.0.0,<3.0.0",
+    "pyecharts>=2.0.0,<3.0.0",
+    "playwright>=1.52.0",
+    "httpx-ws>=0.7.2,<1.0.0",
+
+    "pillow>=10.0.0,<11.0.0; python_version < '3.13'",
+    "pillow>=11.0.0,<12.0.0; python_version >= '3.13'",
+
+    "numpy==1.26.0; python_version < '3.10'",
+    "numpy>=2.0.0,<3.0.0; python_version >= '3.10'"
+]
+
+[project.urls]
+"Homepage" = "https://github.com/Yuri-YuzuChaN/nonebot-plugin-maimaidx"
+"Bug Tracker" = "https://github.com/Yuri-YuzuChaN/nonebot-plugin-maimaidx/issues"
+
+[tool.setuptools.package-data]
+"*" = ["maimaidxhelp.png"]

nonebot_plugin_maimaidx-2.1.0/pyproject.toml

@@ -1,34 +0,0 @@
-[project]
-name = "nonebot-plugin-maimaidx"
-version = "2.1.0"
-authors = [
-  { name="Yuri-YuzuChaN", email="806235364@qq.com" },
-]
-description = "maimaidx plugin for nonebot2"
-readme = "README.md"
-requires-python = ">=3.9, <3.13"
-license = "MIT"
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "Operating System :: OS Independent",
-]
-dependencies = [
-    "nonebot2<3.0.0,>=2.0.0",
-    "nonebot-adapter-onebot<3.0.0,>=2.2.2",
-    "nonebot-plugin-apscheduler<1.0.0,>=0.3.0",
-    "aiofiles<24.0.0,>=23.2.1",
-    "httpx<1.0.0,>=0.23.1",
-    "pillow<11.0.0,>=10.0.0",
-    "pydantic<3.0.0,>=2.0.0",
-    "pyecharts<3.0.0,>=2.0.0",
-    "pytest-playwright<0.7.0",
-    "numpy<2.0.0,>=1.26.0",
-    "httpx-ws<1.0.0,>=0.7.2"
-]
-
-[project.urls]
-"Homepage" = "https://github.com/Yuri-YuzuChaN/nonebot-plugin-maimaidx"
-"Bug Tracker" = "https://github.com/Yuri-YuzuChaN/nonebot-plugin-maimaidx/issues"
-
-[tool.setuptools.package-data]
-"*" = ["maimaidxhelp.png"]