AstrBot 4.3.5__py3-none-any.whl → 4.5.1__py3-none-any.whl

astrbot/core/platform/sources/misskey/misskey_event.py

@@ -40,48 +40,83 @@ class MisskeyPlatformEvent(AstrMessageEvent):
         return any(message_trimmed.startswith(prefix) for prefix in system_prefixes)
 
     async def send(self, message: MessageChain):
-        content, has_at = serialize_message_chain(message.chain)
-
-        if not content:
-            logger.debug("[MisskeyEvent] 内容为空，跳过发送")
-            return
-
+        """发送消息，使用适配器的完整上传和发送逻辑"""
         try:
-            original_message_id = getattr(self.message_obj, "message_id", None)
-            raw_message = getattr(self.message_obj, "raw_message", {})
-
-            if raw_message and not has_at:
-                user_data = raw_message.get("user", {})
-                user_info = {
-                    "username": user_data.get("username", ""),
-                    "nickname": user_data.get("name", user_data.get("username", "")),
-                }
-                content = add_at_mention_if_needed(content, user_info, has_at)
-
-            # 根据会话类型选择发送方式
-            if hasattr(self.client, "send_message") and is_valid_user_session_id(
-                self.session_id
-            ):
-                user_id = extract_user_id_from_session_id(self.session_id)
-                await self.client.send_message(user_id, content)
-            elif hasattr(self.client, "send_room_message") and is_valid_room_session_id(
-                self.session_id
-            ):
-                room_id = extract_room_id_from_session_id(self.session_id)
-                await self.client.send_room_message(room_id, content)
-            elif original_message_id and hasattr(self.client, "create_note"):
-                visibility, visible_user_ids = resolve_visibility_from_raw_message(
-                    raw_message
-                )
-                await self.client.create_note(
-                    content,
-                    reply_id=original_message_id,
-                    visibility=visibility,
-                    visible_user_ids=visible_user_ids,
-                )
-            elif hasattr(self.client, "create_note"):
-                logger.debug("[MisskeyEvent] 创建新帖子")
-                await self.client.create_note(content)
+            logger.debug(
+                f"[MisskeyEvent] send 方法被调用，消息链包含 {len(message.chain)} 个组件"
+            )
+
+            # 使用适配器的 send_by_session 方法，它包含文件上传逻辑
+            from astrbot.core.platform.message_session import MessageSession
+            from astrbot.core.platform.message_type import MessageType
+
+            # 根据session_id类型确定消息类型
+            if is_valid_user_session_id(self.session_id):
+                message_type = MessageType.FRIEND_MESSAGE
+            elif is_valid_room_session_id(self.session_id):
+                message_type = MessageType.GROUP_MESSAGE
+            else:
+                message_type = MessageType.FRIEND_MESSAGE  # 默认
+
+            session = MessageSession(
+                platform_name=self.platform_meta.name,
+                message_type=message_type,
+                session_id=self.session_id,
+            )
+
+            logger.debug(
+                f"[MisskeyEvent] 检查适配器方法: hasattr(self.client, 'send_by_session') = {hasattr(self.client, 'send_by_session')}"
+            )
+
+            # 调用适配器的 send_by_session 方法
+            if hasattr(self.client, "send_by_session"):
+                logger.debug("[MisskeyEvent] 调用适配器的 send_by_session 方法")
+                await self.client.send_by_session(session, message)
+            else:
+                # 回退到原来的简化发送逻辑
+                content, has_at = serialize_message_chain(message.chain)
+
+                if not content:
+                    logger.debug("[MisskeyEvent] 内容为空，跳过发送")
+                    return
+
+                original_message_id = getattr(self.message_obj, "message_id", None)
+                raw_message = getattr(self.message_obj, "raw_message", {})
+
+                if raw_message and not has_at:
+                    user_data = raw_message.get("user", {})
+                    user_info = {
+                        "username": user_data.get("username", ""),
+                        "nickname": user_data.get(
+                            "name", user_data.get("username", "")
+                        ),
+                    }
+                    content = add_at_mention_if_needed(content, user_info, has_at)
+
+                # 根据会话类型选择发送方式
+                if hasattr(self.client, "send_message") and is_valid_user_session_id(
+                    self.session_id
+                ):
+                    user_id = extract_user_id_from_session_id(self.session_id)
+                    await self.client.send_message(user_id, content)
+                elif hasattr(
+                    self.client, "send_room_message"
+                ) and is_valid_room_session_id(self.session_id):
+                    room_id = extract_room_id_from_session_id(self.session_id)
+                    await self.client.send_room_message(room_id, content)
+                elif original_message_id and hasattr(self.client, "create_note"):
+                    visibility, visible_user_ids = resolve_visibility_from_raw_message(
+                        raw_message
+                    )
+                    await self.client.create_note(
+                        content,
+                        reply_id=original_message_id,
+                        visibility=visibility,
+                        visible_user_ids=visible_user_ids,
+                    )
+                elif hasattr(self.client, "create_note"):
+                    logger.debug("[MisskeyEvent] 创建新帖子")
+                    await self.client.create_note(content)
 
             await super().send(message)
 

astrbot/core/platform/sources/misskey/misskey_utils.py

@@ -5,6 +5,68 @@ import astrbot.api.message_components as Comp
 from astrbot.api.platform import AstrBotMessage, MessageMember, MessageType
 
 
+class FileIDExtractor:
+    """从 API 响应中提取文件 ID 的帮助类（无状态）。"""
+
+    @staticmethod
+    def extract_file_id(result: Any) -> Optional[str]:
+        if not isinstance(result, dict):
+            return None
+
+        id_paths = [
+            lambda r: r.get("createdFile", {}).get("id"),
+            lambda r: r.get("file", {}).get("id"),
+            lambda r: r.get("id"),
+        ]
+
+        for p in id_paths:
+            try:
+                if fid := p(result):
+                    return fid
+            except Exception:
+                continue
+
+        return None
+
+
+class MessagePayloadBuilder:
+    """构建不同类型消息负载的帮助类（无状态）。"""
+
+    @staticmethod
+    def build_chat_payload(
+        user_id: str, text: Optional[str], file_id: Optional[str] = None
+    ) -> Dict[str, Any]:
+        payload = {"toUserId": user_id}
+        if text:
+            payload["text"] = text
+        if file_id:
+            payload["fileId"] = file_id
+        return payload
+
+    @staticmethod
+    def build_room_payload(
+        room_id: str, text: Optional[str], file_id: Optional[str] = None
+    ) -> Dict[str, Any]:
+        payload = {"toRoomId": room_id}
+        if text:
+            payload["text"] = text
+        if file_id:
+            payload["fileId"] = file_id
+        return payload
+
+    @staticmethod
+    def build_note_payload(
+        text: Optional[str], file_ids: Optional[List[str]] = None, **kwargs
+    ) -> Dict[str, Any]:
+        payload: Dict[str, Any] = {}
+        if text:
+            payload["text"] = text
+        if file_ids:
+            payload["fileIds"] = file_ids
+        payload |= kwargs
+        return payload
+
+
 def serialize_message_chain(chain: List[Any]) -> Tuple[str, bool]:
     """将消息链序列化为文本字符串"""
     text_parts = []
@@ -15,11 +77,19 @@ def serialize_message_chain(chain: List[Any]) -> Tuple[str, bool]:
         if isinstance(component, Comp.Plain):
             return component.text
         elif isinstance(component, Comp.File):
-            file_name = getattr(component, "name", "文件")
-            return f"[文件: {file_name}]"
+            # 为文件组件返回占位符，但适配器仍会处理原组件
+            return "[文件]"
+        elif isinstance(component, Comp.Image):
+            # 为图片组件返回占位符，但适配器仍会处理原组件
+            return "[图片]"
         elif isinstance(component, Comp.At):
             has_at = True
-            return f"@{component.qq}"
+            # 优先使用name字段（用户名），如果没有则使用qq字段
+            # 这样可以避免在Misskey中生成 @<user_id> 这样的无效提及
+            if hasattr(component, "name") and component.name:
+                return f"@{component.name}"
+            else:
+                return f"@{component.qq}"
         elif hasattr(component, "text"):
             text = getattr(component, "text", "")
             if "@" in text:
@@ -43,15 +113,22 @@ def serialize_message_chain(chain: List[Any]) -> Tuple[str, bool]:
 
 
 def resolve_message_visibility(
-    user_id: Optional[str],
-    user_cache: Dict[str, Any],
-    self_id: Optional[str],
+    user_id: Optional[str] = None,
+    user_cache: Optional[Dict[str, Any]] = None,
+    self_id: Optional[str] = None,
+    raw_message: Optional[Dict[str, Any]] = None,
     default_visibility: str = "public",
 ) -> Tuple[str, Optional[List[str]]]:
-    """解析 Misskey 消息的可见性设置"""
+    """解析 Misskey 消息的可见性设置
+
+    可以从 user_cache 或 raw_message 中解析，支持两种调用方式：
+    1. 基于 user_cache: resolve_message_visibility(user_id, user_cache, self_id)
+    2. 基于 raw_message: resolve_message_visibility(raw_message=raw_message, self_id=self_id)
+    """
     visibility = default_visibility
     visible_user_ids = None
 
+    # 优先从 user_cache 解析
     if user_id and user_cache:
         user_info = user_cache.get(user_id)
         if user_info:
@@ -66,38 +143,36 @@ def resolve_message_visibility(
                 visible_user_ids = [uid for uid in visible_user_ids if uid]
             else:
                 visibility = original_visibility
+            return visibility, visible_user_ids
+
+    # 回退到从 raw_message 解析
+    if raw_message:
+        original_visibility = raw_message.get("visibility", default_visibility)
+        if original_visibility == "specified":
+            visibility = "specified"
+            original_visible_users = raw_message.get("visibleUserIds", [])
+            sender_id = raw_message.get("userId", "")
+
+            users_to_include = []
+            if sender_id:
+                users_to_include.append(sender_id)
+            if self_id:
+                users_to_include.append(self_id)
+
+            visible_user_ids = list(set(original_visible_users + users_to_include))
+            visible_user_ids = [uid for uid in visible_user_ids if uid]
+        else:
+            visibility = original_visibility
 
     return visibility, visible_user_ids
 
 
+# 保留旧函数名作为向后兼容的别名
 def resolve_visibility_from_raw_message(
     raw_message: Dict[str, Any], self_id: Optional[str] = None
 ) -> Tuple[str, Optional[List[str]]]:
-    """从原始消息数据中解析可见性设置"""
-    visibility = "public"
-    visible_user_ids = None
-
-    if not raw_message:
-        return visibility, visible_user_ids
-
-    original_visibility = raw_message.get("visibility", "public")
-    if original_visibility == "specified":
-        visibility = "specified"
-        original_visible_users = raw_message.get("visibleUserIds", [])
-        sender_id = raw_message.get("userId", "")
-
-        users_to_include = []
-        if sender_id:
-            users_to_include.append(sender_id)
-        if self_id:
-            users_to_include.append(self_id)
-
-        visible_user_ids = list(set(original_visible_users + users_to_include))
-        visible_user_ids = [uid for uid in visible_user_ids if uid]
-    else:
-        visibility = original_visibility
-
-    return visibility, visible_user_ids
+    """从原始消息数据中解析可见性设置（已弃用，使用 resolve_message_visibility 替代）"""
+    return resolve_message_visibility(raw_message=raw_message, self_id=self_id)
 
 
 def is_valid_user_session_id(session_id: Union[str, Any]) -> bool:
@@ -128,6 +203,20 @@ def is_valid_room_session_id(session_id: Union[str, Any]) -> bool:
     )
 
 
+def is_valid_chat_session_id(session_id: Union[str, Any]) -> bool:
+    """检查 session_id 是否是有效的聊天 session_id (仅限chat%前缀)"""
+    if not isinstance(session_id, str) or "%" not in session_id:
+        return False
+
+    parts = session_id.split("%")
+    return (
+        len(parts) == 2
+        and parts[0] == "chat"
+        and bool(parts[1])
+        and parts[1] != "unknown"
+    )
+
+
 def extract_user_id_from_session_id(session_id: str) -> str:
     """从 session_id 中提取用户 ID"""
     if "%" in session_id:
@@ -149,21 +238,22 @@ def extract_room_id_from_session_id(session_id: str) -> str:
 def add_at_mention_if_needed(
     text: str, user_info: Optional[Dict[str, Any]], has_at: bool = False
 ) -> str:
-    """如果需要且没有@用户，则添加@用户"""
+    """如果需要且没有@用户，则添加@用户
+
+    注意：仅在有有效的username时才添加@提及，避免使用用户ID
+    """
     if has_at or not user_info:
         return text
 
     username = user_info.get("username")
-    nickname = user_info.get("nickname")
+    # 如果没有username，则不添加@提及，返回原文本
+    # 这样可以避免生成 @<user_id> 这样的无效提及
+    if not username:
+        return text
 
-    if username:
-        mention = f"@{username}"
-        if not text.startswith(mention):
-            text = f"{mention}\n{text}".strip()
-    elif nickname:
-        mention = f"@{nickname}"
-        if not text.startswith(mention):
-            text = f"{mention}\n{text}".strip()
+    mention = f"@{username}"
+    if not text.startswith(mention):
+        text = f"{mention}\n{text}".strip()
 
     return text
 
@@ -197,6 +287,22 @@ def process_files(
     return file_parts
 
 
+def format_poll(poll: Dict[str, Any]) -> str:
+    """将 Misskey 的 poll 对象格式化为可读字符串。"""
+    if not poll or not isinstance(poll, dict):
+        return ""
+    multiple = poll.get("multiple", False)
+    choices = poll.get("choices", [])
+    text_choices = [
+        f"({idx}) {c.get('text', '')} [{c.get('votes', 0)}票]"
+        for idx, c in enumerate(choices, start=1)
+    ]
+    parts = ["[投票]", ("允许多选" if multiple else "单选")] + (
+        ["选项: " + ", ".join(text_choices)] if text_choices else []
+    )
+    return " ".join(parts)
+
+
 def extract_sender_info(
     raw_data: Dict[str, Any], is_chat: bool = False
 ) -> Dict[str, Any]:
@@ -248,7 +354,7 @@ def create_base_message(
     else:
         session_prefix = "note"
         session_id = f"{session_prefix}%{sender_info['sender_id']}"
-        message.type = MessageType.FRIEND_MESSAGE
+        message.type = MessageType.OTHER_MESSAGE
 
     message.session_id = (
         session_id if sender_info["sender_id"] else f"{session_prefix}%unknown"
@@ -303,6 +409,8 @@ def cache_user_info(
             "nickname": sender_info["nickname"],
             "visibility": raw_data.get("visibility", "public"),
             "visible_user_ids": raw_data.get("visibleUserIds", []),
+            # 保存原消息ID，用于回复时作为reply_id
+            "reply_to_note_id": raw_data.get("id"),
         }
 
     user_cache[sender_info["sender_id"]] = user_cache_data
@@ -325,3 +433,106 @@ def cache_room_info(
             "visibility": "specified",
             "visible_user_ids": [client_self_id],
         }
+
+
+async def resolve_component_url_or_path(
+    comp: Any,
+) -> Tuple[Optional[str], Optional[str]]:
+    """尝试从组件解析可上传的远程 URL 或本地路径。
+
+    返回 (url_candidate, local_path)。两者可能都为 None。
+    这个函数尽量不抛异常，调用方可按需处理 None。
+    """
+    url_candidate = None
+    local_path = None
+
+    async def _get_str_value(coro_or_val):
+        """辅助函数：统一处理协程或普通值"""
+        try:
+            if hasattr(coro_or_val, "__await__"):
+                result = await coro_or_val
+            else:
+                result = coro_or_val
+            return result if isinstance(result, str) else None
+        except Exception:
+            return None
+
+    try:
+        # 1. 尝试异步方法
+        for method in ["convert_to_file_path", "get_file", "register_to_file_service"]:
+            if not hasattr(comp, method):
+                continue
+            try:
+                value = await _get_str_value(getattr(comp, method)())
+                if value:
+                    if value.startswith("http"):
+                        url_candidate = value
+                        break
+                    else:
+                        local_path = value
+            except Exception:
+                continue
+
+        # 2. 尝试 get_file(True) 获取可直接访问的 URL
+        if not url_candidate and hasattr(comp, "get_file"):
+            try:
+                value = await _get_str_value(comp.get_file(True))
+                if value and value.startswith("http"):
+                    url_candidate = value
+            except Exception:
+                pass
+
+        # 3. 回退到同步属性
+        if not url_candidate and not local_path:
+            for attr in ("file", "url", "path", "src", "source"):
+                try:
+                    value = getattr(comp, attr, None)
+                    if value and isinstance(value, str):
+                        if value.startswith("http"):
+                            url_candidate = value
+                            break
+                        else:
+                            local_path = value
+                            break
+                except Exception:
+                    continue
+
+    except Exception:
+        pass
+
+    return url_candidate, local_path
+
+
+def summarize_component_for_log(comp: Any) -> Dict[str, Any]:
+    """生成适合日志的组件属性字典（尽量不抛异常）。"""
+    attrs = {}
+    for a in ("file", "url", "path", "src", "source", "name"):
+        try:
+            v = getattr(comp, a, None)
+            if v is not None:
+                attrs[a] = v
+        except Exception:
+            continue
+    return attrs
+
+
+async def upload_local_with_retries(
+    api: Any,
+    local_path: str,
+    preferred_name: Optional[str],
+    folder_id: Optional[str],
+) -> Optional[str]:
+    """尝试本地上传，返回 file id 或 None。如果文件类型不允许则直接失败。"""
+    try:
+        res = await api.upload_file(local_path, preferred_name, folder_id)
+        if isinstance(res, dict):
+            fid = res.get("id") or (res.get("raw") or {}).get("createdFile", {}).get(
+                "id"
+            )
+            if fid:
+                return str(fid)
+    except Exception:
+        # 上传失败，直接返回 None，让上层处理错误
+        return None
+
+    return None

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py

@@ -15,12 +15,13 @@ class QQOfficialWebhook:
         self.appid = config["appid"]
         self.secret = config["secret"]
         self.port = config.get("port", 6196)
+        self.is_sandbox = config.get("is_sandbox", False)
         self.callback_server_host = config.get("callback_server_host", "0.0.0.0")
 
         if isinstance(self.port, str):
             self.port = int(self.port)
 
-        self.http: BotHttp = BotHttp(timeout=300)
+        self.http: BotHttp = BotHttp(timeout=300, is_sandbox=self.is_sandbox)
         self.api: BotAPI = BotAPI(http=self.http)
         self.token = Token(self.appid, self.secret)
 

astrbot/core/platform/sources/satori/satori_adapter.py

@@ -499,10 +499,36 @@ class SatoriPlatformAdapter(Platform):
                 }
 
             return None
+        except ET.ParseError as e:
+            logger.warning(f"XML解析失败，使用正则提取: {e}")
+            return await self._extract_quote_with_regex(content)
         except Exception as e:
             logger.error(f"提取<quote>标签时发生错误: {e}")
             return None
 
+    async def _extract_quote_with_regex(self, content: str) -> Optional[dict]:
+        """使用正则表达式提取quote标签信息"""
+        import re
+
+        quote_pattern = r"<quote\s+([^>]*)>(.*?)</quote>"
+        match = re.search(quote_pattern, content, re.DOTALL)
+
+        if not match:
+            return None
+
+        attrs_str = match.group(1)
+        inner_content = match.group(2)
+
+        id_match = re.search(r'id\s*=\s*["\']([^"\']*)["\']', attrs_str)
+        quote_id = id_match.group(1) if id_match else ""
+        content_without_quote = content.replace(match.group(0), "")
+        content_without_quote = content_without_quote.strip()
+
+        return {
+            "quote": {"id": quote_id, "content": inner_content},
+            "content_without_quote": content_without_quote,
+        }
+
     async def _convert_quote_message(self, quote: dict) -> Optional[AstrBotMessage]:
         """转换引用消息"""
         try:
@@ -574,7 +600,7 @@ class SatoriPlatformAdapter(Platform):
             root = ET.fromstring(processed_content)
             await self._parse_xml_node(root, elements)
         except ET.ParseError as e:
-            logger.error(f"解析 Satori 元素时发生解析错误: {e}, 错误内容: {content}")
+            logger.warning(f"解析 Satori 元素时发生解析错误: {e}, 错误内容: {content}")
             # 如果解析失败，将整个内容当作纯文本
             if content.strip():
                 elements.append(Plain(text=content))