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

nonebot_plugin_osubot/api.py

@@ -8,8 +8,9 @@ from typing import Union, Literal, Optional
 from nonebot.log import logger
 from expiringdict import ExpiringDict
 from nonebot import get_plugin_config
-from httpx import Response, AsyncClient
+from httpx import Response
 
+from .network.manager import network_manager
 from .utils import FGM
 from .config import Config
 from .mods import get_mods
@@ -25,7 +26,6 @@ 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)
-proxy = plugin_config.osu_proxy
 
 key = plugin_config.osu_key
 client_id = plugin_config.osu_client
@@ -34,15 +34,15 @@ bg_url = plugin_config.info_bg
 
 @auto_retry
 async def safe_async_get(url, headers: Optional[dict] = None, params: Optional[dict] = None) -> Response:
-    async with AsyncClient(proxy=proxy, follow_redirects=True) as client:
-        req = await client.get(url, headers=headers, params=params)
+    client = await network_manager.get_client()
+    req = await client.get(url, headers=headers, params=params)
     return req
 
 
 @auto_retry
 async def safe_async_post(url, headers=None, data=None, json=None) -> Response:
-    async with AsyncClient(proxy=proxy) as client:
-        req = await client.post(url, headers=headers, data=data, json=json)
+    client = await network_manager.get_client()
+    req = await client.post(url, headers=headers, data=data, json=json)
     return req
 
 
