koishi-plugin-share-links-analysis 0.2.0 → 0.2.2

package/lib/index.js

@@ -126,12 +126,25 @@ function escapeHtml(str) {
 }
 async function sendResult(session, config, result, logger) {
     if (config.useForward) {
-        return sendResult_forward(session, config, result, logger);
+        try {
+            await sendResult_forward(session, config, result, logger);
+            return; // 成功，结束
+        }
+        catch (err) {
+            logger.warn('合并转发失败，回退到普通消息:', err);
+            await sendResult_plain(session, config, result, logger);
+            return;
+        }
+    }
+    else {
+        await sendResult_plain(session, config, result, logger);
+        return;
     }
-    else
-        return sendResult_plain(session, config, result, logger);
 }
 async function sendResult_plain(session, config, result, logger) {
+    if (config.logLevel === 'full') {
+        logger.info('进入普通消息发送');
+    }
     let message = config.format;
     // 对所有文本内容进行 HTML 转义
     message = message.replace(/{title}/g, escapeHtml(result.title || ''));
@@ -144,16 +157,15 @@ async function sendResult_plain(session, config, result, logger) {
     message = message.replace(/{stats}/g, escapeHtml(result.stats || ''));
     // 【修复】只要 videoUrl 存在就处理，仅当 duration 明确超长时才替换为提示
     if (result.videoUrl) {
+        message = message.replace(/{videoUrl}/g, escapeHtml(result.videoUrl));
         // 仅当 duration 是有效数字且超长时，才显示提示
         if (typeof result.duration === 'number' && result.duration > config.Maximumduration * 60) {
             const tip = escapeHtml(config.Maximumduration_tip || '');
             message = message.replace(/{video}/g, tip);
-            message = message.replace(/{videoUrl}/g, '');
         }
         else {
             // 正常发送视频和链接
             message = message.replace(/{video}/g, koishi_1.h.video(result.videoUrl).toString());
-            message = message.replace(/{videoUrl}/g, escapeHtml(result.videoUrl));
             if (config.logLevel === 'link_only' || config.logLevel === 'full') {
                 logger.info(`视频直链 (${result.platform}): ${result.videoUrl}`);
             }
@@ -174,6 +186,9 @@ async function sendResult_plain(session, config, result, logger) {
     }
 }
 async function sendResult_forward(session, config, result, logger) {
+    if (config.logLevel === 'full') {
+        logger.info('进入合并转发发送');
+    }
     let message = config.format;
     // Step 1: 替换纯文本字段
     message = message.replace(/{title}/g, escapeHtml(result.title || ''));
@@ -181,6 +196,13 @@ async function sendResult_forward(session, config, result, logger) {
     message = message.replace(/{description}/g, escapeHtml(result.description || ''));
     message = message.replace(/{sourceUrl}/g, escapeHtml(result.sourceUrl || ''));
     message = message.replace(/{stats}/g, escapeHtml(result.stats || ''));
+    if (result.videoUrl) {
+        message = message.replace(/{videoUrl}/g, escapeHtml(result.videoUrl));
+    }
+    if (typeof result.duration === 'number' && result.duration > config.Maximumduration * 60) {
+        const tip = escapeHtml(config.Maximumduration_tip || '');
+        message = message.replace(/{video}/g, tip);
+    }
     // Step 2: 检查是否包含视频占位符
     const hasVideoInTemplate = message.includes('{video}');
     // Step 3: 构建富媒体映射
@@ -260,7 +282,6 @@ async function sendResult_forward(session, config, result, logger) {
                     nickname: '分享助手',
                     content: [
                         { type: 'video', data: { file: result.videoUrl } },
-                        { type: 'text', data: { text: `\n视频直链: ${result.videoUrl}` } }
                     ]
                 }
             });
@@ -272,24 +293,17 @@ async function sendResult_forward(session, config, result, logger) {
     if (forwardNodes.length === 0)
         return;
     // Step 6: 发送合并转发
-    try {
-        if (!(session.onebot && session.onebot._request))
-            throw new Error("onebot is not defined");
-        await session.onebot._request('send_group_forward_msg', {
-            group_id: session.guildId,
-            messages: forwardNodes,
-            news: [{ text: result.description || '' }],
-            prompt: result.title || '',
-            summary: 'Powered by furryaxw',
-            source: result.title || ''
-        });
-        if (config.logLevel === 'full') {
-            logger.info(`解析结果: \n ${JSON.stringify(result, null, 2)}`);
-        }
-    }
-    catch (err) {
-        logger.warn('合并转发发送失败:', err);
-        // 失败时回退到普通消息
-        await sendResult_plain(session, config, result, logger);
+    if (!(session.onebot && session.onebot._request))
+        throw new Error("onebot is not defined");
+    await session.onebot._request('send_group_forward_msg', {
+        group_id: session.guildId,
+        messages: forwardNodes,
+        news: [{ text: result.description || '' }],
+        prompt: result.title || '',
+        summary: 'Powered by furryaxw',
+        source: result.title || ''
+    });
+    if (config.logLevel === 'full') {
+        logger.info(`解析结果: \n ${JSON.stringify(result, null, 2)}`);
     }
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "koishi-plugin-share-links-analysis",
   "description": "自用插件",
   "license": "MIT",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [