nonebot-plugin-osubot 6.23.0__tar.gz → 6.24.0__tar.gz

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/PKG-INFO

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

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/api.py

@@ -11,19 +11,19 @@ from nonebot import get_plugin_config
 from httpx import Response
 
 from .network.manager import network_manager
+from .schema.beatmapsets import BeatmapSets
 from .utils import FGM
 from .config import Config
 from .mods import get_mods
 from .network import auto_retry
 from .exceptions import NetworkError
 from .network.first_response import get_first_response
-from .schema import User, NewScore, SayoBeatmap, RecommendData
+from .schema import User, NewScore, RecommendData
 from .schema.score import UnifiedScore, NewStatistics, UnifiedBeatmap
 from .schema.ppysb import InfoResponse, ScoresResponse, V2ScoresResponse
 from .schema.user import Level, GradeCounts, UnifiedUser, UserStatistics
 
 api = "https://osu.ppy.sh/api/v2"
-sayoapi = "https://api.sayobot.cn"
 cache = ExpiringDict(max_len=1, max_age_seconds=86400)
 plugin_config = get_plugin_config(Config)
 
@@ -122,6 +122,7 @@ async def fetch_score_batch(
                 hp=i.beatmap.drain,
                 od=i.beatmap.accuracy,
                 stars=i.beatmap.difficulty_rating,
+                convert=i.beatmap.convert,
             ),
             beatmapset=i.beatmapset,
         )
