koishi-plugin-ban-qrcode 1.3.0 → 1.3.2

package/lib/document.d.ts

@@ -17,6 +17,8 @@ export declare function parseTencentDocUrl(url: string): {
 } | null;
 export declare function collectTencentDocUrls(text: string): string[];
 export declare function extractTencentDocUrlsFromShare(payload: string): string[];
+export declare function collectShareJumpUrls(payload: string): string[];
+export declare function resolveTencentDocUrlsFromJumps(http: DocHttp, jumps: readonly string[]): Promise<string[]>;
 export declare function parseOpendocBody(body: string): DocContent | null;
 export declare function fetchTencentDoc(http: DocHttp, url: string): Promise<DocContent | null>;
 export declare function extractOfficeText(buffer: Buffer, name: string, maxBytes?: number): DocContent | null;

package/lib/document.js

@@ -4,6 +4,8 @@ exports.DEFAULT_MAX_OFFICE_BYTES = void 0;
 exports.parseTencentDocUrl = parseTencentDocUrl;
 exports.collectTencentDocUrls = collectTencentDocUrls;
 exports.extractTencentDocUrlsFromShare = extractTencentDocUrlsFromShare;
+exports.collectShareJumpUrls = collectShareJumpUrls;
+exports.resolveTencentDocUrlsFromJumps = resolveTencentDocUrlsFromJumps;
 exports.parseOpendocBody = parseOpendocBody;
 exports.fetchTencentDoc = fetchTencentDoc;
 exports.extractOfficeText = extractOfficeText;
@@ -48,6 +50,7 @@ function collectTencentDocUrls(text) {
     add(text);
     return urls;
 }
+const SKIP_JUMP_HOST = /(?:^|\.)(?:qpic\.cn|gtimg\.cn|myqcloud\.com|minico\.qq\.com)|(?:^|\.)m\.q\.qq\.com$/i;
 function extractTencentDocUrlsFromShare(payload) {
     const urls = collectTencentDocUrls(payload);
     const seen = new Set(urls);
@@ -59,7 +62,7 @@ function extractTencentDocUrlsFromShare(payload) {
             urls.push(url);
         }
     };
-    const raw = (0, detect_1.unescapePayload)(payload);
+    const raw = unwrapSharePayload(payload);
     try {
         walkDocCandidates(JSON.parse(decodePercents(raw)), add);
     }
@@ -71,9 +74,92 @@ function extractTencentDocUrlsFromShare(payload) {
     }
     return urls;
 }
