🐛 移除没有必要的命令

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
   "features": {
     "ghcr.io/devcontainers-contrib/features/poetry:2": {}
   },
-  "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install -E all && poetry run pre-commit install && npm install -g pnpm && pnpm install",
+  "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install -E all && poetry run pre-commit install && yarn install",
   "customizations": {
     "vscode": {
       "settings": {

.github/actions/build-docs/action.yml

@@ -10,5 +10,5 @@ runs:
     - name: Build Frontend
       shell: bash
       run: |
-        pnpm install
+        yarn install
-        pnpm docs:build
+        yarn docs:build

.github/actions/build-frontend/action.yml

@@ -11,5 +11,5 @@ runs:
       shell: bash
       working-directory: ./admin-frontend
       run: |
-        pnpm install
+        yarn install
-        pnpm build
+        yarn build

.github/actions/setup-node/action.yml

@@ -8,16 +8,11 @@ runs:
       with:
         node-version: "20"
 
-    - name: Set Up Pnpm
+    - id: yarn-cache-dir-path
-      uses: pnpm/action-setup@v4
+      run: echo "::set-output name=dir::$(yarn cache dir)"
-      with:
-        version: 9
-
-    - id: pnpm-cache-dir-path
-      run: echo "::set-output name=dir::$(pnpm store path)"
       shell: bash
 
     - uses: actions/cache@v4
       with:
-        path: ${{ steps.pnpm-cache-dir-path.outputs.dir }}
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ ci:
   autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.3
+    rev: v0.6.0
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
@@ -34,7 +34,7 @@ repos:
         stages: [commit]
 
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v9.9.1
+    rev: v9.8.0
     hooks:
       - id: eslint
         additional_dependencies:

CHANGELOG.md

@@ -1,14 +1,9 @@
 # Change Log
 
-## v0.9.4
+## 最近更新
 
 ### Bug 修复
 
-- FSM 内部执行外部函数出现异常时不应崩溃 [@AzideCupric](https://github.com/AzideCupric) ([#616](https://github.com/MountainDash/nonebot-bison/pull/616))
-- 无权限用户尝试添加订阅时返回提示信息 [@suyiiyii](https://github.com/suyiiyii) ([#617](https://github.com/MountainDash/nonebot-bison/pull/617))
-- B站请求策略阶段行为优化 [@AzideCupric](https://github.com/AzideCupric) ([#610](https://github.com/MountainDash/nonebot-bison/pull/610))
-- Rss 不再删除格式化字符 [@suyiiyii](https://github.com/suyiiyii) ([#615](https://github.com/MountainDash/nonebot-bison/pull/615))
-- forbid adding platform that needs browser in no-browser env [@felinae98](https://github.com/felinae98) ([#609](https://github.com/MountainDash/nonebot-bison/pull/609))
 - 修正项目的代码警告 [@AzideCupric](https://github.com/AzideCupric) ([#614](https://github.com/MountainDash/nonebot-bison/pull/614))
 - 修复 anonymous_site() 无法正确工作的问题 [@felinae98](https://github.com/felinae98) ([#606](https://github.com/MountainDash/nonebot-bison/pull/606))
 

admin-frontend/package.json

@@ -5,26 +5,26 @@
   "homepage": "bison",
   "proxy": "http://127.0.0.1:8080",
   "dependencies": {
-    "@arco-design/web-react": "^2.64.0",
+    "@arco-design/web-react": "^2.63.1",
-    "@babel/core": "^7.25.2",
+    "@babel/core": "^7.24.7",
     "@babel/plugin-syntax-flow": "^7.24.7",
-    "@babel/plugin-transform-react-jsx": "^7.25.2",
+    "@babel/plugin-transform-react-jsx": "^7.24.7",
     "@reduxjs/toolkit": "^1.9.7",
     "@testing-library/dom": "^10.4.0",
-    "@testing-library/react": "^16.0.1",
+    "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.5.2",
-    "@types/jest": "^29.5.13",
+    "@types/jest": "^29.5.12",
-    "@types/node": "^20.16.5",
+    "@types/node": "^20.14.10",
-    "@types/react": "^18.3.7",
+    "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-redux": "^9.1.2",
-    "react-router-dom": "^6.26.2",
+    "react-router-dom": "^6.24.1",
     "react-scripts": "5.0.1",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
-    "typescript": "^5.6.2",
+    "typescript": "^5.5.4",
     "web-vitals": "^3.5.2"
   },
   "scripts": {
@@ -53,17 +53,17 @@
     ]
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^6.5.0",
+    "@testing-library/jest-dom": "^6.4.6",
-    "@typescript-eslint/eslint-plugin": "^8.6.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.6.0",
+    "@typescript-eslint/parser": "^8.0.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.6.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^18.0.0",
-    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsx-a11y": "^6.10.0",
+    "eslint-plugin-jsx-a11y": "^6.9.0",
-    "eslint-plugin-react": "^7.36.1",
+    "eslint-plugin-react": "^7.34.3",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-redux": "^4.2.0"
+    "eslint-plugin-react-redux": "^4.1.0"
   }
 }

docker/Dockerfile

@@ -1,8 +1,7 @@
-FROM node:20.17.0 as frontend
+FROM node:20.15.1 as frontend
 ADD . /app
 WORKDIR /app/admin-frontend
-RUN npm install -g pnpm
+RUN yarn && yarn build
-RUN pnpm install && pnpm build
 
 FROM python:3.11
 RUN python3 -m pip install poetry && poetry config virtualenvs.create false

docker/Dockerfile_with_frontend

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.10
+# syntax=docker/dockerfile:1.8
 FROM python:3.11-slim-bullseye as base
 
 FROM base as builder

docker/Dockerfile_with_frontend_sentry

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.10
+# syntax=docker/dockerfile:1.8
 FROM python:3.11-slim-bullseye as base
 
 FROM base as builder

nonebot_bison/platform/__init__.py

@@ -3,7 +3,6 @@ from pkgutil import iter_modules
 from collections import defaultdict
 from importlib import import_module
 
-from ..plugin_config import plugin_config
 from .platform import Platform, make_no_target_group
 
 _package_dir = str(Path(__file__).resolve().parent)
@@ -23,15 +22,3 @@ for name, platform_list in _platform_list.items():
         platform_manager[name] = platform_list[0]
     else:
         platform_manager[name] = make_no_target_group(platform_list)
-
-
-def _get_unavailable_platforms() -> dict[str, str]:
-    res = {}
-    for name, platform in platform_manager.items():
-        if platform.site.require_browser and not plugin_config.bison_use_browser:
-            res[name] = "需要启用 bison_use_browser"
-    return res
-
-
-# platform => reason for not available
-unavailable_paltforms: dict[str, str] = _get_unavailable_platforms()

nonebot_bison/platform/bilibili/fsm.py

@@ -2,24 +2,10 @@ import sys
 import asyncio
 import inspect
 from enum import Enum
-from functools import wraps
 from dataclasses import dataclass
 from collections.abc import Set as AbstractSet
 from collections.abc import Callable, Sequence, Awaitable, AsyncGenerator
-from typing import (
+from typing import TYPE_CHECKING, Any, Generic, TypeVar, Protocol, TypeAlias, TypedDict, NamedTuple, runtime_checkable
-    TYPE_CHECKING,
-    Any,
-    Generic,
-    TypeVar,
-    Protocol,
-    ParamSpec,
-    TypeAlias,
-    TypedDict,
-    NamedTuple,
-    Concatenate,
-    overload,
-    runtime_checkable,
-)
 
 from nonebot import logger
 
@@ -31,7 +17,6 @@ TAddon = TypeVar("TAddon", contravariant=True)
 TState = TypeVar("TState", contravariant=True)
 TEvent = TypeVar("TEvent", contravariant=True)
 TFSM = TypeVar("TFSM", bound="FSM", contravariant=True)
-P = ParamSpec("P")
 
 
 class StateError(Exception): ...
@@ -178,52 +163,6 @@ class FSM(Generic[TState, TEvent, TAddon]):
         self.started = False
 
         del self.machine
-        self.current_state = self.graph["initial"]
         self.machine = self._core()
 
         logger.trace("FSM closed")
-
-
-@overload
-def reset_on_exception(
-    func: Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]],
-) -> Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]]:
-    """自动在发生异常后重置 FSM"""
-
-
-@overload
-def reset_on_exception(
-    auto_start: bool = False,
-) -> Callable[
-    [Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]]], Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]]
-]:
-    """自动在异常后重置 FSM，当 auto_start 为 True 时，自动启动 FSM"""
-
-
-# 参考自 dataclasses.dataclass 的实现
-def reset_on_exception(func=None, /, *, auto_start=False):  # pyright: ignore[reportInconsistentOverload]
-    def warp(func: Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]]):
-        return __reset_clear_up(func, auto_start)
-
-    # 判断调用的是 @reset_on_exception 还是 @reset_on_exception(...)
-    if func is None:
-        # 调用的是带括号的
-        return warp
-
-    # 调用的是不带括号的
-    return warp(func)
-
-
-def __reset_clear_up(func: Callable[Concatenate[TFSM, P], Awaitable[ActionReturn]], auto_start: bool):
-    @wraps(func)
-    async def wrapper(fsm_self: TFSM, *args: P.args, **kwargs: P.kwargs) -> ActionReturn:
-        try:
-            return await func(fsm_self, *args, **kwargs)
-        except Exception as e:
-            logger.error(f"Exception in {func.__name__}: {e}")
-            await fsm_self.reset()
-            if auto_start and not fsm_self.started:
-                await fsm_self.start()
-            raise e
-
-    return wrapper

