koishi-plugin-share-links-analysis 0.15.2 → 0.15.3

package/lib/index.js

@@ -98,6 +98,10 @@ exports.Config = koishi_1.Schema.intersect([
         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("当链接被阻止时提醒发送者"),
+        sensitiveMessage: koishi_1.Schema.string().role('textarea').default(`内容包含敏感信息，已停止解析
+如果你是管理员，你可以通过 help share 指令获取更多帮助`).description("内容被判定为敏感且当前会话不允许时返回的提示文案。"),
+        blockedMessage: koishi_1.Schema.string().role('textarea').default(`根据策略，该链接已被阻止解析：平台：{platform}
+如果你是管理员，你可以通过 help share 指令获取更多帮助`).description("链接被会话策略阻止时返回的提示文案。<br/>可用占位符: `{platform}`"),
     }).description("高级解析设置"),
     koishi_1.Schema.object({
         cookieCloud: koishi_1.Schema.object({
@@ -739,21 +743,33 @@ function apply(ctx, config) {
         ctx.setInterval(cleanExpiredCache, config.autoCleanInterval * 60 * 60 * 1000);
     }
     // 注册指令
+    /**
+     * 会话设置的管理权限：群聊要求管理员，私聊里会话本身就是自己的作用域
+     */
+    const canManageSettings = async (session) => {
+        if (!session.guildId)
+            return true;
+        if (!session.userId)
+            return false;
+        return await (0, utils_1.isUserAdmin)(session, session.userId);
+    };
     const cmd = ctx.command('share', '分享解析插件配置', { authority: 1 })
         .action(async ({ session }) => {
-        if (!session?.guildId || !session?.userId)
-            return '该指令只能在群组中使用。';
-        const { parsers, nsfw } = await (0, utils_1.getEffectiveSettings)(ctx, session.guildId, config);
+        const scope = session && (0, utils_1.getSettingsScope)(session);
+        if (!scope)
+            return '当前会话不可用。';
+        const { parsers, nsfw } = await (0, utils_1.getEffectiveSettings)(ctx, scope, config);
         const parserList = Object.entries(parsers)
             .map(([name, enabled]) => `${enabled ? '✅' : '❌'} ${name}`)
             .join('\n');
         return `当前解析器状态：\n${parserList}\nNSFW 内容：${nsfw ? '✅' : '❌'}`.trim();
     });
-    cmd.subcommand('.parsers [parser:string] [mode:string]', '查看/管理当前群的解析器状态', { authority: 1 })
+    cmd.subcommand('.parsers [parser:string] [mode:string]', '查看/管理当前会话的解析器状态', { authority: 1 })
         .action(async ({ session }, parser, value) => {
-        if (!session?.guildId || !session?.userId)
-            return '该指令只能在群组中使用。';
-        if (!await (0, utils_1.isUserAdmin)(session, session.userId))
+        const scope = session && (0, utils_1.getSettingsScope)(session);
+        if (!scope)
+            return '当前会话不可用。';
+        if (!await canManageSettings(session))
             return '权限不足';
         const isValidParser = (name) => core_1.parsers_str.includes(name);
         if (!isValidParser(parser))
@@ -761,29 +777,31 @@ function apply(ctx, config) {
         if (!value)
             return '请输入正确的模式';
         const mode = value.trim().toLowerCase() === 'true';
-        const data = await ctx.database.get('sla_group_settings', session.guildId);
+        const data = await ctx.database.get('sla_group_settings', scope);
         const final_parsers = { ...data[0]?.custom_parsers, ...{ [parser]: mode } };
-        const record = { guildId: session.guildId, custom_parsers: final_parsers };
+        const record = { guildId: scope, custom_parsers: final_parsers };
         await ctx.database.upsert('sla_group_settings', [record]);
     });
     cmd.subcommand('.nsfw [value:string]', '设置是否允许 NSFW 内容', { authority: 1 })
         .action(async ({ session }, value) => {
-        if (!session?.guildId || !session?.userId)
-            return '该指令只能在群组中使用。';
-        if (!await (0, utils_1.isUserAdmin)(session, session.userId))
+        const scope = session && (0, utils_1.getSettingsScope)(session);
+        if (!scope)
+            return '当前会话不可用。';
+        if (!await canManageSettings(session))
             return '权限不足';
         const mode = value.trim().toLowerCase() === 'true';
-        const record = { guildId: session.guildId, nsfw_enabled: mode };
+        const record = { guildId: scope, nsfw_enabled: mode };
         await ctx.database.upsert('sla_group_settings', [record]);
         await session.execute('share');
     });
     cmd.subcommand('.reset', '重置为全局默认设置', { authority: 1 })
         .action(async ({ session }) => {
-        if (!session?.guildId || !session?.userId)
-            return '该指令只能在群组中使用。';
-        if (!await (0, utils_1.isUserAdmin)(session, session.userId))
+        const scope = session && (0, utils_1.getSettingsScope)(session);
+        if (!scope)
+            return '当前会话不可用。';
+        if (!await canManageSettings(session))
             return '权限不足';
-        await ctx.database.remove('sla_group_settings', { guildId: session.guildId });
+        await ctx.database.remove('sla_group_settings', { guildId: scope });
         return '已重置为全局默认设置。';
     });
     cmd.subcommand('.migratecache', '迁移旧解析缓存到新时间线并校验', { authority: 4 })
@@ -1110,22 +1128,13 @@ function apply(ctx, config) {
             return next();
         let linkCount = 0;
         for (const link of links) {
-            if (session.guildId) {
-                const settings = await (0, utils_1.getEffectiveSettings)(ctx, session.guildId, config);
-                if (!settings.parsers[link.platform]) {
-                    logger.debug(`根据策略，该链接已被阻止解析：平台：${link.platform}，链接：${link.url}`);
-                    if (config.showError)
-                        await session.send(`根据策略，该链接已被阻止解析：平台：${link.platform}\n如果你是管理员，你可以通过#help share指令获取更多帮助`);
-                    continue;
-                }
-            }
-            else {
-                if (!config.default_parsers[link.platform]) {
-                    logger.debug(`根据策略，该链接已被阻止解析：平台：${link.platform}，链接：${link.url}`);
-                    if (config.showError)
-                        await session.send(`根据策略，该链接已被阻止解析：平台：${link.platform}`);
-                    continue;
-                }
+            // 会话策略（群组自定义或全局默认）在解析前后都要用到，这里取一次
+            const settings = await (0, utils_1.getEffectiveSettings)(ctx, (0, utils_1.getSettingsScope)(session), config);
+            if (!settings.parsers[link.platform]) {
+                logger.debug(`根据策略，该链接已被阻止解析：平台：${link.platform}，链接：${link.url}`);
+                if (config.showError)
+                    await session.send(config.blockedMessage.replace(/\{platform\}/g, link.platform));
+                continue;
             }
             if (linkCount >= config.parseLimit) {
                 await session.send("已达到单次解析上限…");
@@ -1292,6 +1301,15 @@ function apply(ctx, config) {
                 }
                 if (result) {
                     lastProcessedUrls[channelId][link.url] = Date.now();
+                    // 敏感内容在会话层统一拦截：解析结果来自缓存时同样要过这一关
+                    if (result.sensitive && !settings.nsfw) {
+                        result = {
+                            ...result,
+                            mainbody: (0, utils_1.escapeHtml)(config.sensitiveMessage),
+                            coverUrl: undefined,
+                            files: []
+                        };
+                    }
                     await (0, utils_1.sendResult)(ctx, session, config, result, logger, sendStats);
                 }
                 else {

package/lib/parsers/twitter.js

@@ -43,7 +43,7 @@ async function match(content, ctx, config) {
         rule.pattern.lastIndex = 0;
         while ((m = rule.pattern.exec(content)) !== null) {
             const id = m[2] || m[1];
-            const url = rule.type === 'short' ? `https://t.co/${id}` : `https://x.com/${m[1]}/status/${id}`;
+            const url = rule.type === 'short' ? `https://t.co/${id}` : `https://x.com/i/status/${id}`;
             initialLinks.push({ platform: exports.name, type: rule.type, id, url });
         }
     }
@@ -99,7 +99,7 @@ async function processTweetText(ctx, text, tweetId, data, config) {
             });
         }
     }
-    // 2. 扫描并处理残留的 t.co 短链 (适用于 VxTwitter API 或上一步没清理干净的情况)
+    // 2. 扫描并处理残留的 t.co 短链 (上一步没清理干净的情况)
     const tcoRegex = /https:\/\/t\.co\/\w+/g;
     const matches = processedText.match(tcoRegex);
     if (matches) {
@@ -211,30 +211,57 @@ function extractTweetContent(data, config) {
     };
 }
 /**
- * 从 VxTwitter API 数据对象中提取内容
- * 适用于 api.vxtwitter.com 数据结构
+ * 将 FxTwitter 的 raw_text.facets 转换为 entities 结构，供 processTweetText 复用：
+ * media 段用于剔除附件链接，url 段用于替换为展开后的地址
  */
-function extractVxContent(data) {
+function facetsToEntities(tweet) {
+    const entities = {};
+    const facets = tweet?.raw_text?.facets;
+    if (!Array.isArray(facets))
+        return entities;
+    const media = facets
+        .filter((f) => f?.type === 'media' && f.original)
+        .map((f) => ({ url: f.original }));
+    const urls = facets
+        .filter((f) => f?.type === 'url' && f.original && f.replacement)
+        .map((f) => ({ url: f.original, expanded_url: f.replacement }));
+    if (media.length > 0)
+        entities.media = media;
+    if (urls.length > 0)
+        entities.urls = urls;
+    return entities;
+}
+/**
+ * 从 FxTwitter API 数据对象中提取内容
+ * 适用于 api.fxtwitter.com 的 tweet 结构
+ */
+function extractFxContent(tweet) {
     const images = [];
     const files = [];
     let videoPoster = '';
-    if (data.media_extended && Array.isArray(data.media_extended)) {
-        for (const media of data.media_extended) {
-            if (media.type === 'image') {
-                images.push(media.url);
-            }
-            else if (media.type === 'video' || media.type === 'gif') {
-                files.push(createTwitterVideoFile(media.url));
-                if (!videoPoster && media.thumbnail_url) {
-                    videoPoster = media.thumbnail_url;
-                }
-            }
+    const mediaList = Array.isArray(tweet?.media?.all) && tweet.media.all.length > 0
+        ? tweet.media.all
+        : [...(tweet?.media?.photos ?? []), ...(tweet?.media?.videos ?? [])];
+    // 同一视频可能返回多种格式，优先取 mp4
+    const videos = mediaList.filter((m) => ['video', 'gif', 'animated_gif'].includes(m?.type));
+    const mp4Videos = videos.filter((m) => !m.format || m.format === 'mp4');
+    const pickedVideos = mp4Videos.length > 0 ? mp4Videos : videos;
+    for (const media of mediaList) {
+        if (media?.type === 'photo' && media.url)
+            images.push(media.url);
+    }
+    for (const media of pickedVideos) {
+        const videoUrl = media.url || media.src;
+        if (videoUrl && !files.some(f => f.url === videoUrl)) {
+            files.push(createTwitterVideoFile(videoUrl));
         }
+        if (!videoPoster)
+            videoPoster = media.thumbnail_url || media.poster || media.thumbnail || '';
     }
     return {
-        text: data.text || '',
-        screenName: data.user_screen_name || 'unknown',
-        authorName: data.user_name || 'Unknown',
+        text: tweet?.raw_text?.text ?? tweet?.text ?? '',
+        screenName: tweet?.author?.screen_name || 'unknown',
+        authorName: tweet?.author?.name || 'Unknown',
         images,
         files,
         cover: videoPoster
@@ -286,22 +313,6 @@ async function handleSyndicationFallback(ctx, config, tweetId, session) {
             }
             files.push(...quote.files);
         }
-        // 敏感内容检查
-        const settings = await (0, utils_1.getEffectiveSettings)(ctx, session.guildId, config);
-        if (data.possibly_sensitive && !settings.nsfw) {
-            if (config.showError)
-                await session.send('内容包含敏感信息，已停止解析\n如果你是管理员，你可以通过#help share指令获取更多帮助');
-            return {
-                platform: exports.name,
-                title: `@${screenName} 的推文`,
-                authorName,
-                mainbody: (0, utils_1.escapeHtml)("内容包含敏感信息，已停止解析\n如果你是管理员，你可以通过#help share指令获取更多帮助"),
-                sourceUrl: `https://x.com/${screenName}/status/${tweetId}`,
-                stats: statsString,
-                files: [],
-                coverUrl
-            };
-        }
         return {
             platform: exports.name,
             title: `@${screenName} 的推文`,
@@ -310,7 +321,8 @@ async function handleSyndicationFallback(ctx, config, tweetId, session) {
             sourceUrl: `https://x.com/${screenName}/status/${tweetId}`,
             stats: statsString,
             files,
-            coverUrl
+            coverUrl,
+            sensitive: !!data.possibly_sensitive
         };
     }
     catch (e) {
@@ -325,10 +337,10 @@ async function handleSyndicationFallback(ctx, config, tweetId, session) {
 async function process(ctx, config, link, session) {
     const logger = ctx.logger(`share-links-analysis:${exports.name}`);
     const tweetId = link.id;
-    // 首选: VxTwitter API
+    // 首选: FxTwitter API
     try {
-        const apiUrl = `https://api.vxtwitter.com/Twitter/status/${tweetId}`;
-        logger.debug(`请求 VxAPI: ${apiUrl}`);
+        const apiUrl = `https://api.fxtwitter.com/status/${tweetId}`;
+        logger.debug(`请求 FxTwitter API: ${apiUrl}`);
         const reqOptions = {
             headers: {
                 'User-Agent': config.userAgent
@@ -336,12 +348,16 @@ async function process(ctx, config, link, session) {
         };
         if (config.proxy)
             reqOptions.proxyAgent = config.proxy;
-        const data = await ctx.http.get(apiUrl, reqOptions);
-        if (!data)
-            throw new Error('VxAPI 返回无效');
-        const main = extractVxContent(data);
-        const statsString = `点赞: ${(0, utils_1.numeral)(data.likes, config)} | 评论: ${(0, utils_1.numeral)(data.replies, config)} | 转发: ${(0, utils_1.numeral)(data.retweets, config)}`;
-        let processedMainText = await processTweetText(ctx, main.text, tweetId, data, config);
+        const payload = await ctx.http.get(apiUrl, reqOptions);
+        if (!payload || payload.code !== 200 || !payload.tweet) {
+            const apiError = new Error(`FxTwitter API 返回无效 (code: ${payload?.code ?? 'none'}, message: ${payload?.message ?? 'none'})`);
+            apiError.apiCode = payload?.code;
+            throw apiError;
+        }
+        const tweet = payload.tweet;
+        const main = extractFxContent(tweet);
+        const statsString = `点赞: ${(0, utils_1.numeral)(tweet.likes, config)} | 评论: ${(0, utils_1.numeral)(tweet.replies, config)} | 转发: ${(0, utils_1.numeral)(tweet.retweets, config)}`;
+        let processedMainText = await processTweetText(ctx, main.text, tweetId, { entities: facetsToEntities(tweet) }, config);
         let mainbody = (0, utils_1.escapeHtml)(processedMainText);
         if (main.images.length > 0) {
             mainbody += '\n' + main.images.map(img => koishi_1.h.image(img).toString()).join('\n');
@@ -349,32 +365,17 @@ async function process(ctx, config, link, session) {
         const files = [...main.files];
         const coverUrl = main.cover;
         // 解析引用推文
-        let quoteData = data.qrt;
+        const quoteData = tweet.quote;
         if (quoteData) {
-            // 兼容各种返回结构中的 ID 字段
-            const quoteId = quoteData.tweetID || quoteData.tweet_id || "unknown";
-            const quote = extractVxContent(quoteData);
-            const processedQuoteText = await processTweetText(ctx, quote.text, quoteId, quoteData, config);
+            const quoteId = quoteData.id || "unknown";
+            const quote = extractFxContent(quoteData);
+            const processedQuoteText = await processTweetText(ctx, quote.text, quoteId, { entities: facetsToEntities(quoteData) }, config);
             mainbody += `\n----------\n[引用 @${quote.screenName}]: ${(0, utils_1.escapeHtml)(processedQuoteText)}`;
             if (quote.images.length > 0) {
                 mainbody += '\n' + quote.images.map(img => koishi_1.h.image(img).toString()).join('\n');
             }
             files.push(...quote.files);
         }
-        // 敏感内容检查 (VxTwitter 返回 possibly_sensitive)
-        const settings = await (0, utils_1.getEffectiveSettings)(ctx, session.guildId, config);
-        if (data.possibly_sensitive && !settings.nsfw) {
-            return {
-                platform: exports.name,
-                title: `@${main.screenName} 的推文`,
-                authorName: main.authorName,
-                mainbody: (0, utils_1.escapeHtml)("内容包含敏感信息，已停止解析\n如果你是管理员，你可以通过#help share指令获取更多帮助"),
-                sourceUrl: `https://x.com/${main.screenName}/status/${tweetId}`,
-                stats: statsString,
-                files: [],
-                coverUrl
-            };
-        }
         return {
             platform: exports.name,
             title: `@${main.screenName} 的推文`,
@@ -383,16 +384,16 @@ async function process(ctx, config, link, session) {
             sourceUrl: `https://x.com/${main.screenName}/status/${tweetId}`,
             stats: statsString,
             files,
-            coverUrl
+            coverUrl,
+            sensitive: !!tweet.possibly_sensitive
         };
     }
     catch (error) {
-        // 如果是 429 (Rate Limit) 或其他非 404 错误，尝试 Fallback 到 Syndication
-        // 404 通常意味着推文真的没了
-        const isNotFound = error.response?.status === 404;
+        // 404 表示推文不存在（HTTP 层或 API 层），其余错误尝试 Fallback 到 Syndication
+        const isNotFound = error.response?.status === 404 || error.apiCode === 404;
         if (!isNotFound) {
             const causeDetail = error.cause ? ` (cause: ${error.cause.code || error.cause.message || error.cause})` : '';
-            logger.warn(`VxTwitter API 失败 (${error.message}${causeDetail})，尝试 Syndication API Fallback...`);
+            logger.warn(`FxTwitter API 失败 (${error.message}${causeDetail})，尝试 Syndication API Fallback...`);
             try {
                 return await handleSyndicationFallback(ctx, config, tweetId, session);
             }
@@ -406,7 +407,7 @@ async function process(ctx, config, link, session) {
             logger.error(`Twitter 解析失败: ${error.message}`);
         }
         // 最终错误处理
-        if (error.response?.status === 404) {
+        if (isNotFound) {
             await session.send('推文不存在或已被删除');
         }
         else if (error.response?.status === 429) {