Merge branch 'AstrBotDevs:master' into feat/i18n-lazy-load

Author: IGCrystal

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,8 +3,8 @@
 
 ### Modifications / 改动点
 
-<!--请总结你的改动：哪些核心文件被修改了？实现了什么功能？-->
 <!--Please summarize your changes: What core files were modified? What functionality was implemented?-->
+<!--请总结你的改动：哪些核心文件被修改了？实现了什么功能？-->
 
 - [x] This is NOT a breaking change. / 这不是一个破坏性变更。
 <!-- If your changes is a breaking change, please uncheck the checkbox above -->
@@ -21,7 +21,14 @@
 <!--If merged, your code will serve tens of thousands of users! Please double-check the following items before submitting.-->
 <!--如果分支被合并，您的代码将服务于数万名用户！在提交前，请核查一下几点内容。-->
 
-- [ ] 😊 如果 PR 中有新加入的功能，已经通过 Issue / 邮件等方式和作者讨论过。/ If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.
-- [ ] 👀 我的更改经过了良好的测试，**并已在上方提供了“验证步骤”和“运行截图”**。/ My changes have been well-tested, **and "Verification Steps" and "Screenshots" have been provided above**.
-- [ ] 🤓 我确保没有引入新依赖库，或者引入了新依赖库的同时将其添加到了 `requirements.txt` 和 `pyproject.toml` 文件相应位置。/ I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in `requirements.txt` and `pyproject.toml`.
-- [ ] 😮 我的更改没有引入恶意代码。/ My changes do not introduce malicious code.
+- [ ] 😊 If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc. 
+  / 如果 PR 中有新加入的功能，已经通过 Issue / 邮件等方式和作者讨论过。
+
+- [ ] 👀 My changes have been well-tested, **and "Verification Steps" and "Screenshots" have been provided above**.
+  / 我的更改经过了良好的测试，**并已在上方提供了“验证步骤”和“运行截图”**。
+
+- [ ] 🤓 I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in `requirements.txt` and `pyproject.toml`.
+  / 我确保没有引入新依赖库，或者引入了新依赖库的同时将其添加到 `requirements.txt` 和 `pyproject.toml` 文件相应位置。
+
+- [ ] 😮 My changes do not introduce malicious code.
+  / 我的更改没有引入恶意代码。

.github/workflows/pr-title-check.yml

@@ -0,0 +1,53 @@
+name: PR Title Check
+
+on:
+  pull_request_target:
+    types: [opened, edited, reopened, synchronize]
+
+jobs:
+  title-format:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      issues: write
+
+    steps:
+      - name: Validate PR title
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const title = (context.payload.pull_request.title || "").trim();
+            // allow only:
+            // feat: xxx
+            // feat(scope): xxx
+            const pattern = /^(feat)(\([a-z0-9-]+\))?:\s.+$/i;
+            const isValid = pattern.test(title);
+            const isSameRepo =
+              context.payload.pull_request.head.repo.full_name === context.payload.repository.full_name;
+
+            if (!isValid) {
+              if (isSameRepo) {
+                try {
+                  await github.rest.issues.createComment({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    issue_number: context.payload.pull_request.number,
+                    body: [
+                      "⚠️ PR title format check failed.",
+                      "Required formats:",
+                      "- `feat: xxx`",
+                      "- `feat(scope): xxx`",
+                      "Please update your PR title and push again."
+                    ].join("\n")
+                  });
+                } catch (e) {
+                  core.warning(`Failed to post PR title comment: ${e.message}`);
+                }
+              } else {
+                core.warning("Fork PR: comment permission is restricted; skip posting review comment.");
+              }
+            }
+
+            if (!isValid) {
+              core.setFailed("Invalid PR title. Expected format: feat: xxx or feat(scope): xxx.");
+            }

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.20.0"
+__version__ = "4.20.1"

astrbot/core/astr_main_agent_resources.py

