nonebot-plugin-osubot 6.17.1__tar.gz → 6.18.0__tar.gz

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/PKG-INFO

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

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/api.py

@@ -370,8 +370,8 @@ async def get_sayo_map_info(sid, t=0) -> SayoBeatmap:
 async def get_map_bg(mapid, sid, bg_name) -> BytesIO:
     res = await get_first_response(
         [
-            f"https://osu.direct/api/media/background/{mapid}",
-            f"https://subapi.nerinyan.moe/bg/{mapid}",
+            f"https://catboy.best/preview/background/{mapid}",
+            f"https://api.nerinyan.moe/bg/{mapid}",
             f"https://dl.sayobot.cn/beatmaps/files/{sid}/{bg_name}",
         ]
     )

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/draw/bp.py

@@ -7,10 +7,10 @@ from PIL import ImageDraw, UnidentifiedImageError
 
 from ..pp import cal_pp
 from ..mods import get_mods_list
-from ..api import get_user_scores, get_user_info_data
 from ..exceptions import NetworkError
 from ..schema.score import Mod, UnifiedScore
 from .score import cal_legacy_acc, cal_legacy_rank
+from ..api import get_user_scores, get_user_info_data
 from ..file import map_path, get_pfm_img, download_osu
 from .utils import draw_fillet, draw_fillet2, open_user_icon, filter_scores_with_regex
 from .static import BgImg, Image, BgImg1, ModsDict, RankDict, Torus_Regular_20, Torus_Regular_25, Torus_SemiBold_25
