merge: sync upstream/master and keep upstream qqofficial implementation

Author: AstrBot Local

astrbot/cli/__init__.py

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

astrbot/core/config/default.py

@@ -5,7 +5,7 @@
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.19.5"
+VERSION = "4.20.0"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [

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

@@ -120,7 +120,7 @@ async def send_streaming(self, generator, use_fallback: bool = False):
                     self.send_buffer.chain.extend(chain.chain)
 
                 # 节流：按时间间隔发送中间分片
-                current_time = asyncio.get_event_loop().time()
+                current_time = asyncio.get_running_loop().time()
                 if current_time - last_edit_time >= throttle_interval:
                     ret = cast(
                         message.Message,
@@ -130,7 +130,7 @@ async def send_streaming(self, generator, use_fallback: bool = False):
                     ret_id = self._extract_response_message_id(ret)
                     if ret_id is not None:
                         stream_payload["id"] = ret_id
-                    last_edit_time = asyncio.get_event_loop().time()
+                    last_edit_time = asyncio.get_running_loop().time()
                     self.send_buffer = None  # 清空已发送的分片，避免下次重复发送旧内容
 
             if isinstance(source, botpy.message.C2CMessage):

astrbot/core/tools/cron_tools.py

@@ -30,7 +30,7 @@ class CreateActiveCronTool(FunctionTool[AstrAgentContext]):
             "properties": {
                 "cron_expression": {
                     "type": "string",
-                    "description": "Cron expression defining recurring schedule (e.g., '0 8 * * *').",
+                    "description": "Cron expression defining recurring schedule (e.g., '0 8 * * *' or '0 23 * * mon-fri'). Prefer named weekdays like 'mon-fri' or 'sat,sun' instead of numeric day-of-week ranges such as '1-5' to avoid ambiguity across cron implementations.",
                 },
                 "run_at": {
                     "type": "string",

astrbot/dashboard/routes/backup.py

@@ -977,7 +977,17 @@ async def download_backup(self):
                 if not jwt_secret:
                     return Response().error("服务器配置错误").__dict__
 
-                jwt.decode(token, jwt_secret, algorithms=["HS256"])
+                # Verify JWT token with strict security options
+                jwt.decode(
+                    token,
+                    jwt_secret,
+                    algorithms=["HS256"],
+                    options={
+                        "require": ["exp"],  # Require expiration claim
+                        "verify_signature": True,  # Explicitly verify signature
+                        "verify_exp": True,  # Verify expiration
+                    },
+                )
             except jwt.ExpiredSignatureError:
                 return Response().error("Token 已过期，请刷新页面后重试").__dict__
             except jwt.InvalidTokenError:

changelogs/v4.20.0.md

@@ -0,0 +1,64 @@
+## What's Changed
+
+### 新增
+
+- 新增俄语翻译（[#6081](https://github.com/AstrBotDevs/AstrBot/pull/6081)）。
+- QQ 官方 Bot 新增文件、语音、视频消息支持（含 WebSocket 模式）（[#6063](https://github.com/AstrBotDevs/AstrBot/pull/6063)）。
+
+### 优化
+
+- 优化 QQ 官方 Bot 的流式消息投递可靠性与主动媒体发送能力（[#6131](https://github.com/AstrBotDevs/AstrBot/pull/6131)）。
+- 优化边界场景下 booter 选择逻辑与消息发送工具（[#6064](https://github.com/AstrBotDevs/AstrBot/pull/6064)）。
+
+### 修复
+
+- 修复 Dashboard README 对话框锚点导航失效（[#6083](https://github.com/AstrBotDevs/AstrBot/pull/6083)）。
+- 优先使用具名 weekday 的 cron 示例，避免歧义（[#6091](https://github.com/AstrBotDevs/AstrBot/pull/6091)）。
+- 修复插件市场安装后状态未及时刷新的问题（[#6124](https://github.com/AstrBotDevs/AstrBot/pull/6124)）。
+- 修复插件依赖安装逻辑：仅安装缺失依赖（[#6088](https://github.com/AstrBotDevs/AstrBot/pull/6088)）。
+- 移除 Telegram 适配器中已废弃的 `normalize_whitespace` 参数（[#6044](https://github.com/AstrBotDevs/AstrBot/pull/6044)）。
+- 修复 Windows 本地 skill 文件读取问题（[#6028](https://github.com/AstrBotDevs/AstrBot/pull/6028)）。
+- 修复 Discord pre-ack emoji 配置重启后不持久化的问题（[#6031](https://github.com/AstrBotDevs/AstrBot/pull/6031)）。
+- 统一 WebUI 搜索框清空行为（[#6017](https://github.com/AstrBotDevs/AstrBot/pull/6017)）。
+- 优化插件依赖自动安装流程与 Dashboard 安装体验（[#5954](https://github.com/AstrBotDevs/AstrBot/pull/5954)）。
+
+
+### 文档
+
+- 新增 Astrbook 和玖帕喵社区链接（[#6135](https://github.com/AstrBotDevs/AstrBot/pull/6135)）。
+- 修正文档 `docker.md` 与 `napcat.md` 中的拼写错误（[#6048](https://github.com/AstrBotDevs/AstrBot/pull/6048)）。
+- 在多语言 README 中补充官方开发群号，并改进配置元数据中的正则说明。
+- 更新编辑链接模式并移除过时仓库引用。
+
+---
+
+## What's Changed (EN)
+
+### New Features
+
+- Added Russian translation support ([#6081](https://github.com/AstrBotDevs/AstrBot/pull/6081)).
+- Added file, voice, and video message support for QQ Official Bot (including WebSocket mode) ([#6063](https://github.com/AstrBotDevs/AstrBot/pull/6063)).
+
+### Improvements
+
+- Improved streaming message delivery reliability and proactive media sending for QQ Official API ([#6131](https://github.com/AstrBotDevs/AstrBot/pull/6131)).
+- Optimized booter selection logic in edge cases and message sending tooling ([#6064](https://github.com/AstrBotDevs/AstrBot/pull/6064)).
+
+### Bug Fixes
+
+- Fixed broken README dialog anchor navigation in the Dashboard ([#6083](https://github.com/AstrBotDevs/AstrBot/pull/6083)).
+- Preferred named weekday cron examples to reduce ambiguity ([#6091](https://github.com/AstrBotDevs/AstrBot/pull/6091)).
+- Fixed plugin market install-state refresh after installation ([#6124](https://github.com/AstrBotDevs/AstrBot/pull/6124)).
+- Fixed plugin dependency installation logic to install only missing packages ([#6088](https://github.com/AstrBotDevs/AstrBot/pull/6088)).
+- Removed deprecated `normalize_whitespace` parameter in the Telegram adapter ([#6044](https://github.com/AstrBotDevs/AstrBot/pull/6044)).
+- Fixed local skill file reading issues on Windows ([#6028](https://github.com/AstrBotDevs/AstrBot/pull/6028)).
+- Fixed Discord pre-ack emoji config not being persisted across restarts ([#6031](https://github.com/AstrBotDevs/AstrBot/pull/6031)).
+- Unified WebUI search input clear behavior ([#6017](https://github.com/AstrBotDevs/AstrBot/pull/6017)).
+- Improved plugin dependency auto-install flow and Dashboard installation experience ([#5954](https://github.com/AstrBotDevs/AstrBot/pull/5954)).
+
+### Documentation
+
+- Added Astrbook and Jiupa Miao community links ([#6135](https://github.com/AstrBotDevs/AstrBot/pull/6135)).
+- Fixed typos in `docker.md` and `napcat.md` ([#6048](https://github.com/AstrBotDevs/AstrBot/pull/6048)).
+- Added official developer group IDs to multilingual READMEs and improved regex description in config metadata.
+- Updated edit-link patterns and removed obsolete repository references.

dashboard/src/components/shared/ReadmeDialog.vue

@@ -48,6 +48,24 @@ const loading = ref(false);
 const isEmpty = ref(false);
 const copyFeedbackTimer = ref(null);
 const lastRequestId = ref(0);
+const scrollContainer = ref(null);
+
+function slugifyHeading(text, slugCounts) {
+  const base = (text || "")
+    .trim()
+    .toLowerCase()
+    .normalize("NFKD")
+    .replace(/[\u0300-\u036f]/g, "")
+    .replace(/[^\p{Letter}\p{Number}\s-]/gu, "")
+    .replace(/\s+/g, "-")
+    .replace(/-+/g, "-");
+
+  if (!base) return "";
+
+  const count = slugCounts.get(base) || 0;
+  slugCounts.set(base, count + 1);
+  return count === 0 ? base : `${base}-${count}`;
+}
 
 onUnmounted(() => {
   if (copyFeedbackTimer.value) clearTimeout(copyFeedbackTimer.value);
@@ -153,6 +171,18 @@ const renderedHtml = computed(() => {
   // 3. 后处理方案：完全隔离，安全性最高
   const tempDiv = document.createElement("div");
   tempDiv.innerHTML = cleanHtml;
+
+  const slugCounts = new Map();
+  tempDiv.querySelectorAll("h1, h2, h3, h4, h5, h6").forEach((heading) => {
+    if (heading.id) {
+      slugCounts.set(heading.id, (slugCounts.get(heading.id) || 0) + 1);
+      return;
+    }
+
+    const slug = slugifyHeading(heading.textContent, slugCounts);
+    if (slug) heading.id = slug;
+  });
+
   tempDiv.querySelectorAll("a").forEach((link) => {
     const href = link.getAttribute("href");
     // 强制所有外部链接使用安全的 _blank 策略
@@ -251,18 +281,35 @@ watch(
 
 function handleContainerClick(event) {
   const btn = event.target.closest(".copy-code-btn");
-  if (!btn) return;
-  const code = btn.closest(".code-block-wrapper")?.querySelector("code");
-  if (code) {
-    if (navigator.clipboard?.writeText) {
-      navigator.clipboard
-        .writeText(code.textContent)
-        .then(() => showCopyFeedback(btn, true))
-        .catch(() => tryFallbackCopy(code.textContent, btn));
-    } else {
-      tryFallbackCopy(code.textContent, btn);
+  if (btn) {
+    const code = btn.closest(".code-block-wrapper")?.querySelector("code");
+    if (code) {
+      if (navigator.clipboard?.writeText) {
+        navigator.clipboard
+          .writeText(code.textContent)
+          .then(() => showCopyFeedback(btn, true))
+          .catch(() => tryFallbackCopy(code.textContent, btn));
+      } else {
+        tryFallbackCopy(code.textContent, btn);
+      }
     }
+    return;
   }
+
+  const anchor = event.target.closest('a[href^="#"]');
+  if (!anchor) return;
+
+  const rawHref = anchor.getAttribute("href");
+  const targetId = rawHref ? decodeURIComponent(rawHref.slice(1)) : "";
+  if (!targetId) return;
+
+  const target = scrollContainer.value?.querySelector(
+    `#${CSS.escape(targetId)}`,
+  );
+  if (!target) return;
+
+  event.preventDefault();
+  target.scrollIntoView({ behavior: "smooth", block: "start" });
 }
 
 function tryFallbackCopy(text, btn) {
@@ -326,7 +373,7 @@ const showActionArea = computed(() => {
           <v-icon>mdi-close</v-icon>
         </v-btn>
       </v-card-title>
-      <v-card-text style="overflow-y: auto">
+      <v-card-text ref="scrollContainer" style="overflow-y: auto">
         <div v-if="showActionArea" class="d-flex justify-space-between mb-4">
           <v-btn
             v-if="modeConfig.showGithubButton && repoUrl"
@@ -436,6 +483,7 @@ const showActionArea = computed(() => {
   margin-bottom: 16px;
   font-weight: 600;
   line-height: 1.25;
+  scroll-margin-top: 12px;
 }
 
 :deep(.markdown-body h1) {

dashboard/src/i18n/composables.ts

@@ -11,7 +11,7 @@ const translations = ref<Record<string, any>>({});
  */
 export async function initI18n(locale: Locale = 'zh-CN') {
   currentLocale.value = locale;
-  
+
   // 加载静态翻译数据
   loadTranslations(locale);
 }
@@ -50,7 +50,7 @@ export function useI18n() {
   const t = (key: string, params?: Record<string, string | number>): string => {
     const keys = key.split('.');
     let value: any = translations.value;
-    
+
     // 遍历键路径
     for (const k of keys) {
       if (value && typeof value === 'object' && k in value) {
@@ -61,35 +61,35 @@ export function useI18n() {
         return `[MISSING: ${key}]`;
       }
     }
-    
+
     if (typeof value !== 'string') {
       console.warn(`Translation value is not string: ${key}`, value);
       // 返回带括号的键名，便于在开发时识别类型错误的翻译
       return `[INVALID: ${key}]`;
     }
-    
+
     // 此时value确定是string类型
     let result: string = value;
-    
+
     // 处理参数插值
     if (params) {
       result = result.replace(/\{(\w+)\}/g, (match: string, paramKey: string) => {
         return params[paramKey]?.toString() || match;
       });
     }
-    
+
     return result;
   };
-  
+
   // 切换语言
   const setLocale = async (newLocale: Locale) => {
     if (newLocale !== currentLocale.value) {
       currentLocale.value = newLocale;
       loadTranslations(newLocale);
-      
+
       // 保存到localStorage
       localStorage.setItem('astrbot-locale', newLocale);
-      
+
       // 触发自定义事件，通知相关页面重新加载配置数据
       // 这是因为插件适配器的 i18n 数据是通过后端 API 注入的，
       // 需要根据 Accept-Language 头重新获取
@@ -98,16 +98,16 @@ export function useI18n() {
       }));
     }
   };
-  
+
   // 获取当前语言
   const locale = computed(() => currentLocale.value);
-  
+
   // 获取可用语言列表
-  const availableLocales: Locale[] = ['zh-CN', 'en-US'];
-  
+  const availableLocales: Locale[] = ['zh-CN', 'en-US', 'ru-RU'];
+
   // 检查是否已加载
   const isLoaded = computed(() => Object.keys(translations.value).length > 0);
-  
+
   return {
     t,
     locale,
@@ -122,13 +122,13 @@ export function useI18n() {
  */
 export function useModuleI18n(moduleName: string) {
   const { t } = useI18n();
-  
+
   const tm = (key: string, params?: Record<string, string | number>): string => {
     // 将斜杠转换为点号以匹配嵌套对象结构
     const normalizedModuleName = moduleName.replace(/\//g, '.');
     return t(`${normalizedModuleName}.${key}`, params);
   };
-  
+
   // 获取原始翻译值（可能是字符串、数组或对象）
   const getRaw = (key: string): any => {
     const normalizedModuleName = moduleName.replace(/\//g, '.');
@@ -143,10 +143,10 @@ export function useModuleI18n(moduleName: string) {
         return null;
       }
     }
-    
+
     return value;
   };
-  
+
   return { tm, getRaw };
 }
 
@@ -155,20 +155,21 @@ export function useModuleI18n(moduleName: string) {
  */
 export function useLanguageSwitcher() {
   const { locale, setLocale, availableLocales } = useI18n();
-  
+
   const languageOptions = computed(() => [
     { value: 'zh-CN', label: '简体中文', flag: '🇨🇳' },
-    { value: 'en-US', label: 'English', flag: '🇺🇸' }
+    { value: 'en-US', label: 'English', flag: '🇺🇸' },
+    { value: 'ru-RU', label: 'Русский', flag: '🇷🇺' }
   ]);
-  
+
   const currentLanguage = computed(() => {
     return languageOptions.value.find(lang => lang.value === locale.value);
   });
-  
+
   const switchLanguage = async (newLocale: Locale) => {
     await setLocale(newLocale);
   };
-  
+
   return {
     locale,
     languageOptions,
@@ -220,9 +221,9 @@ function deepMerge(target: Record<string, any>, source: Record<string, any>) {
 export async function setupI18n() {
   // 从localStorage获取保存的语言设置
   const savedLocale = localStorage.getItem('astrbot-locale') as Locale;
-  const initialLocale = savedLocale && ['zh-CN', 'en-US'].includes(savedLocale) 
-    ? savedLocale 
+  const initialLocale = savedLocale && ['zh-CN', 'en-US', 'ru-RU'].includes(savedLocale)
+    ? savedLocale
     : 'zh-CN';
-  
+
   await initI18n(initialLocale);
 } 

dashboard/src/i18n/locales/en-US/features/config-metadata.json

@@ -78,6 +78,7 @@
     },
     "persona": {
       "description": "Persona",
+      "hint": "Set the default persona for AI conversations. Personas can be managed in the Persona tab.",
       "provider_settings": {
         "default_personality": {
           "description": "Default Persona"