koishi-plugin-maibot 1.7.67 → 1.7.69

package/lib/binding-verify.d.ts

@@ -1,26 +1,12 @@
 import type { UserBinding } from './database';
 export declare function normalizePreviewUserId(userId: string | number): string;
-/** 与插件配置 bindingPlayerNameMatch 对应 */
-export interface BindingPlayerNameMatchConfig {
-    /** 0–100：规范化后玩家名相似度下限（编辑距离比值×100）。100 须完全一致 */
-    minSimilarityPercent?: number;
-}
-export interface BindingNameMatchOptions {
-    minSimilarityPercent: number;
-}
-export declare function resolveBindingNameMatchOptions(cfg?: BindingPlayerNameMatchConfig): BindingNameMatchOptions;
-/** 玩家名规范化：去首尾空白 + Unicode NFKC（全角英数、兼容字符等与半角统一） */
-export declare function normalizePlayerNameForMatch(name: string): string;
-/** 0–1，分母为 max(len)；用于短玩家名 */
-export declare function playerNameSimilarityRatio(a: string, b: string): number;
 /**
- * 校验 preview 与绑定是否为同一街机账号（加密 UserID + 可选绑定时的玩家名）
- * @param nameMatch 玩家名：先 NFKC 规范化，再按 minSimilarityPercent 比较编辑距离比值
+ * 校验 preview 与绑定是否为同一街机账号：仅比较绑定记录的 maiUid 与二维码 preview 的 UserID。
  */
 export declare function verifyPreviewMatchesBinding(binding: UserBinding, preview: {
     UserID: string | number;
     UserName?: string;
-}, nameMatch?: BindingNameMatchOptions): string | null;
+}): string | null;
 /** lastStateAt：maibot_user_rebind_state.lastBindChangeAt；bindTime：当前绑定记录的 bindTime（无绑定则 0） */
 export declare function msUntilBindChangeAllowed(lastStateAtMs: number, bindTimeMs: number, minIntervalDays: number): number;
 export declare function formatBindChangeWaitHuman(ms: number): string;

package/lib/binding-verify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"binding-verify.d.ts","sourceRoot":"","sources":["../src/binding-verify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAEtE;AAED,sCAAsC;AACtC,MAAM,WAAW,4BAA4B;IAC3C,+CAA+C;IAC/C,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAC9B;AAED,MAAM,WAAW,uBAAuB;IACtC,oBAAoB,EAAE,MAAM,CAAA;CAC7B;AAID,wBAAgB,8BAA8B,CAC5C,GAAG,CAAC,EAAE,4BAA4B,GACjC,uBAAuB,CAKzB;AAED,mDAAmD;AACnD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhE;AAsBD,8BAA8B;AAC9B,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAKtE;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EACvD,SAAS,GAAE,uBAA0D,GACpE,MAAM,GAAG,IAAI,CAgCf;AAED,8FAA8F;AAC9F,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAS5D"}
+{"version":3,"file":"binding-verify.d.ts","sourceRoot":"","sources":["../src/binding-verify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAEtE;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GACtD,MAAM,GAAG,IAAI,CAcf;AAED,8FAA8F;AAC9F,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAS5D"}

package/lib/binding-verify.js

@@ -1,94 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizePreviewUserId = normalizePreviewUserId;
-exports.resolveBindingNameMatchOptions = resolveBindingNameMatchOptions;
-exports.normalizePlayerNameForMatch = normalizePlayerNameForMatch;
-exports.playerNameSimilarityRatio = playerNameSimilarityRatio;
 exports.verifyPreviewMatchesBinding = verifyPreviewMatchesBinding;
 exports.msUntilBindChangeAllowed = msUntilBindChangeAllowed;
 exports.formatBindChangeWaitHuman = formatBindChangeWaitHuman;
 function normalizePreviewUserId(userId) {
     return String(userId);
 }
-const DEFAULT_MIN_SIMILARITY = 100;
-function resolveBindingNameMatchOptions(cfg) {
-    let p = cfg?.minSimilarityPercent;
-    if (typeof p !== 'number' || Number.isNaN(p))
-        p = DEFAULT_MIN_SIMILARITY;
-    p = Math.min(100, Math.max(0, p));
-    return { minSimilarityPercent: p };
-}
-/** 玩家名规范化：去首尾空白 + Unicode NFKC（全角英数、兼容字符等与半角统一） */
-function normalizePlayerNameForMatch(name) {
-    return name.normalize('NFKC').trim();
-}
-function levenshtein(a, b) {
-    const m = a.length;
-    const n = b.length;
-    if (m === 0)
-        return n;
-    if (n === 0)
-        return m;
-    const dp = new Uint32Array(n + 1);
-    for (let j = 0; j <= n; j++)
-        dp[j] = j;
-    for (let i = 1; i <= m; i++) {
-        let prev = dp[0];
-        dp[0] = i;
-        for (let j = 1; j <= n; j++) {
-            const tmp = dp[j];
-            const cost = a[i - 1] === b[j - 1] ? 0 : 1;
-            dp[j] = Math.min(dp[j] + 1, dp[j - 1] + 1, prev + cost);
-            prev = tmp;
-        }
-    }
-    return dp[n];
-}
-/** 0–1，分母为 max(len)；用于短玩家名 */
-function playerNameSimilarityRatio(a, b) {
-    if (a === b)
-        return 1;
-    const maxLen = Math.max(a.length, b.length);
-    if (maxLen === 0)
-        return 1;
-    return Math.max(0, 1 - levenshtein(a, b) / maxLen);
-}
 /**
- * 校验 preview 与绑定是否为同一街机账号（加密 UserID + 可选绑定时的玩家名）
- * @param nameMatch 玩家名：先 NFKC 规范化，再按 minSimilarityPercent 比较编辑距离比值
+ * 校验 preview 与绑定是否为同一街机账号：仅比较绑定记录的 maiUid 与二维码 preview 的 UserID。
  */
-function verifyPreviewMatchesBinding(binding, preview, nameMatch = resolveBindingNameMatchOptions()) {
+function verifyPreviewMatchesBinding(binding, preview) {
     const pid = normalizePreviewUserId(preview.UserID);
     if (pid === '-1' || preview.UserID === -1) {
-        return '❌ 无效或过期的二维码，无法完成验证。';
+        return '❌ 无效或过期的二维码，无法完成验证。请重新获取玩家二维码后重试。';
     }
     if (String(binding.maiUid) !== pid) {
-        return '❌ 当前二维码对应的街机账号与绑定不一致，请使用已绑定账号本人微信获取的二维码。';
-    }
-    const boundName = binding.boundPlayerName?.trim();
-    if (!boundName || preview.UserName === undefined) {
-        return null;
-    }
-    const current = String(preview.UserName).trim();
-    const na = normalizePlayerNameForMatch(boundName);
-    const nb = normalizePlayerNameForMatch(current);
-    if (!na) {
-        return null;
-    }
-    if (!nb) {
-        return `❌ 玩家名与绑定记录不一致（绑定为「${boundName}」，当前玩家名为空）。如已改名请使用解绑卡流程后重新绑定。`;
-    }
-    const min = nameMatch.minSimilarityPercent;
-    const ratio = playerNameSimilarityRatio(na, nb);
-    const pct = ratio * 100;
-    if (pct + 1e-9 >= min) {
-        return null;
-    }
-    const minDisp = Number.isInteger(min) ? String(min) : min.toFixed(1);
-    if (min >= 100) {
-        return `❌ 玩家名与绑定记录不一致（绑定为「${boundName}」，当前为「${current}」）。如已改名请使用解绑卡流程后重新绑定。`;
+        return (`❌ 街机账号 UID 不一致：\n` +
+            `• 当前绑定记录的 UID：${binding.maiUid}\n` +
+            `• 当前二维码对应的 UID：${pid}\n` +
+            `若您已更换游戏账号，请使用 /mai解绑 后重新绑定（换绑冷却期内请使用 /mai解绑卡）。`);
     }
-    return `❌ 玩家名与绑定记录不一致（绑定为「${boundName}」，当前为「${current}」）。规范化后相似度约 ${pct.toFixed(0)}%（要求≥${minDisp}%）。可在插件配置中调低「玩家名最低相似度」或解绑后重新绑定。`;
+    return null;
 }
 /** lastStateAt：maibot_user_rebind_state.lastBindChangeAt；bindTime：当前绑定记录的 bindTime（无绑定则 0） */
 function msUntilBindChangeAllowed(lastStateAtMs, bindTimeMs, minIntervalDays) {

package/lib/binding-verify.js.map

@@ -1 +1 @@
-{"version":3,"file":"binding-verify.js","sourceRoot":"","sources":["../src/binding-verify.ts"],"names":[],"mappings":";;AAEA,wDAEC;AAcD,wEAOC;AAGD,kEAEC;AAuBD,8DAKC;AAMD,kEAoCC;AAGD,4DAUC;AAED,8DASC;AA1HD,SAAgB,sBAAsB,CAAC,MAAuB;IAC5D,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;AACvB,CAAC;AAYD,MAAM,sBAAsB,GAAG,GAAG,CAAA;AAElC,SAAgB,8BAA8B,CAC5C,GAAkC;IAElC,IAAI,CAAC,GAAG,GAAG,EAAE,oBAAoB,CAAA;IACjC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAAE,CAAC,GAAG,sBAAsB,CAAA;IACxE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACjC,OAAO,EAAE,oBAAoB,EAAE,CAAC,EAAE,CAAA;AACpC,CAAC;AAED,mDAAmD;AACnD,SAAgB,2BAA2B,CAAC,IAAY;IACtD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;AACtC,CAAC;AAED,SAAS,WAAW,CAAC,CAAS,EAAE,CAAS;IACvC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;IAClB,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;IAClB,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAA;IACrB,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAA;IACrB,MAAM,EAAE,GAAG,IAAI,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;QAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;QAChB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACT,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5B,MAAM,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;YACjB,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC1C,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,CAAA;YACvD,IAAI,GAAG,GAAG,CAAA;QACZ,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;AACd,CAAC;AAED,8BAA8B;AAC9B,SAAgB,yBAAyB,CAAC,CAAS,EAAE,CAAS;IAC5D,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAA;IACrB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAA;IAC3C,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAA;IAC1B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,CAAA;AACpD,CAAC;AAED;;;GAGG;AACH,SAAgB,2BAA2B,CACzC,OAAoB,EACpB,OAAuD,EACvD,YAAqC,8BAA8B,EAAE;IAErE,MAAM,GAAG,GAAG,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAClD,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1C,OAAO,qBAAqB,CAAA;IAC9B,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC;QACnC,OAAO,0CAA0C,CAAA;IACnD,CAAC;IACD,MAAM,SAAS,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI,EAAE,CAAA;IACjD,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACjD,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAA;IAC/C,MAAM,EAAE,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAAA;IACjD,MAAM,EAAE,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAA;IAC/C,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,OAAO,qBAAqB,SAAS,+BAA+B,CAAA;IACtE,CAAC;IACD,MAAM,GAAG,GAAG,SAAS,CAAC,oBAAoB,CAAA;IAC1C,MAAM,KAAK,GAAG,yBAAyB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAC/C,MAAM,GAAG,GAAG,KAAK,GAAG,GAAG,CAAA;IACvB,IAAI,GAAG,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;QACtB,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IACpE,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;QACf,OAAO,qBAAqB,SAAS,SAAS,OAAO,uBAAuB,CAAA;IAC9E,CAAC;IACD,OAAO,qBAAqB,SAAS,SAAS,OAAO,eAAe,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,OAAO,iCAAiC,CAAA;AACpI,CAAC;AAED,8FAA8F;AAC9F,SAAgB,wBAAwB,CACtC,aAAqB,EACrB,UAAkB,EAClB,eAAuB;IAEvB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,EAAE,UAAU,IAAI,CAAC,CAAC,CAAA;IAC1D,IAAI,CAAC,IAAI;QAAE,OAAO,CAAC,CAAA;IACnB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAChE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA;IACjC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,CAAA;AACrC,CAAC;AAED,SAAgB,yBAAyB,CAAC,EAAU;IAClD,IAAI,EAAE,IAAI,CAAC;QAAE,OAAO,GAAG,CAAA;IACvB,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IAChD,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IACrE,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACpD,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IAC3D,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACrD,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;IAC9B,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAA;AAC9B,CAAC"}
+{"version":3,"file":"binding-verify.js","sourceRoot":"","sources":["../src/binding-verify.ts"],"names":[],"mappings":";;AAEA,wDAEC;AAKD,kEAiBC;AAGD,4DAUC;AAED,8DASC;AAhDD,SAAgB,sBAAsB,CAAC,MAAuB;IAC5D,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;AACvB,CAAC;AAED;;GAEG;AACH,SAAgB,2BAA2B,CACzC,OAAoB,EACpB,OAAuD;IAEvD,MAAM,GAAG,GAAG,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAClD,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1C,OAAO,mCAAmC,CAAA;IAC5C,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC;QACnC,OAAO,CACL,mBAAmB;YACnB,iBAAiB,OAAO,CAAC,MAAM,IAAI;YACnC,kBAAkB,GAAG,IAAI;YACzB,gDAAgD,CACjD,CAAA;IACH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,8FAA8F;AAC9F,SAAgB,wBAAwB,CACtC,aAAqB,EACrB,UAAkB,EAClB,eAAuB;IAEvB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,EAAE,UAAU,IAAI,CAAC,CAAC,CAAA;IAC1D,IAAI,CAAC,IAAI;QAAE,OAAO,CAAC,CAAA;IACnB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAChE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA;IACjC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,CAAA;AACrC,CAAC;AAED,SAAgB,yBAAyB,CAAC,EAAU;IAClD,IAAI,EAAE,IAAI,CAAC;QAAE,OAAO,GAAG,CAAA;IACvB,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IAChD,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IACrE,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACpD,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IAC3D,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACrD,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;IAC9B,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAA;AAC9B,CAAC"}

package/lib/index.d.ts

@@ -69,11 +69,6 @@ export interface Config {
         minDaysBetweenBindChange: number;
         shopUrl?: string;
     };
-    /** SGID / preview 校验时：绑定快照玩家名与当前玩家名的匹配（含 /mai状态、mymai 等） */
-    bindingPlayerNameMatch?: {
-        /** 0–100：NFKC 规范化后，编辑距离相似度下限；100 为须完全一致。全角如 Ｍｉｌｋ 与半角 Milk 在 100 下通常视为一致 */
-        minSimilarityPercent: number;
-    };
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -88,7 +88,7 @@ exports.Config = koishi_1.Schema.object({
     autoRecallProcessingMessages: koishi_1.Schema.boolean().default(true).description('B50任务完成后自动撤回"正在处理"和"已提交"消息'),
     authLevelForCardAdmin: koishi_1.Schema.number().default(4).description('卡密管理指令（生成/删除/导出）需要的 Koishi authority，默认 4'),
     priorityCooldown: koishi_1.Schema.object({
-        enabled: koishi_1.Schema.boolean().default(false).description('开启后，非管理员、非优先用户执行功能指令需等待冷却'),
+        enabled: koishi_1.Schema.boolean().default(false).description('开启后，对参与冷却槽的 mai 指令在指令执行前统一检查间隔（见插件内 commandToCooldownSlot：含发票/B50/状态等分槽，其余多数为 default 槽；帮助、绑定类、maialert、管理员指令等不参与）'),
         adminBypassAuthority: koishi_1.Schema.number()
             .default(4)
             .description('仅当用户 Koishi authority 大于该数值时视为管理员：绕过冷却，并自动写入永久个人优先（带标记，权限回落时自动删除）；卡密兑换的优先记录不会被删除。'),
@@ -123,15 +123,6 @@ exports.Config = koishi_1.Schema.object({
         minDaysBetweenBindChange: 30,
         shopUrl: '',
     }),
-    bindingPlayerNameMatch: koishi_1.Schema.object({
-        minSimilarityPercent: koishi_1.Schema.number()
-            .default(100)
-            .min(0)
-            .max(100)
-            .description('玩家名最低相似度（0–100）。先进行 Unicode NFKC 规范化（全角/半角英数字统一）再按编辑距离计算；100 表示须完全一致。略低于 100 可容忍少量字符差异（改名、显示差异等）。'),
-    })
-        .description('绑定记录中的玩家名与 preview 的校验（maiUid 一致时的第二道校验）')
-        .default({ minSimilarityPercent: 100 }),
 });
 // 我认识了很多朋友 以下是我认识的好朋友们！
 // Fracture_Hikaritsu
@@ -210,6 +201,36 @@ function getSessionCommandUsageHint(session) {
 function isMaiPluginCommandName(name) {
     return name.trim().startsWith('mai');
 }
+/**
+ * <spec:text> 会把「clear -g 群号」整段吃成一个参数；从首尾拆出 -g 群标识，并与 .option('-g') 合并（优先已解析的 -g）。
+ */
+function splitGroupPrioritySpecAndGuild(specRaw, optionGuild) {
+    let specStr = (specRaw ?? '').trim();
+    let guild = String(optionGuild ?? '').trim();
+    const lead = specStr.match(/^\s*-g\s+(\S+)\s+([\s\S]+)$/i);
+    if (lead) {
+        if (!guild)
+            guild = lead[1];
+        specStr = lead[2].trim();
+    }
+    const tail = specStr.match(/^([\s\S]+?)\s+-g\s+(\S+)\s*$/i);
+    if (tail) {
+        specStr = tail[1].trim();
+        if (!guild)
+            guild = tail[2];
+    }
+    return { spec: specStr, guild };
+}
+/** 群优先表里的 guildKey 多为 platform:guildId；仅填数字时按当前会话平台补前缀 */
+function normalizeGuildKeyForPriority(gk, session) {
+    const t = gk.trim();
+    if (!t)
+        return t;
+    if (!/^\d+$/.test(t))
+        return t;
+    const p = String(session.platform || '').trim().toLowerCase();
+    return p ? `${p}:${t}` : t;
+}
 async function computeMaiCommandUsageHint(command, session) {
     if (!command || !isMaiPluginCommandName(String(command.name || '')))
         return '';
@@ -1174,7 +1195,7 @@ async function getQrText(session, ctx, api, binding, config, timeout = 60000, pr
         if (cacheAge < cacheValidDuration && binding.lastQrCode.startsWith('SGWCMAID')) {
             try {
                 const previewCached = await api.getPreview(config.machineInfo.clientId, binding.lastQrCode);
-                const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, previewCached, (0, binding_verify_1.resolveBindingNameMatchOptions)(config.bindingPlayerNameMatch));
+                const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, previewCached);
                 if (!vErr) {
                     if (previewCached.UserName != null && !binding.boundPlayerName?.trim()) {
                         await ctx.database.set('maibot_bindings', { userId: binding.userId }, {
@@ -1288,7 +1309,7 @@ async function getQrText(session, ctx, api, binding, config, timeout = 60000, pr
                 return { qrText: '', error: '无效或过期的二维码' };
             }
             if (binding) {
-                const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview, (0, binding_verify_1.resolveBindingNameMatchOptions)(config.bindingPlayerNameMatch));
+                const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview);
                 if (vErr) {
                     await session.send(vErr);
                     return { qrText: '', error: vErr };
@@ -1426,20 +1447,29 @@ function apply(ctx, config) {
         const keys = await getSessionBindingKeys(ctx, session);
         return keys[0] || String(session.userId || '');
     }
-    async function gateUserCooldown(session, commandName) {
-        if (!session)
-            return undefined;
-        const hit = await (0, priority_cooldown_1.checkCommandCooldown)(ctx, session, priorityCooldownCfg, commandName, getCooldownPrimaryUserId, async (s) => getSessionBindingKeys(ctx, s));
-        return hit ?? undefined;
-    }
-    async function markUserCooldown(session, commandName) {
-        if (!session)
+    ctx.on('command/before-execute', async (argv) => {
+        const sess = argv.session;
+        const cmd = argv.command;
+        if (!sess || !cmd)
+            return;
+        const cmdName = String(cmd.name || '');
+        if (!priorityCooldownCfg?.enabled)
+            return;
+        if (!isMaiPluginCommandName(cmdName))
+            return;
+        if ((0, priority_cooldown_1.commandToCooldownSlot)(cmdName) === null)
             return;
-        const uid = await getCooldownPrimaryUserId(session);
+        const wl = checkWhitelist(sess, config);
+        if (!wl.allowed)
+            return;
+        const hit = await (0, priority_cooldown_1.checkCommandCooldown)(ctx, sess, priorityCooldownCfg, cmdName, getCooldownPrimaryUserId, async (s) => getSessionBindingKeys(ctx, s));
+        if (hit)
+            return hit;
+        const uid = await getCooldownPrimaryUserId(sess);
         if (!uid)
             return;
-        await (0, priority_cooldown_1.recordCommandCooldown)(ctx, uid, commandName, priorityCooldownCfg);
-    }
+        await (0, priority_cooldown_1.recordCommandCooldown)(ctx, uid, cmdName, priorityCooldownCfg);
+    });
     /**
      * 获取上传任务的统计信息（平均处理时长和今日成功率）
      * @param commandPrefix 命令前缀，用于筛选日志（如 'mai上传B50' 或 'mai上传落雪b50'）
@@ -2249,7 +2279,7 @@ function apply(ctx, config) {
   /mai管理员取消群组优先 [群标识] — 取消群组优先；省略时在群内则针对当前群
   /mai管理员取消个人优先 <@或ID> — 清除个人优先记录
   /mai管理员设置个人优先 <@或ID> <spec> — spec：永久、7d、clear 等
-  /mai管理员设置群组优先 <spec> [-g 群标识] — 直接改群组优先；spec：永久、7d、clear；-g 省略且群内则当前群
+  /mai管理员设置群组优先 <spec> [-g 群标识] — spec 与 -g 可同一段输入（如 clear -g qq:群号）；纯数字 -g 会按当前平台补前缀；-g 省略且在群内则当前群
   /maibypass <@用户|用户ID> — 清除该用户当前全部指令冷却（别名 /mai管理员清除冷却）`;
         }
         helpText += `
@@ -2685,9 +2715,6 @@ function apply(ctx, config) {
         if (!whitelistCheck.allowed) {
             return whitelistCheck.message || '本群暂时没有被授权使用本Bot的功能，请添加官方群聊1072033605。';
         }
-        const cdStatus = await gateUserCooldown(session, 'mai状态');
-        if (cdStatus)
-            return cdStatus;
         try {
             // 获取目标用户绑定
             const { binding, isProxy, error } = await getTargetBinding(session, targetUserId);
@@ -2904,7 +2931,6 @@ function apply(ctx, config) {
                 status: 'success',
                 result: statusInfo,
             });
-            await markUserCooldown(session, 'mai状态');
             return appendRefId(statusInfo, refId);
         }
         catch (error) {
@@ -3326,9 +3352,6 @@ function apply(ctx, config) {
         if (!whitelistCheck.allowed) {
             return whitelistCheck.message || '本群暂时没有被授权使用本Bot的功能，请添加官方群聊1072033605。';
         }
-        const cdInv = await gateUserCooldown(session, 'mai发票');
-        if (cdInv)
-            return cdInv;
         const multiple = multipleInput ? Number(multipleInput) : 2;
         if (!Number.isInteger(multiple) || multiple < 2 || multiple > 6) {
             return '❌ 倍数必须是2-6之间的整数\n例如：/mai发票 3\n例如：/mai发票 6 @userid';
@@ -3427,7 +3450,6 @@ function apply(ctx, config) {
                 status: 'success',
                 result: successMessage,
             });
-            await markUserCooldown(session, 'mai发票');
             return appendRefId(successMessage, refId);
         }
         catch (error) {
@@ -3552,9 +3574,6 @@ function apply(ctx, config) {
         if (!whitelistCheck.allowed) {
             return whitelistCheck.message || '本群暂时没有被授权使用本Bot的功能，请添加官方群聊1072033605。';
         }
-        const cdB50u = await gateUserCooldown(session, 'mai上传B50');
-        if (cdB50u)
-            return cdB50u;
         try {
             // 解析参数：可能是SGID或targetUserId
             let qrCode;
@@ -3595,7 +3614,7 @@ function apply(ctx, config) {
                     if (preview.UserID === -1 || (typeof preview.UserID === 'string' && preview.UserID === '-1')) {
                         return '❌ 无效或过期的二维码，请重新发送';
                     }
-                    const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview, (0, binding_verify_1.resolveBindingNameMatchOptions)(config.bindingPlayerNameMatch));
+                    const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview);
                     if (vErr) {
                         return vErr;
                     }
@@ -3690,7 +3709,6 @@ function apply(ctx, config) {
                 result: successMessage,
                 apiResponse: result,
             });
-            await markUserCooldown(session, 'mai上传B50');
             // 发送成功消息并获取消息ID（用于后续撤回）
             const successMsgIds = await sendAndGetMessageIds(session, appendRefId(successMessage, refId));
             // 合并处理中消息ID和成功消息ID
@@ -3734,9 +3752,6 @@ function apply(ctx, config) {
         if (!whitelistCheck.allowed) {
             return whitelistCheck.message || '本群暂时没有被授权使用本Bot的功能，请添加官方群聊1072033605。';
         }
-        const cdUa = await gateUserCooldown(session, 'maiua');
-        if (cdUa)
-            return cdUa;
         try {
             // 解析参数：可能是SGID/URL或落雪代码或目标用户
             let qrCode;
@@ -3784,7 +3799,7 @@ function apply(ctx, config) {
                     if (preview.UserID === -1 || (typeof preview.UserID === 'string' && preview.UserID === '-1')) {
                         return '❌ 无效或过期的二维码，请重新发送';
                     }
-                    const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview, (0, binding_verify_1.resolveBindingNameMatchOptions)(config.bindingPlayerNameMatch));
+                    const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview);
                     if (vErr) {
                         return vErr;
                     }
@@ -4008,9 +4023,6 @@ function apply(ctx, config) {
             if (results.length === 0) {
                 return `⚠️ 未能发起上传请求${proxyTip}`;
             }
-            if (results.some(r => /B50任务已提交/.test(r) && r.includes('✅'))) {
-                await markUserCooldown(session, 'maiua');
-            }
             return `${results.join('\n\n')}${proxyTip ? `\n${proxyTip}` : ''}`;
         }
         catch (error) {
@@ -4152,9 +4164,6 @@ function apply(ctx, config) {
         if (!whitelistCheck.allowed) {
             return whitelistCheck.message || '本群暂时没有被授权使用本Bot的功能，请添加官方群聊1072033605。';
         }
-        const cdItem = await gateUserCooldown(session, 'mai获取收藏品');
-        if (cdItem)
-            return cdItem;
         try {
             // 解析首参：可为 SGID/链接 或 目标用户（代操作）
             let qrCode;
@@ -4220,7 +4229,7 @@ function apply(ctx, config) {
                     if (preview.UserID === -1 || (typeof preview.UserID === 'string' && preview.UserID === '-1')) {
                         return '❌ 无效或过期的二维码，请重新发送';
                     }
-                    const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview, (0, binding_verify_1.resolveBindingNameMatchOptions)(config.bindingPlayerNameMatch));
+                    const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview);
                     if (vErr) {
                         return vErr;
                     }
@@ -4290,7 +4299,6 @@ function apply(ctx, config) {
                     return '❌ 获取收藏品失败：服务器返回未成功，请稍后再试或刷新二维码后再试。';
                 }
             }
-            await markUserCooldown(session, 'mai获取收藏品');
             return `✅ 已为 ${maskUserId(binding.maiUid)} 获取收藏品${proxyTip}\n类型: ${selectedType?.label}\nID: ${itemId}\n数量: ${stockFinal}`;
         }
         catch (error) {
@@ -4319,9 +4327,6 @@ function apply(ctx, config) {
         if (!whitelistCheck.allowed) {
             return whitelistCheck.message || '本群暂时没有被授权使用本Bot的功能，请添加官方群聊1072033605。';
         }
-        const cdVer = await gateUserCooldown(session, 'mai修改版本号');
-        if (cdVer)
-            return cdVer;
         try {
             let qrCode;
             let targetUserId;
@@ -4347,7 +4352,7 @@ function apply(ctx, config) {
                     if (preview.UserID === -1 || (typeof preview.UserID === 'string' && preview.UserID === '-1')) {
                         return '❌ 无效或过期的二维码，请重新发送';
                     }
-                    const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview, (0, binding_verify_1.resolveBindingNameMatchOptions)(config.bindingPlayerNameMatch));
+                    const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview);
                     if (vErr) {
                         return vErr;
                     }
@@ -4420,7 +4425,6 @@ function apply(ctx, config) {
                 }
                 return '❌ 修改版本号失败：服务器返回未成功，请稍后再试或刷新二维码后再试。';
             }
-            await markUserCooldown(session, 'mai修改版本号');
             return `✅ 已为 ${maskUserId(binding.maiUid)} 修改版本号${proxyTip}\n机台版本: ${romVer}\n数据版本: ${dataVer}`;
         }
         catch (error) {
@@ -4695,9 +4699,6 @@ function apply(ctx, config) {
         if (!whitelistCheck.allowed) {
             return whitelistCheck.message || '本群暂时没有被授权使用本Bot的功能，请添加官方群聊1072033605。';
         }
-        const cdLx = await gateUserCooldown(session, 'mai上传落雪b50');
-        if (cdLx)
-            return cdLx;
         // 解析参数：第一个参数可能是SGID/URL或落雪代码
         let qrCode;
         let lxnsCode;
@@ -4752,7 +4753,7 @@ function apply(ctx, config) {
                     if (preview.UserID === -1 || (typeof preview.UserID === 'string' && preview.UserID === '-1')) {
                         return '❌ 无效或过期的二维码，请重新发送';
                     }
-                    const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview, (0, binding_verify_1.resolveBindingNameMatchOptions)(config.bindingPlayerNameMatch));
+                    const vErr = (0, binding_verify_1.verifyPreviewMatchesBinding)(binding, preview);
                     if (vErr) {
                         return vErr;
                     }
@@ -4843,7 +4844,6 @@ function apply(ctx, config) {
                 result: successMessage,
                 apiResponse: result,
             });
-            await markUserCooldown(session, 'mai上传落雪b50');
             // 发送成功消息并获取消息ID（用于后续撤回）
             const successMsgIds = await sendAndGetMessageIds(session, appendRefId(successMessage, refId));
             // 合并处理中消息ID和成功消息ID
@@ -6320,6 +6320,9 @@ function apply(ctx, config) {
     });
     ctx.command('mai管理员设置群组优先 <spec:text>', '直接设置群组优先（-g 指定群，默认当前群）')
         .userFields(['authority'])
+        .usage(' 示例：/mai管理员设置群组优先 clear -g qq:5911013814031454\n' +
+        '或：/mai管理员设置群组优先 -g qq:5911013814031454 永久\n' +
+        '（仅数字群号时请写 qq:群号；在群内执行可省略 -g）')
         .option('guild', '-g <guildKey:string> 群标识，如 qq:群号')
         .action(async ({ session, options }, spec) => {
         if (!session)
@@ -6327,14 +6330,16 @@ function apply(ctx, config) {
         if ((session.user?.authority ?? 0) < authLevelForCardAdmin) {
             return `❌ 权限不足，需要 auth 等级 ${authLevelForCardAdmin} 以上`;
         }
-        if (!spec?.trim()) {
+        const { spec: specOnly, guild: guildOpt } = splitGroupPrioritySpecAndGuild(spec, options?.guild);
+        if (!specOnly) {
             return '❌ 用法：/mai管理员设置群组优先 <永久|7d|clear> [-g 群标识]';
         }
-        const sp = (0, priority_cooldown_1.parsePriorityAdminSpec)(spec);
+        const sp = (0, priority_cooldown_1.parsePriorityAdminSpec)(specOnly);
         if (sp === null) {
             return '❌ 无效的 spec，示例：永久、7d、clear';
         }
-        const gk = (String(options?.guild ?? '').trim() || (0, priority_cooldown_1.canonicalGuildPriorityKey)(session) || '').trim();
+        let gk = (guildOpt.trim() || (0, priority_cooldown_1.canonicalGuildPriorityKey)(session) || '').trim();
+        gk = normalizeGuildKeyForPriority(gk, session);
         if (!gk) {
             return '❌ 请使用 -g 指定群标识（platform:guildId），或在群聊内执行。';
         }