@@ -34,7 +34,7 @@ async def draw_bp(
     if mods:
         mods_ls = get_mods_list(scores, mods)
         if low_bound > len(mods_ls):
-            raise NetworkError(f'未找到开启 {"|".join(mods)} Mods的成绩')
+            raise NetworkError(f"未找到开启 {'|'.join(mods)} Mods的成绩")
         if high_bound > len(mods_ls):
             mods_ls = mods_ls[low_bound - 1 :]
         else:

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/draw/info.py

@@ -10,14 +10,13 @@ from ..exceptions import NetworkError
 from ..database.models import InfoData
 from ..api import get_random_bg, get_user_info_data
 from .utils import info_calc, draw_fillet, update_icon, open_user_icon
-from ..file import user_cache_path, badge_cache_path, make_badge_cache_file
+from ..file import get_projectimg, team_cache_path, user_cache_path, badge_cache_path, make_badge_cache_file
 from .static import (
     Image,
     InfoImg,
     ExpLeftBg,
     ExpRightBg,
     ExpCenterBg,
-    SupporterBg,
     Torus_Regular_20,
     Torus_Regular_25,
     Torus_Regular_30,
@@ -142,14 +141,27 @@ async def draw_info(uid: Union[int, str], mode: str, day: int, source: str) -> B
                 badges_img = Image.open(badges_path).convert("RGBA").resize((86, 40))
             except UnidentifiedImageError:
                 badges_path.unlink()
-                raise NetworkError("badges图片下载错误，请重试！")
+                raise NetworkError("badges 图片下载错误，请重试！")
             im.alpha_composite(badges_img, (length, height))
     # 地区
     country_bg = Image.open(country).convert("RGBA").resize((80, 54))
     im.alpha_composite(country_bg, (400, 394))
+    if info.team and info.team.flag_url:
+        team_path = team_cache_path / f"{info.team.id}.png"
+        if not team_path.exists():
+            team_img = await get_projectimg(info.team.flag_url)
+            team_img = Image.open(team_img).convert("RGBA")
+            team_img.save(team_path)
+        try:
+            team_img = Image.open(team_path).convert("RGBA").resize((108, 54))
+            im.alpha_composite(team_img, (400, 280))
+        except UnidentifiedImageError:
+            team_path.unlink()
+            raise NetworkError("team 图片下载错误，请重试！")
+        draw.text((515, 300), info.team.name, font=Torus_Regular_30, anchor="lt")
     # supporter
-    if info.is_supporter:
-        im.alpha_composite(SupporterBg.resize((54, 54)), (400, 280))
+    # if info.is_supporter:
+    # im.alpha_composite(SupporterBg.resize((54, 54)), (400, 280))
     # 经验
     if statistics.level.progress != 0:
         im.alpha_composite(ExpLeftBg, (50, 646))

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/draw/rating.py

@@ -152,8 +152,7 @@ async def draw_rating(match_id: str, algorithm: str = "osuplus") -> bytes:
 
         draw.text(
             (350 + x_offset, 341 + base_y),
-            f"Total Score: {score_to_3digit(player_stats.total_score)}"
-            f" ({score_to_3digit(player_stats.average_score)})",
+            f"Total Score: {score_to_3digit(player_stats.total_score)} ({score_to_3digit(player_stats.average_score)})",
             font=Torus_SemiBold_20,
             fill="#bbbbbb",
             anchor="lm",

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/draw/score.py

@@ -3,7 +3,7 @@ from io import BytesIO
 from typing import Optional
 from datetime import datetime, timedelta
 
-from PIL import ImageDraw, ImageFilter, ImageEnhance, ImageSequence
+from PIL import ImageDraw, ImageFilter, ImageEnhance, ImageSequence, UnidentifiedImageError
 
 from ..info import get_bg
 from ..mods import get_mods_list
@@ -12,9 +12,9 @@ from ..schema.user import UnifiedUser
 from ..schema import Beatmap, NewScore
 from ..beatmap_stats_moder import with_mods
 from ..pp import cal_pp, get_ss_pp, get_if_pp_ss_pp
-from ..file import map_path, download_osu, user_cache_path
 from ..schema.score import Mod, UnifiedScore, NewStatistics
 from ..api import osu_api, get_user_scores, get_user_info_data, get_ppysb_map_scores
+from ..file import map_path, download_osu, get_projectimg, team_cache_path, user_cache_path
 from .utils import (
     crop_bg,
     draw_acc,
@@ -32,7 +32,6 @@ from .static import (
     Image,
     IconLs,
     Venera_75,
-    SupporterBg,
     Torus_Regular_20,
     Torus_Regular_30,
     Torus_Regular_75,
@@ -164,7 +163,7 @@ async def get_score_data(
                     score = i
                     break
             else:
-                raise NetworkError(f'未找到开启 {"|".join(mods)} Mods的成绩')
+                raise NetworkError(f"未找到开启 {'|'.join(mods)} Mods的成绩")
     else:
         score_ls.sort(key=lambda x: x.total_score, reverse=True)
         score = score_ls[0]
@@ -265,9 +264,22 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     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))
+    if info.team and info.team.flag_url:
+        team_path = team_cache_path / f"{info.team.id}.png"
+        if not team_path.exists():
+            team_img = await get_projectimg(info.team.flag_url)
+            team_img = Image.open(team_img).convert("RGBA")
+            team_img.save(team_path)
+        try:
+            team_img = Image.open(team_path).convert("RGBA").resize((80, 40))
+            im.alpha_composite(team_img, (250, 640))
+        except UnidentifiedImageError:
+            team_path.unlink()
+            raise NetworkError("team 图片下载错误，请重试！")
+        draw.text((340, 660), info.team.name, font=Torus_Regular_20, anchor="lt")
     # supporter
-    if info.is_supporter:
-        im.alpha_composite(SupporterBg.resize((40, 40)), (250, 640))
+    # if info.is_supporter:
+    #     im.alpha_composite(SupporterBg.resize((40, 40)), (250, 640))
     # 处理mania转谱cs
     if score_info.ruleset_id == 3 and mapinfo.mode == 0:
         temp_accuracy = mapinfo.accuracy
@@ -527,7 +539,7 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
         draw.text(
             (1002, 580),
             (
-                f"{score_info.statistics.perfect / score_info.statistics.great :.1f}:1"
+                f"{score_info.statistics.perfect / score_info.statistics.great:.1f}:1"
                 if (score_info.statistics.great or 0) != 0
                 else "∞:1"
             ),

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/file.py

@@ -16,6 +16,7 @@ osufile = Path(__file__).parent / "osufile"
 map_path = Path() / "data" / "osu" / "map"
 user_cache_path = Path() / "data" / "osu" / "user"
 badge_cache_path = Path() / "data" / "osu" / "badge"
+team_cache_path = Path() / "data" / "osu" / "team"
 api_ls = [
     "https://api.chimu.moe/v1/download/",
     "https://osu.direct/api/d/",

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/matcher/bp.py

@@ -42,7 +42,7 @@ async def _bp(state: T_State):
         lazer_mode = "lazer模式下" if state["is_lazer"] else "stable模式下"
         mods = f" mod:{state['mods']}" if state["mods"] else ""
         await UniMessage.text(
-            f"在查找用户：{state['username']} {NGM[state['mode']]}模式" f" bp{best} {lazer_mode}{mods}时 {str(e)}"
+            f"在查找用户：{state['username']} {NGM[state['mode']]}模式 bp{best} {lazer_mode}{mods}时 {str(e)}"
         ).finish(reply_to=True)
     await UniMessage.image(raw=data).finish(reply_to=True)
 
@@ -74,8 +74,7 @@ async def _pfm(state: T_State):
         lazer_mode = "lazer模式下" if state["is_lazer"] else "stable模式下"
         mods = f" mod:{state['mods']}" if state["mods"] else ""
         await UniMessage.text(
-            f"在查找用户：{state['username']} {NGM[state['mode']]}模式"
-            f" bp{state['range']} {lazer_mode}{mods}时 {str(e)}"
+            f"在查找用户：{state['username']} {NGM[state['mode']]}模式 bp{state['range']} {lazer_mode}{mods}时 {str(e)}"
         ).finish(reply_to=True)
     await UniMessage.image(raw=data).finish(reply_to=True)
 

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/matcher/bp_analyze.py

@@ -43,7 +43,7 @@ async def _(event: Event, state: T_State):
         )
     except NetworkError as e:
         await UniMessage.text(
-            f"在查找用户：{state['username']} {NGM[state['mode']]}模式" f" {lazer_mode}时 {str(e)}"
+            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:
@@ -106,6 +106,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"{score_ls[0].user.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-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/matcher/history.py

@@ -33,5 +33,5 @@ async def _info(state: T_State):
     pp_ls = [pp_ls[i] for i in filtered_indices]
     date_ls = [date_ls[i] for i in filtered_indices]
     rank_ls = [rank_ls[i] for i in filtered_indices]
-    byt = await draw_history_plot(pp_ls, date_ls, rank_ls, f'{user.osu_name} {NGM[state["mode"]]} pp/rank history')
+    byt = await draw_history_plot(pp_ls, date_ls, rank_ls, f"{user.osu_name} {NGM[state['mode']]} pp/rank history")
     await UniMessage.image(raw=byt).finish(reply_to=True)

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/matcher/medal.py

@@ -60,7 +60,7 @@ async def _(msg: Message = CommandArg()):
     words = re.sub(style_regex, "", words)
     words = re.sub(r"<[^>]+>", "", words)
     if medal_data["PackID"]:
-        words += f'\nhttps://osu.ppy.sh/beatmaps/packs/{medal_data["PackID"].rstrip(",,,")}'
+        words += f"\nhttps://osu.ppy.sh/beatmaps/packs/{medal_data['PackID'].rstrip(',,,')}"
     await (UniMessage.image(url=medal_data["Link"]) + words).send(reply_to=True)
     if medal_data["beatmaps"]:
         msg = UniMessage()
@@ -68,7 +68,7 @@ async def _(msg: Message = CommandArg()):
             medal_data["beatmaps"] = medal_data["beatmaps"][:5]
         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"{beatmap['SongTitle']} [{beatmap['DifficultyName']}]\n{beatmap['Difficulty']}⭐\n"
+                + f"https://osu.ppy.sh/b/{beatmap['BeatmapID']}"
             )
         await msg.send()

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/matcher/recommend.py

@@ -52,7 +52,7 @@ async def handle_recommend(state: T_State, matcher: type[Matcher]):
         bg = ""
         logger.error(f"出现问题： 有问题的是{bid}, {sid}")
     s = (
-        f'推荐的铺面是{recommend_map.mapName} ⭐{round(recommend_map.difficulty, 2)}\n{"".join(recommend_map.mod)}\n'
+        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}"

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/matcher/score.py

@@ -29,6 +29,6 @@ async def _score(state: T_State):
         lazer_mode = "lazer模式下" if state["is_lazer"] else "stable模式下"
         mods = f" mod:{state['mods']}" if state["mods"] else ""
         await UniMessage.text(
-            f"在查找用户：{state['username']} {NGM[state['mode']]}模式" f" {lazer_mode}{mods} 成绩时 {str(e)}"
+            f"在查找用户：{state['username']} {NGM[state['mode']]}模式 {lazer_mode}{mods} 成绩时 {str(e)}"
         ).finish(reply_to=True)
     await UniMessage.image(raw=data).finish(reply_to=True)

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/nonebot_plugin_osubot/schema/user.py

@@ -85,6 +85,13 @@ class User(UserCompact):
     statistics_rulesets: Optional[StatisticsRulesets] = None
 
 
+class Team(Base):
+    flag_url: Optional[str] = None
+    id: int
+    name: str
+    short_name: str
+
+
 class UnifiedUser(Base):
     avatar_url: str
     country_code: str
@@ -93,3 +100,4 @@ class UnifiedUser(Base):
     is_supporter: bool
     badges: Optional[list[Badge]] = None
     statistics: Optional[UserStatistics] = None
+    team: Optional[Team] = None

{nonebot-plugin-osubot-6.17.1 → nonebot-plugin-osubot-6.18.0}/pyproject.toml

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