koishi-plugin-share-links-analysis 0.2.1 → 0.2.3

package/lib/index.js

@@ -6,6 +6,7 @@ exports.apply = apply;
 const koishi_1 = require("koishi");
 const core_1 = require("./core");
 const xiaohongshu_1 = require("./parsers/xiaohongshu");
+const types_1 = require("koishi-plugin-adapter-onebot/lib/types");
 exports.name = 'share-links-analysis';
 exports.inject = {
     required: ['BiliBiliVideo', 'database', 'puppeteer'],
@@ -157,16 +158,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}`);
             }
@@ -179,12 +179,12 @@ async function sendResult_plain(session, config, result, logger) {
     }
     // 过滤空行，保留含有 < 的行（如图片、视频标签）
     const cleanMessage = message.split('\n').filter(line => line.trim() !== '' || line.includes('<')).join('\n');
-    if (cleanMessage) {
-        await session.send(koishi_1.h.quote(session.messageId) + cleanMessage);
-    }
     if (config.logLevel === 'full') {
         logger.info(`解析结果: \n ${JSON.stringify(result, null, 2)}`);
     }
+    if (cleanMessage) {
+        await session.send(koishi_1.h.quote(session.messageId) + cleanMessage);
+    }
 }
 async function sendResult_forward(session, config, result, logger) {
     if (config.logLevel === 'full') {
@@ -197,6 +197,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: 构建富媒体映射
@@ -276,7 +283,6 @@ async function sendResult_forward(session, config, result, logger) {
                     nickname: '分享助手',
                     content: [
                         { type: 'video', data: { file: result.videoUrl } },
-                        { type: 'text', data: { text: `\n视频直链: ${result.videoUrl}` } }
                     ]
                 }
             });
@@ -287,18 +293,27 @@ async function sendResult_forward(session, config, result, logger) {
     }
     if (forwardNodes.length === 0)
         return;
-    // Step 6: 发送合并转发
-    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)}`);
     }
+    // Step 6: 发送合并转发
+    if (!(session.onebot && session.onebot._request))
+        throw new Error("Onebot is not defined");
+    try {
+        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 || ''
+        });
+    }
+    catch (e) {
+        if (e instanceof types_1.TimeoutError) {
+        }
+        else {
+            throw e;
+        }
+    }
 }

package/package.json

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