nonebot-plugin-osubot 6.20.1__tar.gz → 6.22.0__tar.gz

{nonebot-plugin-osubot-6.20.1 → nonebot-plugin-osubot-6.22.0}/PKG-INFO

@@ -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 → nonebot-plugin-osubot-6.22.0}/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-6.20.1 → nonebot-plugin-osubot-6.22.0}/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-6.20.1 → nonebot-plugin-osubot-6.22.0}/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>