koishi-plugin-share-links-analysis 0.6.3 → 0.7.1

package/README.md

@@ -10,8 +10,7 @@
 
 特别鸣谢以下项目的支持：
 
-- [@summonhim/koishi-plugin-bili-parser](https://www.npmjs.com/package/@summonhim/koishi-plugin-bili-parser)
-- [koishi-plugin-iirose-media-request](https://www.npmjs.com/package/koishi-plugin-iirose-media-request)
-
-原项目：[koishi-plugin-bilibili-videolink-analysis](https://github.com/shangxueink/koishi-shangxue-apps/tree/main/plugins/bilibili-videolink-analysis)
-~~<br>本项目基于原项目0.6.3版本修改~~ 已重构大部分代码
+- [koishi-plugin-bilibili-videolink-analysis](https://github.com/shangxueink/koishi-shangxue-apps/tree/main/plugins/bilibili-videolink-analysis)
+- [koishi-plugin-xiaohongshu](https://www.npmjs.com/package/koishi-plugin-xiaohongshu)
+以及解析方式原作者：[@MuJie](https://mu-jie.cc/)
+- [BetterTwitFix](https://github.com/dylanpdx/BetterTwitFix)

package/lib/core.d.ts

@@ -1,6 +1,6 @@
 import { Context, Session } from 'koishi';
 import { Link, PluginConfig, ParsedInfo } from './types';
-export declare const parsers_str: string[];
+export declare const parsers_str: ("bilibili" | "xiaohongshu" | "twitter" | "xiaoheihe")[];
 /**
  * 从文本中解析出所有支持的链接
  * @param content 消息内容

package/lib/core.js

@@ -41,9 +41,10 @@ exports.init = init;
 const Bilibili = __importStar(require("./parsers/bilibili"));
 const Xiaohongshu = __importStar(require("./parsers/xiaohongshu"));
 const Twitter = __importStar(require("./parsers/twitter"));
+const Xiaoheihe = __importStar(require("./parsers/xiaoheihe"));
 // 定义所有支持的解析器
-const parsers = [Bilibili, Xiaohongshu, Twitter];
-exports.parsers_str = ['bilibili', 'xiaohongshu', 'twitter'];
+const parsers = [Bilibili, Xiaohongshu, Twitter, Xiaoheihe];
+exports.parsers_str = parsers.map(p => p.name);
 /**
  * 从文本中解析出所有支持的链接
  * @param content 消息内容
@@ -67,7 +68,9 @@ function resolveLinks(content) {
  */
 async function processLink(ctx, config, link, session) {
     for (const parser of parsers) {
-        if (parser.match(link.url).length > 0) {
+        if (parser.name == link.platform) {
+            if (config.logLevel == "full")
+                ctx.logger('share-links-analysis').info(`解析平台：${parser.name}，链接：${link.url}`);
             return await parser.process(ctx, config, link, session);
         }
     }

package/lib/index.js

@@ -35,6 +35,7 @@ exports.Config = koishi_1.Schema.intersect([
             koishi_1.Schema.const("forward").description("合并转发"),
             koishi_1.Schema.const("mixed").description("混合发送"),
         ]).default("forward").description("发送模式"),
+        usingLocal: koishi_1.Schema.boolean().default(false).description("使用本地文件（关闭后代理设置无效）"),
         sendFiles: koishi_1.Schema.boolean().default(true).description("是否发送文件（视频等）"),
         sendLinks: koishi_1.Schema.boolean().default(false).description("是否附加直链（仅对合并发送有效）"),
     }).description("基础设置"),
@@ -51,7 +52,7 @@ exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
         parseLimit: koishi_1.Schema.number().default(3).description("单对话多链接解析上限"),
         useNumeral: koishi_1.Schema.boolean().default(true).description("使用格式化数字 (如 10000 -> 1万)"),
-        showError: koishi_1.Schema.boolean().default(false).description("当链接不正确时提醒发送者"),
+        showError: koishi_1.Schema.boolean().default(false).description("当链接被阻止时提醒发送者"),
     }).description("高级解析设置"),
     koishi_1.Schema.object({
         proxy: koishi_1.Schema.string().description("代理设置"),
@@ -108,7 +109,8 @@ function apply(ctx, config) {
         if (!await (0, utils_1.isUserAdmin)(session, session.userId))
             return '权限不足';
         if (parser) {
-            if (!core_1.parsers_str.includes(parser))
+            const isValidParser = (name) => core_1.parsers_str.includes(name);
+            if (!isValidParser(parser))
                 return '请输入正确的解析器名称';
             if (!value)
                 return '请输入正确的模式';
@@ -165,12 +167,22 @@ function apply(ctx, config) {
         for (const link of links) {
             if (session.guildId) {
                 const settings = await (0, utils_1.getEffectiveSettings)(ctx, session.guildId, config);
-                if (!settings.parsers[link.platform])
+                if (!settings.parsers[link.platform]) {
+                    if (config.logLevel == "full")
+                        ctx.logger('share-links-analysis').info(`根据策略，该链接已被阻止解析：平台：${link.platform}，链接：${link.url}`);
+                    if (config.showError)
+                        await session.send(`根据策略，该链接已被阻止解析：平台：${link.platform}`);
                     continue;
+                }
             }
             else {
-                if (!config.default_parsers[link.platform])
+                if (!config.default_parsers[link.platform]) {
+                    if (config.logLevel == "full")
+                        ctx.logger('share-links-analysis').info(`根据策略，该链接已被阻止解析：平台：${link.platform}，链接：${link.url}`);
+                    if (config.showError)
+                        await session.send(`根据策略，该链接已被阻止解析：平台：${link.platform}`);
                     continue;
+                }
             }
             if (linkCount >= config.parseLimit) {
                 await session.send("已达到单次解析上限…");
@@ -192,9 +204,6 @@ function apply(ctx, config) {
                 lastProcessedUrls[channelId][link.url] = now;
                 await sendResult(session, config, result, logger);
             }
-            else if (config.showError) {
-                await session.send(`无法解析链接：${link.url}。可能是不支持的类型或链接有误。`);
-            }
             linkCount++;
         }
     });

package/lib/parsers/bilibili.d.ts

@@ -1,5 +1,6 @@
 import { Context, Session } from 'koishi';
 import { Link, ParsedInfo, PluginConfig } from '../types';
+export declare const name = "bilibili";
 /**
  * 在文本中匹配B站链接 (长链/短链/纯BV号)
  * @param content 消息内容

package/lib/parsers/bilibili.js

@@ -1,9 +1,11 @@
 "use strict";
 // src/parsers/bilibili.ts
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.name = void 0;
 exports.match = match;
 exports.process = process;
 const utils_1 = require("../utils");
+exports.name = "bilibili";
 const linkRules = [
     {
         pattern: /(?:https?:\/\/)?(?:www\.bilibili\.com\/video\/)(([ab]v[0-9a-zA-Z]+))/gi,
@@ -36,7 +38,7 @@ function match(content) {
                 continue;
             seen.add(url);
             results.push({
-                platform: 'bilibili',
+                platform: exports.name,
                 type,
                 id,
                 url,
@@ -52,7 +54,7 @@ function match(content) {
             continue;
         seen.add(url);
         results.push({
-            platform: 'bilibili',
+            platform: exports.name,
             type: 'video',
             id: videoId,
             url,
@@ -69,7 +71,7 @@ function match(content) {
  * @returns 处理后的标准格式对象
  */
 async function process(ctx, config, link, session) {
-    const logger = ctx.logger('share-links-analysis:bilibili');
+    const logger = ctx.logger(`share-links-analysis:${exports.name}`);
     let videoId = link.id;
     let videoIdType = link.type;
     if (link.type === 'short') {
@@ -180,7 +182,7 @@ async function process(ctx, config, link, session) {
             files = [{ type: "video", url: videoUrl }];
         }
         return {
-            platform: 'bilibili',
+            platform: exports.name,
             title: data.title,
             authorName: data.owner.name,
             mainbody: (0, utils_1.escapeHtml)(data.desc),

package/lib/parsers/twitter.d.ts

@@ -1,5 +1,6 @@
 import { Context, Session } from 'koishi';
 import { PluginConfig, ParsedInfo, Link } from '../types';
+export declare const name = "twitter";
 /**
  * 在文本中匹配 Twitter/X 链接
  */

package/lib/parsers/twitter.js

@@ -1,13 +1,12 @@
 "use strict";
 // src/parsers/twitter.ts
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.name = void 0;
 exports.match = match;
 exports.process = process;
 const koishi_1 = require("koishi");
 const utils_1 = require("../utils");
-// ======================
-// 链接匹配规则
-// ======================
+exports.name = "twitter";
 const linkRules = [
     {
         pattern: /https?:\/\/(?:www\.)?(?:twitter\.com|x\.com|mobile\.twitter\.com)\/([\w-]+)\/status\/(\d+)/gi,
@@ -42,7 +41,7 @@ function match(content) {
                 continue;
             seen.add(cleanUrl);
             results.push({
-                platform: 'twitter',
+                platform: exports.name,
                 type: rule.type,
                 id: tweetId,
                 url: cleanUrl,
@@ -55,7 +54,7 @@ function match(content) {
  * 处理单条 Twitter 链接
  */
 async function process(ctx, config, link, session) {
-    const logger = ctx.logger('twitter:process');
+    const logger = ctx.logger(`share-links-analysis:${exports.name}`);
     let apiUrl;
     if (link.type === 'short') {
         // 短链接需先解析，但 vxtwitter 支持直接转换
@@ -84,7 +83,8 @@ async function process(ctx, config, link, session) {
         }
         const enable_nsfw = await (0, utils_1.getEffectiveSettings)(ctx, session.guildId, config);
         if (tweetData.possibly_sensitive && !enable_nsfw) {
-            await session.send('潜在的不合规内容，已停止发送');
+            if (config.showError)
+                await session.send(`潜在的不合规内容，根据策略已停止发送`);
             return null;
         }
         // 解析媒体
@@ -113,7 +113,7 @@ async function process(ctx, config, link, session) {
             }
         }
         return {
-            platform: 'twitter',
+            platform: exports.name,
             title: `@${tweetData.user_screen_name} 的推文`,
             authorName: tweetData.user_name || tweetData.user_screen_name,
             mainbody: mainbody,
@@ -161,7 +161,6 @@ function parseMedia(tweetData) {
                     preview_url: media.thumbnail_url,
                     duration: media.duration_millis ? media.duration_millis / 1000 : undefined
                 });
-                continue;
         }
     }
     return { images, videos };

package/lib/parsers/xiaoheihe.d.ts

@@ -0,0 +1,5 @@
+import { Context, Session } from 'koishi';
+import { PluginConfig, ParsedInfo, Link } from '../types';
+export declare const name = "xiaoheihe";
+export declare function match(content: string): Link[];
+export declare function process(ctx: Context, config: PluginConfig, link: Link, session: Session): Promise<ParsedInfo | null>;

package/lib/parsers/xiaoheihe.js

@@ -0,0 +1,268 @@
+"use strict";
+// src/parsers/xiaoheihe.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.name = void 0;
+exports.match = match;
+exports.process = process;
+const koishi_1 = require("koishi");
+const utils_1 = require("../utils");
+exports.name = "xiaoheihe";
+const linkRules = [
+    {
+        pattern: /https?:\/\/api.xiaoheihe\.cn\/v3\/bbs\/app\/api\/web\/share\?link_id=\w+/gi,
+        type: "bbs_api",
+    },
+    {
+        pattern: /https?:\/\/www.xiaoheihe\.cn\/app\/bbs\/link\/\w+/gi,
+        type: "bbs",
+    }
+];
+function match(content) {
+    const results = [];
+    for (const rule of linkRules) {
+        const match = content.match(rule.pattern);
+        if (match) {
+            for (const fullUrl of match) {
+                const id = fullUrl.match(/\w+$/)?.[0];
+                if (id) {
+                    results.push({
+                        platform: exports.name,
+                        type: rule.type,
+                        id,
+                        url: `https://www.xiaoheihe.cn/app/bbs/link/${id}`,
+                    });
+                }
+            }
+        }
+    }
+    return results;
+}
+async function process(ctx, config, link, session) {
+    const logger = ctx.logger(`share-links-analysis:${exports.name}`);
+    const url = link.url;
+    let page = null;
+    try {
+        page = await ctx.puppeteer.page();
+        await page.setUserAgent(config.userAgent);
+        // 设置请求拦截（阻止非必要资源加载加速解析）
+        await page.setRequestInterception(true);
+        page.on('request', (req) => {
+            const resourceType = req.resourceType();
+            // 必须加载的资源
+            if (url.includes('/app/community/detail/') ||
+                url.includes('heybox-bbs') ||
+                url.includes('heybox-common') ||
+                resourceType === 'xhr' ||
+                resourceType === 'script') {
+                req.continue();
+                return;
+            }
+            // 阻止非必要资源
+            if (['image', 'stylesheet', 'font', 'media'].includes(resourceType) &&
+                !url.includes('avatar') &&
+                !url.includes('thumb')) {
+                req.abort();
+            }
+            else {
+                req.continue();
+            }
+        });
+        // 导航到目标页面
+        const response = await Promise.race([
+            page.goto(link.url, { waitUntil: 'networkidle2', timeout: 10000 }),
+            new Promise((_, reject) => setTimeout(() => reject(new Error('页面加载超时')), 10000))
+        ]);
+        if (!response || response.status() !== 200) {
+            throw new Error(`页面加载失败，状态码: ${response?.status() || '未知'}`);
+        }
+        // 智能等待 - 适配两种布局
+        await Promise.race([
+            page.waitForFunction(() => {
+                return document.querySelector('.hb-bbs-image-text') ||
+                    document.querySelector('.hb-bbs-post');
+            }, { timeout: 30000 }),
+            new Promise((_, reject) => setTimeout(() => reject(new Error('核心内容容器未找到')), 30000))
+        ]);
+        // 全面解析页面内容
+        const postData = await page.evaluate(() => {
+            // 1. 检测页面类型
+            const isImageTextType = !!document.querySelector('.hb-bbs-image-text');
+            const isPostType = !!document.querySelector('.hb-bbs-post');
+            if (!isImageTextType && !isPostType) {
+                throw new Error('不支持的页面结构');
+            }
+            // 2. 基础数据解析（通用）
+            let title = '';
+            let username = '未知用户';
+            let level = 'Lv.0';
+            let time = '未知时间';
+            let ip = '未知地区';
+            const tags = [];
+            const contentBlocks = [];
+            let authorSection = null;
+            let coverImage = '';
+            // 3. 操作数据解析（通用）
+            let likeCount = '0';
+            let favoriteCount = '0';
+            let commentCount = '0';
+            const operationBox = document.querySelector('.link-reply__operation-box');
+            if (operationBox) {
+                const buttons = operationBox.querySelectorAll('button');
+                buttons.forEach((button) => {
+                    const icon = button.querySelector('i');
+                    const countSpan = button.querySelector('.link-reply__operation-desc');
+                    const count = countSpan?.textContent?.trim() || '0';
+                    if (icon?.classList.contains('heybox-bbs_thumbs-up')) {
+                        likeCount = count;
+                    }
+                    else if (icon?.classList.contains('heybox-common_star')) {
+                        favoriteCount = count;
+                    }
+                    else if (icon?.classList.contains('heybox-bbs_comment')) {
+                        commentCount = count;
+                    }
+                });
+            }
+            // 4. 按类型解析内容
+            if (isImageTextType) {
+                // ===== 旧结构解析 (.hb-bbs-image-text) =====
+                const container = document.querySelector('.hb-bbs-image-text');
+                // 标题
+                title = container.querySelector('.section-title__content')?.textContent?.trim() || '无标题';
+                // 作者信息
+                authorSection = container.querySelector('.link-section-user');
+                if (authorSection) {
+                    username = authorSection.querySelector('.link-user__username')?.textContent?.trim() || '未知用户';
+                    level = authorSection.querySelector('.level-tag__wrapper')?.textContent?.trim() || 'Lv.0';
+                    time = authorSection.querySelector('.link-data__time')?.textContent?.trim() || '未知时间';
+                    ip = authorSection.querySelector('.link-data__ip')?.textContent?.trim() || '未知地区';
+                }
+                // 标签
+                container.querySelectorAll('.link-section-tags .content-tag-text').forEach(tag => {
+                    const text = tag.textContent?.trim();
+                    if (text)
+                        tags.push(text);
+                });
+                // 内容
+                const mainContent = container.querySelector('.image-text__content')?.textContent?.trim() || '';
+                contentBlocks.push({ type: 'text', content: mainContent });
+                // 图片（轮播图）
+                container.querySelectorAll('.header-image__item-image img').forEach((img, index) => {
+                    const src = img.src.replace(/\?.*$/, '');
+                    contentBlocks.push({ type: 'image', content: src });
+                });
+            }
+            else if (isPostType) {
+                const container = document.querySelector('.hb-bbs-post');
+                const postContainer = container.querySelector('.post__container');
+                // 标题
+                title = postContainer.querySelector('.section-title__content')?.textContent?.trim() || '无标题';
+                // 作者信息
+                authorSection = postContainer.querySelector('.link-section-user');
+                if (authorSection) {
+                    username = authorSection.querySelector('.link-user__username')?.textContent?.trim() || '未知用户';
+                    level = authorSection.querySelector('.level-tag__wrapper')?.textContent?.trim() || 'Lv.0';
+                    // 时间/IP 在子元素中
+                    const metaData = authorSection.querySelector('.user-info__line-2');
+                    if (metaData) {
+                        time = metaData.querySelector('.link-data__time')?.textContent?.trim() || '未知时间';
+                        ip = metaData.querySelector('.link-data__ip')?.textContent?.replace('·', '').trim() || '未知地区';
+                    }
+                }
+                // 标签（使用第一个标签区域）
+                postContainer.querySelectorAll('.link-section-tags:first-of-type .content-tag-text').forEach(tag => {
+                    const text = tag.textContent?.trim();
+                    if (text)
+                        tags.push(text);
+                });
+                // 封面图片
+                const headerImageContainer = container.querySelector('.post__header-image');
+                if (headerImageContainer) {
+                    const headerImage = headerImageContainer.querySelector('img');
+                    if (headerImage) {
+                        coverImage = headerImage.src.replace(/\?.*$/, '');
+                    }
+                }
+                // 正文内容
+                const contentContainer = postContainer.querySelector('.post__content');
+                if (contentContainer) {
+                    // 遍历所有子节点保持顺序
+                    Array.from(contentContainer.childNodes).forEach(node => {
+                        if (node.nodeType !== Node.ELEMENT_NODE)
+                            return;
+                        const el = node;
+                        // 文本段落
+                        if (el.matches('p.com-text, p.com-origin-source')) {
+                            let text = el.textContent?.trim() || '';
+                            // 特殊处理来源声明
+                            if (el.classList.contains('com-origin-source')) {
+                                text = `🔖 ${text}`;
+                            }
+                            if (text)
+                                contentBlocks.push({ type: 'text', content: text });
+                        }
+                        // 图片
+                        else if (el.matches('div.com-img, div.hb-cpt__image')) {
+                            // 优先查找带'show'类的图片
+                            const img = el.querySelector('img.hb-cpt__image-elem.show') ||
+                                el.querySelector('img.hb-cpt__image-elem');
+                            if (img) {
+                                const src = img.src.replace(/\?.*$/, '');
+                                contentBlocks.push({ type: 'image', content: src });
+                            }
+                        }
+                    });
+                }
+            }
+            return {
+                // @ts-ignore
+                isImageTextType,
+                isPostType,
+                title,
+                username,
+                level,
+                time,
+                ip,
+                tags,
+                contentBlocks,
+                likeCount,
+                favoriteCount,
+                commentCount,
+                coverImage
+            };
+        });
+        if (!postData)
+            throw new Error('未找到有效内容');
+        // 确保页面关闭
+        if (page)
+            await page.close().catch(() => {
+            });
+        // 5. 构建消息
+        let mainbody = "";
+        // 内容块
+        postData.contentBlocks.forEach((block) => {
+            if (block.type === 'text') {
+                mainbody += (0, utils_1.escapeHtml)(block.content + "\n");
+            }
+            else if (block.type === 'image') {
+                mainbody += koishi_1.h.image(block.content).toString();
+            }
+        });
+        const tag = postData.tags.length ? `标签：${postData.tags.join(' | ')}\n` : '';
+        const status = `点赞: ${(0, utils_1.numeral)(postData.likeCount, config)} | 收藏: ${(0, utils_1.numeral)(postData.favoriteCount, config)} | 评论: ${(0, utils_1.numeral)(postData.commentCount, config)}`;
+        return {
+            platform: exports.name,
+            title: postData.title,
+            authorName: postData.username,
+            mainbody: mainbody + tag,
+            sourceUrl: link.url,
+            stats: postData.isImageTextType ? status : "",
+            coverUrl: postData.coverImage,
+            files: []
+        };
+    }
+    catch (error) {
+        logger.error('解析失败:', error);
+        return null;
+    }
+}

package/lib/parsers/xiaohongshu.d.ts

@@ -1,5 +1,6 @@
 import { Context, Session } from 'koishi';
 import { Link, ParsedInfo, PluginConfig } from '../types';
+export declare const name = "xiaohongshu";
 /**
  * 在文本中匹配小红书链接 (长链接或短链接)
  * @param content 消息内容

package/lib/parsers/xiaohongshu.js

@@ -1,12 +1,14 @@
 "use strict";
 // src/parsers/xiaohongshu.ts
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.name = void 0;
 exports.match = match;
 exports.init = init;
 exports.process = process;
 const koishi_1 = require("koishi");
 const cheerio_1 = require("cheerio");
 const utils_1 = require("../utils");
+exports.name = "xiaohongshu";
 const linkRules = [
     {
         pattern: /(?:https?:\/\/)?(?:www\.xiaohongshu\.com\/discovery\/item\/)([\w?=&\-.%]+)/gi,
@@ -45,7 +47,7 @@ function match(content) {
                 continue;
             seen.add(url);
             results.push({
-                platform: 'xiaohongshu',
+                platform: exports.name,
                 type,
                 id: cleanId,
                 url,
@@ -61,7 +63,6 @@ function match(content) {
  */
 async function init(ctx, config) {
     const logger = ctx.logger('share-links-analysis:xiaohongshu');
-    const platformId = 'xiaohongshu';
     if (!ctx.puppeteer) {
         logger.warn('Puppeteer 服务未启用，无法自动刷新 Cookie。');
         return false;
@@ -136,8 +137,7 @@ async function init(ctx, config) {
  * @returns 处理后的标准格式对象
  */
 async function process(ctx, config, link, session) {
-    const logger = ctx.logger('share-links-analysis:xiaohongshu');
-    const platformId = 'xiaohongshu';
+    const logger = ctx.logger(`share-links-analysis:${exports.name}`);
     // 步骤一：从原始分享链接中提取 xsec_token
     let token = null;
     try {
@@ -271,7 +271,7 @@ async function process(ctx, config, link, session) {
             files = [{ type: "video", url: videoUrl }];
         }
         return {
-            platform: 'xiaohongshu',
+            platform: exports.name,
             title: noteData.title,
             authorName: noteData.user.nickname,
             mainbody: mainbody,

package/lib/types.d.ts

@@ -24,6 +24,7 @@ export interface PluginConfig {
     Min_Interval: number;
     waitTip_Switch: false | string;
     useForward: 'plain' | 'forward' | 'mixed';
+    usingLocal: boolean;
     sendFiles: boolean;
     sendLinks: boolean;
     format: string;
@@ -122,3 +123,22 @@ export interface XhsInitialState {
         };
     };
 }
+export interface ContentBlock {
+    type: 'text' | 'image';
+    content: string;
+}
+export interface XiaoHeiHePostData {
+    isImageTextType: boolean;
+    isPostType: boolean;
+    title: string;
+    username: string;
+    level: string;
+    time: string;
+    ip: string;
+    tags: string[];
+    contentBlocks: ContentBlock[];
+    likeCount: string;
+    favoriteCount: string;
+    commentCount: string;
+    coverImage: string;
+}

package/lib/utils.d.ts

@@ -8,6 +8,7 @@ import { Context, Logger, Session } from "koishi";
  */
 export declare function numeral(num: number, config: PluginConfig): string;
 export declare function escapeHtml(str: string): string;
+export declare function unescapeHtml(str: string): string;
 export declare function getFileSize(url: string, proxy: string | undefined, userAgent: string | undefined, logger: Logger): Promise<number | null>;
 export declare function getEffectiveSettings(ctx: Context, guildId: string | undefined, config: PluginConfig): Promise<{
     parsers: any;

package/lib/utils.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.numeral = numeral;
 exports.escapeHtml = escapeHtml;
+exports.unescapeHtml = unescapeHtml;
 exports.getFileSize = getFileSize;
 exports.getEffectiveSettings = getEffectiveSettings;
 exports.isUserAdmin = isUserAdmin;
@@ -78,6 +79,15 @@ function escapeHtml(str) {
         .replace(/"/g, '"')
         .replace(/'/g, ''');
 }
+function unescapeHtml(str) {
+    if (!str)
+        return '';
+    return str.replace(/"/g, '"')
+        .replace(/'/g, "'")
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&amp;/g, '&');
+}
 function getProxyAgent(proxy, url) {
     if (!proxy)
         return undefined;
@@ -327,14 +337,19 @@ async function sendResult_plain(session, config, result, logger) {
     }
     // --- 下载封面 ---
     if (result.coverUrl) {
-        try {
-            mediaCoverUrl = await downloadAndMapUrl(result.coverUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
-            if (config.logLevel === 'full')
-                logger.info(`封面已下载: ${mediaCoverUrl}`);
+        if (config.usingLocal) {
+            try {
+                mediaCoverUrl = await downloadAndMapUrl(result.coverUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
+                if (config.logLevel === 'full')
+                    logger.info(`封面已下载: ${mediaCoverUrl}`);
+            }
+            catch (e) {
+                logger.warn(`封面下载失败: ${result.coverUrl}`, e);
+                mediaCoverUrl = result.coverUrl;
+            }
         }
-        catch (e) {
-            logger.warn(`封面下载失败: ${result.coverUrl}`, e);
-            mediaCoverUrl = '';
+        else {
+            mediaCoverUrl = result.coverUrl;
         }
     }
     // --- 下载 mainbody 中的图片 ---
@@ -343,14 +358,19 @@ async function sendResult_plain(session, config, result, logger) {
         const urlMap = {};
         await Promise.all(imgMatches.map(async (match) => {
             const remoteUrl = match[1];
-            try {
-                const localUrl = await downloadAndMapUrl(remoteUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
-                urlMap[remoteUrl] = localUrl;
-                if (config.logLevel === 'full')
-                    logger.info(`正文图片已下载: ${localUrl}`);
+            if (config.usingLocal) {
+                try {
+                    const localUrl = await downloadAndMapUrl(remoteUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
+                    urlMap[remoteUrl] = localUrl;
+                    if (config.logLevel === 'full')
+                        logger.info(`正文图片已下载: ${localUrl}`);
+                }
+                catch (e) {
+                    logger.warn(`正文图片下载失败: ${remoteUrl}`, e);
+                }
             }
-            catch (e) {
-                logger.warn(`正文图片下载失败: ${remoteUrl}`, e);
+            else {
+                urlMap[remoteUrl] = remoteUrl;
             }
         }));
         mediaMainbody = result.mainbody;
@@ -399,7 +419,9 @@ async function sendResult_plain(session, config, result, logger) {
             }
             if (shouldSend) {
                 try {
-                    const localUrl = await downloadAndMapUrl(remoteUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
+                    let localUrl = remoteUrl;
+                    if (config.usingLocal)
+                        localUrl = await downloadAndMapUrl(remoteUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
                     if (!localUrl)
                         continue;
                     let element = null;
@@ -441,7 +463,7 @@ async function sendResult_forward(session, config, result, logger, mixed_sending
     const localDownloadDir = config.localDownloadDir;
     const onebotReadDir = config.onebotReadDir;
     let mediaCoverUrl = result.coverUrl;
-    let mediaMainbody = result.mainbody;
+    let mediaMainbody = unescapeHtml(result.mainbody ?? '');
     let proxy = undefined;
     if (config.proxy_settings[result.platform]) {
         proxy = config.proxy;
@@ -449,12 +471,17 @@ async function sendResult_forward(session, config, result, logger, mixed_sending
     }
     // --- 封面 ---
     if (result.coverUrl) {
-        try {
-            mediaCoverUrl = await downloadAndMapUrl(result.coverUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
+        if (config.usingLocal) {
+            try {
+                mediaCoverUrl = await downloadAndMapUrl(result.coverUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
+            }
+            catch (e) {
+                logger.warn('封面下载失败', e);
+                mediaCoverUrl = '';
+            }
         }
-        catch (e) {
-            logger.warn('封面下载失败', e);
-            mediaCoverUrl = '';
+        else {
+            mediaCoverUrl = result.coverUrl;
         }
     }
     // --- mainbody 图片 ---
@@ -462,11 +489,16 @@ async function sendResult_forward(session, config, result, logger, mixed_sending
         const imgUrls = [...result.mainbody.matchAll(/<img\s[^>]*src\s*=\s*["']?([^"'>\s]+)["']?/gi)].map(m => m[1]);
         const urlMap = {};
         await Promise.all(imgUrls.map(async (url) => {
-            try {
-                urlMap[url] = await downloadAndMapUrl(url, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
+            if (config.usingLocal) {
+                try {
+                    urlMap[url] = await downloadAndMapUrl(url, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
+                }
+                catch (e) {
+                    logger.warn(`正文图片下载失败: ${url}`, e);
+                }
             }
-            catch (e) {
-                logger.warn(`正文图片下载失败: ${url}`, e);
+            else {
+                urlMap[url] = url;
             }
         }));
         mediaMainbody = result.mainbody;
@@ -557,7 +589,9 @@ async function sendResult_forward(session, config, result, logger, mixed_sending
             }
             if (shouldInclude) {
                 try {
-                    const localUrl = await downloadAndMapUrl(remoteUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
+                    let localUrl = remoteUrl;
+                    if (config.usingLocal)
+                        localUrl = await downloadAndMapUrl(remoteUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger);
                     if (!localUrl)
                         continue;
                     if (!mixed_sending) {

package/package.json

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