nonebot-plugin-osubot 6.23.0__py3-none-any.whl → 6.24.0__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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
 
 

nonebot_plugin_osubot/schema/__init__.py

@@ -1,7 +1,6 @@
 from .user import User, Badge
 from .match import Game, Match
 from .alphaosu import RecommendData
-from .sayo_beatmap import SayoBeatmap
 from .score import Score, NewScore, BeatmapUserScore
 from .beatmap import Beatmap, Beatmapset, SeasonalBackgrounds
 
@@ -14,7 +13,6 @@ __all__ = [
     "Beatmap",
     "Beatmapset",
     "SeasonalBackgrounds",
-    "SayoBeatmap",
     "RecommendData",
     "Match",
     "Game",

nonebot_plugin_osubot/schema/beatmapsets.py

@@ -0,0 +1,42 @@
+from typing import Optional
+from .basemodel import Base
+
+
+class BidData(Base):
+    id: int
+    mode_int: int
+    version: str
+    total_length: int
+    cs: float
+    ar: float
+    accuracy: float
+    drain: float
+    difficulty_rating: float
+    count_circles: int
+    count_sliders: int
+    count_spinners: int
+    max_combo: Optional[int] = None
+    playcount: int
+    passcount: int
+
+
+class BeatmapSets(Base):
+    id: int
+    ranked: int
+    title: str
+    artist: str
+    title_unicode: str
+    artist_unicode: str
+    creator: str
+    user_id: int
+    source: str
+    last_updated: str
+    ranked_date: Optional[str]
+    bpm: float
+    favourite_count: int
+    video: bool
+    storyboard: bool
+    tags: str
+    language_id: int
+    genre_id: int
+    beatmaps: list[BidData]

nonebot_plugin_osubot/schema/score.py

@@ -114,6 +114,7 @@ class UnifiedBeatmap(Base):
     hp: float
     stars: float
     user_id: Optional[int] = None
+    convert: Optional[bool] = False
 
 
 class UnifiedScore(Base):

{nonebot_plugin_osubot-6.23.0.dist-info → nonebot_plugin_osubot-6.24.0.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 nonebot_plugin_osubot/__init__.py,sha256=Q-mTTnOIdKiKG6JrVm-kqpPrAhOP9lWyiKHNRqA7gpc,1478
-nonebot_plugin_osubot/api.py,sha256=8NnLtAFR4-ING4Ja6vR5TfU1VDXOitp0aczGmZBPl54,16400
+nonebot_plugin_osubot/api.py,sha256=3jJbgJdL1sJ_FcbTqJQxRPLlJueaUXhH0REfy8Ff-ps,16521
 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/data/osu/1849145.osz,sha256=enbHOvDu6ZkvQBM7gtvgZBY-r0a7z87pG62Xm9hXUSI,6933013
@@ -7,8 +7,8 @@ nonebot_plugin_osubot/data/osu/1849145.zip,sha256=k957Du9QVliv1rt6ku3sKDoTIOeyJk
 nonebot_plugin_osubot/database/__init__.py,sha256=7CDo9xU_DGLQ6uTj_mU_Px92phg_DMU5mP6WvgOxFLY,101
 nonebot_plugin_osubot/database/models.py,sha256=VF_MxR70eRbiIHtqWjpE_Vea4xR38X0RJiQIO96mjsY,1595
 nonebot_plugin_osubot/draw/__init__.py,sha256=dRELA2Vi4gTe8v48q0iHXLDOEj7Unk-_ChDXJp3qkhg,265
-nonebot_plugin_osubot/draw/bmap.py,sha256=GzEiUEkcwdX6ixZ-qmM8TQQf0imD8taur3eX4lJ5wVg,5128
-nonebot_plugin_osubot/draw/bp.py,sha256=EffKW5HcbqQheGRzr8VAU5q6OJ1je21XxVJ2JTmPL9E,8948
+nonebot_plugin_osubot/draw/bmap.py,sha256=AfOCYVFPtjrrUaqTi-zfl5c3_lCQvIF1XoV31H5a4ko,5123
+nonebot_plugin_osubot/draw/bp.py,sha256=Ma-it9MFYcHiIigb5_ZzG8p7wlL7-hh3sQKgB412jfo,8970
 nonebot_plugin_osubot/draw/catch_preview.py,sha256=uSYoTqfdxRy4anpH9Uhj8NntPo008pzw1t6xRMTBBkI,1397
 nonebot_plugin_osubot/draw/catch_preview_templates/css/style.css,sha256=2I1VwycLhKJMxwjHj19zAV6MBkFMLu_qLunpoiRlGlM,3919
 nonebot_plugin_osubot/draw/catch_preview_templates/js/beatmap/beatmap.js,sha256=xh6RUz3D40-HJHu0KGqac_eAIHGoAR12bF58V9ft7iQ,5784
@@ -39,46 +39,45 @@ nonebot_plugin_osubot/draw/catch_preview_templates/js/util.js,sha256=XveUlX-d0vr
 nonebot_plugin_osubot/draw/catch_preview_templates/js/viewbox.js,sha256=RPsUyoKNAQub2n7oUGwWyFppZu0iVuy6DD5gggQZS3E,1641
 nonebot_plugin_osubot/draw/catch_preview_templates/js/zip.min.js,sha256=pQmrVxuGCMeLS-XS3QsVhzjwap28fr9Ya083uPlg1sM,86405
 nonebot_plugin_osubot/draw/catch_preview_templates/pic.html,sha256=jwPxxyYFLGpbD29h8u_j3LBY33ya7BS2R_t95EldAmk,3092
-nonebot_plugin_osubot/draw/echarts.py,sha256=OzL_397yWrDAIXsEWf72hAiqdIUBz1D182cli6ORD6s,1037
-nonebot_plugin_osubot/draw/info.py,sha256=i2YcJmSdTpwhZl_nDe7GJv4jQTB8_9oBfpq2Zw2hwo0,11162
-nonebot_plugin_osubot/draw/map.py,sha256=4M8xRd0dIbC5g1s8I4eTZ3vRglM6r_TSznFOZ62K2wk,8654
+nonebot_plugin_osubot/draw/echarts.py,sha256=0fmfxKdnGUe7FKKb_7kS6Qj_PyrUZHUam7altC0WyKg,1142
+nonebot_plugin_osubot/draw/info.py,sha256=SkrkE-kWJmdQIZ8oKJocRf6hTrJZy-qwE3xUvz5lJpk,11344
+nonebot_plugin_osubot/draw/map.py,sha256=Oo1s5YuNxWzNVMBIASk0gO0ISATS-pQBPg68NcbpF74,8756
 nonebot_plugin_osubot/draw/match_history.py,sha256=GBJl6lAA27U7NSMC2isEzD_YsoIPAeG6ijDu7Oflcl0,997
 nonebot_plugin_osubot/draw/rating.py,sha256=pA7mGLI4IujmYB6kQf_tSkR7mZGpUAVLRLyaAsZhqTM,20397
-nonebot_plugin_osubot/draw/score.py,sha256=65XjTD5nZ3lJt6yvlv2DWcpu14IKFkqWmD88Q0RnuvQ,29218
+nonebot_plugin_osubot/draw/score.py,sha256=cUD8zpdf8e43Du9Z_A6T3HIP3IxtgSF3wheaNwMBWWk,29277
 nonebot_plugin_osubot/draw/static.py,sha256=wdlzNO3xyiauKiMLr_h-B9uAsFU7fX_Y-fOusYKZP3k,4132
-nonebot_plugin_osubot/draw/taiko_preview.py,sha256=tqhuHSdxUJEuXqKHMJDeSLdusuJhSnMMiaG5FbUnaJw,11441
-nonebot_plugin_osubot/draw/templates/bpa_chart.html,sha256=R-fO46HtmC4y3brMFGz6MQkna8ke7WGHVIgUnvcY248,7012
+nonebot_plugin_osubot/draw/taiko_preview.py,sha256=X2hzWewMfH_0wFLBBtAALrXwT55pdytIu7215p0Gfws,11414
+nonebot_plugin_osubot/draw/templates/bpa_chart.html,sha256=J0YbxM2_iGHIgLKs6qBbL-wdmNJ4Fc4FAQcc22RDuD8,7019
 nonebot_plugin_osubot/draw/templates/echarts.min.js,sha256=IF32ooP8NPIzQg_fs7lVHpwG92JcCPE1TZAEyFSgGZU,1022939
 nonebot_plugin_osubot/draw/templates/mod_chart.html,sha256=Iz71KM5v9z_Rt2vqJ5WIZumRIHgDfcGIUmWGvVGZ-nQ,1508
 nonebot_plugin_osubot/draw/templates/pp_rank_line_chart.html,sha256=Gyf-GR8ZBlWQTks0TlB3M8EWUBMVwiUaesFAmDISxLo,1417
-nonebot_plugin_osubot/draw/templates/t.html,sha256=_A4c7lR3zfjIWoeR38jBMtuUCA6SFEYNZWPAkbNfHPk,10597
 nonebot_plugin_osubot/draw/utils.py,sha256=6QDbByPQZCxI0k_i5MsExyWZ-sHgJUw6nEWLv85IgLY,15826
 nonebot_plugin_osubot/exceptions.py,sha256=N_FsEk-9Eu2QnuznhdfWn6OoyA1HH73Q7bUaY89gVi0,40
-nonebot_plugin_osubot/file.py,sha256=GhG54EdVsxFf8_8GZOPh4YGvw9iw5bAX9JFz4Mg4kMg,4379
+nonebot_plugin_osubot/file.py,sha256=kfnaf68q0Au54YMUqhD2nYnusEsHqjxJKy2LqPA8urI,4104
 nonebot_plugin_osubot/info/__init__.py,sha256=I7YlMQiuHExEeJWqyzZb2I-Vl2uql3Py2LdhSH2Z9N0,136
 nonebot_plugin_osubot/info/bg.py,sha256=Icua4bS38k0c-WbLUjhfS4IXOF83bgyu_oa2HwX4ZEQ,1541
 nonebot_plugin_osubot/info/bind.py,sha256=b2ua625hbYym7rpb-kLBB-VDP5YWFdmT5RweM58ggWw,4934
-nonebot_plugin_osubot/mania/__init__.py,sha256=XRPn563jDJiPohFekcoFFCqCJYznb-6uORneioZv4xI,5534
+nonebot_plugin_osubot/mania/__init__.py,sha256=t5-24nd2FiZTKvMFvNg8ZV9Lp_OFSHjhj_gWUV3s1es,5560
 nonebot_plugin_osubot/matcher/__init__.py,sha256=yID7QcdQF6_Mouwbej3JwYUBbKSU3VQdrjq6B1Fz9P8,1331
 nonebot_plugin_osubot/matcher/bind.py,sha256=QQJc2S7XFo5tu4CPloIET6fKaeiQixgb8M7QvULV6E0,2834
 nonebot_plugin_osubot/matcher/bp.py,sha256=GidJfuZ9lJ7LwMq126DDOwMksNUOz4Bkab83OlKg8t8,3983
-nonebot_plugin_osubot/matcher/bp_analyze.py,sha256=L2ccAi7TQvpD036DyA27D8wuiqBBkcfLT0ldk_Apv8w,3820
+nonebot_plugin_osubot/matcher/bp_analyze.py,sha256=xi40HVOcTvmHWR4WNLm706126CulfpV5UP0500FNiD8,4159
 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=Bv4Rt11eB65hdsPu6KhCjmEP1AacFUwA0uu5AytNB68,24192
 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
-nonebot_plugin_osubot/matcher/map_convert.py,sha256=YfR-_u5F_GCdn2mv9ZvMEpfxTc63f9nmihIUdu54eN8,5716
+nonebot_plugin_osubot/matcher/map_convert.py,sha256=Q3oNK8NvOUE56mOXQ0PvRQkZZ0nLbtFrAp9wxqw-7Ak,5973
 nonebot_plugin_osubot/matcher/match.py,sha256=uyrm8I_WgHK2ya1q46AUxNk_cQiKKh7GKlUzrrG1o7w,472
-nonebot_plugin_osubot/matcher/medal.py,sha256=OlJTwBvh0kGx_KWhjksozI910c8QdaVFBgtnwqLVyLU,2965
+nonebot_plugin_osubot/matcher/medal.py,sha256=LZf8hlXGHy8mdK2l97SsYCChfYYovEDBGNbUPO3AOsw,2967
 nonebot_plugin_osubot/matcher/mu.py,sha256=l3Ebz47o46EvN2nvo9-zzQI4CTaLMcd5XW0qljqSGIM,445
 nonebot_plugin_osubot/matcher/osu_help.py,sha256=64rOkYEOETvU8AF__0xLZjVRs3cTac0D1XEultPK_kM,728
 nonebot_plugin_osubot/matcher/osudl.py,sha256=yLEblYnLprTf2T00FiRWJ8CuCd0IHyUY9Ka68yAKOXo,872
 nonebot_plugin_osubot/matcher/pr.py,sha256=xGjQvEJHmIZkq9luu8TtbjBB8FykGI4Wzi_-eXghOjQ,4951
-nonebot_plugin_osubot/matcher/preview.py,sha256=n9wgdNG9SF_JQ78nShTsTElJkBDJQr67DRc8Q9sVcCo,1896
+nonebot_plugin_osubot/matcher/preview.py,sha256=olEvSgdIzqSpNH-PjOeu48iiX-TeRJqptOeQqrIo6b4,1940
 nonebot_plugin_osubot/matcher/rank.py,sha256=sFEim3cR_vswzLmbagjqy-ypolcprAxQpawiSEcFqEI,3619
 nonebot_plugin_osubot/matcher/rating.py,sha256=JY1Q1ELU3Y1FhQ7kVWVkgVsYEVxkAcxjsoMcwC_u234,450
-nonebot_plugin_osubot/matcher/recommend.py,sha256=1LcjACkiPdZV0VqXbZx-oTytKr8lYxg1q0zZuXowWTc,2678
+nonebot_plugin_osubot/matcher/recommend.py,sha256=DChL83UNSi_XDHUm1ksPwUgQE12PI_EHaxXkJQoZ5Oc,2521
 nonebot_plugin_osubot/matcher/score.py,sha256=Nk6dpDlszKJKdboTSQRBf-wMGioHIPqKSVWrnT0Xbns,1212
 nonebot_plugin_osubot/matcher/update.py,sha256=MHpxoJmU0hKW82XuM9YpyCxUUjjiNKwejnRgYwueR4Q,3168
 nonebot_plugin_osubot/matcher/update_mode.py,sha256=0Wy6Y1-rN7XcqBZyo37mYFdixq-4HxCwZftUaiYhZqE,1602
@@ -358,24 +357,24 @@ nonebot_plugin_osubot/osufile/mods/6K.png,sha256=umRQwUCqGtRxL1J0OK4fEfPgda-sKTy
 nonebot_plugin_osubot/osufile/mods/7K.png,sha256=zkeacf2WSDywv0zt4QCVTa4A54wbLI5_APvQZhnd0qY,970
 nonebot_plugin_osubot/osufile/mods/8K.png,sha256=-NFuLd08N-7NiDV-blOprSP56Xx5kLBusmyvYVPdXKE,1045
 nonebot_plugin_osubot/osufile/mods/9K.png,sha256=jMgg_a16eRrVV-a8wx4cTHyD9BozUzwibOhNIG4dQ-Y,1368
-nonebot_plugin_osubot/osufile/mods/AP.png,sha256=9qH_KtcpqmMquU0PxIgCX1MG01Vo4MXSFibuE-8_Td8,1777
-nonebot_plugin_osubot/osufile/mods/CL.png,sha256=Mqsi9M0w7ouhN31o6alizwnOUCy8CVJw49RllH6zf74,2466
-nonebot_plugin_osubot/osufile/mods/DT.png,sha256=AoH8eGUdM9d0UF9Y-YIXlXp5FBHMCLMwxaFiHNPmDIo,1531
-nonebot_plugin_osubot/osufile/mods/EZ.png,sha256=TQYpPexTrYpNSVq5QyuiFeQeN7v720_uZLipHYVKDL0,1411
-nonebot_plugin_osubot/osufile/mods/FI.png,sha256=jNX9pJeJIL8VlHXEBNNqKJUw_CabIm9jRU2TgwmyLzw,978
-nonebot_plugin_osubot/osufile/mods/FL.png,sha256=Kv4lCJ8kYDW2xq6xAwrEJlPL2V7DvqbBcKcgWK_WPRQ,1111
-nonebot_plugin_osubot/osufile/mods/HD.png,sha256=BIYpJhBrdGOuW03EQHq0r1Jz_fLuMx1ezEA1I6OojFk,1722
-nonebot_plugin_osubot/osufile/mods/HR.png,sha256=ThRdj6BtUsCUFKgFvdQZtJ0o4kL3rKkMUBT9_LBbrNw,1386
-nonebot_plugin_osubot/osufile/mods/HT.png,sha256=ha0iFzpa9V8u8g_439xNHJlKPDIiUGBkDRYKILKnHL4,1381
-nonebot_plugin_osubot/osufile/mods/MR.png,sha256=7fXVrXPOMhh0ek1gQy7TKvgMKN2G-p0MFQB5iKUtXZ0,1151
-nonebot_plugin_osubot/osufile/mods/NC.png,sha256=94xR0FyljJQO5QubrJVfWaJwNCIOjWstb6CSUP5IkSE,1386
-nonebot_plugin_osubot/osufile/mods/NF.png,sha256=frjuacyqTldRXYczCzFzcVQ7LLkw-7KTnHcVHvGajaY,1222
-nonebot_plugin_osubot/osufile/mods/PF.png,sha256=J3Cl59CJf04xAergY-ofVTJKahivEO0JFN7v6KH4v0E,1110
-nonebot_plugin_osubot/osufile/mods/RX.png,sha256=gc8cWpFv3HZF0GaQN7Kp0Y9T8mlMgz3wY6rymzzkWh4,1519
-nonebot_plugin_osubot/osufile/mods/SD.png,sha256=JptCZkXv8kOpIksYimWdC7hRJXShL7NMwY7DiUZuKBQ,1291
-nonebot_plugin_osubot/osufile/mods/SO.png,sha256=qKPoP-LXNU3nSVn8e7z2d6LddFOG-v4gbBEUOb6BtXU,1493
-nonebot_plugin_osubot/osufile/mods/TD.png,sha256=ZAprUMXNcqs_tXPF0HU34qa_NUZo6U-NemMjVxBOk10,1309
-nonebot_plugin_osubot/osufile/mods/V2.png,sha256=Y3ju7KMECnGiECRM1MnZUuuwQqbflkdz6I7XjCCTw2E,1354
+nonebot_plugin_osubot/osufile/mods/AP.png,sha256=Fr1ip8Mxp-4FGInKRNSaEh-UOjjwBmFOn622P3bh7Js,1777
+nonebot_plugin_osubot/osufile/mods/CL.png,sha256=d6umxTJ9Ukxr6qpuK0C_K49eDXpIupk_gLvmCyLulcQ,1595
+nonebot_plugin_osubot/osufile/mods/DT.png,sha256=SKG0ueXlp1LkNBN7jYZLqFgFgAellleag_OTmCq7u_Q,1621
+nonebot_plugin_osubot/osufile/mods/EZ.png,sha256=2v8urESIhNVuYHwfpw2DHjC2VuvuOo_fd0QIV6YpWSY,1303
+nonebot_plugin_osubot/osufile/mods/FI.png,sha256=NPBvNd12oE4zrXtqfmK6swxJ-qe5Ao38edBldzCDnfM,1249
+nonebot_plugin_osubot/osufile/mods/FL.png,sha256=CKx3ITzByhbJ4uDNoZ6c7RpjNcJlicI879pTVTLxvRY,1288
+nonebot_plugin_osubot/osufile/mods/HD.png,sha256=67aJOk_HMuRpwRVu3bTsGOxRAGaMj218YYoQSYxw-RA,2159
+nonebot_plugin_osubot/osufile/mods/HR.png,sha256=OwDFQTPbQIIwxymwGgyoGCS3RTkzPt0tdtk4238CnHc,1389
+nonebot_plugin_osubot/osufile/mods/HT.png,sha256=I7E8Y87rtfsKzto_clVf4GiIu7CHYrP7FGmeZi89oKU,1404
+nonebot_plugin_osubot/osufile/mods/MR.png,sha256=ksEwedL_bEBm34VIBt9IDfBFuB20VBn3C3F4sfyrhTs,1290
+nonebot_plugin_osubot/osufile/mods/NC.png,sha256=CWo_Xkdmgsp1YOi-TamevcNdpYgq_1lAVDXZ5cGFqEQ,1365
+nonebot_plugin_osubot/osufile/mods/NF.png,sha256=7C6rZp7ZbAo1SUC3uHUrd73OY_2Mn7KpofCM4SmGBG0,1634
+nonebot_plugin_osubot/osufile/mods/PF.png,sha256=XbJt5JnqRUktT0kLXkCn6Iv9sLj1TFycQRsOmGnJjRE,1304
+nonebot_plugin_osubot/osufile/mods/RX.png,sha256=tc6MTF1oDcji1P_wuEZjGORa4Ah3GaCQLM9ABatNg00,1265
+nonebot_plugin_osubot/osufile/mods/SD.png,sha256=FQaNUkSCt92kAeEo5GVG4neWMN0TUdC637g8FMWbjuw,1695
+nonebot_plugin_osubot/osufile/mods/SO.png,sha256=Fiz7A8x0MklH9PUsMz9vX9GYOp1p7o9pCcdhsZSmEkI,1512
+nonebot_plugin_osubot/osufile/mods/TD.png,sha256=rWej0qHVNPxQJOztx_AYacYhJHnFlddO8X3xGwSLReQ,1498
+nonebot_plugin_osubot/osufile/mods/V2.png,sha256=pyXx83YcJaimJL6i3DfrX8XdJ_3UmL8RgtP6ua0v7wM,1205
 nonebot_plugin_osubot/osufile/pfm_ctb.png,sha256=9JJu8J1gR_nQhb1EWOuJUOjNitYK_gcH6MRGiYtvsGI,53451
 nonebot_plugin_osubot/osufile/pfm_mania.png,sha256=PKlAezcKALo0UMnrYvTCL3pd-oJNEU76qLVPhfDLFdk,52208
 nonebot_plugin_osubot/osufile/pfm_std.png,sha256=ts7e7IUeoalLuw0Pww0X3trXUpZwnWRsOqdQ1RzcdFM,57032
@@ -398,16 +397,16 @@ nonebot_plugin_osubot/osufile/work/stars.png,sha256=zifMmxxjOGzSZAm1tr-3ky_yy18p
 nonebot_plugin_osubot/osufile/work/stars_expertplus.png,sha256=cmfpErs-flPxHEhVmS9H8vy8H7mrChvV_Q4A77oSVFY,517
 nonebot_plugin_osubot/osufile/work/suppoter.png,sha256=4V4eNhB8_8KIXsQ1jzFyHUkicKPb5LPehoIcri4h8E4,16061
 nonebot_plugin_osubot/pp.py,sha256=PSWGLWERr4vVtE9H5D2EBm-_hM5HOU3PQvv1cC4rqmQ,3175
-nonebot_plugin_osubot/schema/__init__.py,sha256=io5BqRRNeBUSWPw5VXQav_TMrDN4dsTVpoMzrU9lTCA,468
+nonebot_plugin_osubot/schema/__init__.py,sha256=iC4BTSW_uPyH5-1xk3ByYa5kCicnOFWqxhuTmQKn2ik,411
 nonebot_plugin_osubot/schema/alphaosu.py,sha256=7cJLIwl4X-dshYsXMi8hHgcp7Ly6BiI3pqwXENhMaX0,693
 nonebot_plugin_osubot/schema/basemodel.py,sha256=aZI1rdOHx-kmMXohazq1s5tYdtR-2WRzfYQATmWd6a4,99
 nonebot_plugin_osubot/schema/beatmap.py,sha256=UnobfZEHq1V2HG-A4j3BECubO-dB1JzTMA2_QIXttNM,1960
+nonebot_plugin_osubot/schema/beatmapsets.py,sha256=rEbkmZHYXqmRtg9CyV0hzxc5kZFGm9OWoOv_laYripQ,780
 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=gxF_RVSUOyj7EF_q3XeHhNj5qg19MW-B1aePjnTmi08,3233
+nonebot_plugin_osubot/schema/score.py,sha256=o32jKDESzFwOFPZnzjKqxNIj0MPUL9mFvBqgaZARHac,3269
 nonebot_plugin_osubot/schema/user.py,sha256=sxNmqymG_kIVuGuzfchSv9UML6NPG70cqo2_h5xDIpM,2250
 nonebot_plugin_osubot/utils/__init__.py,sha256=pyv8XxBcCOeQVDj1E4dgvktzcefgQXfKBlarsYGx1sg,815
-nonebot_plugin_osubot-6.23.0.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-nonebot_plugin_osubot-6.23.0.dist-info/METADATA,sha256=XK7OxlxWEiM1vCKm4_4A8u6vRMh6ZQXl-OrdF9zxq8A,4476
-nonebot_plugin_osubot-6.23.0.dist-info/RECORD,,
+nonebot_plugin_osubot-6.24.0.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+nonebot_plugin_osubot-6.24.0.dist-info/METADATA,sha256=wNBfSWq-1OB76NivPUP2ZuXxJlbILx1enIhGNnngGDs,4476
+nonebot_plugin_osubot-6.24.0.dist-info/RECORD,,

nonebot_plugin_osubot/draw/templates/t.html

@@ -1,58 +0,0 @@
-<head>
-    <meta charset="UTF-8">
-    <title>Awesome-pyecharts</title>
-    <script type="text/javascript" src="./echarts.min.js"></script>
-</head>
-<body >
-    <div id="1" class="chart-container" style="width:900px; height:500px; "></div>
-    <script>
-        const chart = echarts.init(
-            document.getElementById('1'), 'white', {renderer: 'canvas'}
-        );
-        const option = {
-            "animation": false,
-        title: {
-          text: 'title',
-          left: 'center' // 标题水平居中
-        },
-        xAxis: {
-          type: 'category',
-          data: ['2023-09-10', '2023-09-11', '2023-09-12', '2023-09-13', '2023-09-14', '2023-09-15', '2023-09-16', '2023-09-17', '2023-09-18', '2023-09-19', '2023-09-20', '2023-09-21', '2023-09-22', '2023-09-23', '2023-09-24', '2023-09-25', '2023-09-26', '2023-09-27', '2023-09-28', '2023-09-29', '2023-09-30', '2023-10-01', '2023-10-02', '2023-10-03', '2023-10-04', '2023-10-05', '2023-10-06', '2023-10-07', '2023-10-08', '2023-10-09', '2023-10-10', '2023-10-11', '2023-10-12', '2023-10-13', '2023-10-14', '2023-10-15', '2023-10-16', '2023-10-17', '2023-10-18', '2023-10-19', '2023-10-20', '2023-10-21', '2023-10-22', '2023-10-23', '2023-10-24', '2023-10-25', '2023-10-26', '2023-11-04', '2023-11-05', '2023-11-06', '2023-11-07', '2023-11-08', '2023-11-09', '2023-11-10', '2023-11-11', '2023-11-14', '2023-11-15', '2023-11-16', '2023-11-17', '2023-11-18', '2023-11-19', '2023-11-21', '2023-11-22', '2023-11-23', '2023-11-24', '2023-11-25', '2023-11-26', '2023-11-27', '2023-11-28', '2023-11-29', '2023-11-30', '2023-12-01', '2023-12-02', '2023-12-03', '2023-12-04', '2023-12-05', '2023-12-06', '2023-12-07', '2023-12-08', '2023-12-10', '2023-12-11', '2023-12-13', '2023-12-14', '2023-12-15', '2023-12-16', '2023-12-17', '2023-12-18', '2023-12-19', '2023-12-20', '2023-12-21', '2023-12-22', '2023-12-23', '2023-12-24', '2023-12-25', '2023-12-26', '2023-12-27', '2023-12-28', '2023-12-29', '2023-12-30', '2023-12-31', '2024-01-02', '2024-01-03', '2024-01-04', '2024-01-05', '2024-01-06', '2024-01-07', '2024-01-08', '2024-01-09', '2024-01-10', '2024-01-12', '2024-01-13', '2024-01-14', '2024-01-15', '2024-01-16', '2024-01-17', '2024-01-18', '2024-01-19', '2024-01-20', '2024-01-21', '2024-01-23', '2024-01-24', '2024-01-25', '2024-01-26', '2024-01-27', '2024-01-28', '2024-01-29', '2024-01-30', '2024-01-31', '2024-02-01', '2024-02-02', '2024-02-03', '2024-02-04', '2024-02-05', '2024-02-06', '2024-02-07', '2024-02-08', '2024-02-09', '2024-02-10', '2024-02-11', '2024-02-12', '2024-02-13', '2024-02-14', '2024-02-15', '2024-02-16', '2024-02-17', '2024-02-18', '2024-02-19', '2024-02-20', '2024-02-21', '2024-02-22', '2024-02-23', '2024-02-24', '2024-02-25', '2024-02-26', '2024-02-27', '2024-02-28', '2024-03-01', '2024-03-03', '2024-03-03', '2024-03-04', '2024-03-05', '2024-03-06', '2024-03-07', '2024-03-08', '2024-03-09', '2024-03-10', '2024-03-11', '2024-03-12', '2024-03-13', '2024-03-14', '2024-03-15', '2024-03-16', '2024-03-17', '2024-03-18', '2024-03-19', '2024-03-20', '2024-03-21', '2024-03-22', '2024-03-23', '2024-03-24', '2024-03-25', '2024-03-26', '2024-03-27', '2024-03-28', '2024-03-29', '2024-03-30', '2024-03-31', '2024-04-01', '2024-04-02', '2024-04-03', '2024-04-04', '2024-04-05', '2024-04-06', '2024-04-07', '2024-04-08', '2024-04-09', '2024-04-10', '2024-04-11', '2024-04-12', '2024-04-13', '2024-04-14', '2024-04-15', '2024-04-17', '2024-04-18', '2024-04-19', '2024-04-20', '2024-04-21', '2024-04-22', '2024-04-23', '2024-04-25', '2024-04-26', '2024-04-27', '2024-04-28', '2024-04-29', '2024-04-30', '2024-05-01', '2024-05-02', '2024-05-03', '2024-05-04', '2024-05-05', '2024-05-06', '2024-05-07', '2024-05-08', '2024-05-09', '2024-05-10', '2024-05-11', '2024-05-12', '2024-05-13', '2024-05-14', '2024-05-15', '2024-05-16', '2024-05-17', '2024-05-18', '2024-05-19', '2024-05-20', '2024-05-21', '2024-05-22', '2024-05-23', '2024-05-24', '2024-05-25', '2024-05-26', '2024-05-27', '2024-05-28', '2024-05-29', '2024-06-08', '2024-06-09', '2024-06-10', '2024-06-11', '2024-06-12', '2024-06-13', '2024-06-14', '2024-06-15', '2024-06-16', '2024-06-17', '2024-06-18', '2024-06-19', '2024-06-20', '2024-06-21', '2024-06-22', '2024-06-23', '2024-06-24', '2024-06-25', '2024-06-26', '2024-06-27', '2024-06-28', '2024-06-29', '2024-06-30', '2024-07-01', '2024-07-02', '2024-07-03', '2024-07-04', '2024-07-05', '2024-07-06', '2024-07-07', '2024-07-08', '2024-07-09', '2024-07-10', '2024-07-11', '2024-07-12', '2024-07-13', '2024-07-14', '2024-07-15', '2024-07-16', '2024-07-17', '2024-07-18', '2024-07-19', '2024-07-20', '2024-07-21', '2024-07-22', '2024-07-23', '2024-07-24', '2024-07-25', '2024-07-26', '2024-07-27', '2024-07-28', '2024-07-29', '2024-07-30', '2024-07-31', '2024-08-01', '2024-08-02', '2024-08-03', '2024-08-04', '2024-08-05', '2024-08-06', '2024-08-07', '2024-08-08', '2024-08-09', '2024-08-10', '2024-08-11', '2024-08-12', '2024-08-13', '2024-08-14', '2024-08-15', '2024-08-16', '2024-08-17', '2024-08-18', '2024-08-19', '2024-08-20', '2024-08-21', '2024-08-23', '2024-08-25', '2024-08-26', '2024-08-27', '2024-08-28', '2024-08-29', '2024-08-30']
-        },
-        yAxis: [{
-          type: 'value',
-          scale: true,
-          name: 'pp'
-        },
-        {
-          type: 'value',
-          scale: true,
-          alignTicks: true,
-          inverse: true,
-          nameLocation: 'start',
-          name: 'rank'
-        }],
-        legend: {
-          top: 30,
-          left: 'center',
-          data: ['pp', 'rank']
-        },
-        series: [
-          {
-            name: 'pp',
-            type: 'line',
-            data: [35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 35.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 63.0, 65.0, 65.0, 65.0, 65.0, 65.0, 65.0, 65.0, 65.0, 217.0, 279.0, 502.0, 502.0, 502.0, 502.0, 502.0, 594.0, 645.0, 675.0, 711.0, 711.0, 734.0, 734.0, 760.0, 760.0, 760.0, 760.0, 760.0, 760.0, 760.0, 760.0, 760.0, 760.0, 760.0, 760.0, 760.0, 760.0, 760.0, 773.0, 773.0, 773.0, 780.0, 780.0, 780.0, 780.0, 780.0, 786.0, 786.0, 786.0, 786.0, 786.0, 846.0, 846.0, 846.0, 846.0, 846.0, 846.0, 846.0, 846.0, 846.0, 846.0, 846.0, 884.0, 884.0, 884.0, 884.0, 884.0, 884.0, 884.0, 884.0, 884.0, 884.0, 901.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0, 918.0],
-            yAxisIndex: 0,
-            connectNulls: true
-          },
-          {
-            name: 'rank',
-            type: 'line',
-            data: [597621, 598017, 598412, 598767, 599153, 599495, 599903, 600412, 600872, 601316, 601679, 602046, 602400, 602790, 603231, 603760, 604147, 604497, 604820, 605196, 605577, 606022, 606488, 606853, 607191, 607557, 607913, 608261, 608681, 609189, 609639, 610012, 610323, 610642, 610970, 611454, 611952, 612305, 612572, 612889, 613222, 613566, 614023, 614580, 614970, 615316, 615640, 618935, 619325, 619730, 620037, 620351, 620701, 621013, 621284, 622414, 622694, 622977, 623326, 623619, 623980, 624757, 625055, 625356, 625664, 625971, 626366, 626791, 627138, 627423, 627712, 628022, 628337, 628720, 629199, 629589, 629898, 630255, 630600, 631390, 631936, 633019, 633590, 634155, 634735, 635357, 636031, 636623, 637181, 637746, 638261, 638809, 638605, 639212, 639770, 640255, 640827, 641344, 641896, 642430, 643496, 643933, 644375, 644850, 644850, 645880, 646435, 646927, 647343, 648158, 648600, 649131, 649686, 650155, 650600, 651045, 651475, 651957, 652499, 653539, 653971, 654374, 654812, 655251, 655682, 656172, 656601, 657000, 657822, 658591, 659287, 660112, 660941, 661668, 662235, 662789, 663393, 664001, 664666, 665370, 666053, 666615, 667178, 667714, 668259, 668887, 669565, 670199, 670736, 671250, 671776, 672296, 672932, 672932, 674074, 674503, 675478, 676604, 676604, 677239, 677775, 678202, 678720, 679203, 679741, 680402, 681106, 681673, 682155, 682631, 683145, 683670, 684280, 684917, 685457, 685457, 701150, 701651, 702135, 702795, 703522, 704087, 704631, 705183, 705739, 706353, 707034, 707670, 708247, 708749, 709234, 709779, 710305, 710950, 711583, 712212, 712710, 713224, 713735, 714246, 714922, 715662, 716697, 717180, 717673, 718171, 718757, 719415, 719919, 720831, 721296, 721774, 722332, 722973, 723572, 724099, 724663, 725187, 725693, 726334, 726995, 727524, 722529, 723092, 723640, 724227, 724924, 725686, 726264, 726868, 517992, 473344, 364793, 365036, 365375, 365644, 365934, 333701, 317654, 309231, 299124, 299380, 293440, 293604, 288836, 289058, 289313, 289520, 289718, 289897, 290101, 290283, 290491, 290714, 290904, 291090, 291279, 291481, 291701, 288439, 288649, 288876, 287321, 287500, 287716, 287924, 288139, 286780, 286979, 287181, 287349, 287536, 272991, 273177, 273370, 273535, 273713, 273880, 274026, 274197, 274394, 274601, 274776, 266252, 266401, 266549, 266721, 266909, 267071, 267252, 267425, 267610, 267803, 264244, 260838, 261041, 261208, 261373, 261565, 261748, 261950, 262150, 262353, 262457, 262622, 262785, 262954, 263153, 263354, 263533, 263696, 263858, 264027, 264196, 264371, 264534, 264743, 264946, 265108, 265452, 265827, 266022, 266220, 266373, 266559, 266726],
-            yAxisIndex: 1,
-            connectNulls: true
-          }
-        ]};
-        chart.setOption(option);
-    </script>
-</body>

nonebot_plugin_osubot/schema/sayo_beatmap.py

@@ -1,59 +0,0 @@
-from typing import Optional
-
-from .basemodel import Base
-
-
-class BidData(Base):
-    bid: int
-    mode: int
-    version: str
-    length: int
-    CS: float
-    AR: float
-    OD: float
-    HP: float
-    star: float
-    aim: float
-    speed: float
-    hit300window: float
-    pp: float
-    pp_aim: float
-    pp_speed: float
-    pp_acc: float
-    circles: int
-    sliders: int
-    spinners: int
-    maxcombo: int
-    playcount: int
-    passcount: int
-    bg: str
-    audio: str
-
-
-class MapInfo(Base):
-    sid: int
-    local_update: int
-    bids_amount: int
-    approved: int
-    title: str
-    artist: str
-    titleU: str
-    artistU: str
-    creator: str
-    creator_id: int
-    source: str
-    last_update: int
-    approved_date: int
-    bpm: float
-    favourite_count: int
-    video: int
-    storyboard: int
-    tags: str
-    language: int
-    genre: int
-    bid_data: list[BidData]
-
-
-class SayoBeatmap(Base):
-    status: int
-    data: Optional[MapInfo] = None