koishi-plugin-share-links-analysis 0.7.0 → 0.7.2

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.js

@@ -68,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

@@ -52,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("代理设置"),
@@ -167,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("已达到单次解析上限…");

package/lib/parsers/twitter.js

@@ -83,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;
         }
         // 解析媒体

package/lib/parsers/xiaoheihe.js

@@ -9,7 +9,7 @@ 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,
+        pattern: /https?:\/\/api.xiaoheihe\.cn\/v3\/bbs\/app\/api\/web\/share\?[\w=&]+/gi,
         type: "bbs_api",
     },
     {
@@ -23,7 +23,11 @@ function match(content) {
         const match = content.match(rule.pattern);
         if (match) {
             for (const fullUrl of match) {
-                const id = fullUrl.match(/\w+$/)?.[0];
+                let id;
+                if (rule.type == "bbs")
+                    id = fullUrl.match(/\w+$/)?.[0];
+                else if (rule.type == "bbs_api")
+                    id = fullUrl.match(/link_id=\w+/gi)?.[0].slice(8);
                 if (id) {
                     results.push({
                         platform: exports.name,
@@ -80,8 +84,8 @@ async function process(ctx, config, link, session) {
             page.waitForFunction(() => {
                 return document.querySelector('.hb-bbs-image-text') ||
                     document.querySelector('.hb-bbs-post');
-            }, { timeout: 10000 }),
-            new Promise((_, reject) => setTimeout(() => reject(new Error('核心内容容器未找到')), 10000))
+            }, { timeout: 30000 }),
+            new Promise((_, reject) => setTimeout(() => reject(new Error('核心内容容器未找到')), 30000))
         ]);
         // 全面解析页面内容
         const postData = await page.evaluate(() => {
@@ -215,6 +219,7 @@ async function process(ctx, config, link, session) {
                 }
             }
             return {
+                // @ts-ignore
                 isImageTextType,
                 isPostType,
                 title,

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;
@@ -453,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;

package/package.json

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