fix(agent): grant channel owners admin access

app/modules/wechat/__init__.py

@@ -7,7 +7,11 @@ from urllib.parse import quote
 
 from app.core.context import Context, MediaInfo
 from app.core.event import eventmanager
-from app.helper.agent import matches_channel_admin
+from app.helper.agent import (
+    matches_channel_admin,
+    register_channel_admin_resolver,
+    resolve_config_principal_ids,
+)
 from app.log import logger
 from app.modules import _ModuleBase, _MessageBase
 from app.modules.wechat.WXBizMsgCrypt3 import WXBizMsgCrypt
@@ -19,6 +23,17 @@ from app.utils.dom import DomUtils
 from app.utils.structures import DictUtils
 
 
+def _resolve_wechat_admin_ids(config: Optional[dict]) -> set[str]:
+    """解析企业微信管理员及机器人模式下的主用户 ID。"""
+    config_keys = ["WECHAT_ADMINS"]
+    if (config or {}).get("WECHAT_MODE", "app") == "bot":
+        config_keys.append("WECHAT_BOT_CHAT_ID")
+    return resolve_config_principal_ids(config, *config_keys)
+
+
+register_channel_admin_resolver(MessageChannel.Wechat, _resolve_wechat_admin_ids)
+
+
 class WechatModule(_ModuleBase, _MessageBase[WeChat]):
 
     def init_module(self) -> None:
@@ -88,7 +103,11 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
         admins = cls._get_admins(config)
         if not admins:
             return False
-        return str(user_id or "").strip() not in admins
+        return not matches_channel_admin(
+            MessageChannel.Wechat,
+            config,
+            user_id,
+        )
 
     @classmethod
     def _create_client(cls, conf):
@@ -253,7 +272,9 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
                 return CommingMessage(channel=MessageChannel.Wechat, source=client_config.name,
                                       userid=user_id, username=user_id,
                                       is_channel_admin=matches_channel_admin(
-                                          client_config.config, "WECHAT_ADMINS", user_id
+                                          MessageChannel.Wechat,
+                                          client_config.config,
+                                          user_id,
                                       ), text=content or "",
                                       images=images, audio_refs=audio_refs, files=files)
         except Exception as err:
@@ -325,7 +346,9 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
             userid=sender,
             username=sender,
             is_channel_admin=matches_channel_admin(
-                client_config.config, "WECHAT_ADMINS", sender
+                MessageChannel.Wechat,
+                client_config.config,
+                sender,
             ),
             text=text or "",
             images=images,

app/modules/wechat/wechatbot.py

@@ -15,8 +15,10 @@ from app.core.cache import FileCache
 from app.core.config import settings
 from app.core.context import MediaInfo, Context
 from app.core.metainfo import MetaInfo
+from app.helper.agent import matches_channel_admin
 from app.log import logger
 from app.schemas import CommingMessage
+from app.schemas.types import MessageChannel
 from app.utils.http import RequestUtils
 from app.utils.string import StringUtils
 
@@ -489,7 +491,16 @@ class WeChatBot:
 
         self._remember_target(sender)
 
-        if text and text.startswith("/") and self._admins and sender not in self._admins:
+        is_channel_admin = matches_channel_admin(
+            MessageChannel.Wechat,
+            {
+                "WECHAT_ADMINS": ",".join(self._admins),
+                "WECHAT_BOT_CHAT_ID": getattr(self, "_default_chat_id", None),
+                "WECHAT_MODE": "bot",
+            },
+            sender,
+        )
+        if text and text.startswith("/") and self._admins and not is_channel_admin:
             self.send_msg(title="只有管理员才有权限执行此命令", userid=sender)
             return