@@ -105,8 +105,10 @@ async def fetch_score_batch(
             statistics=i.statistics,
             legacy_total_score=i.legacy_total_score,
             passed=i.passed,
+            pp=i.pp,
             beatmap=UnifiedBeatmap(
                 id=i.beatmap_id,
+                user_id=i.beatmap.user_id,
                 set_id=i.beatmapset.id,
                 artist=i.beatmapset.artist,
                 title=i.beatmapset.title,
@@ -198,6 +200,7 @@ 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/draw/catch_preview_templates/js/catch/catch.js

@@ -673,9 +673,10 @@ Catch.prototype.draw2 = function (SCALE, SPEED = 1, params = {}) {
     // 按总物件数/时间控制密度
     let totalTime = this.fullCatchObjects[this.fullCatchObjects.length - 1].time - this.fullCatchObjects[0].time;
     if (this.fullCatchObjects.length * 1000 / totalTime > 2) comboSplit = Math.ceil(this.fullCatchObjects.length * 1000 / totalTime) * 10;
-    // 按0.5*位数修约
-    let roundBy = Math.pow(10, comboSplit.toString().length) * 0.5;
+    // 按0.5*(10^(位数-1&&最小为2))修约  60=>50  270=>250  820=>800  1434=>1500  1834=>2000
+    let roundBy = Math.pow(10, Math.max(comboSplit.toString().length - 1, 2)) * 0.5;
     comboSplit = Math.round(comboSplit / roundBy) * roundBy;
+    if (comboSplit <= 0) comboSplit = 20;
     for (let i = 0; i < this.fullCatchObjects.length; i++) {
         let showCombo = null;
         if (objs[i].type === "Fruit" || objs[i].type === "Droplet") {
@@ -799,4 +800,4 @@ Catch.prototype.processProgressBar = function (ctx, totalTime) {
             ctx.fillRect(ctxwidth * time / totalTime, 0, ctxwidth * (endtime - time) / totalTime, ctxheight);
         }
     }
-};
+};

nonebot_plugin_osubot/draw/catch_preview_templates/pic.html

@@ -41,7 +41,7 @@
 
         const createImg = function () {
             const self = this;
-            const osufile = `{{ osu_file }}`;
+            const osufile = {{ osu_file|tojson }};
             let SPEED = 1;
             let mods = {
                 HR: {{ is_hr }},
@@ -85,4 +85,4 @@
     </script>
 </body>
 
-</html>
+</html>

nonebot_plugin_osubot/draw/score.py

@@ -28,19 +28,25 @@ from .utils import (
     open_user_icon,
     filter_scores_with_regex,
     trim_text_with_ellipsis,
+    draw_text_with_outline,
 )
 from .static import (
     Image,
     IconLs,
-    Venera_75,
+    Venera_60,
+    Torus_Regular_15,
     Torus_Regular_20,
-    Torus_Regular_30,
-    Torus_Regular_75,
+    Torus_Regular_25,
+    Torus_Regular_50,
+    Torus_Regular_60,
+    Torus_SemiBold_15,
     Torus_SemiBold_20,
     Torus_SemiBold_25,
     Torus_SemiBold_30,
     osufile,
     extra_30,
+    Stardiff,
+    Stars,
 )
 
 
@@ -197,15 +203,23 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     original_ss_pp_info = get_ss_pp(str(osu.absolute()), 0, is_lazer)
     if_pp, ss_pp = get_if_pp_ss_pp(score_info, str(osu.absolute()), is_lazer)
     # 新建图片
-    im = Image.new("RGBA", (1500, 720))
+    im = Image.new("RGBA", (1280, 720))
     draw = ImageDraw.Draw(im)
     # 获取cover并裁剪，高斯，降低亮度
     try:
         bg = await get_bg(mapinfo.id, mapinfo.beatmapset_id)
-        cover_crop = await crop_bg((1500, 720), bg)
-        cover_gb = cover_crop.filter(ImageFilter.GaussianBlur(3))
-        cover_img = ImageEnhance.Brightness(cover_gb).enhance(2 / 4.0)
-        im.alpha_composite(cover_img, (0, 0))
+        cover_crop_left = await crop_bg((1280, 720), bg)
+        cover_gb_left = cover_crop_left.filter(ImageFilter.GaussianBlur(10))
+        cover_gb_left = ImageEnhance.Brightness(cover_gb_left).enhance(1)
+        cover_img_left = ImageEnhance.Brightness(cover_gb_left).enhance(2 / 4.0)
+        im.alpha_composite(cover_img_left, (0, 0))
+        # 新小图 BG
+        cover_crop_right = await crop_bg((650, 270), bg)
+        cover_gb_right = cover_crop_right.filter(ImageFilter.GaussianBlur(1))
+        cover_gb_right = ImageEnhance.Brightness(cover_gb_right).enhance(0.9)
+        cover_img_right = ImageEnhance.Brightness(cover_gb_right).enhance(1)
+        cover_img_right = draw_fillet(cover_img_right, 15)
+        im.alpha_composite(cover_img_right, (0, 50))
     except NetworkError:
         ...
     # 获取成绩背景做底图
@@ -213,58 +227,70 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     recent_bg = Image.open(bg).convert("RGBA")
     im.alpha_composite(recent_bg)
     # 模式
-    draw.text((75, 75), IconLs[score_info.ruleset_id], font=extra_30, anchor="lt")
+    draw_text_with_outline(
+        draw,
+        (30, 80),
+        IconLs[score_info.ruleset_id],
+        extra_30,
+        anchor="lm",
+        fill=(255, 255, 255, 255),
+    )
     # 难度星星
-    stars_bg = stars_diff(pp_info.difficulty.stars)
+    stars_bg = stars_diff(pp_info.difficulty.stars, Stars)
     stars_img = stars_bg.resize((85, 37))
-    im.alpha_composite(stars_img, (122, 72))
+    im.alpha_composite(stars_img, (552, 67))
+    # 难度竖条
+    star_bg = stars_diff(pp_info.difficulty.stars, Stardiff)
+    star_img = star_bg.resize((20, 271))
+    im.alpha_composite(star_img, (0, 50))
+    # 星级
     if pp_info.difficulty.stars < 6.5:
         color = (0, 0, 0, 255)
     else:
         color = (255, 217, 102, 255)
-    # 星级
+
     draw.text(
-        (128, 90),
+        (556, 85),
         f"★{pp_info.difficulty.stars:.2f}",
         font=Torus_SemiBold_20,
         anchor="lm",
         fill=color,
     )
     # mods
-    if any(i in score_info.mods for i in (Mod(acronym="HD"), Mod(acronym="FL"), Mod(acronym="FI"))):
-        ranking = ["XH", "SH", "A", "B", "C", "D", "F"]
-    else:
-        ranking = ["X", "S", "A", "B", "C", "D", "F"]
+    # if any(i in score_info.mods for i in (Mod(acronym="HD"), Mod(acronym="FL"), Mod(acronym="FI"))):
+    # ranking = ["XH", "SH", "A", "B", "C", "D", "F"]
+    # else:
+    # ranking = ["X", "S", "A", "B", "C", "D", "F"]
     if score_info.mods:
         for mods_num, s_mods in enumerate(score_info.mods):
             mods_bg = osufile / "mods" / f"{s_mods.acronym}.png"
             try:
                 mods_img = Image.open(mods_bg).convert("RGBA")
-                im.alpha_composite(mods_img, (500 + 50 * mods_num, 160))
+                im.alpha_composite(mods_img, (880 + 50 * mods_num, 100))
             except FileNotFoundError:
                 pass
     # 成绩S-F
-    rank_ok = False
-    for rank_num, i in enumerate(ranking):
-        rank_img = osufile / "ranking" / f"ranking-{i}.png"
-        if rank_ok:
-            rank_b = Image.open(rank_img).convert("RGBA").resize((48, 24))
-            rank_new = Image.new("RGBA", rank_b.size, (0, 0, 0, 0))
-            rank_bg = Image.blend(rank_new, rank_b, 0.5)
-        elif i != score_info.rank:
-            rank_b = Image.open(rank_img).convert("RGBA").resize((48, 24))
-            rank_new = Image.new("RGBA", rank_b.size, (0, 0, 0, 0))
-            rank_bg = Image.blend(rank_new, rank_b, 0.2)
-        else:
-            rank_bg = Image.open(rank_img).convert("RGBA").resize((48, 24))
-            rank_ok = True
-        im.alpha_composite(rank_bg, (75, 163 + 39 * rank_num))
+    # rank_ok = False
+    # for rank_num, i in enumerate(ranking):
+    # rank_img = osufile / "ranking" / f"ranking-{i}.png"
+    # if rank_ok:
+    # rank_b = Image.open(rank_img).convert("RGBA").resize((48, 24))
+    # rank_new = Image.new("RGBA", rank_b.size, (0, 0, 0, 0))
+    # rank_bg = Image.blend(rank_new, rank_b, 0.5)
+    # elif i != score_info.rank:
+    # rank_b = Image.open(rank_img).convert("RGBA").resize((48, 24))
+    # rank_new = Image.new("RGBA", rank_b.size, (0, 0, 0, 0))
+    # rank_bg = Image.blend(rank_new, rank_b, 0.2)
+    # else:
+    # rank_bg = Image.open(rank_img).convert("RGBA").resize((48, 24))
+    # rank_ok = True
+    # im.alpha_composite(rank_bg, (75, 163 + 39 * rank_num))
     # 成绩+acc
     im = draw_acc(im, score_info.accuracy, score_info.ruleset_id)
     # 地区
     country = osufile / "flags" / f"{info.country_code}.png"
     country_bg = Image.open(country).convert("RGBA").resize((66, 45))
-    im.alpha_composite(country_bg, (250, 577))
+    im.alpha_composite(country_bg, (208, 597))
     if info.team and info.team.flag_url:
         team_path = team_cache_path / f"{info.team.id}.png"
         if not team_path.exists():
@@ -273,11 +299,11 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
             team_img.save(team_path)
         try:
             team_img = Image.open(team_path).convert("RGBA").resize((80, 40))
-            im.alpha_composite(team_img, (250, 640))
+            im.alpha_composite(team_img, (208, 660))
         except UnidentifiedImageError:
             team_path.unlink()
             raise NetworkError("team 图片下载错误，请重试！")
-        draw.text((340, 660), info.team.name, font=Torus_Regular_20, anchor="lt")
+        draw.text((297, 675), info.team.name, font=Torus_Regular_20, anchor="lt")
     # supporter
     # if info.is_supporter:
     #     im.alpha_composite(SupporterBg.resize((40, 40)), (250, 640))
@@ -309,38 +335,38 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     ]
 
     for num, (orig, new) in enumerate(zip(original_mapdiff, mapdiff)):
-        orig_difflen = int(250 * max(0, orig) / 10) if orig <= 10 else 250
-        new_difflen = int(250 * max(0, new) / 10) if new <= 10 else 250
+        orig_difflen = int(400 * max(0, orig) / 10) if orig <= 10 else 400
+        new_difflen = int(400 * max(0, new) / 10) if new <= 10 else 400
         if is_close(new, orig):
             color = (255, 255, 255, 255)
             diff_len = Image.new("RGBA", (orig_difflen, 8), color)
-            im.alpha_composite(diff_len, (1190, 306 + 35 * num))
+            im.alpha_composite(diff_len, (165, 352 + 35 * num))
         elif new > orig and not (score_info.ruleset_id == 3 and mapinfo.mode == "osu"):
             color = (198, 92, 102, 255)
             orig_color = (246, 136, 144, 255)
             new_diff_len = Image.new("RGBA", (new_difflen, 8), color)
-            im.alpha_composite(new_diff_len, (1190, 306 + 35 * num))
+            im.alpha_composite(new_diff_len, (165, 352 + 35 * num))
             orig_diff_len = Image.new("RGBA", (orig_difflen, 8), orig_color)
-            im.alpha_composite(orig_diff_len, (1190, 306 + 35 * num))
+            im.alpha_composite(orig_diff_len, (165, 352 + 35 * num))
         elif new < orig and not (score_info.ruleset_id == 3 and mapinfo.mode == "osu"):
             color = (161, 212, 238, 255)
             orig_color = (255, 255, 255, 255)
             orig_diff_len = Image.new("RGBA", (orig_difflen, 8), orig_color)
-            im.alpha_composite(orig_diff_len, (1190, 306 + 35 * num))
+            im.alpha_composite(orig_diff_len, (165, 352 + 35 * num))
             new_diff_len = Image.new("RGBA", (new_difflen, 8), color)
-            im.alpha_composite(new_diff_len, (1190, 306 + 35 * num))
+            im.alpha_composite(new_diff_len, (165, 352 + 35 * num))
         else:
             raise Exception("没有这种情况")
         if new == round(new):
             draw.text(
-                (1470, 310 + 35 * num),
+                (610, 355 + 35 * num),
                 f"{new:.0f}",
                 font=Torus_SemiBold_20,
                 anchor="mm",
             )
         else:
             draw.text(
-                (1470, 310 + 35 * num),
+                (610, 355 + 35 * num),
                 f"{new:.2f}" if new != round(new, 1) else f"{new:.1f}",
                 font=Torus_SemiBold_20,
                 anchor="mm",
@@ -351,253 +377,291 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     if stars > original_stars:
         color = (198, 92, 102, 255)
         orig_color = (246, 111, 34, 255)
-        new_difflen = int(250 * max(0.0, stars) / 10) if stars <= 10 else 250
+        new_difflen = int(400 * max(0.0, stars) / 10) if stars <= 10 else 400
         new_diff_len = Image.new("RGBA", (new_difflen, 8), color)
-        im.alpha_composite(new_diff_len, (1190, 446))
-        orig_difflen = int(250 * max(0.0, original_stars) / 10) if original_stars <= 10 else 250
+        im.alpha_composite(new_diff_len, (165, 490))
+        orig_difflen = int(400 * max(0.0, original_stars) / 10) if original_stars <= 10 else 400
         orig_diff_len = Image.new("RGBA", (orig_difflen, 8), orig_color)
-        im.alpha_composite(orig_diff_len, (1190, 446))
+        im.alpha_composite(orig_diff_len, (165, 490))
     elif stars < original_stars:
         color = (161, 187, 127, 255)
         orig_color = (255, 204, 34, 255)
-        orig_difflen = int(250 * max(0.0, original_stars) / 10) if original_stars <= 10 else 250
+        orig_difflen = int(400 * max(0.0, original_stars) / 10) if original_stars <= 10 else 400
         orig_diff_len = Image.new("RGBA", (orig_difflen, 8), orig_color)
-        im.alpha_composite(orig_diff_len, (1190, 446))
-        new_difflen = int(250 * max(0.0, stars) / 10) if stars <= 10 else 250
+        im.alpha_composite(orig_diff_len, (165, 490))
+        new_difflen = int(400 * max(0.0, stars) / 10) if stars <= 10 else 400
         new_diff_len = Image.new("RGBA", (new_difflen, 8), color)
-        im.alpha_composite(new_diff_len, (1190, 446))
+        im.alpha_composite(new_diff_len, (165, 490))
     else:
         color = (255, 204, 34, 255)
-        difflen = int(250 * stars / 10) if stars <= 10 else 250
+        difflen = int(400 * stars / 10) if stars <= 10 else 400
         diff_len = Image.new("RGBA", (difflen, 8), color)
-        im.alpha_composite(diff_len, (1190, 446))
-    draw.text((1470, 450), f"{stars:.2f}", font=Torus_SemiBold_20, anchor="mm")
+        im.alpha_composite(diff_len, (165, 490))
+    draw.text((610, 493), f"{stars:.2f}", font=Torus_SemiBold_20, anchor="mm")
     # 时长 - 滑条
-    diff_info = (
+    diff_info = [
         calc_songlen(mapinfo.total_length),
         f"{mapinfo.bpm:.1f}",
         mapinfo.count_circles,
         mapinfo.count_sliders,
-    )
+    ] + ([mapinfo.count_spinners] if score_info.ruleset_id != 3 else [])
     for num, i in enumerate(diff_info):
-        draw.text(
-            (1070 + 120 * num, 245),
+        draw_text_with_outline(
+            draw,
+            (70 + 120 * num, 300),
             f"{i}",
             font=Torus_Regular_20,
             anchor="lm",
             fill=(255, 204, 34, 255),
         )
     # 状态
-    draw.text((1400, 184), mapinfo.status.capitalize(), font=Torus_SemiBold_20, anchor="mm")
+    draw_text_with_outline(
+        draw,
+        (595, 115),
+        mapinfo.status.capitalize(),
+        Torus_SemiBold_15,
+        anchor="mm",
+        fill=(255, 255, 255, 255),
+    )
+    # setid
+    draw.text((32, 25), f"Setid：{mapinfo.beatmapset_id}", font=Torus_SemiBold_20, anchor="lm")
     # mapid
-    draw.text((1485, 90), f"Mapid: {mapinfo.id}", font=Torus_SemiBold_20, anchor="rm")
+    draw.text((650, 25), f"Mapid: {mapinfo.id}", font=Torus_SemiBold_20, anchor="rm")
     # 曲名
-    draw.text(
-        (75, 38),
-        f"{mapinfo.beatmapset.title} | by {mapinfo.beatmapset.artist_unicode}",
-        font=Torus_SemiBold_30,
+    title = trim_text_with_ellipsis(mapinfo.beatmapset.title, 600, Torus_SemiBold_30)
+    draw_text_with_outline(
+        draw,
+        (30, 200),
+        title,
+        Torus_SemiBold_30,
+        anchor="lm",
+        fill=(255, 255, 255, 255),
+    )
+    # 艺术家
+    artist = trim_text_with_ellipsis(mapinfo.beatmapset.artist, 600, Torus_SemiBold_20)
+    draw_text_with_outline(
+        draw,
+        (30, 230),
+        artist,
+        Torus_SemiBold_20,
         anchor="lm",
+        fill=(255, 255, 255, 255),
     )
-    # 谱面版本，mapper
+    # mapper
     if mapinfo.owners:
         owner_names = [owner.username for owner in mapinfo.owners]
         owners_str = ", ".join(owner_names)
-        mapper = f"{mapinfo.version} | 谱师: {owners_str}"
+        mapper = f"谱师: {owners_str}"
 
     else:
-        mapper = f"{mapinfo.version} | 谱师: {mapinfo.beatmapset.creator}"
-    mapper = trim_text_with_ellipsis(mapper, 1000, Torus_SemiBold_20)
-
-    draw.text(
-        (225, 90),
+        mapper = f"谱师: {mapinfo.beatmapset.creator}"
+    mapper = trim_text_with_ellipsis(mapper, 600, Torus_SemiBold_15)
+    draw_text_with_outline(
+        draw,
+        (30, 265),
         mapper,
-        font=Torus_SemiBold_20,
+        Torus_SemiBold_15,
+        anchor="lm",
+        fill=(255, 255, 255, 255),
+    )
+    # 谱面版本
+    version = trim_text_with_ellipsis(mapinfo.version, 450, Torus_SemiBold_15)
+    draw_text_with_outline(
+        draw,
+        (65, 80),
+        version,
+        Torus_SemiBold_15,
         anchor="lm",
+        fill=(255, 255, 255, 255),
     )
     # 评价
-    draw.text((316, 307), score_info.rank, font=Venera_75, anchor="mm")
+    draw.text((772, 185), score_info.rank, font=Venera_60, anchor="mm")
     # 分数
     draw.text(
-        (498, 251),
+        (880, 165),
         f"{score_info.legacy_total_score or score_info.total_score:,}",
-        font=Torus_Regular_75,
+        font=Torus_Regular_60,
         anchor="lm",
     )
     # 时间
-    draw.text((498, 341), "达成时间:", font=Torus_SemiBold_20, anchor="lm")
-    draw.text((630, 341), score_info.ended_at.strftime("%Y-%m-%d %H:%M:%S"), font=Torus_SemiBold_20, anchor="lm")
+    draw.text((883, 230), "达成时间：", font=Torus_SemiBold_20, anchor="lm")
+    draw.text((985, 230), score_info.ended_at.strftime("%Y-%m-%d %H:%M:%S"), font=Torus_SemiBold_20, anchor="lm")
     # 全球排名
-    draw.text((583, 410), f"#{grank}" if grank else "", font=Torus_SemiBold_25, anchor="mm")
+    draw.text((883, 260), "全球排行：" if grank else "", font=Torus_SemiBold_20, anchor="lm")
+    draw.text((985, 260), f"#{grank}" if grank else "", font=Torus_SemiBold_25, anchor="lm")
     # 左下玩家名
-    draw.text((250, 530), info.username, font=Torus_SemiBold_30, anchor="lm")
+    draw.text((208, 550), info.username, font=Torus_SemiBold_30, anchor="lm")
     # 国内排名
     draw.text(
-        (325, 610),
+        (283, 630),
         f"#{info.statistics.country_rank}",
         font=Torus_SemiBold_25,
         anchor="lm",
     )
     if score_info.ruleset_id in {0, 4, 8}:
-        draw.text((720, 550), ss_pp, font=Torus_Regular_30, anchor="mm")
-        draw.text((840, 550), if_pp, font=Torus_Regular_30, anchor="mm")
-        draw.text((960, 550), f"{pp_info.pp:.0f}", font=Torus_Regular_30, anchor="mm")
-        draw.text((720, 645), f"{pp_info.pp_aim:.0f}", font=Torus_Regular_30, anchor="mm")
-        draw.text((840, 645), f"{pp_info.pp_speed:.0f}", font=Torus_Regular_30, anchor="mm")
-        draw.text((960, 645), f"{pp_info.pp_accuracy:.0f}", font=Torus_Regular_30, anchor="mm")
+        draw.text((1066, 393), ss_pp, font=Torus_Regular_25, anchor="mm")
+        draw.text((933, 393), if_pp, font=Torus_Regular_25, anchor="mm")
+        draw.text((768, 438), f"{pp_info.pp:.0f}", font=Torus_Regular_50, anchor="mm")
+        draw.text((933, 482), f"{pp_info.pp_aim:.0f}", font=Torus_Regular_25, anchor="mm")
+        draw.text((1066, 482), f"{pp_info.pp_speed:.0f}", font=Torus_Regular_25, anchor="mm")
+        draw.text((1200, 482), f"{pp_info.pp_accuracy:.0f}", font=Torus_Regular_25, anchor="mm")
         draw.text(
-            (1157, 550),
+            (768, 577),
             f"{score_info.accuracy:.2f}%",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1385, 550),
+            (768, 666),
             f"{score_info.max_combo:,}/{pp_info.difficulty.max_combo}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1100, 645),
+            (933, 577),
             f"{score_info.statistics.great or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1214, 645),
+            (1066, 577),
             f"{score_info.statistics.ok or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1328, 645),
+            (933, 666),
             f"{score_info.statistics.meh or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1442, 645),
+            (1066, 666),
             f"{score_info.statistics.miss or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
     elif score_info.ruleset_id in {1, 5}:
         draw.text(
-            (1118, 550),
+            (768, 577),
             f"{score_info.accuracy:.2f}%",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
-        draw.text((1270, 550), f"{score_info.max_combo:,}", font=Torus_Regular_30, anchor="mm")
-        draw.text((1420, 550), f"{pp_info.pp:.0f}/{ss_pp}", font=Torus_Regular_30, anchor="mm")
+        draw.text((768, 666), f"{score_info.max_combo:,}", font=Torus_Regular_25, anchor="mm")
+        draw.text((768, 438), f"{pp_info.pp:.0f}", font=Torus_Regular_50, anchor="mm")
+        draw.text((933, 393), f"{ss_pp}", font=Torus_Regular_25, anchor="mm")
         draw.text(
-            (1118, 645),
+            (933, 577),
             f"{score_info.statistics.great or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1270, 645),
+            (1066, 577),
             f"{score_info.statistics.ok or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1420, 645),
+            (933, 666),
             f"{score_info.statistics.miss or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
     elif score_info.ruleset_id in {2, 6}:
         draw.text(
-            (1083, 550),
+            (768, 577),
             f"{score_info.accuracy:.2f}%",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1247, 550),
+            (768, 666),
             f"{score_info.max_combo}/{pp_info.difficulty.max_combo}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
-        draw.text((1411, 550), f"{pp_info.pp:.0f}/{ss_pp}", font=Torus_Regular_30, anchor="mm")
+        draw.text((768, 438), f"{pp_info.pp:.0f}", font=Torus_Regular_50, anchor="mm")
+        draw.text((933, 393), f"{ss_pp}", font=Torus_Regular_25, anchor="mm")
         draw.text(
-            (1062, 645),
+            (933, 577),
             f"{score_info.statistics.great or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1185, 645),
+            (1066, 577),
             f"{score_info.statistics.large_tick_hit or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1309, 645),
+            (933, 666),
             f"{score_info.statistics.small_tick_miss or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1432, 645),
+            (1066, 666),
             f"{score_info.statistics.miss or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
     else:
         draw.text(
-            (1002, 580),
+            (933, 600),
             (
                 f"{score_info.statistics.perfect / score_info.statistics.great:.1f}:1"
                 if (score_info.statistics.great or 0) != 0
                 else "∞:1"
             ),
-            font=Torus_Regular_20,
+            font=Torus_Regular_15,
             anchor="mm",
         )
         draw.text(
-            (1002, 550),
+            (768, 577),
             f"{score_info.accuracy:.2f}%",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
-        draw.text((1197, 550), f"{score_info.max_combo}", font=Torus_Regular_30, anchor="mm")
-        draw.text((1395, 550), f"{pp_info.pp:.0f}/{ss_pp}", font=Torus_Regular_30, anchor="mm")
+        draw.text((768, 666), f"{score_info.max_combo}", font=Torus_Regular_25, anchor="mm")
+        draw.text((768, 438), f"{pp_info.pp:.0f}", font=Torus_Regular_50, anchor="mm")
+        draw.text((933, 393), f"{ss_pp}", font=Torus_Regular_25, anchor="mm")
         draw.text(
-            (953, 645),
+            (933, 577),
             f"{score_info.statistics.perfect or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1051, 645),
+            (1066, 577),
             f"{score_info.statistics.great or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1150, 645),
+            (1200, 577),
             f"{score_info.statistics.good or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1249, 645),
+            (933, 666),
             f"{score_info.statistics.ok or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1347, 645),
+            (1066, 666),
             f"{score_info.statistics.meh or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1445, 645),
+            (1200, 666),
             f"{score_info.statistics.miss or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
     user_icon = await open_user_icon(info, source)
@@ -607,7 +671,7 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     if not getattr(user_icon, "is_animated", False):
         icon_bg = user_icon.convert("RGBA").resize((170, 170))
         icon_img = draw_fillet(icon_bg, 15)
-        im.alpha_composite(icon_img, (60, 510))
+        im.alpha_composite(icon_img, (27, 532))
         byt = BytesIO()
         im.convert("RGB").save(byt, "jpeg")
         im.close()
@@ -620,7 +684,7 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
         # 创建一个新的 RGBA 图片，将 PNG 图片作为背景，将当前帧添加到背景上
         rgba_frame = Image.new("RGBA", im.size, (0, 0, 0, 0))
         rgba_frame.paste(im, (0, 0), im)
-        rgba_frame.paste(gif_frame, (60, 510), gif_frame)
+        rgba_frame.paste(gif_frame, (27, 532), gif_frame)
         # 将 RGBA 图片转换为 RGB 模式，并添加到 GIF 图片中
         gif_frames.append(rgba_frame)
     gif_bytes = BytesIO()

nonebot_plugin_osubot/draw/static.py

@@ -15,14 +15,15 @@ Torus_Regular_35 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf
 Torus_Regular_40 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf"), 40)
 Torus_Regular_45 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf"), 45)
 Torus_Regular_50 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf"), 50)
-Torus_Regular_75 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf"), 75)
+Torus_Regular_60 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf"), 60)
+Torus_SemiBold_15 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 15)
 Torus_SemiBold_20 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 20)
 Torus_SemiBold_25 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 25)
 Torus_SemiBold_30 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 30)
 Torus_SemiBold_40 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 40)
 Torus_SemiBold_45 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 45)
 Torus_SemiBold_50 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 50)
-Venera_75 = ImageFont.truetype(str(osufile / "fonts" / "Venera.otf"), 75)
+Venera_60 = ImageFont.truetype(str(osufile / "fonts" / "Venera.otf"), 60)
 extra_30 = ImageFont.truetype(str(osufile / "fonts" / "Extra.otf"), 30)
 
 InfoImg = Image.open(osufile / "info.png").convert("RGBA")
@@ -36,6 +37,7 @@ MapBg = Image.open(osufile / "beatmapinfo.png").convert("RGBA")
 MapBg1 = Image.open(osufile / "maniabeatmapinfo.png").convert("RGBA")
 BarImg = Image.open(osufile / "work" / "bmap.png").convert("RGBA")
 Stars = Image.open(osufile / "work" / "stars.png").convert("RGBA")
+Stardiff = Image.open(osufile / "work" / "stardiff.png").convert("RGBA")
 TeamBlue = Image.open(osufile / "match" / "team_blue.png").convert("RGBA")
 TeamRed = Image.open(osufile / "match" / "team_red.png").convert("RGBA")
 MpLink = Image.open(osufile / "match" / "mplink.png").convert("RGBA")

nonebot_plugin_osubot/draw/templates/bpa_chart.html

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

nonebot_plugin_osubot/draw/utils.py

@@ -6,13 +6,14 @@ from io import BytesIO
 from typing import Union, Optional
 from difflib import SequenceMatcher
 
+from PIL.ImageFile import ImageFile
 from matplotlib.figure import Figure
 from PIL import ImageDraw, ImageFilter, ImageEnhance, UnidentifiedImageError
 
 from ..schema.user import UnifiedUser
 from ..schema import SeasonalBackgrounds
 from ..api import safe_async_get, get_seasonal_bg
-from .static import Path, Image, Stars, ColorArr, np, osufile
+from .static import Path, Image, ColorArr, np, osufile
 from ..file import map_path, download_osu, get_projectimg, user_cache_path, team_cache_path
 
 
@@ -120,8 +121,8 @@ def draw_acc(img: Image, acc: float, mode: int):
     ax.clear()
     fig.clf()
     fig.clear()
-    score_acc_img = Image.open(acc_img).convert("RGBA").resize((576, 432))
-    img.alpha_composite(score_acc_img, (25, 83))
+    score_acc_img = Image.open(acc_img).convert("RGBA").resize((384, 288))
+    img.alpha_composite(score_acc_img, (580, 35))
     return img
 
 
@@ -183,7 +184,7 @@ async def crop_bg(size: tuple[int, int], path: Union[str, Path, BytesIO, Image.I
         return sf
 
 
-def stars_diff(stars: float):
+def stars_diff(stars: float, stars_bg: ImageFile):
     if stars < 0.1:
         r, g, b = 170, 170, 170
     elif stars >= 9:
@@ -192,10 +193,10 @@ def stars_diff(stars: float):
         # 颜色取色参考 https://github.com/ppy/osu-web/blob/97997d9c7b7f9c49f9b3cdd776c71afb9872c34b/resources/js/utils/beatmap-helper.ts#L20
         r, g, b, _a = ColorArr[int(stars * 100)]
     # 打开底图
-    xx, yy = Stars.size
+    xx, yy = stars_bg.size
     # 填充背景
-    img = Image.new("RGBA", Stars.size, (r, g, b))
-    img.paste(Stars, (0, 0, xx, yy), Stars)
+    img = Image.new("RGBA", stars_bg.size, (r, g, b))
+    img.paste(stars_bg, (0, 0, xx, yy), stars_bg)
     # 把白色变透明
     arr = np.array(img)
     # 创建mask，将白色替换为True，其他颜色替换为False
@@ -438,3 +439,18 @@ def trim_text_with_ellipsis(text, max_width, font):
 
     # 返回截断后的字符串 + 省略号
     return truncated_text + ellipsis_symbol if truncated_text else ellipsis_symbol
+
+
+# 字体描边函数
+def draw_text_with_outline(draw, position, text, font, anchor, fill):
+    for dx in [-1, 0, 1]:
+        for dy in [-1, 0, 1]:
+            if dx != 0 or dy != 0:
+                draw.text(
+                    (position[0] + dx, position[1] + dy),
+                    text,
+                    font=font,
+                    anchor=anchor,
+                    fill=(0, 0, 0, 255),
+                )
+    draw.text(position, text, font=font, anchor=anchor, fill=fill)

nonebot_plugin_osubot/matcher/bp_analyze.py

@@ -7,9 +7,8 @@ from nonebot_plugin_alconna import UniMessage
 
 from ..utils import NGM
 from .utils import split_msg
-from ..schema import NewScore
 from ..database import UserData
-from ..api import osu_api, get_users
+from ..api import get_user_scores, get_users
 from ..exceptions import NetworkError
 from ..draw.score import cal_score_info
 from ..draw.echarts import draw_bpa_plot
@@ -35,17 +34,11 @@ async def _(event: Event, state: T_State):
     uid = state["user"]
     lazer_mode = "lazer模式下" if state["is_lazer"] else "stable模式下"
     try:
-        bp_info = await osu_api(
-            "bp",
-            uid,
-            NGM[state["mode"]],
-            legacy_only=int(not user.lazer_mode),
-        )
+        score_ls = await get_user_scores(uid, NGM[state["mode"]], "best", 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)
-    score_ls = [NewScore(**i) for i in bp_info]
     for score in score_ls:
         for mod in score.mods:
             if mod.acronym == "DT" or mod.acronym == "NC":
@@ -106,6 +99,6 @@ async def _(event: Event, state: T_State):
         mapper_pp_data.append({"name": user_dic.get(mapper, ""), "value": round(pp, 2)})
     if len(mapper_pp_data) > 20:
         mapper_pp_data = mapper_pp_data[:20]
-    name = f"{score_ls[0].user.username} {NGM[state['mode']]} 模式 "
+    name = f"{state['username']} {NGM[state['mode']]} 模式 "
     byt = await draw_bpa_plot(name, pp_ls, length_ls, pp_data, mapper_pp_data)
     await UniMessage.image(raw=byt).finish(reply_to=True)

nonebot_plugin_osubot/matcher/guess.py

@@ -16,6 +16,8 @@ from nonebot.internal.rule import Rule, Event
 from nonebot_plugin_alconna import At, UniMsg, UniMessage
 from nonebot_plugin_session import SessionId, SessionIdType
 
+from ..draw.taiko_preview import parse_map, map_to_image
+from ..schema.score import UnifiedScore
 from ..utils import NGM
 from ..info import get_bg
 from .utils import split_msg
@@ -23,7 +25,7 @@ from ..schema import NewScore
 from ..exceptions import NetworkError
 from ..database.models import UserData
 from ..mania import generate_preview_pic
-from ..api import osu_api, safe_async_get
+from ..api import safe_async_get, get_user_scores
 from ..file import map_path, download_tmp_osu
 from ..draw.catch_preview import draw_cath_preview
 
@@ -46,23 +48,27 @@ data_path = Path() / "data" / "osu"
 pcm_path = data_path / "out.pcm"
 
 
-async def get_random_beatmap_set(binded_id, group_id, ttl=10) -> (NewScore, str):
-    if ttl == 0:
-        return
-    selected_user = random.choice(binded_id)
-    if not selected_user:
-        return
-    user = await UserData.filter(user_id=selected_user).first()
-    try:
-        bp_info = await osu_api("bp", user.osu_id, NGM[str(user.osu_mode)])
-    except NetworkError:
-        return await get_random_beatmap_set(binded_id, group_id, ttl - 1)
-    selected_score = random.choice([NewScore(**i) for i in bp_info])
-    if selected_score.beatmapset.id not in guess_song_cache[group_id]:
-        guess_song_cache[group_id].add(selected_score.beatmapset.id)
-    else:
-        return await get_random_beatmap_set(binded_id, group_id, ttl - 1)
-    return selected_score, user.osu_name
+async def get_random_beatmap_set(binded_id, group_id) -> (UnifiedScore, str):
+    # 获取已猜过的歌曲集合
+    guessed_songs = guess_song_cache[group_id]
+    available_scores = []
+    for user_id in binded_id:
+        try:
+            user = await UserData.filter(user_id=user_id).first()
+            if not user:
+                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]
+            available_scores.extend(unguessed_scores)
+        except NetworkError:
+            continue  # 跳过网络错误的用户，继续尝试其他用户
+    if not available_scores:
+        return None, None  # 所有歌曲都被猜过了
+    # 随机选择一个未猜过的成绩
+    selected_score, osu_name = random.choice(available_scores)
+    guess_song_cache[group_id].add(selected_score.beatmapset.id)
+    return selected_score, osu_name
 
 
 @guess_audio.handle(parameterless=[split_msg()])
@@ -89,12 +95,11 @@ async def _(
         if not user_data:
             await UniMessage.text("该用户未绑定osu账号").finish(reply_to=True)
         try:
-            bp_info = await osu_api("bp", user_data.osu_id, NGM[state["mode"]])
+            bp_ls = await get_user_scores(user_data.osu_id, NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[group_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -103,12 +108,11 @@ async def _(
         selected_user = user_data.osu_name
     elif state["user"]:
         try:
-            bp_info = await osu_api("bp", state["user"], NGM[state["mode"]])
+            bp_ls = await get_user_scores(state["user"], NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[group_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -354,12 +358,11 @@ async def _(
         if not user_data:
             await UniMessage.text("该用户未绑定osu账号").finish(reply_to=True)
         try:
-            bp_info = await osu_api("bp", user_data.osu_id, NGM[state["mode"]])
+            bp_ls = await get_user_scores(user_data.osu_id, NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -368,12 +371,11 @@ async def _(
         selected_user = user_data.osu_name
     elif state["user"]:
         try:
-            bp_info = await osu_api("bp", state["user"], NGM[state["mode"]])
+            bp_ls = await get_user_scores(state["user"], NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -422,7 +424,7 @@ async def _(
         await UniMessage.text("由于未绑定OSU账号，本次随机选择模式进行猜歌\n" + state["error"]).send(reply_to=True)
     else:
         mode = state["mode"]
-    if mode == "0" or mode == "1":
+    if mode == "0":
         await UniMessage.text("该模式暂不支持猜歌").finish(reply_to=True)
     binded_id = await UserData.filter(osu_mode=mode).values_list("user_id", flat=True)
     if not binded_id:
@@ -435,12 +437,11 @@ async def _(
         if not user_data:
             await UniMessage.text("该用户未绑定osu账号").finish(reply_to=True)
         try:
-            bp_info = await osu_api("bp", user_data.osu_id, NGM[state["mode"]])
+            bp_ls = await get_user_scores(user_data.osu_id, NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -449,12 +450,11 @@ async def _(
         guess_song_cache[session_id].add(selected_score.beatmapset.id)
     elif state["user"]:
         try:
-            bp_info = await osu_api("bp", state["user"], NGM[state["mode"]])
+            bp_ls = await get_user_scores(state["user"], NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -471,18 +471,18 @@ async def _(
     chart_set_timeout(matcher, session_id)
     if mode == "3":
         osu = await download_tmp_osu(selected_score.beatmap.id)
-        byt = await generate_preview_pic(osu)
-        await (
-            UniMessage.text(f"开始谱面猜歌游戏，猜猜下面谱面的曲名吧，该曲抽选自 {selected_user} 的bp")
-            + UniMessage.image(raw=byt)
-        ).finish()
+        pic = await generate_preview_pic(osu)
+    elif mode == "1":
+        osu = await download_tmp_osu(selected_score.beatmap.id)
+        beatmap = parse_map(osu)
+        pic = map_to_image(beatmap)
     else:
         mods = [i.acronym for i in selected_score.mods]
         pic = await draw_cath_preview(selected_score.beatmap.id, selected_score.beatmapset.id, mods)
-        await (
-            UniMessage.text(f"开始谱面猜歌游戏，猜猜下面谱面的曲名吧，该曲抽选自 {selected_user} 的bp")
-            + UniMessage.image(raw=pic)
-        ).finish()
+    await (
+        UniMessage.text(f"开始谱面猜歌游戏，猜猜下面谱面的曲名吧，该曲抽选自 {selected_user} 的bp")
+        + UniMessage.image(raw=pic)
+    ).finish()
 
 
 @chart_word_matcher.handle()

nonebot_plugin_osubot/matcher/utils.py

@@ -33,7 +33,9 @@ def split_msg():
         state["query"] = []
         state["target"] = None
         state["is_lazer"] = True if not user_data else user_data.lazer_mode
-        arg = arg.extract_plain_text().strip()
+        arg = (
+            arg.extract_plain_text().strip().replace("＝", "=").replace("：", ":").replace("＆", "&").replace("＃", "#")
+        )
         matches = re.findall(pattern, arg)
         for match in matches:
             if match[0]:
@@ -85,9 +87,9 @@ def split_msg():
         if state["source"] == "ppysb" and not arg.strip():
             sb_user_data = await SbUserData.get_or_none(user_id=qq)
             if sb_user_data:
-                state["user"] = sb_user_data.osu_id if user_data else 0
-                state["username"] = sb_user_data.osu_name if user_data else ""
+                state["user"] = sb_user_data.osu_id
+                state["username"] = sb_user_data.osu_name
             else:
-                state["error"] = "该账号尚未绑定sb 服务器，请输入 /sbbind 用户名 绑定账号"
+                state["error"] = "该账号尚未绑定 sb 服务器，请输入 /sbbind 用户名 绑定账号"
 
     return Depends(dependency)

nonebot_plugin_osubot/network/manager.py

@@ -0,0 +1,30 @@
+import httpx
+import asyncio
+from ..config import Config
+from httpx import AsyncClient
+from nonebot import get_plugin_config
+
+
+plugin_config = get_plugin_config(Config)
+proxy = plugin_config.osu_proxy
+
+
+class NetworkManager:
+    def __init__(self):
+        self._client = None
+        self._lock = asyncio.Lock()
+
+    async def get_client(self) -> AsyncClient:
+        if self._client is None:
+            async with self._lock:
+                if self._client is None:
+                    self._client = AsyncClient(
+                        proxy=proxy,
+                        follow_redirects=True,
+                        limits=httpx.Limits(max_keepalive_connections=20, max_connections=100, keepalive_expiry=30),
+                        timeout=httpx.Timeout(30.0),
+                    )
+        return self._client
+
+
+network_manager = NetworkManager()

nonebot_plugin_osubot/schema/score.py

@@ -113,6 +113,7 @@ class UnifiedBeatmap(Base):
     ar: float
     hp: float
     stars: float
+    user_id: int
 
 
 class UnifiedScore(Base):
@@ -127,3 +128,4 @@ class UnifiedScore(Base):
     statistics: NewStatistics
     beatmap: Optional[UnifiedBeatmap] = None
     passed: bool
+    pp: Optional[float] = None

{nonebot_plugin_osubot-6.20.1.dist-info → nonebot_plugin_osubot-6.22.0.dist-info}/METADATA

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

{nonebot_plugin_osubot-6.20.1.dist-info → nonebot_plugin_osubot-6.22.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 nonebot_plugin_osubot/__init__.py,sha256=Q-mTTnOIdKiKG6JrVm-kqpPrAhOP9lWyiKHNRqA7gpc,1478
-nonebot_plugin_osubot/api.py,sha256=8GXbumU7_1D0gyYuGtjHgNT82rSXKZUV-WG5mpUubYE,16336
+nonebot_plugin_osubot/api.py,sha256=-KTefbeRJJwXD0I2hywJfD3ogpLyrrphJoZGoru_3U4,16410
 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
@@ -17,7 +17,7 @@ nonebot_plugin_osubot/draw/catch_preview_templates/js/beatmap/timingpoint.js,sha
 nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/LegacyRandom.js,sha256=HDiks3FCVQBtVK5VzN7YV9Ekkk_WHYi0fPk3-XCQaj8,2155
 nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/PalpableCatchHitObject.js,sha256=CnUBiIkAqFUaCrc5TXRtL_fuK20NeK1yMti1Sp4dJAE,5702
 nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/bananashower.js,sha256=sPISMifUWVXK9nXuOD7JUPeXBNPBKquiDNKpYzbSJyg,988
-nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/catch.js,sha256=MnYorETgLMjXJ8X0uPNyapD3m0KHHzHdoPnkUcBU374,34430
+nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/catch.js,sha256=uLbMrZBZfvj1YxJVIeirFWVVJ2apLPfB1VY_KHq-hSE,34561
 nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/fruit.js,sha256=ABvFMbmXP0t5wACUhSVbu8sVJ845mWJ9sWiQJtMV5co,437
 nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/juicestream.js,sha256=kWjmPtT_UgnUlg5G-_8q-1AyNTv6GLRp0bOOfiMcojc,7347
 nonebot_plugin_osubot/draw/catch_preview_templates/js/fakeaudio.js,sha256=gJrdVwNrAVjWx80z_XkzybL9ldfV97nKl7k1v7NulBg,1211
@@ -36,20 +36,20 @@ nonebot_plugin_osubot/draw/catch_preview_templates/js/standard/spinner.js,sha256
 nonebot_plugin_osubot/draw/catch_preview_templates/js/util.js,sha256=XveUlX-d0vrUnXaGbR8y428s6Nw2zhDR235pFko_MxM,1504
 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=kmwzKgqWzWRPAlg0eqVibSZpC9NVo-U9gGrxRl3D6m0,3086
+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/match_history.py,sha256=GBJl6lAA27U7NSMC2isEzD_YsoIPAeG6ijDu7Oflcl0,997
 nonebot_plugin_osubot/draw/rating.py,sha256=pA7mGLI4IujmYB6kQf_tSkR7mZGpUAVLRLyaAsZhqTM,20397
-nonebot_plugin_osubot/draw/score.py,sha256=Y2-BUuKYgYoXk-Uq0PFNg3WaU_SUfSB6Ebo446xslUg,27553
-nonebot_plugin_osubot/draw/static.py,sha256=2rznsXZTcKggQ5JSpsJg4y6uWP4e-Y40U7v_QAwLT4Q,3969
+nonebot_plugin_osubot/draw/score.py,sha256=z7HNBOFVHaarbeo2FK8vIpoGVhu47E2BgCqG_axTwSo,29610
+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=cnpM0qRvvyCMTRP-mIOABQlaaqxQwG5kLUxlo4h7F7w,7012
+nonebot_plugin_osubot/draw/templates/bpa_chart.html,sha256=R-fO46HtmC4y3brMFGz6MQkna8ke7WGHVIgUnvcY248,7012
 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/utils.py,sha256=LZVDmrQizVwVFX0kDJISYYO68jmZbn5Xz40gV5bj8bo,15276
+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/info/__init__.py,sha256=I7YlMQiuHExEeJWqyzZb2I-Vl2uql3Py2LdhSH2Z9N0,136
@@ -59,9 +59,9 @@ nonebot_plugin_osubot/mania/__init__.py,sha256=XRPn563jDJiPohFekcoFFCqCJYznb-6uO
 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=S1dhYiGqtPQapJt4PB5mNKfpPbOpVNAqDIToNEJVpSY,3949
+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=iE5oRZ3mDTC_wcjLJTyyAWlmnDzkAgzGN5rvoTIn0uM,24093
+nonebot_plugin_osubot/matcher/guess.py,sha256=QmD-a88pnPfSSBAvSpD2tlHDGMRpYWqtxfNuLsHuBYM,24144
 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
@@ -80,11 +80,12 @@ nonebot_plugin_osubot/matcher/score.py,sha256=Nk6dpDlszKJKdboTSQRBf-wMGioHIPqKSV
 nonebot_plugin_osubot/matcher/update.py,sha256=MHpxoJmU0hKW82XuM9YpyCxUUjjiNKwejnRgYwueR4Q,3168
 nonebot_plugin_osubot/matcher/update_mode.py,sha256=0Wy6Y1-rN7XcqBZyo37mYFdixq-4HxCwZftUaiYhZqE,1602
 nonebot_plugin_osubot/matcher/url_match.py,sha256=opx4DYSQ83tk0qlMOBirl4TC49WXHgMZ04lMr9NCHNs,746
-nonebot_plugin_osubot/matcher/utils.py,sha256=BUAorxXrWioiMzR0nZ8NUeaV48ZGUDe4FXLWxKT72g4,4240
+nonebot_plugin_osubot/matcher/utils.py,sha256=gWmNa31wUxcY_PNSNLy348x5_7sTY9ttMKH-5V5jkuE,4304
 nonebot_plugin_osubot/mods.py,sha256=vxIWYX0HwTxetPAHWZK5ojEMfqV9HFlWT0YC4Yncgb8,1402
 nonebot_plugin_osubot/network/__init__.py,sha256=WOijcd81yhnpGKYeiDIOxbBDVI12GHPRGoOFfxrUuQk,61
 nonebot_plugin_osubot/network/auto_retry.py,sha256=vDfYGbEVPF6WZLYXmRVkNvaxf6_6RyIqEAcA7TRwV_k,565
 nonebot_plugin_osubot/network/first_response.py,sha256=zETRc6g0AG8ExLyHZTLUl7uzUCdUVIL0IfxvdEtCPt0,932
+nonebot_plugin_osubot/network/manager.py,sha256=x0GI1cFv3m3ZIS4oNJed197PaRo8_Vut_2J7m9ySV30,858
 nonebot_plugin_osubot/osufile/Best Performance.png,sha256=qBNeZcym5vIqyE23K62ohjVBEPCjlNP9wQgXaT20XyY,704
 nonebot_plugin_osubot/osufile/History Score.jpg,sha256=yv3-GaJ7sBAbAPMFlUeoyg1PzMhv31Ip5bC4H0qJfSA,836
 nonebot_plugin_osubot/osufile/beatmapinfo.png,sha256=QQjMIGgAdvH6VKgHrrCZWasawsBb95erij4a_B0gjwA,30694
@@ -372,10 +373,10 @@ nonebot_plugin_osubot/osufile/mods/SD.png,sha256=JptCZkXv8kOpIksYimWdC7hRJXShL7N
 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/pfm_ctb.png,sha256=UYiDqal_wQHJxqOGYrXNs587FZg6qGALAA6OaQaqPws,44488
-nonebot_plugin_osubot/osufile/pfm_mania.png,sha256=YnLEs9SUivR8BfTZQDyGZXQJMYLIB_v8KuA9qbuysMQ,45512
-nonebot_plugin_osubot/osufile/pfm_std.png,sha256=_H7i_QKzwkDH70avZLvn7dqcldRpKBHH_Y8AkflmNTI,47809
-nonebot_plugin_osubot/osufile/pfm_taiko.png,sha256=ds3C71ZKGiXd6LgxuLfrKxDrfPbzrbMddmh9IwLW3tk,44271
+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
+nonebot_plugin_osubot/osufile/pfm_taiko.png,sha256=7OAhXVfL_j7pZ4MZAXexgSMNmUyVNsvvq1Ij2XzFEgc,55756
 nonebot_plugin_osubot/osufile/ranking/ranking-A.png,sha256=nA4kI67IbnC-gfu1pCnPupHC45Uoqa6LYmJKawzV_L0,4364
 nonebot_plugin_osubot/osufile/ranking/ranking-B.png,sha256=KJCEGr7OkQ12rqng6_JL9r6qLTAclPO_PtHHmLFQooY,4214
 nonebot_plugin_osubot/osufile/ranking/ranking-C.png,sha256=SsIWOTOymgMze521v4G_rdqL6QqpE64R1dhxpmhzBAc,3862
@@ -389,6 +390,7 @@ nonebot_plugin_osubot/osufile/work/bmap.png,sha256=Uc2znhA_SQ5Zc5MxdtIlnK2YlkhQS
 nonebot_plugin_osubot/osufile/work/center.png,sha256=AJkhRnPCv1aYPg5nLV2ZCtDGo3lPzP3orT62DvS3c_4,83
 nonebot_plugin_osubot/osufile/work/left.png,sha256=wJtK_kGmtRumI3F-vK0cl2Q2N1v7DB5bc9qofe4LyqI,128
 nonebot_plugin_osubot/osufile/work/right.png,sha256=WKkaefFr5C_pdm9mFMyYMUS_BNzMPATmqlvebVU36OY,136
+nonebot_plugin_osubot/osufile/work/stardiff.png,sha256=mBPOspsqNr1FkDolzTpnyIz-8NIKfrYn_dXi_eMS34s,156
 nonebot_plugin_osubot/osufile/work/stars.png,sha256=zifMmxxjOGzSZAm1tr-3ky_yy18p1bbjgkl3zYRMcp4,305
 nonebot_plugin_osubot/osufile/work/stars_expertplus.png,sha256=cmfpErs-flPxHEhVmS9H8vy8H7mrChvV_Q4A77oSVFY,517
 nonebot_plugin_osubot/osufile/work/suppoter.png,sha256=4V4eNhB8_8KIXsQ1jzFyHUkicKPb5LPehoIcri4h8E4,16061
@@ -400,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=zHU-w2e7RzMDL8vdPkX5vggcqalBo83JTvu96abcflo,3124
+nonebot_plugin_osubot/schema/score.py,sha256=Qtvs5Hfvw5m2b00e8ZjrcrLGDyL4lqDspRwrkORY-xU,3172
 nonebot_plugin_osubot/schema/user.py,sha256=sxNmqymG_kIVuGuzfchSv9UML6NPG70cqo2_h5xDIpM,2250
 nonebot_plugin_osubot/utils/__init__.py,sha256=pyv8XxBcCOeQVDj1E4dgvktzcefgQXfKBlarsYGx1sg,815
-nonebot_plugin_osubot-6.20.1.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-nonebot_plugin_osubot-6.20.1.dist-info/METADATA,sha256=cosRoPpyiqrB686g_vBWg7JhlUs9jQ7CGFVvGZonDzU,4476
-nonebot_plugin_osubot-6.20.1.dist-info/RECORD,,
+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,,