koishi-plugin-ban-qrcode 1.1.2 → 1.1.3

package/lib/detect.d.ts

@@ -27,6 +27,8 @@ export type SkipReason = 'direct' | 'no-guild' | 'no-user' | 'guild-filter' | 's
 export interface FileRef {
     src: string;
     name: string;
+    fileId?: string;
+    busid?: number;
 }
 export interface MessageParts {
     images: string[];

package/lib/detect.js

@@ -55,6 +55,10 @@ const SHARE_TYPES = new Set([
     'onebot:xml',
     'onebot:share',
 ]);
+const CONTACT_TYPES = new Set([
+    'contact',
+    'onebot:contact',
+]);
 const FILE_TYPES = new Set(['file']);
 const OFFICE_FILE = /\.(docx?|txt)$/i;
 function collectImageSrcs(nodes) {
@@ -95,14 +99,24 @@ function collectMessageParts(nodes, extra = '') {
                     texts.push(content);
             }
             if (SHARE_TYPES.has(node.type)) {
-                addShare(node.attrs?.data ?? node.attrs?.content ?? node.attrs?.value);
+                addShare(unwrapShareData(node.attrs?.data ?? node.attrs?.content ?? node.attrs?.value));
+            }
+            if (CONTACT_TYPES.has(node.type)) {
+                addShare(node.attrs);
             }
             if (FILE_TYPES.has(node.type)) {
-                const src = pickSrc(node.attrs);
-                const name = String(node.attrs?.filename ?? node.attrs?.name ?? node.attrs?.file ?? '');
-                if (src && !seenFile.has(src)) {
-                    seenFile.add(src);
-                    files.push({ src, name });
+                const fileId = pickFileId(node.attrs);
+                const src = pickSrc(node.attrs) ?? fileId;
+                const name = String(node.attrs?.filename ?? node.attrs?.name ?? node.attrs?.file_name ?? node.attrs?.file ?? '');
+                if (src && !seenFile.has(fileId || src)) {
+                    seenFile.add(fileId || src);
+                    const busid = pickBusid(node.attrs);
+                    files.push({
+                        src,
+                        name,
+                        ...(fileId ? { fileId } : {}),
+                        ...(busid !== undefined ? { busid } : {}),
+                    });
                 }
             }
             if (node.children?.length)
@@ -117,6 +131,8 @@ function collectMessageParts(nodes, extra = '') {
             addShare(match[1]);
         for (const match of extra.matchAll(/\[(?:CQ:)?xml(?:,data=|:data=)([\s\S]+?)\]/gi))
             addShare(match[1]);
+        for (const match of extra.matchAll(/\[(?:CQ:)?contact(?:,|\.)[^\]]+\]/gi))
+            addShare(match[0]);
         for (const match of extra.matchAll(/<(?:json|xml|onebot:json|onebot:xml)\s[^>]*\bdata="([^"]+)"/gi)) {
             addShare(decodeEntities(match[1]));
         }
@@ -152,20 +168,35 @@ function decodeEntities(text) {
         .replace(/&amp;/g, '&')
         .replace(/&#39;/g, "'")
         .replace(/&lt;/g, '<')
-        .replace(/&gt;/g, '>');
+        .replace(/&gt;/g, '>')
+        .replace(/&#44;/g, ',')
+        .replace(/&#91;/g, '[')
+        .replace(/&#93;/g, ']');
 }
 function stringifyShare(raw) {
-    if (raw && typeof raw === 'object') {
+    const unwrapped = unwrapShareData(raw);
+    if (unwrapped && typeof unwrapped === 'object') {
         try {
-            return JSON.stringify(raw);
+            return JSON.stringify(unwrapped);
         }
         catch {
             return undefined;
         }
     }
-    if (typeof raw !== 'string' || !raw.trim())
+    if (typeof unwrapped !== 'string' || !unwrapped.trim())
         return undefined;
-    return unescapePayload(raw.trim());
+    return unescapePayload(unwrapped.trim());
+}
+function unwrapShareData(raw) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw))
+        return raw;
+    const record = raw;
+    if (typeof record.app === 'string')
+        return raw;
+    if (typeof record.data === 'string' && record.data.trim().startsWith('{')) {
+        return unescapePayload(record.data.trim());
+    }
+    return raw;
 }
 function isDownloadableSrc(src) {
     return /^(https?:|data:|file:)/i.test(src);
@@ -184,6 +215,23 @@ function pickSrc(attrs) {
         .map(value => value.trim());
     return values.find(isDownloadableSrc) ?? values[0];
 }
+function pickFileId(attrs) {
+    const values = [attrs?.file_id, attrs?.fileId]
+        .filter((value) => typeof value === 'string' && Boolean(value.trim()))
+        .map(value => value.trim());
+    return values[0];
+}
+function pickBusid(attrs) {
+    const value = attrs?.busid ?? attrs?.busId;
+    if (typeof value === 'number' && Number.isFinite(value))
+        return value;
+    if (typeof value === 'string' && value.trim()) {
+        const parsed = Number(value);
+        if (Number.isFinite(parsed))
+            return parsed;
+    }
+    return undefined;
+}
 function collectUrlsFromJson(raw) {
     let value = raw;
     if (typeof raw === 'string') {

package/lib/index.js

@@ -26,7 +26,7 @@ exports.Config = koishi_1.Schema.object({
     ignoreUsers: koishi_1.Schema.array(koishi_1.Schema.string()).role('table').default([]).description('忽略的用户 ID。'),
     guilds: koishi_1.Schema.array(koishi_1.Schema.string()).role('table').default([]).description('只在这些群生效。留空表示全部群。'),
     scanQrcode: koishi_1.Schema.boolean().default(true).description('扫描图片二维码。'),
-    scanGroupInvite: koishi_1.Schema.boolean().default(true).description('拦截邀请 / 推荐群聊分享卡。'),
+    scanGroupInvite: koishi_1.Schema.boolean().default(true).description('拦截邀请 / 推荐群聊 / 群名片分享卡。'),
     scanDocs: koishi_1.Schema.boolean().default(true).description('检查腾讯文档和 Word / 文本附件里的广告。'),
     adKeywords: koishi_1.Schema.array(koishi_1.Schema.string()).role('table').default([]).description('额外广告关键词。命中即撤回。'),
     debug: koishi_1.Schema.boolean().default(true).description('输出调试日志：跳过原因、消息结构、下载/扫码/文档结果。'),
@@ -58,7 +58,9 @@ function apply(ctx, config) {
         const docUrls = config.scanDocs
             ? (0, document_1.collectTencentDocUrls)([parts.text, ...parts.shares, ...parts.urls].join('\n'))
             : [];
-        const officeFiles = config.scanDocs ? parts.files.filter(file => (0, detect_1.isOfficeFile)(file.name)) : [];
+        const officeFiles = config.scanDocs
+            ? parts.files.filter(file => (0, detect_1.isOfficeFile)(file.name) || (0, detect_1.isOfficeFile)(file.src))
+            : [];
         const docCards = config.scanDocs ? parts.shares.filter(share_1.isTencentDocCard) : [];
         const docCardText = docCards.map(share_1.extractShareCardText).filter(Boolean).join('\n');
         const needInvite = config.scanGroupInvite && parts.shares.some(share_1.isGroupInviteCard);
@@ -69,7 +71,8 @@ function apply(ctx, config) {
         }
         if (!needInvite && !needQr && !needDocs)
             return;
-        const resolveFile = (0, qrcode_1.createFileResolver)(session.bot);
+        const guildId = (0, detect_1.resolveGuildId)(moderate);
+        const resolveFile = (0, qrcode_1.createFileResolver)(session.bot, guildId);
         const download = (src) => (0, qrcode_1.downloadImage)(ctx.http, src, resolveFile);
         try {
             if (needInvite) {
@@ -143,7 +146,7 @@ function apply(ctx, config) {
             }
             for (const file of officeFiles) {
                 try {
-                    const doc = (0, document_1.extractOfficeText)(await download(file.src), file.name);
+                    const doc = (0, document_1.extractOfficeText)(await (0, qrcode_1.downloadFile)(ctx.http, { ...file, groupId: guildId }, resolveFile), file.name);
                     const ad = doc ? (0, ad_1.detectAdContent)(doc.text, doc.title || file.name, config.adKeywords) : null;
                     if (config.debug)
                         logger.info('office %s ad=%s', file.name, Boolean(ad));
@@ -154,7 +157,7 @@ function apply(ctx, config) {
                 }
                 catch (error) {
                     if (config.debug)
-                        logger.info('office error %s', file.name);
+                        logger.info('office error %s %s', file.name, errorMessage(error));
                     logger.warn(error);
                 }
             }
@@ -227,6 +230,9 @@ function createDocHttp(http) {
         },
     };
 }
+function errorMessage(error) {
+    return error instanceof Error && error.message ? error.message : 'unknown';
+}
 function cookiesFromHeaders(headers) {
     const parts = typeof headers.getSetCookie === 'function'
         ? headers.getSetCookie()

package/lib/qrcode.d.ts

@@ -1,4 +1,5 @@
 import { HTTP } from 'koishi';
+import { FileRef } from './detect';
 type WechatScan = (input: {
     data: Uint8ClampedArray;
     width: number;
@@ -6,13 +7,21 @@ type WechatScan = (input: {
 }) => Promise<{
     text?: string | null;
 } | null | undefined>;
+export type FileDownload = FileRef & {
+    groupId?: string;
+};
 type FileInternal = {
     getImage?(src: string): unknown;
+    getFile?(...args: unknown[]): unknown;
+    get_file?(...args: unknown[]): unknown;
+    getGroupFileUrl?(...args: unknown[]): unknown;
+    get_group_file_url?(...args: unknown[]): unknown;
 };
 export declare function createFileResolver(bot: {
     internal?: FileInternal;
-}): (src: string) => Promise<Buffer | string | null>;
+}, groupId?: string): (input: string | FileDownload) => Promise<Buffer | string | null>;
 export declare function downloadImage(http: HTTP, src: string, resolveFile?: (src: string) => Promise<Buffer | string | null>): Promise<Buffer>;
+export declare function downloadFile(http: HTTP, file: FileDownload, resolveFile?: (file: FileDownload) => Promise<Buffer | string | null>): Promise<Buffer>;
 export declare function decodeQr(buffer: Buffer): Promise<string | null>;
 export declare function warmupQrDecoder(): Promise<WechatScan | null>;
 export {};

package/lib/qrcode.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFileResolver = createFileResolver;
 exports.downloadImage = downloadImage;
+exports.downloadFile = downloadFile;
 exports.decodeQr = decodeQr;
 exports.warmupQrDecoder = warmupQrDecoder;
 const promises_1 = require("node:fs/promises");
@@ -14,26 +15,17 @@ const jsqr_1 = __importDefault(require("jsqr"));
 const detect_1 = require("./detect");
 let wechatScan;
 let wechatLoad;
-function createFileResolver(bot) {
-    return async (src) => {
+function createFileResolver(bot, groupId) {
+    return async (input) => {
         const internal = bot.internal;
         if (!internal)
             return null;
+        const file = typeof input === 'string' ? { src: input, name: input } : input;
         try {
-            const info = unwrapFileInfo(await internal.getImage?.(src));
-            if (!info)
-                return null;
-            if (typeof info.base64 === 'string' && info.base64) {
-                return Buffer.from(info.base64, 'base64');
+            if ((0, detect_1.isOfficeFile)(file.name) || (0, detect_1.isOfficeFile)(file.src)) {
+                return await resolveOfficeFile(internal, { ...file, groupId: file.groupId ?? groupId });
             }
-            if (typeof info.url === 'string' && (0, detect_1.isDownloadableSrc)(info.url))
-                return info.url;
-            if (typeof info.file === 'string' && info.file) {
-                if ((0, detect_1.isDownloadableSrc)(info.file))
-                    return info.file;
-                return (0, promises_1.readFile)(info.file);
-            }
-            return null;
+            return await resolveFromInfo(unwrapFileInfo(await internal.getImage?.(file.src)));
         }
         catch {
             return null;
@@ -41,6 +33,13 @@ function createFileResolver(bot) {
     };
 }
 async function downloadImage(http, src, resolveFile) {
+    return downloadBuffer(http, src, resolveFile, 'cannot download image');
+}
+async function downloadFile(http, file, resolveFile) {
+    return downloadBuffer(http, file, resolveFile, 'cannot download file');
+}
+async function downloadBuffer(http, target, resolveFile, fallback) {
+    const src = typeof target === 'string' ? target : target.src;
     let lastError;
     const remote = /^https?:/i.test(src);
     if ((0, detect_1.isDownloadableSrc)(src)) {
@@ -51,23 +50,23 @@ async function downloadImage(http, src, resolveFile) {
             lastError = error;
         }
         if (!remote) {
-            throw lastError instanceof Error ? lastError : new Error('cannot download image');
+            throw lastError instanceof Error ? lastError : new Error(fallback);
         }
     }
     if (resolveFile) {
         try {
-            const resolved = await resolveFile(src);
+            const resolved = await resolveFile(target);
             if (Buffer.isBuffer(resolved))
                 return resolved;
             if (typeof resolved === 'string' && resolved && resolved !== src) {
-                return downloadDirect(http, resolved);
+                return (0, detect_1.isDownloadableSrc)(resolved) ? downloadDirect(http, resolved) : (0, promises_1.readFile)(resolved);
             }
         }
         catch (error) {
             lastError = lastError ?? error;
         }
     }
-    throw lastError instanceof Error ? lastError : new Error('cannot download image');
+    throw lastError instanceof Error ? lastError : new Error(fallback);
 }
 async function downloadDirect(http, src) {
     if (src.startsWith('data:')) {
@@ -85,6 +84,76 @@ async function downloadDirect(http, src) {
     }
     return Buffer.from(await http.get(src, { responseType: 'arraybuffer' }));
 }
+async function resolveOfficeFile(internal, file) {
+    const keys = uniqueKeys([
+        file.fileId,
+        file.src && !(0, detect_1.isDownloadableSrc)(file.src) ? file.src : undefined,
+    ]);
+    for (const key of keys) {
+        const fromFile = await firstResolved([
+            () => internal.getFile?.({ file: key }),
+            () => internal.get_file?.({ file: key }),
+        ]);
+        if (fromFile)
+            return fromFile;
+    }
+    const groupId = file.groupId;
+    if (!groupId)
+        return null;
+    const busid = file.busid ?? 102;
+    const gid = /^\d+$/.test(groupId) ? Number(groupId) : groupId;
+    for (const key of keys) {
+        const payload = { group_id: gid, file_id: key, busid };
+        const fromUrl = await firstResolved([
+            () => internal.getGroupFileUrl?.(payload),
+            () => internal.get_group_file_url?.(payload),
+            () => internal.getGroupFileUrl?.(gid, key, busid),
+            () => internal.get_group_file_url?.(gid, key, busid),
+        ]);
+        if (fromUrl)
+            return fromUrl;
+    }
+    return null;
+}
+async function firstResolved(calls) {
+    for (const call of calls) {
+        try {
+            const result = await resolveFromInfo(unwrapFileInfo(await call()));
+            if (result)
+                return result;
+        }
+        catch {
+            // adapter methods may be missing or reject; try the next one
+        }
+    }
+    return null;
+}
+async function resolveFromInfo(info) {
+    if (!info)
+        return null;
+    if (typeof info.base64 === 'string' && info.base64) {
+        return Buffer.from(info.base64, 'base64');
+    }
+    if (typeof info.url === 'string' && (0, detect_1.isDownloadableSrc)(info.url))
+        return info.url;
+    if (typeof info.file === 'string' && info.file) {
+        if ((0, detect_1.isDownloadableSrc)(info.file))
+            return info.file;
+        return (0, promises_1.readFile)(info.file);
+    }
+    return null;
+}
+function uniqueKeys(values) {
+    const seen = new Set();
+    const keys = [];
+    for (const value of values) {
+        if (!value || seen.has(value))
+            continue;
+        seen.add(value);
+        keys.push(value);
+    }
+    return keys;
+}
 async function decodeQr(buffer) {
     const image = await prepareImage(buffer);
     const { data, width, height } = image.bitmap;
@@ -121,6 +190,9 @@ function loadWechatScan() {
     return wechatLoad;
 }
 function unwrapFileInfo(value) {
+    if (typeof value === 'string' && value) {
+        return (0, detect_1.isDownloadableSrc)(value) ? { url: value } : { file: value };
+    }
     if (!value || typeof value !== 'object')
         return null;
     const record = value;

package/lib/share.js

@@ -9,6 +9,7 @@ const INVITE_APPS = new Set([
     'com.tencent.qun.invite',
     'com.tencent.troopsharecard',
 ]);
+const GROUP_PROMPT = /群名片|\[QQ名片\]群|推荐群聊|邀请你加入群聊|邀请加入群聊/;
 function normalizeShare(payload) {
     let text = payload.trim();
     const wrapped = /^\[(?:CQ:)?json(?:,data=|:data=)/i.exec(text);
@@ -18,8 +19,12 @@ function normalizeShare(payload) {
 }
 function isGroupInviteCard(payload) {
     const raw = normalizeShare(payload);
-    const json = tryParseJson(raw);
+    if (isContactGroupSegment(raw))
+        return true;
+    const json = readShareJson(raw);
     if (json) {
+        if (isContactGroupRecord(json))
+            return true;
         const app = String(json.app ?? '');
         if (INVITE_APPS.has(app))
             return true;
@@ -28,22 +33,25 @@ function isGroupInviteCard(payload) {
             return true;
         const contact = isRecord(json.meta) ? json.meta.contact : undefined;
         if (isRecord(contact)) {
-            if (contact.tag === '推荐好友' || String(contact.jumpUrl ?? '').includes('source=sharecard'))
-                return false;
-            if (contact.tag === '群名片')
-                return true;
-            if (String(contact.jumpUrl ?? '').includes('card_type=group'))
-                return true;
-            if (String(contact.pcJumpUrl ?? '').includes('groupwpa'))
+            const jumpUrl = String(contact.jumpUrl ?? '');
+            const pcJumpUrl = String(contact.pcJumpUrl ?? '');
+            const avatar = String(contact.avatar ?? '');
+            if (contact.tag === '群名片'
+                || jumpUrl.includes('card_type=group')
+                || pcJumpUrl.includes('groupwpa')
+                || avatar.includes('p.qlogo.cn/gh/'))
                 return true;
+            if (contact.tag === '推荐好友' || jumpUrl.includes('source=sharecard'))
+                return false;
         }
         const prompt = String(json.prompt ?? '');
-        if (/群名片\s*:/.test(prompt) || /推荐群聊|邀请你加入群聊|邀请加入群聊/.test(prompt))
+        const desc = String(json.desc ?? '');
+        if (GROUP_PROMPT.test(prompt) || GROUP_PROMPT.test(desc))
             return true;
         if (bizsrc.includes('cardshare'))
             return false;
     }
-    if (/brief=["']\[推荐群\]["']|brief=["']\[邀请加群\]["']/.test(raw))
+    if (/brief=["']\[(?:推荐群|邀请加群|群名片)\]["']/.test(raw))
         return true;
     if ((/邀请你加入群聊|邀请加入群聊/.test(raw)) && (/serviceID=/.test(raw) || /com\.tencent\.qun/.test(raw)))
         return true;
@@ -98,6 +106,30 @@ function extractShareCardText(payload) {
     add(/<desc[^>]*>([^<]+)/i.exec(raw)?.[1]);
     return chunks.join('\n');
 }
+function readShareJson(text) {
+    const json = tryParseJson(text);
+    if (!json)
+        return null;
+    if (typeof json.app === 'string')
+        return json;
+    if (typeof json.data === 'string') {
+        const inner = tryParseJson(normalizeShare(json.data));
+        if (inner)
+            return inner;
+    }
+    return json;
+}
+function isContactGroupSegment(raw) {
+    return /\[(?:CQ:)?contact(?:,|\.)[^\]]*type=group/i.test(raw);
+}
+function isContactGroupRecord(json) {
+    const type = String(json.type ?? '').toLowerCase();
+    if (type !== 'group' && type !== '群')
+        return false;
+    if (json.app)
+        return false;
+    return Boolean(json.id || json.qq || json.uin);
+}
 function tryParseJson(text) {
     try {
         const value = JSON.parse(text);

package/package.json

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

package/readme.md

@@ -73,7 +73,7 @@ npm run build
 
 1. 只处理群聊，忽略私聊和机器人自己的消息
 2. 图片二维码：收集 `img` / `image`，下载后解码
-3. 拉群卡片：识别 `json` / `xml` 分享卡（`com.tencent.qun.invite`、群名片、`[推荐群]` 等）
+3. 拉群卡片：识别 `json` / `xml` / `contact` 分享卡（`com.tencent.qun.invite`、群名片、`[推荐群]` 等）
 4. 文档广告：从文本、分享卡里取出 `docs.qq.com` 链接，或下载 `.doc` / `.docx` / `.txt`，识别夹带的推销文案（例如校园床品「送货到寝」）
 5. 文档里的图也会再扫一遍二维码
 
@@ -275,7 +275,7 @@ Actions 会 `npm ci` → `npm test` → `npm run build` → `npm publish --acces
 
 ## Changelog
 
-当前版本 **1.1.2**：修复 OneBot `getImage` 未绑定导致的生产崩溃，扫码失败不再跳过腾讯文档检测；文档分享卡按广告关键词兜底，而不是只看「大一新生必备清单」标题。1.1.1 补齐跳过原因日志，并用 `http.file` / OneBot `get_image` 与微信扫码器提高检出率。1.1.0 起拦截拉群分享卡和腾讯文档 / Word 广告。
+当前版本 **1.1.3**：补拦 QQ 群名片（`source=sharecard` 的 contact.lua 卡、OneBot `contact` 段）。1.1.2 修复 OneBot `getImage` 未绑定导致的生产崩溃，扫码失败不再跳过腾讯文档检测。1.1.1 补齐跳过原因日志，并用 `http.file` / OneBot `get_image` 与微信扫码器提高检出率。1.1.0 起拦截拉群分享卡和腾讯文档 / Word 广告。
 
 ## License