nonebot-plugin-osubot 6.23.0__tar.gz → 6.23.1__tar.gz

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.23.1}/PKG-INFO

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

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.23.1}/nonebot_plugin_osubot/api.py

@@ -189,6 +189,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,

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.23.1}/nonebot_plugin_osubot/draw/bmap.py

@@ -7,7 +7,7 @@ from ..file import get_projectimg
 from ..api import get_sayo_map_info
 from ..exceptions import NetworkError
 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:
@@ -59,7 +59,7 @@ async def draw_bmap_info(mapid) -> BytesIO:
             # 难度
             draw.text((20, 320 + h_num), IconLs[cmap.mode], font=extra_30, anchor="lt")
             # 星星
-            stars_bg = stars_diff(cmap.star)
+            stars_bg = stars_diff(cmap.star, Stars)
             stars_img = stars_bg.resize((80, 30))
             im.alpha_composite(stars_img, (60, 320 + h_num))
             # diff

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.23.1}/nonebot_plugin_osubot/draw/echarts.py

@@ -20,7 +20,8 @@ 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-6.23.0 → nonebot-plugin-osubot-6.23.1}/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:

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.23.1}/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-6.23.0 → nonebot-plugin-osubot-6.23.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-6.23.0 → nonebot-plugin-osubot-6.23.1}/nonebot_plugin_osubot/matcher/bp_analyze.py

@@ -34,12 +34,17 @@ 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:
+        # Filter mods outside of the iteration
+        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

{nonebot-plugin-osubot-6.23.0 → nonebot-plugin-osubot-6.23.1}/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-6.23.0 → nonebot-plugin-osubot-6.23.1}/pyproject.toml

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

nonebot-plugin-osubot-6.23.0/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>