From 9059d1fb17ab1eed839e5fb14c2d319d046d01cf Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Tue, 11 Mar 2025 00:34:22 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=94=AF=E6=8C=81=E5=9C=A8?= =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E9=9A=94=E7=A6=BB=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=B0=86=E7=BE=A4=E8=81=8A=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=20#746?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- astrbot/core/pipeline/whitelist_check/stage.py | 2 +- packages/astrbot/main.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/astrbot/core/pipeline/whitelist_check/stage.py b/astrbot/core/pipeline/whitelist_check/stage.py index 024de0834..cff215dac 100644 --- a/astrbot/core/pipeline/whitelist_check/stage.py +++ b/astrbot/core/pipeline/whitelist_check/stage.py @@ -51,7 +51,7 @@ class WhitelistCheckStage(Stage): and event.get_message_type() == MessageType.FRIEND_MESSAGE ): return - if event.unified_msg_origin not in self.whitelist: + if event.unified_msg_origin not in self.whitelist and event.get_group_id() not in self.whitelist: if self.wl_log: logger.info( f"会话 ID {event.unified_msg_origin} 不在会话白名单中，已终止事件传播。请在配置文件中添加该会话 ID 到白名单。" diff --git a/packages/astrbot/main.py b/packages/astrbot/main.py index 70f9efa44..93e370e39 100644 --- a/packages/astrbot/main.py +++ b/packages/astrbot/main.py @@ -262,8 +262,15 @@ class Main(star.Star): """获取会话 ID 和 管理员 ID""" sid = event.unified_msg_origin user_id = str(event.get_sender_id()) - ret = f"""SID: {sid} 此 ID 可用于设置会话白名单。/wl 添加白名单, /dwl 删除白名单。 -UID: {user_id} 此 ID 可用于设置管理员。/op 授权管理员, /deop 取消管理员。""" + ret = f"""SID: {sid} 此 ID 可用于设置会话白名单。 +/wl 添加白名单, /dwl 删除白名单。 + +UID: {user_id} 此 ID 可用于设置管理员。 +/op 授权管理员, /deop 取消管理员。""" + + if self.context.get_config()["platform_settings"]["unique_session"] and event.get_group_id(): + ret += f"\n\n当前处于独立会话模式, 此群 ID: {event.get_group_id()}, 也可将此 ID 加入白名单来放行整个群聊。" + event.set_result(MessageEventResult().message(ret).use_t2i(False)) @filter.permission_type(filter.PermissionType.ADMIN)