koishi-plugin-share-links-analysis 0.2.4 → 0.3.0

package/lib/index.js

@@ -81,7 +81,7 @@ function apply(ctx, config) {
     ctx.middleware(async (session, next) => {
         if (!session.content || !session.channelId)
             return next();
-        const content = session.content.replace(/\\/g, '');
+        const content = session.content.replace(/\\/g, '').replace(/&/g, '&');
         const channelId = session.channelId;
         const links = (0, core_1.resolveLinks)(content);
         if (links.length === 0)
@@ -131,8 +131,7 @@ async function sendResult(session, config, result, logger) {
             return; // 成功，结束
         }
         catch (err) {
-            logger.warn('合并转发失败，回退到普通消息:', err);
-            await sendResult_plain(session, config, result, logger);
+            logger.warn('合并转发失败:', err);
             return;
         }
     }
@@ -298,21 +297,12 @@ async function sendResult_forward(session, config, result, logger) {
     // 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.name === 'TimeoutError') {
-        }
-        else {
-            throw e;
-        }
-    }
+    await session.onebot._request('send_group_forward_msg', {
+        group_id: session.guildId,
+        messages: forwardNodes,
+        news: [{ text: result.description || '-' }, { text: '点击查看详情 | Powered by furryaxw' }],
+        prompt: result.title || '',
+        summary: '分享解析',
+        source: result.title || ''
+    });
 }

package/lib/parsers/bilibili.js

@@ -13,8 +13,8 @@ function match(content) {
     const results = [];
     // 匹配标准长链接和短链接
     const linkRegex = [
-        { pattern: /(https?:\/\/)?(www\.bilibili\.com\/video\/([ab]v[0-9a-zA-Z]+))/i, type: "video" },
-        { pattern: /(https?:\/\/)?(b23\.tv\/[0-9a-zA-Z]+)/i, type: "short" },
+        { pattern: /(https?:\/\/)?(www\.bilibili\.com\/video\/([ab]v[0-9a-zA-Z]+))/g, type: "video" },
+        { pattern: /(https?:\/\/)?(b23\.tv\/[0-9a-zA-Z]+)/g, type: "short" },
     ];
     for (const rule of linkRegex) {
         const matches = [...content.matchAll(new RegExp(rule.pattern, 'gi'))];

package/lib/parsers/xiaohongshu.js

@@ -12,16 +12,29 @@ const utils_1 = require("../utils");
  * @returns 匹配到的链接对象数组
  */
 function match(content) {
-    const urlRegex = /https?:\/\/(?:www\.xiaohongshu\.com\/discovery\/item\/[A-Za-z0-9]+|xhslink\.com\/[A-Za-z0-9]+)\??[^ \n\r]*/g;
-    const matches = content.match(urlRegex);
-    if (!matches)
-        return [];
-    return matches.map(url => ({
-        platform: 'xiaohongshu',
-        type: 'note',
-        id: url.split('/').pop().split('?')[0],
-        url: url
-    }));
+    const results = [];
+    // 匹配标准长链接和短链接
+    const linkRegex = [
+        { pattern: /(https?:\/\/)?(www\.xiaohongshu\.com\/discovery\/item\/([\w?=\-&\.%]+))/g, type: "discovery" },
+        { pattern: /(https?:\/\/)?(www\.xiaohongshu\.com\/explore\/([\w?=\-&\.%]+))/g, type: "explore" },
+        { pattern: /(https?:\/\/)?(xhslink\.com\/(m\/)?[0-9a-zA-Z]+)/g, type: "short" },
+    ];
+    for (const rule of linkRegex) {
+        const matches = [...content.matchAll(new RegExp(rule.pattern, 'gi'))];
+        for (const matchArr of matches) {
+            if (matchArr[2]) {
+                // 强制将所有链接格式化为 https 开头
+                const formattedUrl = `https://${matchArr[2]}`;
+                results.push({
+                    platform: 'xiaohongshu',
+                    type: rule.type,
+                    id: formattedUrl.split('/').pop().split('?')[0],
+                    url: formattedUrl
+                });
+            }
+        }
+    }
+    return results;
 }
 /**
  * 使用 Puppeteer 刷新小红书 Cookie 并存入数据库

package/package.json

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