fix(bilibili): live broadcast on lagrange

Author: ProgramRipper

Dockerfile

@@ -1,18 +1,17 @@
 FROM python:slim
 WORKDIR /app
-ENV PATH=.venv/bin:${PATH} \
-    PLAYWRIGHT_BROWSERS_PATH=downloads/ms-playwright
+ENV PATH=.venv/bin:${PATH}
 
-RUN pip install pdm && pip cache purge
+RUN pip install pdm; pip cache purge
 COPY pyproject.toml pdm.lock ./
-RUN pdm sync -G docker --prod --no-editable && \
-    pdm cache clear && \
+RUN pdm sync -G docker --prod --no-editable; \
+    pdm cache clear; \
     \
-    pip freeze | xargs pip uninstall -y && \
+    pip freeze | xargs pip uninstall -y; \
     \
-    playwright install chromium --with-deps && \
-    apt clean && \
+    playwright install chromium --with-deps; \
+    apt clean; \
     rm -rf /var/lib/apt/lists/*
 COPY . .
 
-CMD nb orm upgrade && nb run
+CMD nb orm upgrade; nb run

migrations/versions/bilibili/dynamic/9a8b6ae112db_initial_revision.py

@@ -5,6 +5,7 @@
 创建时间: 2023-12-23 16:39:26.978084
 
 """
+
 from __future__ import annotations
 
 from collections.abc import Sequence

migrations/versions/bilibili/live/770b97dd5299_initial_revision.py

@@ -5,6 +5,7 @@
 创建时间: 2023-11-18 04:43:41.481381
 
 """
+
 from __future__ import annotations
 
 from collections.abc import Sequence

pdm.lock

@@ -3,21 +3,20 @@ name = ""
 version = "0.1.0"
 description = "Twelve"
 readme = "README.md"
-requires-python = "~=3.11"
+requires-python = "~=3.12"
 dependencies = [
     "backoff~=2.2",
-    "cachetools~=5.3",
-    "nonebot2[fastapi,httpx,websockets]~=2.2",
-    "nonebot-adapter-onebot~=2.3",
-    "nonebot-plugin-alconna~=0.36,<0.37",
-    "nonebot-plugin-apscheduler~=0.3",
-    "nonebot-plugin-guild-patch~=0.2",
-    "nonebot-plugin-htmlrender~=0.2",
+    "cachetools~=5.5",
+    "nonebot2[fastapi,httpx,websockets]~=2.3",
+    "nonebot-adapter-onebot~=2.4",
+    "nonebot-plugin-alconna~=0.52",
+    "nonebot-plugin-apscheduler~=0.5",
+    "nonebot-plugin-htmlrender~=0.3",
     "nonebot-plugin-orm[default]~=0.7",
-    "nonebot-plugin-sentry~=1.0",
-    "nonebot-plugin-session~=0.2",
-    "nonebot-plugin-session-orm~=0.1",
-    "pydantic~=1.10",
+    "nonebot-plugin-sentry~=2.0",
+    "nonebot-plugin-session~=0.3",
+    "nonebot-plugin-session-orm~=0.2",
+    "pydantic==2.9.2",
 ]
 
 [project.optional-dependencies]
@@ -30,7 +29,6 @@ adapters = [
 plugins = [
     "nonebot_plugin_alconna",
     "nonebot_plugin_apscheduler",
-    "nonebot_plugin_guild_patch",
     "nonebot_plugin_htmlrender",
     "nonebot_plugin_orm",
     "nonebot_plugin_sentry",
@@ -41,9 +39,13 @@ plugin_dirs = ["src/plugins"]
 builtin_plugins = []
 
 [tool.pdm.dev-dependencies]
-dev = ["black~=23.11", "isort~=5.12", "nonebot-plugin-orm[sqlite]~=0.7"]
+dev = [
+    "black~=24.8",
+    "isort~=5.13",
+    "nonebot-plugin-orm[sqlite]~=0.7",
+]
 
 [tool.pyright]
 enableExperimentalFeatures = true
-pythonVersion = "3.11"
+pythonVersion = "3.12"
 pythonPlatform = "Linux"

pyproject.toml

@@ -1,12 +1,11 @@
 from asyncio import gather
-from collections import defaultdict, deque
+from collections import defaultdict
 from contextlib import asynccontextmanager
 from queue import PriorityQueue
 from typing import Any, AsyncGenerator
 
 import backoff
 from arclet.alconna import Arg
-from cachetools import FIFOCache
 from httpx import AsyncClient
 from nonebot import get_driver, get_plugin_config, logger
 from nonebot.plugin import PluginMetadata
@@ -278,4 +277,6 @@ async def _(db: async_scoped_session, sess: EventSession):
     if not subs:
         return await UniMessage(f"没有订阅动态").send()
 
-    await UniMessage("已订阅动态:\n" + "\n".join(f"UID:{sub.uid}" for sub in subs)).send()
+    await UniMessage(
+        "已订阅动态:\n" + "\n".join(f"UID:{sub.uid}" for sub in subs)
+    ).send()

src/plugins/bilibili/plugins/dynamic/__init__.py

@@ -97,13 +97,21 @@ async def broadcast(uids: list[str]) -> None:
             url = await get_share_click(
                 info["room_id"], "vertical-three-point", "live.live-room-detail.0.0.pv"
             )
+            cover = (await client.get(info["cover_from_user"] or info["face"])).content
+
             for sub in room_subs[uid]:
                 tasks.append(
                     send_message(
                         sub.session.session,
-                        plugin_config.live_template.format(url=url, **info),
+                        plugin_config.live_template.format(
+                            url=url,
+                            **info,
+                        ),
                     )
                 )
+                tasks.append(
+                    send_message(sub.session.session, UniMessage.image(raw=cover))
+                )
         else:
             for sub in room_subs[uid]:
                 tasks.append(

src/plugins/bilibili/plugins/live/__init__.py

@@ -8,7 +8,7 @@
 class Config(BaseModel):
     interval: int = 1
     live_template: UniMessageTemplate = UniMessage.template(
-        "{:AtAll()} {uname} 正在直播 {title}{:Image(url=cover_from_user)}{url}"
+        "{:AtAll()} {uname} 正在直播 {title}\n{url}"
     )
     preparing_template: UniMessageTemplate = UniMessage.template("{uname} 下锅了")
 

src/plugins/bilibili/plugins/live/config.py

@@ -13,6 +13,7 @@ class RoomInfo(TypedDict):
     live_time: int
     live_status: int
     uname: str
+    face: str
     cover_from_user: str
 
 

src/plugins/bilibili/plugins/live/models.py

@@ -70,7 +70,7 @@ async def send_message(sess: Session, msg: UniMessage) -> Receipt:
     target = session_to_target(sess)
 
     if isinstance(bot, OneBot11Bot) and not target.private and AtAll in msg:
-        remain = await bot.get_group_at_all_remain(group_id=target.parent_id)
+        remain = await bot.get_group_at_all_remain(group_id=int(target.parent_id))
         if not all(
             itemgetter(
                 "can_at_all",
@@ -103,20 +103,17 @@ def _regex_str_dependency(
 
 
 @overload
-def RegexStr(__group: Literal[0] = 0) -> str:
-    ...
+def RegexStr(__group: Literal[0] = 0) -> str: ...
 
 
 @overload
-def RegexStr(__group: str | int) -> str | Any:
-    ...
+def RegexStr(__group: str | int) -> str | Any: ...
 
 
 @overload
 def RegexStr(
     __group1: str | int, __group2: str | int, *groups: str | int
-) -> tuple[str | Any, ...]:
-    ...
+) -> tuple[str | Any, ...]: ...
 
 
 def RegexStr(*groups: str | int) -> str | tuple[str | Any, ...] | Any: