nonebot-plugin-osubot 6.22.0__tar.gz → 6.22.2__tar.gz

{nonebot-plugin-osubot-6.22.0 → nonebot-plugin-osubot-6.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-osubot
-Version: 6.22.0
+Version: 6.22.2
 Summary: OSUbot in NoneBot2
 License: AGPL-3.0
 Author-email: yaowan233 <572473053@qq.com>

{nonebot-plugin-osubot-6.22.0 → nonebot-plugin-osubot-6.22.2}/nonebot_plugin_osubot/api.py

@@ -200,7 +200,6 @@ async def get_user_scores(
                 ),
                 beatmap=UnifiedBeatmap(
                     id=i.beatmap.id,
-                    user_id=i.beatmap.user_id,
                     set_id=i.beatmap.set_id,
                     artist=i.beatmap.artist,
                     title=i.beatmap.title,

{nonebot-plugin-osubot-6.22.0 → nonebot-plugin-osubot-6.22.2}/nonebot_plugin_osubot/matcher/guess.py

@@ -59,7 +59,7 @@ async def get_random_beatmap_set(binded_id, group_id) -> (UnifiedScore, str):
                 continue
             bp_info = await get_user_scores(user.osu_id, NGM[str(user.osu_mode)], "best")
             # 过滤掉已猜过的歌曲
-            unguessed_scores = [(score, user.osu_name) for score in bp_info if score.beatmapset.id not in guessed_songs]
+            unguessed_scores = [(score, user.osu_name) for score in bp_info if score.beatmap.id not in guessed_songs]
             available_scores.extend(unguessed_scores)
         except NetworkError:
             continue  # 跳过网络错误的用户，继续尝试其他用户
@@ -100,7 +100,7 @@ async def _(
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[group_id]]
+        filtered_bp_ls = [i for i in bp_ls if i.beatmap.id not in guess_song_cache[group_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
         selected_score = random.choice(filtered_bp_ls)
@@ -113,7 +113,7 @@ async def _(
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[group_id]]
+        filtered_bp_ls = [i for i in bp_ls if i.beatmap.id not in guess_song_cache[group_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
         selected_score = random.choice(filtered_bp_ls)
@@ -363,7 +363,7 @@ async def _(
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
+        filtered_bp_ls = [i for i in bp_ls if i.beatmap.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
         selected_score = random.choice(filtered_bp_ls)
@@ -376,7 +376,7 @@ async def _(
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
+        filtered_bp_ls = [i for i in bp_ls if i.beatmap.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
         selected_score = random.choice(filtered_bp_ls)
@@ -442,7 +442,7 @@ async def _(
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
+        filtered_bp_ls = [i for i in bp_ls if i.beatmap.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
         selected_score = random.choice(filtered_bp_ls)
@@ -455,7 +455,7 @@ async def _(
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
+        filtered_bp_ls = [i for i in bp_ls if i.beatmap.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
         selected_score = random.choice(filtered_bp_ls)

{nonebot-plugin-osubot-6.22.0 → nonebot-plugin-osubot-6.22.2}/nonebot_plugin_osubot/schema/score.py

@@ -113,7 +113,7 @@ class UnifiedBeatmap(Base):
     ar: float
     hp: float
     stars: float
-    user_id: int
+    user_id: Optional[int] = None
 
 
 class UnifiedScore(Base):

{nonebot-plugin-osubot-6.22.0 → nonebot-plugin-osubot-6.22.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-osubot"
-version = "6.22.0"
+version = "6.22.2"
 description = "OSUbot in NoneBot2"
 authors = [
     { name = "yaowan233", email = "572473053@qq.com" },