nonebot-plugin-osubot 6.22.0__py3-none-any.whl → 6.22.2__py3-none-any.whl

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/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/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.dist-info → nonebot_plugin_osubot-6.22.2.dist-info}/METADATA

@@ -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.dist-info → nonebot_plugin_osubot-6.22.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 nonebot_plugin_osubot/__init__.py,sha256=Q-mTTnOIdKiKG6JrVm-kqpPrAhOP9lWyiKHNRqA7gpc,1478
-nonebot_plugin_osubot/api.py,sha256=-KTefbeRJJwXD0I2hywJfD3ogpLyrrphJoZGoru_3U4,16410
+nonebot_plugin_osubot/api.py,sha256=0o6Gp_4YzVtYDDRJYoIl4yTW8gy4eSY0LY8COkzkOBo,16363
 nonebot_plugin_osubot/beatmap_stats_moder.py,sha256=mNNTufc-gvO4NdYa3TnealSZI4-LBoiTlb599SeLBck,2915
 nonebot_plugin_osubot/config.py,sha256=Ub2s5Ny09-d1ZwT6x8cirB6zWy0brtO-oZV3W0qEM5Q,311
 nonebot_plugin_osubot/database/__init__.py,sha256=7CDo9xU_DGLQ6uTj_mU_Px92phg_DMU5mP6WvgOxFLY,101
@@ -61,7 +61,7 @@ nonebot_plugin_osubot/matcher/bind.py,sha256=QQJc2S7XFo5tu4CPloIET6fKaeiQixgb8M7
 nonebot_plugin_osubot/matcher/bp.py,sha256=GidJfuZ9lJ7LwMq126DDOwMksNUOz4Bkab83OlKg8t8,3983
 nonebot_plugin_osubot/matcher/bp_analyze.py,sha256=L2ccAi7TQvpD036DyA27D8wuiqBBkcfLT0ldk_Apv8w,3820
 nonebot_plugin_osubot/matcher/getbg.py,sha256=Ar2yIST556MYRxzuXCLSDAMAmESRENN1fCty-kdH7PI,699
-nonebot_plugin_osubot/matcher/guess.py,sha256=QmD-a88pnPfSSBAvSpD2tlHDGMRpYWqtxfNuLsHuBYM,24144
+nonebot_plugin_osubot/matcher/guess.py,sha256=_1J8QyV8f1p8VA0K0gZGpbVueBQcogKd2TJyjzWUHcU,24123
 nonebot_plugin_osubot/matcher/history.py,sha256=ZYkVJHdXuVJmhovRhwxFdqNp0o2uJJOACAZhhutyS3w,1577
 nonebot_plugin_osubot/matcher/info.py,sha256=8CJHTOMTx_nzJ4ZwXo6ZfBwCuO3DtLprRX7jnMtPilk,858
 nonebot_plugin_osubot/matcher/map.py,sha256=sFpOoFv63y-NOkCJhE6aW0DRYDl_8SoQOPsdq50QxT0,1404
@@ -402,9 +402,9 @@ nonebot_plugin_osubot/schema/beatmap.py,sha256=UnobfZEHq1V2HG-A4j3BECubO-dB1JzTM
 nonebot_plugin_osubot/schema/match.py,sha256=lR3pGNVR9K_5GZAdOLG6Ki-W3fwJvgMlNhYOzKNE3lg,494
 nonebot_plugin_osubot/schema/ppysb/__init__.py,sha256=JK2Z4n44gUJPVKdETMJYJ5uIw-4a8T50y6j5n-YrlYM,1375
 nonebot_plugin_osubot/schema/sayo_beatmap.py,sha256=lS1PQZ-HvHl0VhkzlI0-pNLeJrLYWVqmKAo6xZr5I2U,959
-nonebot_plugin_osubot/schema/score.py,sha256=Qtvs5Hfvw5m2b00e8ZjrcrLGDyL4lqDspRwrkORY-xU,3172
+nonebot_plugin_osubot/schema/score.py,sha256=uqIKLKgnvnQKuJBFcmmioKeiU4ThG6uKsxMFHRov_dA,3189
 nonebot_plugin_osubot/schema/user.py,sha256=sxNmqymG_kIVuGuzfchSv9UML6NPG70cqo2_h5xDIpM,2250
 nonebot_plugin_osubot/utils/__init__.py,sha256=pyv8XxBcCOeQVDj1E4dgvktzcefgQXfKBlarsYGx1sg,815
-nonebot_plugin_osubot-6.22.0.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-nonebot_plugin_osubot-6.22.0.dist-info/METADATA,sha256=VsdL1bH40h2QTlFxd3MxYe48g5QgvzFSClziBS9u5EA,4476
-nonebot_plugin_osubot-6.22.0.dist-info/RECORD,,
+nonebot_plugin_osubot-6.22.2.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+nonebot_plugin_osubot-6.22.2.dist-info/METADATA,sha256=r8dWpeauzF1KpCvDzmDWgZn7-ZogwLblTfKIn8r6jng,4476
+nonebot_plugin_osubot-6.22.2.dist-info/RECORD,,