@@ -189,6 +190,7 @@ async def get_user_scores(
                 ended_at=datetime.strptime(i.play_time, "%Y-%m-%dT%H:%M:%S") + timedelta(hours=8),
                 max_combo=i.max_combo,
                 passed=True,
+                pp=i.pp,
                 statistics=NewStatistics(
                     miss=i.nmiss,
                     perfect=i.ngeki,
@@ -412,9 +414,10 @@ async def get_random_bg() -> Optional[bytes]:
     return res.content
 
 
-async def get_sayo_map_info(sid, t=0) -> SayoBeatmap:
-    res = await safe_async_get(f"https://api.sayobot.cn/v2/beatmapinfo?K={sid}&T={t}")
-    return SayoBeatmap(**res.json())
+async def get_beatmapsets_info(sid) -> BeatmapSets:
+    url = f"https://osu.ppy.sh/api/v2/beatmapsets/{sid}"
+    res = await make_request(url, await get_headers(), "未查询到该谱面集(Setid)信息")
+    return BeatmapSets(**res)
 
 
 async def get_map_bg(mapid, sid, bg_name) -> BytesIO:

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/draw/bmap.py

@@ -4,25 +4,20 @@ from datetime import datetime, timedelta
 from PIL import ImageDraw, ImageFilter, ImageEnhance
 
 from ..file import get_projectimg
-from ..api import get_sayo_map_info
-from ..exceptions import NetworkError
+from ..api import get_beatmapsets_info
 from .utils import crop_bg, stars_diff, calc_songlen
-from .static import Image, BarImg, IconLs, Torus_SemiBold_20, Torus_SemiBold_40, Torus_SemiBold_50, extra_30
+from .static import Image, BarImg, IconLs, Torus_SemiBold_20, Torus_SemiBold_40, Torus_SemiBold_50, extra_30, Stars
 
 
 async def draw_bmap_info(mapid) -> BytesIO:
-    sayo_info = await get_sayo_map_info(mapid)
-    if sayo_info.status == -1:
-        raise NetworkError("在sayobot未查询到该地图")
-    data = sayo_info.data
-
+    data = await get_beatmapsets_info(mapid)
     coverurl = f"https://assets.ppy.sh/beatmaps/{mapid}/covers/cover@2x.jpg"
     cover = await get_projectimg(coverurl)
     # 新建
-    if len(data.bid_data) > 20:
+    if len(data.beatmaps) > 20:
         im_h = 400 + 102 * 20
     else:
-        im_h = 400 + 102 * (len(data.bid_data) - 1)
+        im_h = 400 + 102 * (len(data.beatmaps) - 1)
     im = Image.new("RGBA", (1200, im_h), (31, 41, 46, 255))
     draw = ImageDraw.Draw(im)
     # 背景
@@ -37,35 +32,36 @@ async def draw_bmap_info(mapid) -> BytesIO:
     # mapper
     draw.text((25, 105), f"谱面作者: {data.creator}", font=Torus_SemiBold_20, anchor="lt")
     # rank时间
-    if data.approved_date == -1:
+    if not data.ranked_date:
         approved_date = "谱面状态可能非ranked"
     else:
-        datearray = datetime.utcfromtimestamp(data.approved_date)
+        datearray = datetime.fromisoformat(data.ranked_date.replace("Z", ""))
         approved_date = (datearray + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S")
     draw.text((25, 140), f"上架时间: {approved_date}", font=Torus_SemiBold_20, anchor="lt")
     # 来源
-    draw.text((25, 175), f"Source: {data.source}", font=Torus_SemiBold_20, anchor="lt")
+    if data.source:
+        draw.text((25, 175), f"Source: {data.source}", font=Torus_SemiBold_20, anchor="lt")
     # bpm
     draw.text((1150, 105), f"BPM: {data.bpm}", font=Torus_SemiBold_20, anchor="rt")
     # 曲长
-    music_len = calc_songlen(data.bid_data[0].length)
+    music_len = calc_songlen(data.beatmaps[0].total_length)
     draw.text((1150, 140), f"length: {music_len}", font=Torus_SemiBold_20, anchor="rt")
     # Setid
     draw.text((1150, 35), f"Setid: {mapid}", font=Torus_SemiBold_20, anchor="rt")
-    gmap = sorted(data.bid_data, key=lambda k: k.star, reverse=False)
+    gmap = sorted(data.beatmaps, key=lambda k: k.difficulty_rating, reverse=False)
     for num, cmap in enumerate(gmap):
         if num < 20:
             h_num = 102 * num
             # 难度
-            draw.text((20, 320 + h_num), IconLs[cmap.mode], font=extra_30, anchor="lt")
+            draw.text((20, 320 + h_num), IconLs[cmap.mode_int], font=extra_30, anchor="lt")
             # 星星
-            stars_bg = stars_diff(cmap.star)
+            stars_bg = stars_diff(cmap.difficulty_rating, Stars)
             stars_img = stars_bg.resize((80, 30))
             im.alpha_composite(stars_img, (60, 320 + h_num))
             # diff
             im.alpha_composite(BarImg, (10, 365 + h_num))
             gc = ["CS", "HP", "OD", "AR"]
-            for index, i in enumerate((cmap.CS, cmap.HP, cmap.OD, cmap.AR)):
+            for index, i in enumerate((cmap.cs, cmap.drain, cmap.accuracy, cmap.ar)):
                 diff_len = int(200 * i / 10) if i <= 10 else 200
                 diff_bg = Image.new("RGBA", (diff_len, 12), (255, 255, 255, 255))
                 im.alpha_composite(diff_bg, (50 + 300 * index, 365 + h_num))
@@ -90,11 +86,13 @@ async def draw_bmap_info(mapid) -> BytesIO:
                         anchor="lm",
                     )
             # 难度
-            if cmap.star < 6.5:
+            if cmap.difficulty_rating < 6.5:
                 color = (0, 0, 0, 255)
             else:
                 color = (255, 217, 102, 255)
-            draw.text((65, 335 + h_num), f"★{cmap.star:.2f}", font=Torus_SemiBold_20, anchor="lm", fill=color)
+            draw.text(
+                (65, 335 + h_num), f"★{cmap.difficulty_rating:.2f}", font=Torus_SemiBold_20, anchor="lm", fill=color
+            )
             # version
             draw.text(
                 (150, 335 + h_num),
@@ -105,14 +103,14 @@ async def draw_bmap_info(mapid) -> BytesIO:
             # mapid
             draw.text(
                 (1150, 328 + h_num),
-                f"Mapid: {cmap.bid}",
+                f"Mapid: {cmap.id}",
                 font=Torus_SemiBold_20,
                 anchor="rm",
             )
             # maxcb
             draw.text(
                 (700, 328 + h_num),
-                f"Max Combo: {cmap.maxcombo}",
+                f"Max Combo: {cmap.max_combo or 0}",
                 font=Torus_SemiBold_20,
                 anchor="lm",
             )

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/draw/bp.py

@@ -48,7 +48,7 @@ async def draw_bp(
         # 判断是否开启lazer模式
         if is_lazer:
             score_info.legacy_total_score = score_info.total_score
-        if score_info.ruleset_id == 3 and not is_lazer:
+        if score_info.ruleset_id == 3 and not is_lazer and source != "ppysb":
             score_info.accuracy = cal_legacy_acc(score_info.statistics)
         if not is_lazer:
             is_hidden = any(i in score_info.mods for i in (Mod(acronym="HD"), Mod(acronym="FL"), Mod(acronym="FI")))

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/draw/echarts.py

@@ -20,7 +20,14 @@ async def draw_bpa_plot(name, pp_ls, length_ls, mod_pp_ls, mapper_pp_ls) -> byte
     pic = await template_to_pic(
         template_path,
         template_name,
-        {"name": name, "pp_ls": pp_ls, "length_ls": length_ls, "mod_pp_ls": mod_pp_ls, "mapper_pp_ls": mapper_pp_ls},
+        {
+            "name": name,
+            "pp_ls": pp_ls,
+            "length_ls": length_ls,
+            "mod_pp_ls": mod_pp_ls,
+            "mapper_pp_ls": mapper_pp_ls,
+            "length": len(pp_ls),
+        },
     )
     return pic
 

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/draw/info.py

@@ -221,7 +221,9 @@ async def draw_info(uid: Union[int, str], mode: str, day: int, source: str) -> B
     # 总命中
     op, value = info_calc(statistics.total_hits, n_count)
     t_count = f"{statistics.total_hits:,}({op}{value:,})" if value != 0 else f"{statistics.total_hits:,}"
+    avg_hit = 0 if statistics.play_count == 0 else statistics.total_hits // statistics.play_count
     draw.text((935, 1175), t_count, font=Torus_Regular_40, anchor="rt")
+    draw.text((250, 945), f"(avg.{avg_hit:,})", font=Torus_Regular_25, anchor="lt")
     # 游玩时间
     sec = timedelta(seconds=statistics.play_time)
     d_time = datetime(1, 1, 1) + sec

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/draw/map.py

@@ -23,6 +23,7 @@ from .static import (
     Torus_SemiBold_25,
     osufile,
     extra_30,
+    Stars,
 )
 
 
@@ -68,7 +69,7 @@ async def draw_map_info(mapid: int, mods: list[str], is_lazer) -> BytesIO:
     # 模式
     draw.text((50, 65), IconLs[FGM[mapinfo.mode]], font=extra_30, anchor="lt")
     # 难度星星
-    stars_bg = stars_diff(ss_pp_info.difficulty.stars)
+    stars_bg = stars_diff(ss_pp_info.difficulty.stars, Stars)
     stars_img = stars_bg.resize((80, 30))
     im.alpha_composite(stars_img, (90, 65))
     if ss_pp_info.difficulty.stars < 6.5:
@@ -155,8 +156,11 @@ async def draw_map_info(mapid: int, mods: list[str], is_lazer) -> BytesIO:
     if mods:
         for mods_num, s_mods in enumerate(mods):
             mods_bg = osufile / "mods" / f"{s_mods.acronym}.png"
-            mods_img = Image.open(mods_bg).convert("RGBA")
-            im.alpha_composite(mods_img, (700 + 50 * mods_num, 295))
+            try:
+                mods_img = Image.open(mods_bg).convert("RGBA")
+                im.alpha_composite(mods_img, (700 + 50 * mods_num, 295))
+            except FileNotFoundError:
+                pass
     # mapper
     icon_url = f"https://a.ppy.sh/{mapinfo.user_id}"
     user_icon = await get_projectimg(icon_url)

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/draw/score.py

@@ -107,7 +107,7 @@ async def draw_score(
     map_json = await task2
     # 判断是否开启lazer模式
     if source == "osu":
-        score = cal_score_info(is_lazer, score)
+        score = cal_score_info(is_lazer, score, source)
     return await draw_score_pic(score, info, map_json, "", is_lazer, source)
 
 
@@ -180,7 +180,7 @@ async def get_score_data(
         user_path.mkdir(parents=True, exist_ok=True)
     # 判断是否开启lazer模式
     if source == "osu":
-        score = cal_score_info(is_lazer, score)
+        score = cal_score_info(is_lazer, score, source)
     return await draw_score_pic(score, info, map_json, grank, is_lazer, source)
 
 
@@ -795,10 +795,10 @@ def cal_legacy_rank(score_info: UnifiedScore, is_hidden: bool):
         return "N/A"
 
 
-def cal_score_info(is_lazer: bool, score_info: UnifiedScore) -> UnifiedScore:
+def cal_score_info(is_lazer: bool, score_info: UnifiedScore, source: str = "osu") -> UnifiedScore:
     if is_lazer:
         score_info.legacy_total_score = score_info.total_score
-    if score_info.ruleset_id == 3 and not is_lazer:
+    if score_info.ruleset_id == 3 and not is_lazer and source != "ppysb":
         score_info.accuracy = cal_legacy_acc(score_info.statistics)
     if not is_lazer:
         is_hidden = any(i in score_info.mods for i in (Mod(acronym="HD"), Mod(acronym="FL"), Mod(acronym="FI")))

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/draw/taiko_preview.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 from PIL import Image, ImageDraw
 
-from .static import Torus_Regular_8, Torus_Regular_15, Torus_Regular_20, Torus_Regular_25, Torus_Regular_30
+from .static import Torus_Regular_8, Torus_Regular_15
 
 HIT_DON = 0x00
 HIT_KAT = 0x01
@@ -35,20 +35,21 @@ def map_to_image(map_data) -> BytesIO:
     img = Image.new(mode="RGB", size=(3000, 30000), color=0x121212)
     draw = ImageDraw.Draw(img)
 
-    title_font = Torus_Regular_30
-    semi_font = Torus_Regular_25
-    reg_font = Torus_Regular_20
+    # title_font = Torus_Regular_30
+    # semi_font = Torus_Regular_25
+    # reg_font = Torus_Regular_20
     small_font = Torus_Regular_15
     tiny_font = Torus_Regular_8
 
-    draw.text(
-        (LEFT_MARGIN, 40),
-        map_data.artist + " - " + map_data.title + " [" + map_data.diff + "]",
-        font=title_font,
-        fill="#FFF",
-    )
-    draw.text((LEFT_MARGIN, 90), "by " + map_data.creator, font=semi_font, fill="#CCC")
-    draw.text((LEFT_MARGIN, 135), "HP = " + str(map_data.hp) + " OD = " + str(map_data.od), font=reg_font, fill="#AAA")
+    # draw.text(
+    #     (LEFT_MARGIN, 40),
+    #     map_data.artist + " - " + map_data.title + " [" + map_data.diff + "]",
+    #     font=title_font,
+    #     fill="#FFF",
+    # )
+    # draw.text((LEFT_MARGIN, 90), "by " + map_data.creator, font=semi_font, fill="#CCC")
+    # draw.text((LEFT_MARGIN, 135), "HP = " + str(map_data.hp) +
+    # " OD = " + str(map_data.od), font=reg_font, fill="#AAA")
 
     max_meter = 0
     timing_sections = []  # (start, beat_ms, meter, [list of hit_object])
@@ -67,7 +68,7 @@ def map_to_image(map_data) -> BytesIO:
             (map_data.timing_points[i][0], map_data.timing_points[i][1], map_data.timing_points[i][2], current_list)
         )
 
-    y_start = 200
+    y_start = 40
     max_x = 0
     max_y = 0
     bar_number = 1

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/draw/templates/bpa_chart.html

@@ -43,7 +43,7 @@
           xAxis: [
             {
               type: 'category',
-              data: Array.from({ length: 200 }, (_, i) => i),
+              data: Array.from({ length: {{length}} }, (_, i) => i),
               axisLabel: {
                   interval: 9
               }

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/file.py

@@ -47,18 +47,6 @@ async def download_map(setid: int) -> Optional[Path]:
     return filepath
 
 
-async def download_tmp_osu(map_id):
-    url = f"https://osu.ppy.sh/osu/{map_id}"
-    logger.info(f"开始下载谱面: <{map_id}>")
-    req = await safe_async_get(url)
-    filename = f"{map_id}.osu"
-    filepath = map_path / filename
-    chunk = req.read()
-    with open(filepath, "wb") as f:
-        f.write(chunk)
-    return filepath
-
-
 @auto_retry
 async def download_osu(set_id, map_id):
     url = [
@@ -71,6 +59,7 @@ async def download_osu(set_id, map_id):
         if req := await get_first_response(url):
             filename = f"{map_id}.osu"
             filepath = map_path / str(set_id) / filename
+            filepath.parent.mkdir(parents=True, exist_ok=True)
             with open(filepath, "wb") as f:
                 f.write(req)
             return filepath

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/mania/__init__.py

@@ -25,7 +25,7 @@ from reamber.algorithms.playField.parts import (
 )
 
 from ..file import download_map
-from ..schema import SayoBeatmap
+from ..schema.beatmapsets import BeatmapSets
 
 osu_path = Path() / "data" / "osu"
 if not osu_path.exists():
@@ -39,7 +39,7 @@ class Options:
     od: Optional[float]
     set: Optional[int]
     map: Optional[int] = None
-    sayo_info: Optional[SayoBeatmap] = None
+    beatmapsets: Optional[BeatmapSets] = None
     nsv: bool = False
     nln: bool = False
     fln: bool = False
@@ -89,15 +89,14 @@ async def convert_mania_map(options: Options) -> Optional[Path]:
     with ZipFile(osz_file.absolute()) as my_zip:
         my_zip.extractall(path)
     os.remove(osz_file)
-    if options.sayo_info:
-        for i in options.sayo_info.data.bid_data:
-            if i.bid == options.map:
-                audio_file_name = i.audio
-                audio_name = audio_file_name[:-4]
-                audio_type = audio_file_name[-4:]
+    if options.beatmapsets:
+        for file in path.rglob("*.osu"):
+            osu = OsuMap.read_file(str(file.absolute()))
+            if osu.beatmap_id == options.map:
+                audio_file_name = osu.audio_file_name
+                audio_name = osu.audio_file_name[:-4]
+                audio_type = osu.audio_file_name[-4:]
                 break
-        else:
-            raise Exception("小夜api有问题啊")
     if options.rate:
         if options.rate > 10:
             options.rate = 10

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/matcher/bp_analyze.py

@@ -34,12 +34,16 @@ async def _(event: Event, state: T_State):
     uid = state["user"]
     lazer_mode = "lazer模式下" if state["is_lazer"] else "stable模式下"
     try:
-        score_ls = await get_user_scores(uid, NGM[state["mode"]], "best", legacy_only=not state["is_lazer"])
+        score_ls = await get_user_scores(
+            uid, NGM[state["mode"]], "best", state["source"], legacy_only=not state["is_lazer"]
+        )
     except NetworkError as e:
         await UniMessage.text(
             f"在查找用户：{state['username']} {NGM[state['mode']]}模式 {lazer_mode}时 {str(e)}"
         ).finish(reply_to=True)
     for score in score_ls:
+        if not state["is_lazer"] or state["source"] == "ppysb":
+            score.mods = [mod for mod in score.mods if mod.acronym != "CL"]
         for mod in score.mods:
             if mod.acronym == "DT" or mod.acronym == "NC":
                 score.beatmap.total_length /= 1.5
@@ -89,14 +93,15 @@ async def _(event: Event, state: T_State):
         pp_data.append({"name": mod, "value": round(pp, 2)})
     mapper_pp = defaultdict(int)
     for num, i in enumerate(score_ls):
-        mapper_pp[i.beatmap.user_id] += i.pp * 0.95**num
-    mapper_pp = sorted(mapper_pp.items(), key=lambda x: x[1], reverse=True)
-    mapper_pp = mapper_pp[:9]
-    users = await get_users([i[0] for i in mapper_pp])
-    user_dic = {i.id: i.username for i in users}
-    mapper_pp_data = []
-    for mapper, pp in mapper_pp:
-        mapper_pp_data.append({"name": user_dic.get(mapper, ""), "value": round(pp, 2)})
+        key = i.beatmap.creator if state["source"] == "ppysb" else i.beatmap.user_id
+        mapper_pp[key] += i.pp * 0.95**num
+    mapper_pp = sorted(mapper_pp.items(), key=lambda x: x[1], reverse=True)[:9]
+    if state["source"] == "ppysb":
+        mapper_pp_data = [{"name": mapper, "value": round(pp, 2)} for mapper, pp in mapper_pp]
+    else:
+        users = await get_users([i[0] for i in mapper_pp])
+        user_dic = {i.id: i.username for i in users}
+        mapper_pp_data = [{"name": user_dic.get(mapper, ""), "value": round(pp, 2)} for mapper, pp in mapper_pp]
     if len(mapper_pp_data) > 20:
         mapper_pp_data = mapper_pp_data[:20]
     name = f"{state['username']} {NGM[state['mode']]} 模式 "

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/matcher/guess.py

@@ -26,7 +26,7 @@ from ..exceptions import NetworkError
 from ..database.models import UserData
 from ..mania import generate_preview_pic
 from ..api import safe_async_get, get_user_scores
-from ..file import map_path, download_tmp_osu
+from ..file import map_path, download_osu
 from ..draw.catch_preview import draw_cath_preview
 
 games: dict[str, NewScore] = {}
@@ -470,10 +470,10 @@ async def _(
     chart_games[session_id] = selected_score
     chart_set_timeout(matcher, session_id)
     if mode == "3":
-        osu = await download_tmp_osu(selected_score.beatmap.id)
+        osu = await download_osu(selected_score.beatmapset.id, selected_score.beatmap.id)
         pic = await generate_preview_pic(osu)
     elif mode == "1":
-        osu = await download_tmp_osu(selected_score.beatmap.id)
+        osu = await download_osu(selected_score.beatmapset.id, selected_score.beatmap.id)
         beatmap = parse_map(osu)
         pic = map_to_image(beatmap)
     else:

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/matcher/map_convert.py

@@ -7,8 +7,9 @@ from nonebot import on_command, on_shell_command
 from nonebot.exception import ParserExit, ActionFailed
 from nonebot.params import CommandArg, ShellCommandArgv
 
-from ..api import get_sayo_map_info
+from ..api import get_beatmapsets_info, osu_api
 from ..mania import Options, convert_mania_map
+from ..schema import Beatmap
 
 parser = ArgumentParser("convert", description="变换mania谱面")
 parser.add_argument("--set", type=int, help="要转换的谱面的setid")
@@ -37,9 +38,11 @@ async def _(argv: list[str] = ShellCommandArgv()):
         return
     options = Options(**vars(args))
     if options.map:
-        sayo_map_info = await get_sayo_map_info(options.map, 1)
-        options.set = sayo_map_info.data.sid
-        options.sayo_info = sayo_map_info
+        map_data = await osu_api("map", options.map)
+        mapinfo = Beatmap(**map_data)
+        beatmapsets_info = await get_beatmapsets_info(mapinfo.beatmapset_id)
+        options.set = mapinfo.beatmapset_id
+        options.beatmapsets = beatmapsets_info
     if not options.set:
         await UniMessage.text("请提供需要转换的谱面setid").finish(reply_to=True)
     if options.nln and options.fln:
@@ -85,9 +88,11 @@ async def _(msg: Message = CommandArg()):
     args = parser.parse_args(argv)
     options = Options(**vars(args))
     if options.map:
-        sayo_map_info = await get_sayo_map_info(options.map, 1)
-        options.set = sayo_map_info.data.sid
-        options.sayo_info = sayo_map_info
+        map_data = await osu_api("map", options.map)
+        mapinfo = Beatmap(**map_data)
+        beatmapsets_info = await get_beatmapsets_info(mapinfo.beatmapset_id)
+        options.set = mapinfo.beatmapset_id
+        options.beatmapsets = beatmapsets_info
     osz_path = await convert_mania_map(options)
     if not osz_path:
         await UniMessage.text("未找到该地图，请检查是否搞混了mapID与setID").finish(reply_to=True)

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/matcher/medal.py

@@ -69,6 +69,6 @@ async def _(msg: Message = CommandArg()):
         for beatmap in medal_data["beatmaps"]:
             msg += (
                 f"{beatmap['SongTitle']} [{beatmap['DifficultyName']}]\n{beatmap['Difficulty']}⭐\n"
-                + f"https://osu.ppy.sh/b/{beatmap['BeatmapID']}"
+                + f"https://osu.ppy.sh/b/{beatmap['BeatmapID']}\n"
             )
         await msg.send()

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/matcher/preview.py

@@ -5,7 +5,7 @@ from nonebot_plugin_alconna import UniMessage
 from ..utils import NGM
 from ..api import osu_api
 from .utils import split_msg
-from ..file import download_tmp_osu
+from ..file import download_osu
 from ..exceptions import NetworkError
 from ..mania import generate_preview_pic
 from ..draw.catch_preview import draw_cath_preview
@@ -24,7 +24,7 @@ async def _(state: T_State):
     except NetworkError as e:
         await UniMessage.text(f"查找map_id:{osu_id} 信息时 {str(e)}").finish(reply_to=True)
     if state["mode"] == "3":
-        osu = await download_tmp_osu(osu_id)
+        osu = await download_osu(data["beatmapset_id"], int(osu_id))
         if state["_prefix"]["command"][0] == "完整预览":
             pic = await generate_preview_pic(osu, True)
         else:
@@ -34,7 +34,7 @@ async def _(state: T_State):
         pic = await draw_cath_preview(int(osu_id), data["beatmapset_id"], state["mods"])
         await UniMessage.image(raw=pic).finish(reply_to=True)
     elif state["mode"] == "1":
-        osu = await download_tmp_osu(osu_id)
+        osu = await download_osu(data["beatmapset_id"], int(osu_id))
         beatmap = parse_map(osu)
         pic = map_to_image(beatmap)
         await UniMessage.image(raw=pic).finish(reply_to=True)

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.24.0}/nonebot_plugin_osubot/matcher/recommend.py

@@ -2,14 +2,14 @@ import re
 from random import shuffle
 
 from nonebot import on_command
-from nonebot.log import logger
 from nonebot.typing import T_State
 from expiringdict import ExpiringDict
 from nonebot.internal.matcher import Matcher
 from nonebot_plugin_alconna import UniMessage
 
 from .utils import split_msg
-from ..api import get_recommend, update_recommend, get_sayo_map_info
+from ..api import get_recommend, update_recommend, osu_api
+from ..schema import Beatmap
 
 recommend = on_command("推荐", priority=11, block=True, aliases={"recommend", "推荐铺面", "推荐谱面"})
 recommend_cache = ExpiringDict(1000, 60 * 60 * 12)
@@ -41,23 +41,18 @@ async def handle_recommend(state: T_State, matcher: type[Matcher]):
             break
     else:
         await matcher.finish("今天已经没有可以推荐的图啦，明天再来吧")
+        return None
     bid = int(re.findall("https://osu.ppy.sh/beatmaps/(.*)", recommend_map.mapLink)[0])
-    map_info = await get_sayo_map_info(bid, 1)
-    sid = map_info.data.sid
-    for i in map_info.data.bid_data:
-        if i.bid == bid:
-            bg = i.bg
-            break
-    else:
-        bg = ""
-        logger.error(f"出现问题： 有问题的是{bid}, {sid}")
+    map_data = await osu_api("map", bid)
+    map_info = Beatmap(**map_data)
+    sid = map_info.beatmapset_id
     s = (
         f"推荐的铺面是{recommend_map.mapName} ⭐{round(recommend_map.difficulty, 2)}\n{''.join(recommend_map.mod)}\n"
         f"预计pp为{round(recommend_map.predictPP, 2)}\n提升概率为{round(recommend_map.passPercent * 100, 2)}%\n"
         f"{recommend_map.mapLink}\nhttps://kitsu.moe/api/d/{sid}\n"
         f"https://txy1.sayobot.cn/beatmaps/download/novideo/{sid}"
     )
-    pic_url = f"https://dl.sayobot.cn/beatmaps/files/{sid}/{bg}"
+    pic_url = f"https://osu.direct/api/media/background/{bid}"
     return pic_url, s