♻️ 重构模板截图部分以解决导航导致的报错 (#553)

* ♻️ 把 path 放到数据模型里

* ♻️ 使用通用函数来生成模板图片

* 🎨 同步模板项目结构

* 🐛 修正导入路径

nonebot_plugin_tetris_stats/games/top/bind.py

@@ -9,12 +9,11 @@ from nonebot_plugin_user import User
 
 from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
-from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
 from ...utils.lang import get_lang
-from ...utils.render import Bind, render
+from ...utils.render import render_image
 from ...utils.render.schemas.base import People
-from ...utils.screenshot import screenshot
+from ...utils.render.schemas.bind import Bind
 from . import alc
 from .api import Player
 from .constant import GAME_TYPE
@@ -37,9 +36,8 @@ async def _(nb_user: User, account: Player, event_session: Uninfo, interface: Qr
                 game_account=user.unique_identifier,
             )
         if bind_status in (BindStatus.SUCCESS, BindStatus.UPDATE):
-            async with HostPage(
-                await render(
-                    'v1/binding',
+            await UniMessage.image(
+                raw=await render_image(
                     Bind(
                         platform=GAME_TYPE,
                         type='unknown',
@@ -66,7 +64,4 @@ async def _(nb_user: User, account: Player, event_session: Uninfo, interface: Qr
                         lang=get_lang(),
                     ),
                 )
-            ) as page_hash:
-                await UniMessage.image(
-                    raw=await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
-                ).finish()
+            ).finish()

nonebot_plugin_tetris_stats/games/top/query.py

@@ -10,15 +10,13 @@ from nonebot_plugin_user import get_user
 from ...db import query_bind_info, trigger
 from ...i18n import Lang
 from ...utils.exception import FallbackError
-from ...utils.host import HostPage, get_self_netloc
 from ...utils.lang import get_lang
 from ...utils.metrics import TetrisMetricsBasicWithLPM, get_metrics
-from ...utils.render import render
+from ...utils.render import render_image
 from ...utils.render.avatar import get_avatar
 from ...utils.render.schemas.base import People, Trending
 from ...utils.render.schemas.v1.top.info import Data as InfoData
 from ...utils.render.schemas.v1.top.info import Info
-from ...utils.screenshot import screenshot
 from ...utils.typedefs import Me
 from . import alc
 from .api import Player
@@ -75,32 +73,28 @@ async def make_query_image(profile: UserProfile) -> bytes:
         raise FallbackError
     today = get_metrics(lpm=profile.today.lpm, apm=profile.today.apm)
     history = get_avg_metrics(profile.total)
-    async with HostPage(
-        await render(
-            'v1/top/info',
-            Info(
-                user=People(avatar=get_avatar(profile.user_name), name=profile.user_name),
-                today=InfoData(
-                    pps=today.pps,
-                    lpm=today.lpm,
-                    lpm_trending=Trending.KEEP,
-                    apm=today.apm,
-                    apl=today.apl,
-                    apm_trending=Trending.KEEP,
-                ),
-                historical=InfoData(
-                    pps=history.pps,
-                    lpm=history.lpm,
-                    lpm_trending=Trending.KEEP,
-                    apm=history.apm,
-                    apl=history.apl,
-                    apm_trending=Trending.KEEP,
-                ),
-                lang=get_lang(),
+    return await render_image(
+        Info(
+            user=People(avatar=get_avatar(profile.user_name), name=profile.user_name),
+            today=InfoData(
+                pps=today.pps,
+                lpm=today.lpm,
+                lpm_trending=Trending.KEEP,
+                apm=today.apm,
+                apl=today.apl,
+                apm_trending=Trending.KEEP,
             ),
-        )
-    ) as page_hash:
-        return await screenshot(f'http://{get_self_netloc()}/host/{page_hash}.html')
+            historical=InfoData(
+                pps=history.pps,
+                lpm=history.lpm,
+                lpm_trending=Trending.KEEP,
+                apm=history.apm,
+                apl=history.apl,
+                apm_trending=Trending.KEEP,
+            ),
+            lang=get_lang(),
+        ),
+    )
 
 
 def make_query_text(profile: UserProfile) -> UniMessage:

nonebot_plugin_tetris_stats/games/top/unbind.py

@@ -10,12 +10,11 @@ from nonebot_plugin_waiter import suggest  # type: ignore[import-untyped]
 
 from ...config.config import global_config
 from ...db import query_bind_info, remove_bind, trigger
-from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
 from ...utils.lang import get_lang
-from ...utils.render import Bind, render
+from ...utils.render import render_image
 from ...utils.render.schemas.base import People
-from ...utils.screenshot import screenshot
+from ...utils.render.schemas.bind import Bind
 from . import alc
 from .api import Player
 from .constant import GAME_TYPE
@@ -43,10 +42,8 @@ async def _(
             return
         player = Player(user_name=bind.game_account, trust=True)
         user = await player.user
-        netloc = get_self_netloc()
-        async with HostPage(
-            await render(
-                'v1/binding',
+        await UniMessage.image(
+            raw=await render_image(
                 Bind(
                     platform='TOP',
                     type='unlink',
@@ -73,6 +70,5 @@ async def _(
                     lang=get_lang(),
                 ),
             )
-        ) as page_hash:
-            await UniMessage.image(raw=await screenshot(f'http://{netloc}/host/{page_hash}.html')).send()
+        ).send()
         await remove_bind(session=session, user=nb_user, game_platform=GAME_TYPE)