nonebot-plugin-osubot 6.18.1__py3-none-any.whl → 6.19.0__py3-none-any.whl

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/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/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.dist-info → nonebot_plugin_osubot-6.19.0.dist-info}/METADATA

@@ -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>
@@ -18,7 +18,7 @@ Requires-Dist: nonebot2>=2.3.0
 Requires-Dist: pillow>=9.2.0
 Requires-Dist: pydantic!=2.5.0,!=2.5.1,<3.0.0,>=1.10.0
 Requires-Dist: reamber>=0.2.1
-Requires-Dist: rosu-pp-py==2.0.1
+Requires-Dist: rosu-pp-py==3.0.0
 Requires-Dist: tortoise-orm>=0.20.0
 Requires-Dist: typing_extensions>=4.11.0
 Project-URL: Homepage, https://github.com/yaowan233/nonebot-plugin-osubot

{nonebot_plugin_osubot-6.18.1.dist-info → nonebot_plugin_osubot-6.19.0.dist-info}/RECORD

@@ -42,14 +42,14 @@ nonebot_plugin_osubot/draw/info.py,sha256=i2YcJmSdTpwhZl_nDe7GJv4jQTB8_9oBfpq2Zw
 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=bEQq01UCdOeIE_m35nKuNYGk84bzfVjAsQZfleQ1yTU,27223
+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/taiko_preview.py,sha256=tqhuHSdxUJEuXqKHMJDeSLdusuJhSnMMiaG5FbUnaJw,11441
 nonebot_plugin_osubot/draw/templates/bpa_chart.html,sha256=cnpM0qRvvyCMTRP-mIOABQlaaqxQwG5kLUxlo4h7F7w,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=mwP_wTnuRnp9FrlCqUFvCX2p0_Lm5jQ73PgjjhtF6EA,14205
+nonebot_plugin_osubot/draw/utils.py,sha256=fvFs7h8G0UavHAe4vXWugKJZ2ZQmZb0bGl-BSPG95hc,15138
 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
@@ -396,13 +396,13 @@ nonebot_plugin_osubot/pp.py,sha256=PSWGLWERr4vVtE9H5D2EBm-_hM5HOU3PQvv1cC4rqmQ,3
 nonebot_plugin_osubot/schema/__init__.py,sha256=io5BqRRNeBUSWPw5VXQav_TMrDN4dsTVpoMzrU9lTCA,468
 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=_WPLWz6GYs_9igGCHoqWy59p-JfwIZ3MWY6l_f4YGqE,1872
+nonebot_plugin_osubot/schema/beatmap.py,sha256=UnobfZEHq1V2HG-A4j3BECubO-dB1JzTMA2_QIXttNM,1960
 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/user.py,sha256=sxNmqymG_kIVuGuzfchSv9UML6NPG70cqo2_h5xDIpM,2250
 nonebot_plugin_osubot/utils/__init__.py,sha256=pyv8XxBcCOeQVDj1E4dgvktzcefgQXfKBlarsYGx1sg,815
-nonebot_plugin_osubot-6.18.1.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-nonebot_plugin_osubot-6.18.1.dist-info/METADATA,sha256=8mVJgIDqkt_Ps9LK9i018HXK-OfPLmJri2RmJp15wZk,4476
-nonebot_plugin_osubot-6.18.1.dist-info/RECORD,,
+nonebot_plugin_osubot-6.19.0.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+nonebot_plugin_osubot-6.19.0.dist-info/METADATA,sha256=lHB8m5ljuFCJHaM6dNi-AwN82VMLvKMQFNiw67c0CkI,4476
+nonebot_plugin_osubot-6.19.0.dist-info/RECORD,,