nonebot-plugin-rikka 2.2.0__tar.gz → 2.2.1__tar.gz

{nonebot_plugin_rikka-2.2.0 → nonebot_plugin_rikka-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-rikka
-Version: 2.2.0
+Version: 2.2.1
 Summary: 一个简单的舞萌成绩查询Bot插件，同时支持落雪咖啡屋和水鱼查分器
 Requires-Python: <4.0,>=3.10
 Requires-Dist: nonebot2>=2.4.0
@@ -30,6 +30,8 @@ Description-Content-Type: text/markdown
     <source media="(prefers-color-scheme: dark)" srcset="https://erika.snowy.moe/v1/banner/Moemu/Nonebot-Plugin-Rikka.webp?accent=auto&amp;meta=full_name%2Cstars%2Cforks%2Cissues%2Crelease%2Clast_updated" />
     <img width="100%" src="https://erika.snowy.moe/v1/banner/Moemu/Nonebot-Plugin-Rikka.webp?accent=auto&amp;iconPath=assets%2Fgrokbot-icon-transparent.png&amp;theme=light&amp;meta=full_name%2Cstars%2Cforks%2Cissues%2Crelease%2Clast_updated" alt="Nonebot-Plugin-Rikka Banner" />
   </picture>
+  <h1 align="center">Nonebot-Plugin-Rikka</h1>
+  <p align="center">NoneBot2 舞萌DX / 中二节奏查询成绩插件</p>
 </div>
 
 <div align=center>
@@ -41,8 +43,6 @@ Description-Content-Type: text/markdown
   <a href="https://qm.qq.com/q/y1gC9PU4IU"><img src="https://img.shields.io/badge/QQ群-Nightcord-purple" alt="QQ Group"></a>
 </div>
 
-基于 [Nonebot2](https://nonebot.dev/) 的舞萌DX / 中二节奏查分插件
-
 ## 功能🪄
 
 ✅ 支持游戏: 舞萌DX(Ver.CN 1.55+), 中二节奏
@@ -184,7 +184,7 @@ Description-Content-Type: text/markdown
 
 本项目的渲染逻辑 ([painters](./nonebot_plugin_rikka/painters/)) 和资源修改或引用自 [Yuri-YuzuChaN/maimaiDX](https://github.com/Yuri-YuzuChaN/maimaiDX)，感谢上游项目的代码实现和游戏资源整理
 
-本项目的分数查询功能基于 [TrueRou/maimai.py](https://github.com/TrueRou/maimai.py) 提供的框架进行开发，部分机台通信功能参考了某个w开头的我不知道能不能说但是它是开源的如果需要可以私下来找我更新的神秘项目。
+本项目的分数查询功能基于 [TrueRou/maimai.py](https://github.com/TrueRou/maimai.py) 提供的框架进行开发，部分机台通信功能参考了某些神秘项目 ~~（我不知道能不能说但是它是开源的如果需要可以私下来找我更新反正阿里嘎多）~~。
 
 <a href="https://www.afdian.com/a/Moemu" target="_blank"><img src="https://pic1.afdiancdn.com/static/img/welcome/button-sponsorme.png" alt="afadian" style="height: 45px !important;width: 163px !important;"></a>
 

{nonebot_plugin_rikka-2.2.0 → nonebot_plugin_rikka-2.2.1}/README.md

@@ -3,6 +3,8 @@
     <source media="(prefers-color-scheme: dark)" srcset="https://erika.snowy.moe/v1/banner/Moemu/Nonebot-Plugin-Rikka.webp?accent=auto&amp;meta=full_name%2Cstars%2Cforks%2Cissues%2Crelease%2Clast_updated" />
     <img width="100%" src="https://erika.snowy.moe/v1/banner/Moemu/Nonebot-Plugin-Rikka.webp?accent=auto&amp;iconPath=assets%2Fgrokbot-icon-transparent.png&amp;theme=light&amp;meta=full_name%2Cstars%2Cforks%2Cissues%2Crelease%2Clast_updated" alt="Nonebot-Plugin-Rikka Banner" />
   </picture>
+  <h1 align="center">Nonebot-Plugin-Rikka</h1>
+  <p align="center">NoneBot2 舞萌DX / 中二节奏查询成绩插件</p>
 </div>
 
 <div align=center>
@@ -14,8 +16,6 @@
   <a href="https://qm.qq.com/q/y1gC9PU4IU"><img src="https://img.shields.io/badge/QQ群-Nightcord-purple" alt="QQ Group"></a>
 </div>
 
-基于 [Nonebot2](https://nonebot.dev/) 的舞萌DX / 中二节奏查分插件
-
 ## 功能🪄
 
 ✅ 支持游戏: 舞萌DX(Ver.CN 1.55+), 中二节奏
@@ -157,7 +157,7 @@
 
 本项目的渲染逻辑 ([painters](./nonebot_plugin_rikka/painters/)) 和资源修改或引用自 [Yuri-YuzuChaN/maimaiDX](https://github.com/Yuri-YuzuChaN/maimaiDX)，感谢上游项目的代码实现和游戏资源整理
 
-本项目的分数查询功能基于 [TrueRou/maimai.py](https://github.com/TrueRou/maimai.py) 提供的框架进行开发，部分机台通信功能参考了某个w开头的我不知道能不能说但是它是开源的如果需要可以私下来找我更新的神秘项目。
+本项目的分数查询功能基于 [TrueRou/maimai.py](https://github.com/TrueRou/maimai.py) 提供的框架进行开发，部分机台通信功能参考了某些神秘项目 ~~（我不知道能不能说但是它是开源的如果需要可以私下来找我更新反正阿里嘎多）~~。
 
 <a href="https://www.afdian.com/a/Moemu" target="_blank"><img src="https://pic1.afdiancdn.com/static/img/welcome/button-sponsorme.png" alt="afadian" style="height: 45px !important;width: 163px !important;"></a>
 

{nonebot_plugin_rikka-2.2.0 → nonebot_plugin_rikka-2.2.1}/nonebot_plugin_rikka/__init__.py

@@ -18,8 +18,7 @@ init_logger()
 from nonebot import get_driver  # noqa: E402
 from nonebot_plugin_orm import get_scoped_session  # noqa: E402
 
-from . import alconna  # noqa: E402, F401
-from . import database  # noqa: E402, F401
+from . import alconna, database  # noqa: E402, F401
 from .database import ChuSongORM, MaiSongORM  # noqa: E402
 
 

{nonebot_plugin_rikka-2.2.0 → nonebot_plugin_rikka-2.2.1}/nonebot_plugin_rikka/database/crud.py

@@ -20,9 +20,14 @@ from ..models.song import (
     SongNotes,
 )
 from .orm_models import ChuSong as ChuSongORMModel
-from .orm_models import ChuSongAlias, LocationSubscription, MaiPlayCount
+from .orm_models import (
+    ChuSongAlias,
+    LocationSubscription,
+    MaiPlayCount,
+    MaiSongAlias,
+    UserBindInfo,
+)
 from .orm_models import MaiSong as MaiSongORMModel
-from .orm_models import MaiSongAlias, UserBindInfo
 
 if TYPE_CHECKING:
     from ..updater.songs import MusicAliasResponseItem
@@ -219,6 +224,8 @@ class MaiSongORM:
             map=row.map,
             version=row.version,
             difficulties=SongDifficulties(standard=standard_difficulties, dx=dx_difficulties, utage=utage_difficulties),
+            locked=bool(row.locked),
+            disabled=bool(row.disabled),
         )
 
     @staticmethod
@@ -239,6 +246,7 @@ class MaiSongORM:
             bpm=song.bpm,
             map=song.map,
             version=song.version,
+            locked=bool(song.locked),
             # ORM 列为 String，这里序列化为 JSON 字符串
             difficulties=json.dumps(difficulties_dict, ensure_ascii=False),
         )
@@ -276,6 +284,7 @@ class MaiSongORM:
                 existing_obj.bpm = song.bpm
                 existing_obj.map = song.map
                 existing_obj.version = song.version
+                existing_obj.locked = bool(song.locked)
                 existing_obj.difficulties = difficulties_json  # type: ignore
             else:
                 # 插入新记录
@@ -287,6 +296,7 @@ class MaiSongORM:
                     bpm=song.bpm,
                     map=song.map,
                     version=song.version,
+                    locked=bool(song.locked),
                     # ORM 列为 String，这里序列化为 JSON 字符串
                     difficulties=difficulties_json,
                 )

{nonebot_plugin_rikka-2.2.0 → nonebot_plugin_rikka-2.2.1}/nonebot_plugin_rikka/score/maimai/providers/maimai.py

@@ -18,9 +18,9 @@ from maimai_py import (
     Player,
     PlayerIdentifier,
     ScoreExtend,
+    current_version,
 )
 from maimai_py import SongType as MaimaiPySongType
-from maimai_py import current_version
 from nonebot import logger
 from nonebot.internal.matcher import current_event
 from nonebot_plugin_alconna import At, UniMessage

{nonebot_plugin_rikka-2.2.0 → nonebot_plugin_rikka-2.2.1}/nonebot_plugin_rikka/updater/songs.py

@@ -158,6 +158,7 @@ async def fetch_song_info(song_id: int, interval: float = 0.3) -> MaiSong:
     song_info_fields = {f.name for f in fields(MaiSong)}
     song_info_dict = {k: v for k, v in content.items() if k in song_info_fields}
     song_info_dict["difficulties"] = SongDifficulties.init_from_dict(content.get("difficulties", {}))
+    song_info_dict["locked"] = bool(song_info_dict.get("locked"))
 
     await _update_song_fit_diff(song_info_dict["difficulties"], song_id)
 
@@ -205,6 +206,7 @@ async def update_maimai_song_database(db_session: async_scoped_session) -> int:
     for song in songs:
         song_info_dict = {k: v for k, v in song.items() if k in song_info_fields}
         song_info_dict["difficulties"] = SongDifficulties.init_from_dict(song.get("difficulties", {}))
+        song_info_dict["locked"] = bool(song_info_dict.get("locked"))
 
         # 获取拟合定数
         await _update_song_fit_diff(song_info_dict["difficulties"], song_info_dict["id"])

{nonebot_plugin_rikka-2.2.0 → nonebot_plugin_rikka-2.2.1}/pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
     "nonebot-plugin-session>=0.3.2",
     "nonebot-plugin-apscheduler>=0.5.0",
 ]
-version = "2.2.0"
+version = "2.2.1"
 
 [project.optional-dependencies]
 dev = [