From 0e72e630c44d03db605ceb0932690aeea8a8fc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E9=98=99?= <1605206150@qq.com> Date: Mon, 11 Mar 2024 22:00:49 +0800 Subject: [PATCH 1/2] fix config --- nonebot/adapters/kaiheila/adapter.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nonebot/adapters/kaiheila/adapter.py b/nonebot/adapters/kaiheila/adapter.py index db9ca50..889b075 100644 --- a/nonebot/adapters/kaiheila/adapter.py +++ b/nonebot/adapters/kaiheila/adapter.py @@ -261,7 +261,7 @@ async def _forward_ws(self, bot_config: BotConfig) -> None: event = self.json_to_event( json_data, bot and bot.self_id, - ignore_events=self.kaiheila_config.kaiheila_ignore_events, + kaiheila_config=self.kaiheila_config, ) if not event: continue @@ -366,7 +366,7 @@ def json_to_event( json_data: Any, self_id: Optional[str] = None, *, - ignore_events: Optional[Tuple[str, ...]] = None, + kaiheila_config: Optional[KaiheilaConfig] = None, ) -> Union[OriginEvent, Event, None]: if not isinstance(json_data, dict): return None @@ -405,7 +405,7 @@ def json_to_event( if json_data["d"].get("author_id") == self_id : return # 屏蔽其他Bot消息 - if json_data["d"].get("extra", {}).get("author", {}).get("bot") and cls.kaiheila_config.kaiheila_ignore_else_bots: + if json_data["d"].get("extra", {}).get("author", {}).get("bot") and kaiheila_config.kaiheila_ignore_else_bots: return try: data = json_data["d"] @@ -447,7 +447,7 @@ def json_to_event( sub_type = f".{sub_type}" if sub_type else "" event_name: str = post_type + detail_type + sub_type - if ignore_events and event_name.startswith(ignore_events): + if kaiheila_config.ignore_events and event_name.startswith(kaiheila_config.ignore_events): return models = cls.get_event_model(event_name) From 59b5ed8c25fa3be3da0112d8f97a754dc9109e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E9=98=99?= <1605206150@qq.com> Date: Mon, 11 Mar 2024 22:02:06 +0800 Subject: [PATCH 2/2] release 3.2 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c1f8d28..e569bec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-adapter-kaiheila" -version = "0.3.2a1" +version = "0.3.2" description = "kaiheila adapter for nonebot2" authors = ["Tian-que <1605206150@qq.com>", "ssttkkl "] license = "MIT"