@@ -188,7 +188,12 @@ async def call(
 @dataclass
 class SendMessageToUserTool(FunctionTool[AstrAgentContext]):
     name: str = "send_message_to_user"
-    description: str = "Directly send message to the user. Only use this tool when you need to proactively message the user. Otherwise you can directly output the reply in the conversation."
+    description: str = (
+        "Send message to the user. "
+        "Supports various message types including `plain`, `image`, `record`, `video`, `file`, and `mention_user`. "
+        "Use this tool to send media files (`image`, `record`, `video`, `file`), "
+        "or when you need to proactively message the user(such as cron job). For normal text replies, you can output directly."
+    )
 
     parameters: dict = Field(
         default_factory=lambda: {

astrbot/core/computer/tools/neo_skills.py

@@ -164,7 +164,10 @@ class CreateSkillPayloadTool(NeoSkillToolBase):
             "type": "object",
             "properties": {
                 "payload": {
-                    "anyOf": [{"type": "object"}, {"type": "array"}],
+                    "anyOf": [
+                        {"type": "object"},
+                        {"type": "array", "items": {"type": "object"}},
+                    ],
                     "description": (
                         "Skill payload JSON. Typical schema: {skill_markdown, inputs, outputs, meta}. "
                         "This only stores content and returns payload_ref; it does not create a candidate or release."

astrbot/core/config/default.py

@@ -5,7 +5,7 @@
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.20.0"
+VERSION = "4.20.1"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [
@@ -1132,6 +1132,18 @@ class ChatProviderTemplate(TypedDict):
                         "proxy": "",
                         "custom_headers": {},
                     },
+                    "MiniMax": {
+                        "id": "minimax",
+                        "provider": "minimax",
+                        "type": "openai_chat_completion",
+                        "provider_type": "chat_completion",
+                        "enable": True,
+                        "key": [],
+                        "api_base": "https://api.minimaxi.com/v1",
+                        "timeout": 120,
+                        "proxy": "",
+                        "custom_headers": {},
+                    },
                     "xAI": {
                         "id": "xai",
                         "provider": "xai",

astrbot/core/platform/sources/qqofficial/qqofficial_platform_adapter.py

@@ -391,6 +391,47 @@ def _append_attachments(
                 else:
                     msg.append(File(name=filename, file=url, url=url))
 
+    @staticmethod
+    def _parse_face_message(content: str) -> str:
+        """Parse QQ official face message format and convert to readable text.
+
+        QQ official face message format:
+        <faceType=4,faceId="",ext="eyJ0ZXh0IjoiW+a7oeWktOmXruWPt10ifQ==">
+
+        The ext field contains base64-encoded JSON with a 'text' field
+        describing the emoji (e.g., '[满头问号]').
+
+        Args:
+            content: The message content that may contain face tags.
+
+        Returns:
+            Content with face tags replaced by readable emoji descriptions.
+        """
+        import base64
+        import json
+        import re
+
+        def replace_face(match):
+            face_tag = match.group(0)
+            # Extract ext field from the face tag
+            ext_match = re.search(r'ext="([^"]*)"', face_tag)
+            if ext_match:
+                try:
+                    ext_encoded = ext_match.group(1)
+                    # Decode base64 and parse JSON
+                    ext_decoded = base64.b64decode(ext_encoded).decode("utf-8")
+                    ext_data = json.loads(ext_decoded)
+                    emoji_text = ext_data.get("text", "")
+                    if emoji_text:
+                        return f"[表情:{emoji_text}]"
+                except Exception:
+                    pass
+            # Fallback if parsing fails
+            return "[表情]"
+
+        # Match face tags: <faceType=...>
+        return re.sub(r"<faceType=\d+[^>]*>", replace_face, content)
+
     @staticmethod
     def _parse_from_qqofficial(
         message: botpy.message.Message
@@ -416,7 +457,10 @@ def _parse_from_qqofficial(
                 abm.group_id = message.group_openid
             else:
                 abm.sender = MessageMember(message.author.user_openid, "")
-            abm.message_str = message.content.strip()
+            # Parse face messages to readable text
+            abm.message_str = QQOfficialPlatformAdapter._parse_face_message(
+                message.content.strip()
+            )
             abm.self_id = "unknown_selfid"
             msg.append(At(qq="qq_official"))
             msg.append(Plain(abm.message_str))
@@ -432,10 +476,12 @@ def _parse_from_qqofficial(
             else:
                 abm.self_id = ""
 
-            plain_content = message.content.replace(
-                "<@!" + str(abm.self_id) + ">",
-                "",
-            ).strip()
+            plain_content = QQOfficialPlatformAdapter._parse_face_message(
+                message.content.replace(
+                    "<@!" + str(abm.self_id) + ">",
+                    "",
+                ).strip()
+            )
 
             QQOfficialPlatformAdapter._append_attachments(msg, message.attachments)
             abm.message = msg

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

@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import time
 from typing import cast
 
 import quart
@@ -39,6 +40,9 @@ def __init__(
         self.client = botpy_client
         self.event_queue = event_queue
         self.shutdown_event = asyncio.Event()
+        # Deduplication cache for webhook retry callbacks.
+        self._seen_event_ids: dict[str, float] = {}
+        self._dedup_ttl: int = 60  # seconds
 
     async def initialize(self) -> None:
         logger.info("正在登录到 QQ 官方机器人...")
@@ -106,6 +110,22 @@ async def handle_callback(self, request) -> dict:
             print(signed)
             return signed
 
+        event_id = msg.get("id")
+        if event_id:
+            now = time.monotonic()
+            # Lazily evict expired entries to prevent unbounded growth.
+            expired = [
+                k
+                for k, ts in self._seen_event_ids.items()
+                if now - ts > self._dedup_ttl
+            ]
+            for k in expired:
+                del self._seen_event_ids[k]
+            if event_id in self._seen_event_ids:
+                logger.debug(f"Duplicate webhook event {event_id!r}, skipping.")
+                return {"opcode": 12}
+            self._seen_event_ids[event_id] = now
+
         if event and opcode == BotWebSocket.WS_DISPATCH_EVENT:
             event = msg["t"].lower()
             try:

astrbot/core/platform/sources/telegram/tg_event.py

@@ -25,6 +25,16 @@
 from astrbot.core.utils.metrics import Metric
 
 
+def _is_gif(path: str) -> bool:
+    if path.lower().endswith(".gif"):
+        return True
+    try:
+        with open(path, "rb") as f:
+            return f.read(6) in (b"GIF87a", b"GIF89a")
+    except OSError:
+        return False
+
+
 class TelegramPlatformEvent(AstrMessageEvent):
     # Telegram 的最大消息长度限制
     MAX_MESSAGE_LENGTH = 4096
@@ -291,7 +301,13 @@ async def send_with_client(
                         await client.send_message(text=chunk, **cast(Any, payload))
             elif isinstance(i, Image):
                 image_path = await i.convert_to_file_path()
-                await client.send_photo(photo=image_path, **cast(Any, payload))
+                if _is_gif(image_path):
+                    send_coro = client.send_animation
+                    media_kwarg = {"animation": image_path}
+                else:
+                    send_coro = client.send_photo
+                    media_kwarg = {"photo": image_path}
+                await send_coro(**media_kwarg, **cast(Any, payload))
             elif isinstance(i, File):
                 path = await i.get_file()
                 name = i.name or os.path.basename(path)
@@ -406,12 +422,20 @@ async def _process_chain_items(
                 on_text(i.text)
             elif isinstance(i, Image):
                 image_path = await i.convert_to_file_path()
+                if _is_gif(image_path):
+                    action = ChatAction.UPLOAD_VIDEO
+                    send_coro = self.client.send_animation
+                    media_kwarg = {"animation": image_path}
+                else:
+                    action = ChatAction.UPLOAD_PHOTO
+                    send_coro = self.client.send_photo
+                    media_kwarg = {"photo": image_path}
                 await self._send_media_with_action(
                     self.client,
-                    ChatAction.UPLOAD_PHOTO,
-                    self.client.send_photo,
+                    action,
+                    send_coro,
                     user_name=user_name,
-                    photo=image_path,
+                    **media_kwarg,
                     **cast(Any, payload),
                 )
             elif isinstance(i, File):

astrbot/core/platform/sources/wecom_ai_bot/wecomai_adapter.py

@@ -440,9 +440,16 @@ async def _send_long_connection_respond_msg(
         )
 
     def _extract_session_id(self, message_data: dict[str, Any]) -> str:
-        """从消息数据中提取会话ID"""
-        user_id = message_data.get("from", {}).get("userid", "default_user")
-        return format_session_id("wecomai", user_id)
+        """从消息数据中提取会话ID
+        群聊使用 chatid，单聊使用 userid
+        """
+        chattype = message_data.get("chattype", "single")
+        if chattype == "group":
+            chat_id = message_data.get("chatid", "default_group")
+            return format_session_id("wecomai", chat_id)
+        else:
+            user_id = message_data.get("from", {}).get("userid", "default_user")
+            return format_session_id("wecomai", user_id)
 
     async def _enqueue_message(
         self,