nonebot-plugin-osubot 6.18.1__tar.gz → 6.19.0__tar.gz

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.19.0}/PKG-INFO

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

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.19.0}/nonebot_plugin_osubot/draw/score.py

@@ -27,6 +27,7 @@ from .utils import (
     get_modeimage,
     open_user_icon,
     filter_scores_with_regex,
+    trim_text_with_ellipsis,
 )
 from .static import (
     Image,
@@ -398,9 +399,18 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
         anchor="lm",
     )
     # 谱面版本，mapper
+    if mapinfo.owners:
+        owner_names = [owner.username for owner in mapinfo.owners]
+        owners_str = ", ".join(owner_names)
+        mapper = f"{mapinfo.version} | 谱师: {owners_str}"
+
+    else:
+        mapper = f"{mapinfo.version} | 谱师: {mapinfo.beatmapset.creator}"
+    mapper = trim_text_with_ellipsis(mapper, 1000, Torus_SemiBold_20)
+
     draw.text(
         (225, 90),
-        f"{mapinfo.version} | 谱师: {mapinfo.beatmapset.creator}",
+        mapper,
         font=Torus_SemiBold_20,
         anchor="lm",
     )

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.19.0}/nonebot_plugin_osubot/draw/utils.py

@@ -267,18 +267,18 @@ async def update_icon(info: UnifiedUser):
                 user_icon = await get_projectimg(info.avatar_url)
                 with open(path / f"icon.{info.avatar_url.split('.')[-1]}", "wb") as f:
                     f.write(user_icon.getvalue())
-
-    team_path = team_cache_path / f"{info.team.id}.png"
-    if team_path.exists():
-        modified_time = team_path.stat().st_mtime
-        modified_datetime = datetime.datetime.fromtimestamp(modified_time)
-        time_diff = datetime.datetime.now() - modified_datetime
-        # 判断文件是否创建超过一天
-        if time_diff > datetime.timedelta(days=1):
-            team_path.unlink()
-            team_icon = await get_projectimg(info.team.flag_url)
-            with open(team_path, "wb") as f:
-                f.write(team_icon.getvalue())
+    if info.team:
+        team_path = team_cache_path / f"{info.team.id}.png"
+        if team_path.exists():
+            modified_time = team_path.stat().st_mtime
+            modified_datetime = datetime.datetime.fromtimestamp(modified_time)
+            time_diff = datetime.datetime.now() - modified_datetime
+            # 判断文件是否创建超过一天
+            if time_diff > datetime.timedelta(days=1):
+                team_path.unlink()
+                team_icon = await get_projectimg(info.team.flag_url)
+                with open(team_path, "wb") as f:
+                    f.write(team_icon.getvalue())
 
 
 async def update_map(set_id, map_id):
@@ -410,3 +410,29 @@ def filter_scores_with_regex(scores_with_index, conditions):
             score for score in scores_with_index if matches_condition_with_regex(score, key, operator, value)
         ]
     return scores_with_index
+
+
+def trim_text_with_ellipsis(text, max_width, font):
+    # 初始检查：空字符串或无需处理
+    if not text or font.getbbox(text) <= max_width:
+        return text
+    # 逐字符检查
+    ellipsis_symbol = "…"
+    ellipsis_width = font.getbbox("…")
+    # 确保最大宽度能至少容纳一个字符+省略号
+    if max_width < font.getbbox("A") + ellipsis_width:
+        return ellipsis_symbol
+
+    truncated_text = ""
+    current_width = 0
+
+    for char in text:
+        # 检查当前字符宽度 + 省略号宽度是否超标
+        char_width = font.getbbox(char)
+        if current_width + char_width + ellipsis_width > max_width:
+            break
+        truncated_text += char
+        current_width += char_width
+
+    # 返回截断后的字符串 + 省略号
+    return truncated_text + ellipsis_symbol if truncated_text else ellipsis_symbol

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.19.0}/nonebot_plugin_osubot/schema/beatmap.py

@@ -11,6 +11,11 @@ class Covers(Base):
     slimcover: str
 
 
+class Gds(Base):
+    id: int
+    username: str
+
+
 class BeatmapsetCompact(Base):
     artist: str
     artist_unicode: str
@@ -78,6 +83,7 @@ class Beatmap(BeatmapCompact):
     playcount: int
     ranked: int
     url: str
+    owners: Optional[list[Gds]] = None
 
 
 class BackgroundsAttributes(Base):

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.19.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-osubot"
-version = "6.18.1"
+version = "6.19.0"
 description = "OSUbot in NoneBot2"
 authors = [
     { name = "yaowan233", email = "572473053@qq.com" },
@@ -15,7 +15,7 @@ dependencies = [
     "nonebot-plugin-apscheduler>=0.4.0",
     "tortoise-orm>=0.20.0",
     "nonebot-plugin-tortoise-orm>=0.1.4",
-    "rosu-pp-py==2.0.1",
+    "rosu-pp-py==3.0.0",
     "reamber>=0.2.1",
     "httpx>=0.23.3",
     "typing_extensions>=4.11.0",