nonebot_bison/platform/bilibili/retry.py

@@ -14,7 +14,7 @@ from httpx import URL as HttpxURL
 from nonebot_bison.types import Target
 
 from .models import DynRawPost
-from .fsm import FSM, Condition, StateGraph, Transition, ActionReturn, reset_on_exception
+from .fsm import FSM, Condition, StateGraph, Transition, ActionReturn
 
 if TYPE_CHECKING:
     from .platforms import Bilibili
@@ -218,11 +218,6 @@ class RetryFSM(FSM[RetryState, RetryEvent, RetryAddon[TBilibili]]):
         self.addon.reset_all()
         await super().reset()
 
-    @override
-    @reset_on_exception
-    async def emit(self, event: RetryEvent):
-        await super().emit(event)
-
 
 # FIXME: 拿出来是方便测试了，但全局单例会导致所有被装饰的函数共享状态，有待改进
 _retry_fsm = RetryFSM(RETRY_GRAPH, RetryAddon["Bilibili"]())
@@ -241,19 +236,15 @@ def retry_for_352(api_func: Callable[[TBilibili, Target], Awaitable[list[DynRawP
             case RetryState.NROMAL | RetryState.REFRESH | RetryState.RAISE:
                 try:
                     res = await api_func(bls, *args, **kwargs)
-                except ApiCode352Error as e:
+                except ApiCode352Error:
-                    logger.warning("本次 Bilibili API 请求返回 352 错误码")
+                    logger.error("API 352 错误")
                     await _retry_fsm.emit(RetryEvent.REQUEST_AND_RAISE)
-
-                    if _retry_fsm.current_state == RetryState.RAISE:
-                        raise e
-
                     return []
                 else:
                     await _retry_fsm.emit(RetryEvent.REQUEST_AND_SUCCESS)
                     return res
             case RetryState.BACKOFF:
-                logger.warning("本次 Bilibili 请求回避中，不请求")
+                logger.warning("回避中，不请求")
                 await _retry_fsm.emit(RetryEvent.IN_BACKOFF_TIME)
                 return []
             case _:

nonebot_bison/platform/bilibili/scheduler.py

@@ -68,7 +68,7 @@ class BilibiliClientManager(ClientManager):
 
 class BilibiliSite(Site):
     name = "bilibili.com"
-    schedule_setting = {"seconds": 60}
+    schedule_setting = {"seconds": 50}
     schedule_type = "interval"
     client_mgr = BilibiliClientManager
     require_browser = True

nonebot_bison/platform/rss.py

@@ -9,7 +9,7 @@ from bs4 import BeautifulSoup as bs
 from ..post import Post
 from .platform import NewMessage
 from ..types import Target, RawPost
-from ..utils import Site, text_similarity
+from ..utils import Site, text_fletten, text_similarity
 
 
 class RssSite(Site):
@@ -32,7 +32,7 @@ class RssPost(Post):
         for p in soup.find_all("p"):
             p.insert_after("\n")
 
-        return soup.get_text()
+        return text_fletten(soup.get_text())
 
 
 class Rss(NewMessage):
@@ -82,7 +82,7 @@ class Rss(NewMessage):
     async def parse(self, raw_post: RawPost) -> Post:
         title = raw_post.get("title", "")
         soup = bs(raw_post.description, "html.parser")
-        desc = raw_post.description
+        desc = soup.text.strip()
         title, desc = self._text_process(title, desc)
         pics = [x.attrs["src"] for x in soup("img")]
         if raw_post.get("media_content"):

nonebot_bison/sub_manager/add_sub.py

@@ -9,9 +9,9 @@ from nonebot_plugin_saa import Text, PlatformTarget, SupportedAdapters
 from ..types import Target
 from ..config import config
 from ..apis import check_sub_target
+from ..platform import Platform, platform_manager
 from ..config.db_config import SubscribeDupException
 from .utils import common_platform, ensure_user_info, gen_handle_cancel
-from ..platform import Platform, platform_manager, unavailable_paltforms
 
 
 def do_add_sub(add_sub: type[Matcher]):
@@ -39,8 +39,6 @@ def do_add_sub(add_sub: type[Matcher]):
         elif platform == "取消":
             await add_sub.finish("已中止订阅")
         elif platform in platform_manager:
-            if platform in unavailable_paltforms:
-                await add_sub.finish(f"无法订阅 {platform}，{unavailable_paltforms[platform]}")
             state["platform"] = platform
         else:
             await add_sub.reject("平台输入错误")

package.json

@@ -11,9 +11,9 @@
     "docs:update-package": "pnpm dlx vp-update"
   },
   "devDependencies": {
-    "@vuepress/bundler-vite": "2.0.0-rc.15",
+    "@vuepress/bundler-vite": "2.0.0-rc.14",
-    "vue": "^3.5.6",
+    "vue": "^3.4.31",
-    "vuepress": "2.0.0-rc.15",
+    "vuepress": "2.0.0-rc.14",
-    "vuepress-theme-hope": "2.0.0-rc.52"
+    "vuepress-theme-hope": "2.0.0-rc.50"
   }
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-bison"
-version = "0.9.4"
+version = "0.9.3"
 description = "Subscribe message from social medias"
 authors = ["felinae98 <felinae225@qq.com>"]
 license = "MIT"
@@ -24,40 +24,40 @@ classifiers = [
 python = ">=3.10,<4.0.0"
 beautifulsoup4 = ">=4.12.3"
 feedparser = "^6.0.11"
-httpx = ">=0.27.2"
+httpx = ">=0.27.0"
-nonebot2 = { extras = ["fastapi"], version = "^2.3.3" }
+nonebot2 = { extras = ["fastapi"], version = "^2.3.2" }
-nonebot-adapter-onebot = "^2.4.5"
+nonebot-adapter-onebot = "^2.4.4"
-nonebot-plugin-htmlrender = ">=0.3.5"
+nonebot-plugin-htmlrender = ">=0.3.3"
 nonebot-plugin-datastore = ">=1.3.0,<2.0.0"
 nonebot-plugin-apscheduler = ">=0.5.0"
-nonebot-plugin-send-anything-anywhere = ">=0.7.1,<0.7.2"
+nonebot-plugin-send-anything-anywhere = ">=0.6.1,<0.7.0"
-pillow = ">=10.4.0,<11.0"
+pillow = ">=8.4.0,<11.0"
-pyjwt = "^2.9.0"
+pyjwt = "^2.8.0"
-python-socketio = "^5.11.4"
+python-socketio = "^5.11.3"
 tinydb = "^4.8.0"
 qrcode = "^7.4.2"
-pydantic = ">=2.9.2,<3.0.0,!=2.5.0,!=2.5.1"
+pydantic = ">=1.10.17,<3.0.0,!=2.5.0,!=2.5.1"
-lxml = ">=5.3.0"
+lxml = ">=5.2.2"
-yarl = ">=1.11.1"
+yarl = ">=1.9.4"
-hishel = "^0.0.30"
+hishel = "^0.0.20"
-expiringdictx = "^1.1.0"
+expiringdictx = "^1.0.1"
-rapidfuzz = "^3.9.7"
+rapidfuzz = "^3.9.3"
 
 [tool.poetry.group.dev.dependencies]
-black = ">=24.8.0,<25.0"
+black = ">=23.12.1,<25.0"
 ipdb = "^0.13.13"
 isort = "^5.13.2"
 nonemoji = "^0.1.4"
-nb-cli = "^1.4.2"
+nb-cli = "^1.4.1"
-pre-commit = "^3.8.0"
+pre-commit = "^3.7.1"
-ruff = "^0.6.5"
+ruff = "^0.6.0"
 
 [tool.poetry.group.test.dependencies]
 flaky = "^3.8.1"
 nonebug = "^0.3.7"
 nonebug-saa = "^0.4.1"
-pytest = ">=8.3.3,<9.0.0"
+pytest = ">=7.4.4,<9.0.0"
-pytest-asyncio = ">=0.24.0,<0.24.1"
+pytest-asyncio = ">=0.23.7,<0.24.0"
 pytest-cov = ">=5.0.0,<6"
 pytest-mock = "^3.14.0"
 pytest-xdist = { extras = ["psutil"], version = "^3.6.1" }
@@ -68,10 +68,10 @@ freezegun = "^1.5.1"
 optional = true
 
 [tool.poetry.group.docker.dependencies]
-nb-cli = "^1.4.2"
+nb-cli = "^1.4.1"
-nonebot2 = { extras = ["fastapi", "aiohttp"], version = "^2.3.3" }
+nonebot2 = { extras = ["fastapi", "aiohttp"], version = "^2.3.2" }
 nonebot-adapter-red = "^0.9.0"
-nonebot-adapter-qq = "^1.5.1"
+nonebot-adapter-qq = "^1.4.4"
 poetry-core = "^1.9.0"
 
 [tool.poetry.extras]

tests/conftest.py

@@ -18,7 +18,6 @@ def pytest_configure(config: pytest.Config) -> None:
         "superusers": {"10001"},
         "command_start": {""},
         "log_level": "TRACE",
-        "bison_use_browser": True,
     }
 
 
@@ -114,12 +113,3 @@ async def use_legacy_config(app: App):
 
     # 清除单例的缓存
     Singleton._instances.clear()
-
-
-@pytest.fixture
-async def _no_browser(app: App, mocker: MockerFixture):
-    from nonebot_bison.plugin_config import plugin_config
-    from nonebot_bison.platform import _get_unavailable_platforms
-
-    mocker.patch.object(plugin_config, "bison_use_browser", False)
-    mocker.patch("nonebot_bison.platform.unavailable_paltforms", _get_unavailable_platforms())

tests/platforms/test_bilibili.py

@@ -58,92 +58,6 @@ def without_dynamic(app: App):
     )
 
 
-@pytest.mark.asyncio
-async def test_reset_on_exception(app: App):
-    from strenum import StrEnum
-
-    from nonebot_bison.platform.bilibili.fsm import FSM, StateGraph, Transition, ActionReturn, reset_on_exception
-
-    class State(StrEnum):
-        A = "A"
-        B = "B"
-        C = "C"
-
-    class Event(StrEnum):
-        A = "A"
-        B = "B"
-        C = "C"
-
-    class Addon:
-        pass
-
-    async def raction(from_: State, event: Event, to: State, addon: Addon) -> ActionReturn:
-        logger.info(f"action: {from_} -> {to}")
-        raise RuntimeError("test")
-
-    async def action(from_: State, event: Event, to: State, addon: Addon) -> ActionReturn:
-        logger.info(f"action: {from_} -> {to}")
-
-    graph: StateGraph[State, Event, Addon] = {
-        "transitions": {
-            State.A: {
-                Event.A: Transition(raction, State.B),
-                Event.B: Transition(action, State.C),
-            },
-            State.B: {
-                Event.B: Transition(action, State.C),
-            },
-            State.C: {
-                Event.C: Transition(action, State.A),
-            },
-        },
-        "initial": State.A,
-    }
-
-    addon = Addon()
-
-    class AFSM(FSM[State, Event, Addon]):
-        @reset_on_exception(auto_start=True)
-        async def emit(self, event: Event):
-            return await super().emit(event)
-
-    fsm = AFSM(graph, addon)
-
-    await fsm.start()
-    with pytest.raises(RuntimeError):
-        await fsm.emit(Event.A)
-
-    assert fsm.started is True
-    await fsm.emit(Event.B)
-    await fsm.emit(Event.C)
-
-    class BFSM(FSM[State, Event, Addon]):
-        @reset_on_exception
-        async def emit(self, event: Event):
-            return await super().emit(event)
-
-    fsm = BFSM(graph, addon)
-    await fsm.start()
-    with pytest.raises(RuntimeError):
-        await fsm.emit(Event.A)
-
-    assert fsm.started is False
-    with pytest.raises(TypeError, match="can't send non-None value to a just-started async generator"):
-        await fsm.emit(Event.B)
-
-    class CFSM(FSM[State, Event, Addon]): ...
-
-    fsm = CFSM(graph, addon)
-    await fsm.start()
-    with pytest.raises(RuntimeError):
-        await fsm.emit(Event.A)
-
-    assert fsm.started is True
-
-    with pytest.raises(StopAsyncIteration):
-        await fsm.emit(Event.B)
-
-
 @pytest.mark.asyncio
 async def test_retry_for_352(app: App, mocker: MockerFixture):
     from nonebot_bison.post import Post
@@ -269,7 +183,7 @@ async def test_retry_for_352(app: App, mocker: MockerFixture):
 
     fakebili.set_raise352(True)
 
-    for state in test_state_list[:-3]:
+    for state in test_state_list:
         logger.info(f"\n\nnow state should be {state}")
         assert _retry_fsm.current_state == state
 
@@ -280,13 +194,6 @@ async def test_retry_for_352(app: App, mocker: MockerFixture):
         if state == RetryState.BACKOFF:
             freeze_start += timedelta_length * (_retry_fsm.addon.backoff_count + 1) ** 2
 
-    for state in test_state_list[-3:]:
-        logger.info(f"\n\nnow state should be {state}")
-        assert _retry_fsm.current_state == state
-
-        with pytest.raises(ApiCode352Error):
-            await fakebili.get_sub_list(Target("t1"))  # type: ignore
-
     assert client_mgr.refresh_client_call_count == 4 * 3 + 3  # refresh + raise
     assert client_mgr.get_client_call_count == 2 + 4 * 3 + 3  # previous + refresh + raise
 

tests/platforms/test_rss.py

@@ -88,21 +88,9 @@ async def test_fetch_new_1(
     assert post1.title is None
     assert (
         post1.content
-        == "【#統合戦略】 <br />引き続き新テーマ「ミヅキと紺碧の樹」の新要素及びシステムの変更点を一部ご紹介します！ "
+        == "【#統合戦略】 引き続き新テーマ「ミヅキと紺碧の樹」の新要素及びシステムの変更点を一部ご紹介します！"
-        "<br /><br />"
+        " 今回は「灯火」、「ダイス」、「記号認識」、「鍵」についてです。詳細は添付の画像をご確認ください。"
-        "今回は「灯火」、「ダイス」、「記号認識」、「鍵」についてです。<br />詳細は添付の画像をご確認ください。"
+        "#アークナイツ https://t.co/ARmptV0Zvu"
-        "<br /><br />"
-        "#アークナイツ https://t.co/ARmptV0Zvu<br />"
-        '<img src="https://pbs.twimg.com/media/FwZG9YAacAIXDw2?format=jpg&amp;name=orig" />'
-    )
-    plain_content = await post1.get_plain_content()
-    assert (
-        plain_content == "【#統合戦略】 \n"
-        "引き続き新テーマ「ミヅキと紺碧の樹」の新要素及びシステムの変更点を一部ご紹介します！ \n\n"
-        "今回は「灯火」、「ダイス」、「記号認識」、「鍵」についてです。\n"
-        "詳細は添付の画像をご確認ください。\n\n"
-        "#アークナイツ https://t.co/ARmptV0Zvu\n"
-        "[图片]"
     )
 
 
@@ -186,9 +174,7 @@ async def test_fetch_new_4(
     assert len(res2[0][1]) == 1
     post1 = res2[0][1][0]
     assert post1.url == "https://wallhaven.cc/w/85rjej"
-    assert post1.content == '<img alt="loading" class="lazyload" src="https://th.wallhaven.cc/small/85/85rjej.jpg" />'
+    assert post1.content == "85rjej.jpg"
-    plain_content = await post1.get_plain_content()
-    assert plain_content == "[图片]"
 
 
 def test_similar_text_process():

tests/sub_manager/test_add.py

@@ -615,48 +615,3 @@ async def test_add_with_bilibili_bangumi_target_parser(app: App, init_scheduler)
     assert sub.tags == []
     assert sub.target.platform_name == "bilibili-bangumi"
     assert sub.target.target_name == "汉化日记 第三季"
-
-
-@pytest.mark.asyncio
-async def test_subscribe_platform_requires_browser(app: App, mocker: MockerFixture):
-    from nonebot.adapters.onebot.v11.event import Sender
-    from nonebot.adapters.onebot.v11.message import Message
-
-    from nonebot_bison.plugin_config import plugin_config
-    from nonebot_bison.sub_manager import add_sub_matcher, common_platform
-    from nonebot_bison.platform import platform_manager, unavailable_paltforms
-
-    mocker.patch.object(plugin_config, "bison_use_browser", False)
-    mocker.patch.dict(unavailable_paltforms, {"bilibili": "需要启用 bison_use_browser"})
-
-    async with app.test_matcher(add_sub_matcher) as ctx:
-        bot = ctx.create_bot()
-        event_1 = fake_group_message_event(
-            message=Message("添加订阅"),
-            sender=Sender(card="", nickname="test", role="admin"),
-            to_me=True,
-        )
-        ctx.receive_event(bot, event_1)
-        ctx.should_pass_rule()
-        ctx.should_call_send(
-            event_1,
-            BotReply.add_reply_on_platform(platform_manager=platform_manager, common_platform=common_platform),
-            True,
-        )
-        event_2 = fake_group_message_event(
-            message=Message("全部"), sender=Sender(card="", nickname="test", role="admin")
-        )
-        ctx.receive_event(bot, event_2)
-        ctx.should_rejected()
-        ctx.should_call_send(
-            event_2,
-            BotReply.add_reply_on_platform_input_allplatform(platform_manager),
-            True,
-        )
-        event_3 = fake_group_message_event(message=Message("bilibili"), sender=fake_admin_user)
-        ctx.receive_event(bot, event_3)
-        ctx.should_call_send(
-            event_3,
-            BotReply.add_reply_platform_unavailable("bilibili", "需要启用 bison_use_browser"),
-            True,
-        )

tests/utils.py

@@ -146,10 +146,6 @@ class BotReply:
         extra_text = ("1." + target_promot + "\n2.") if target_promot else ""
         return extra_text + base_text
 
-    @staticmethod
-    def add_reply_platform_unavailable(platform: str, reason: str) -> str:
-        return f"无法订阅 {platform}，{reason}"
-
     add_reply_on_id_input_error = "id输入错误"
     add_reply_on_target_parse_input_error = "不能从你的输入中提取出id，请检查你输入的内容是否符合预期"
     add_reply_on_platform_input_error = "平台输入错误"