结构调整

视频解析多图/多媒体结构 消息体适配

hexi/plugins/nonebot_plugin_video_analysis/cleanup.py

@@ -22,7 +22,7 @@ from nonebot import logger, require, get_plugin_config, on_command
 from nonebot.adapters.onebot.v11 import Bot, MessageEvent
 from pydantic import BaseModel
 
-from hexi.plugins.nonebot_plugin_hexi_core.custom_utils import check_manage
+from hexi.core.custom_utils import check_manage
 
 require("nonebot_plugin_apscheduler")
 from nonebot_plugin_apscheduler import scheduler

hexi/plugins/nonebot_plugin_video_analysis/config.py

@@ -1,4 +1,4 @@
-"""统一配置注册：把插件配置按文档标准接入 hexi.web_config(Web 可读可改)。
+"""统一配置注册：把插件配置按文档标准接入 hexi.web_hub.web_config(Web 可读可改)。
 
 - temp 清理配置(env pydantic) → register_model_config
 - S3 存储配置(原硬编码在 services/storage/s3.py) → register_config_items(store=s3 模块)
@@ -7,7 +7,7 @@
 
 from __future__ import annotations
 
-from hexi.config_standard import register_config_items, register_model_config
+from hexi.web_hub.config_standard import register_config_items, register_model_config
 
 from . import cleanup, list_proc  # noqa: F401
 from .services.storage import s3 as _s3mod

hexi/plugins/nonebot_plugin_video_analysis/handlers/douyin.py

@@ -68,13 +68,18 @@ async def parse_douyin(
             logger.info(f"短链重定向: {target_url} -> {resolved}")
             target_url = resolved
     else:
-        # 全链接: www.douyin.com/note/xxx 或 www.douyin.com/video/xxx
+        # 全链接: www.douyin.com/note/xxx、www.douyin.com/video/xxx，
+        # 以及抖音复制出的 iesdouyin.com/share/video|note/xxx（弱网/无网下 App
+        # 生成的恢复连接同样会是这个形态）。统一提取出作品 id 后再交给 SSR / playwright。
         m = re.search(
-            r"(https?://(?:www\.)?douyin\.com/(?:note|video)/\d+)", url
+            r"(https?://(?:www\.)?(?:m\.)?(?:ies)?douyin\.com/(?:share/)?(note|video)/(\d+))",
+            url,
         )
         if not m:
             return None, None, False
-        target_url = m.group(1)
+        # 统一规范化为 www.douyin.com/{note|video}/{id}，避免 iesdouyin 分享页
+        # 在无登录态/弱网下只返回壳页，直接落到浏览器可正常打开的作品页。
+        target_url = f"https://www.douyin.com/{m.group(2)}/{m.group(3)}"
 
     try:
         is_img_post = False

hexi/plugins/nonebot_plugin_video_analysis/handlers/entry.py

@@ -179,6 +179,12 @@ async def dispatch_url(
         await UniMessage.text("检测到链接，正在处理，请稍候...").send()
         try:
             title, parsed_path, image_post = await parse_douyin(url)
+            if not title and not parsed_path:
+                # 链接识别成功但未能获取到作品（网络/风控/链接失效等），
+                # 给出明确失败提示，避免只发"请稍候"后无下文。
+                await UniMessage.text(f"无法解析到媒体：{url}").send()
+                logger.warning(f"媒体解析：未能获取到作品：{url}")
+                return None, None
             return await process_douyin_res(
                 title, parsed_path, is_private, image_post, plan=plan
             )

hexi/plugins/nonebot_plugin_video_analysis/list_proc.py

@@ -1,20 +1,15 @@
 import json
-import random
 import asyncio
 import os
-from typing import List
 
-from nonebot.adapters.onebot.v11 import MessageSegment, PokeNotifyEvent, Message
-from nonebot.plugin.on import on_notice, on_command
-from nonebot import on_type, on_message, logger
+from nonebot.plugin.on import on_command
+from nonebot import logger
 from nonebot.adapters import Event
 from nonebot.matcher import Matcher
-from nonebot.params import CommandArg
-from nonebot.rule import to_me
 from nonebot_plugin_alconna import UniMessage, get_target
 
-from hexi.plugins.nonebot_plugin_hexi_core.custom_utils import check_admin
-# from hexi.plugins.nonebot_plugin_hexi_core.MessageUtils import send_poke
+from hexi.core.custom_utils import check_admin
+# from hexi.core.message_utils import send_poke
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 FILE_PATH = os.path.join(BASE_DIR, "data", "list.json")

hexi/plugins/nonebot_plugin_video_analysis/services/storage/s3.py

@@ -7,7 +7,7 @@ import boto3
 from botocore.config import Config
 from nonebot import logger
 
-from hexi.web_config import get_effective_value
+from hexi.web_hub.web_config import get_effective_value
 
 # 该插件模块名，用于读取统一配置值库(Web 修改后生效)
 _PLUGIN_ID = "hexi.plugins.nonebot_plugin_video_analysis"