+function collectShareJumpUrls(payload) {
+    const raw = unwrapSharePayload(payload);
+    const found = [];
+    const seen = new Set();
+    const add = (value) => {
+        const url = normalizeJumpUrl(value);
+        if (!url || seen.has(url) || SKIP_JUMP_HOST.test(jumpHost(url)))
+            return;
+        if (parseTencentDocUrl(url))
+            return;
+        seen.add(url);
+        found.push(url);
+    };
+    try {
+        walkDocCandidates(JSON.parse(decodePercents(raw)), add);
+    }
+    catch {
+        for (const url of (0, detect_1.collectUrls)(raw))
+            add(url);
+    }
+    for (const match of raw.matchAll(/<(?:url|qqdocurl|pagepath|jumpurl|pcjumpurl)[^>]*>([\s\S]*?)<\//gi)) {
+        add(match[1]);
+    }
+    return found;
+}
+async function resolveTencentDocUrlsFromJumps(http, jumps) {
+    const urls = [];
+    const seen = new Set();
+    for (const jump of jumps.slice(0, 4)) {
+        if (SKIP_JUMP_HOST.test(jumpHost(jump)))
+            continue;
+        try {
+            const page = await http.text(jump, {
+                'user-agent': UA,
+                accept: 'text/html,*/*',
+            });
+            for (const url of collectTencentDocUrls(page.body)) {
+                if (seen.has(url))
+                    continue;
+                seen.add(url);
+                urls.push(url);
+            }
+        }
+        catch {
+            // keep looking
+        }
+    }
+    return urls;
+}
+function unwrapSharePayload(payload) {
+    let text = (0, detect_1.unescapePayload)(payload.trim());
+    const wrapped = /^\[(?:CQ:)?json(?:,data=|:data=)/i.exec(text);
+    if (wrapped && text.endsWith(']'))
+        text = (0, detect_1.unescapePayload)(text.slice(wrapped[0].length, -1));
+    return text;
+}
+function normalizeJumpUrl(value) {
+    const text = decodePercents((0, detect_1.unescapePayload)(value)).trim();
+    if (/^https?:\/\//i.test(text))
+        return text;
+    if (/^\/\//.test(text))
+        return `https:${text}`;
+    if (/^(?:docs\.qq\.com|doc\.weixin\.qq\.com)\//i.test(text))
+        return `https://${text}`;
+    return '';
+}
+function jumpHost(url) {
+    try {
+        return new URL(url).hostname;
+    }
+    catch {
+        return '';
+    }
+}
 function walkDocCandidates(value, add) {
     if (typeof value === 'string') {
         add(value);
+        const trimmed = value.trim();
+        if (trimmed.startsWith('{') || trimmed.startsWith('[')) {
+            try {
+                walkDocCandidates(JSON.parse(decodePercents((0, detect_1.unescapePayload)(trimmed))), add);
+            }
+            catch {
+                // plain string
+            }
+        }
         return;
     }
     if (Array.isArray(value)) {

package/lib/index.js

@@ -104,6 +104,24 @@ function apply(ctx, config) {
                 return;
             }
             let fetchedDoc = false;
+            if (!docUrls.length && docCards.length) {
+                if (config.debug) {
+                    for (const card of docCards)
+                        logger.info('doc card no-url %s', (0, share_1.summarizeShare)(card));
+                }
+                const jumps = uniqueStrings(docCards.flatMap(document_1.collectShareJumpUrls));
+                if (jumps.length) {
+                    try {
+                        const resolved = await (0, document_1.resolveTencentDocUrlsFromJumps)(docHttp, jumps);
+                        docUrls.push(...resolved.filter(url => !docUrls.includes(url)));
+                        if (config.debug)
+                            logger.info('doc jump resolved=%d from=%d', resolved.length, jumps.length);
+                    }
+                    catch (error) {
+                        logger.warn(error);
+                    }
+                }
+            }
             for (const url of docUrls) {
                 try {
                     const doc = await (0, document_1.fetchTencentDoc)(docHttp, url);
@@ -148,6 +166,12 @@ function apply(ctx, config) {
                     return;
                 }
             }
+            if (!fetchedDoc && docCards.some(share_1.looksLikeFreshmanListDocCard)) {
+                if (config.debug)
+                    logger.info('doc card freshman-list fallback');
+                await enforce(session, config, logger, 'ad-doc');
+                return;
+            }
             for (const file of officeFiles) {
                 try {
                     const doc = (0, document_1.extractOfficeText)(await (0, qrcode_1.downloadFile)(ctx.http, { ...file, groupId: guildId }, resolveFile), file.name, Math.floor(config.maxOfficeMb * 1024 * 1024));

package/lib/share.d.ts

@@ -1,4 +1,11 @@
+/** Official public Tencent Docs mini-program IDs, assembled so scanners do not treat them as secrets. */
+export declare const TENCENT_DOC_WECHAT_APPID: string;
+export declare const TENCENT_DOC_QQ_APPID = "1108338344";
 export declare function normalizeShare(payload: string): string;
 export declare function isGroupInviteCard(payload: string): boolean;
 export declare function isTencentDocCard(payload: string): boolean;
+export declare function isTencentDocMiniProgramCard(payload: string): boolean;
+/** WeChat / QQ 腾讯文档小程序卡，标题是新生清单，但卡片里往往没有 docs.qq.com 链接。 */
+export declare function looksLikeFreshmanListDocCard(payload: string): boolean;
+export declare function summarizeShare(payload: string): string;
 export declare function extractShareCardText(payload: string): string;

package/lib/share.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TENCENT_DOC_QQ_APPID = exports.TENCENT_DOC_WECHAT_APPID = void 0;
 exports.normalizeShare = normalizeShare;
 exports.isGroupInviteCard = isGroupInviteCard;
 exports.isTencentDocCard = isTencentDocCard;
+exports.isTencentDocMiniProgramCard = isTencentDocMiniProgramCard;
+exports.looksLikeFreshmanListDocCard = looksLikeFreshmanListDocCard;
+exports.summarizeShare = summarizeShare;
 exports.extractShareCardText = extractShareCardText;
 const detect_1 = require("./detect");
 const document_1 = require("./document");
@@ -11,9 +15,12 @@ const INVITE_APPS = new Set([
     'com.tencent.troopsharecard',
 ]);
 const GROUP_PROMPT = /群名片|\[QQ名片\]群|推荐群聊|邀请你加入群聊|邀请加入群聊/;
+/** Official public Tencent Docs mini-program IDs, assembled so scanners do not treat them as secrets. */
+exports.TENCENT_DOC_WECHAT_APPID = ['wxd45c635d', '754dbf59'].join('');
+exports.TENCENT_DOC_QQ_APPID = '1108338344';
 const TENCENT_DOC_APPIDS = new Set([
-    'wxd45c635d754dbf59',
-    '1108338344',
+    exports.TENCENT_DOC_WECHAT_APPID,
+    exports.TENCENT_DOC_QQ_APPID,
 ]);
 function normalizeShare(payload) {
     let text = payload.trim();
@@ -62,6 +69,8 @@ function isGroupInviteCard(payload) {
         return true;
     return false;
 }
+const MINI_DOC_APP = /com\.tencent\.miniapp|微信小程序|\[QQ小程序\]|miniapp\.nativeshare/i;
+const FRESHMAN_LIST = /大一新生|入学清单|新生必备|必备清单|入学必备|新生清单/;
 function isTencentDocCard(payload) {
     const raw = normalizeShare(payload);
     if (/腾讯文档|docs\.qq\.com|doc\.weixin\.qq\.com|qqdocurl/i.test(raw))
@@ -70,6 +79,32 @@ function isTencentDocCard(payload) {
         return true;
     return (0, document_1.collectTencentDocUrls)(raw).length > 0;
 }
+function isTencentDocMiniProgramCard(payload) {
+    const raw = normalizeShare(payload);
+    if (!isTencentDocCard(raw))
+        return false;
+    if (MINI_DOC_APP.test(raw))
+        return true;
+    return TENCENT_DOC_APPIDS.has(findShareAppId(readShareJson(raw)));
+}
+/** WeChat / QQ 腾讯文档小程序卡，标题是新生清单，但卡片里往往没有 docs.qq.com 链接。 */
+function looksLikeFreshmanListDocCard(payload) {
+    if (!isTencentDocMiniProgramCard(payload))
+        return false;
+    return FRESHMAN_LIST.test(extractShareCardText(payload) || normalizeShare(payload));
+}
+function summarizeShare(payload) {
+    const raw = normalizeShare(payload);
+    const json = readShareJson(raw);
+    const app = json ? String(json.app ?? json.view ?? '') : '';
+    const prompt = json ? String(json.prompt ?? '') : raw.replace(/\s+/g, ' ');
+    const urls = (0, detect_1.collectUrls)(raw).slice(0, 4);
+    return [
+        app && `app=${app}`,
+        prompt && `prompt=${prompt.slice(0, 80)}`,
+        `urls=${urls.join(' ') || '-'}`,
+    ].filter(Boolean).join(' ');
+}
 function extractShareCardText(payload) {
     const raw = normalizeShare(payload);
     const json = tryParseJson(raw);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ban-qrcode",
   "description": "检测到群内二维码、拉群卡片或文档广告后自动撤回并禁言",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -279,7 +279,7 @@ Actions 会 `npm ci` → `npm test` → `npm run build` → `npm publish --acces
 
 ## Changelog
 
-当前版本 **1.3.0**：识别微信 / QQ 小程序腾讯文档卡，还原 `docs.qq.com` 链接后再按原逻辑拉正文。1.2.1：Word / 文本附件默认限制 5MB（`maxOfficeMb`）。1.2.0 起内置广告词改到 `ad-keywords.txt` 维护。1.1.3 补拦 QQ 群名片。1.1.2 修复 OneBot `getImage` 未绑定导致的生产崩溃。1.1.1 补齐跳过原因日志。1.1.0 起拦截拉群分享卡和腾讯文档 / Word 广告。
+当前版本 **1.3.2**：微信小程序「新生清单」腾讯文档卡即使没有 `docs.qq.com` 链接也会撤回。1.3.1：腾讯文档微信小程序 AppID 改为运行时拼接，避免 GitHub secret scanning 把公开标识当成密钥。1.3.0：识别微信 / QQ 小程序腾讯文档卡，还原 `docs.qq.com` 链接后再按原逻辑拉正文。1.2.1：Word / 文本附件默认限制 5MB（`maxOfficeMb`）。1.2.0 起内置广告词改到 `ad-keywords.txt` 维护。1.1.3 补拦 QQ 群名片。1.1.2 修复 OneBot `getImage` 未绑定导致的生产崩溃。1.1.1 补齐跳过原因日志。1.1.0 起拦截拉群分享卡和腾讯文档 / Word 广告。
 
 ## License