koishi-plugin-echo-cave 1.32.3 → 1.34.0

package/lib/config/config.d.ts

@@ -4,6 +4,8 @@ export type OversizedMediaCleanupMode = 'delete-cave' | 'keep-cave';
 export type ForwardSpecialUserHandlingMode = 'ignore' | 'reject' | 'confirm';
 export type S3UploadFailureFallbackMode = 'local' | 'original-link';
 export interface Config {
+    enableChannelWhitelist?: boolean;
+    channelWhitelist?: string[];
     adminMessageProtection?: boolean;
     adminIds?: string[];
     allowContributorDelete?: boolean;
@@ -21,6 +23,7 @@ export interface Config {
     enableForwardUserSelection?: boolean;
     autoBindSingleForwardUser?: boolean;
     forwardSpecialUserHandlingMode?: ForwardSpecialUserHandlingMode;
+    enablePokeTrigger?: boolean;
     alpha?: number;
     mediaStorage?: 'local' | 's3';
     s3UploadFailureFallbackMode?: S3UploadFailureFallbackMode;

package/lib/index.cjs

@@ -4083,6 +4083,8 @@ var zh_CN_default = {
 
 // src/config/locales/zh-CN.json
 var zh_CN_default2 = {
+  enableChannelWhitelist: "\u662F\u5426\u542F\u7528\u7FA4\u804A\u767D\u540D\u5355\u6A21\u5F0F\uFF0C\u5F00\u542F\u540E\u4EC5\u5728\u767D\u540D\u5355\u4E2D\u7684\u7FA4\u804A\u53EF\u4EE5\u4F7F\u7528\u56DE\u58F0\u6D1E\u529F\u80FD\uFF1B\u5173\u95ED\u5219\u9ED8\u8BA4\u5168\u90E8\u7FA4\u804A\u5747\u53EF\u7528",
+  channelWhitelist: "\u7FA4\u804A\u767D\u540D\u5355 (channel ID \u5217\u8868)\uFF0C\u4EC5\u5728\u542F\u7528\u767D\u540D\u5355\u6A21\u5F0F\u65F6\u751F\u6548",
   adminMessageProtection: "\u5F00\u542F\u7BA1\u7406\u5458\u6D88\u606F\u4FDD\u62A4\uFF0C\u5F00\u542F\u540E\u7BA1\u7406\u5458\u53D1\u5E03\u7684\u6D88\u606F\u53EA\u80FD\u7531\u7BA1\u7406\u5458\u5220\u9664",
   adminIds: "\u7BA1\u7406\u5458 ID \u5217\u8868\uFF0C\u4EC5\u8FD9\u4E9B\u7528\u6237\u53EF\u5728\u79C1\u804A\u4F7F\u7528\u7BA1\u7406\u8FC1\u79FB\u547D\u4EE4",
   allowContributorDelete: "\u5141\u8BB8\u6295\u7A3F\u8005\u5220\u9664\u81EA\u5DF1\u6295\u7A3F\u7684\u56DE\u58F0\u6D1E",
@@ -4101,6 +4103,7 @@ var zh_CN_default2 = {
   enableForwardUserSelection: "\u662F\u5426\u542F\u7528\u5408\u5E76\u8F6C\u53D1\u6D88\u606F\u7684\u5173\u8054\u7528\u6237\u9009\u62E9\u529F\u80FD",
   autoBindSingleForwardUser: "\u5408\u5E76\u8F6C\u53D1\u6D88\u606F\u4EC5\u8BC6\u522B\u5230\u4E00\u4E2A\u7528\u6237\u65F6\uFF0C\u662F\u5426\u9ED8\u8BA4\u81EA\u52A8\u7ED1\u5B9A\u8BE5\u7528\u6237",
   forwardSpecialUserHandlingMode: "\u68C0\u6D4B\u5230\u7279\u6B8A\u7528\u6237 1094950020 \u65F6\u7684\u5904\u7406\u65B9\u5F0F\uFF1Aignore \u4E3A\u5FFD\u7565\uFF0Creject \u4E3A\u63D0\u9192\u5E76\u62D2\u7EDD\u5B58\u50A8\uFF0Cconfirm \u4E3A\u63D0\u9192\u3001\u5C55\u793A\u8F6C\u53D1\u5185\u5BB9\u5E76\u8981\u6C42\u786E\u8BA4\u540E\u518D\u5B58\u50A8",
+  enablePokeTrigger: "\u5728\u7FA4\u804A\u4E2D\u62CD\u4E00\u62CD\u673A\u5668\u4EBA\u65F6\uFF0C\u662F\u5426\u89E6\u53D1\u4E0E cave \u6307\u4EE4\u76F8\u540C\u7684\u968F\u673A\u62BD\u53D6\u6548\u679C\uFF08\u4EC5 OneBot/NapCat \u7B49\u652F\u6301 notify.poke \u4E8B\u4EF6\u7684\u9002\u914D\u5668\u6709\u6548\uFF09",
   alpha: "\u52A0\u6743\u968F\u673A\u62BD\u53D6\u7684\u8C03\u6574\u56E0\u5B50\uFF0C\u63A7\u5236\u62BD\u53D6\u6B21\u6570\u5BF9\u6982\u7387\u7684\u5F71\u54CD\u7A0B\u5EA6\uFF0C\u503C\u8D8A\u5927\u5F71\u54CD\u8D8A\u660E\u663E",
   mediaStorage: "\u5A92\u4F53\u5B58\u50A8\u65B9\u5F0F\uFF1Alocal \u4E3A\u672C\u5730\uFF0Cs3 \u4E3A\u5BF9\u8C61\u5B58\u50A8",
   s3UploadFailureFallbackMode: "\u4EC5\u5728\u5A92\u4F53\u5B58\u50A8\u65B9\u5F0F\u4E3A s3 \u65F6\u751F\u6548\uFF1AS3 \u4E0A\u4F20\u5931\u8D25\u540E\u56DE\u9000\u5230\u672C\u5730\u5B58\u50A8\uFF0C\u6216\u4FDD\u7559\u539F\u59CB\u94FE\u63A5",
@@ -4122,6 +4125,10 @@ var zh_CN_default2 = {
 // src/config/config.ts
 var import_koishi2 = require("koishi");
 var Config = import_koishi2.Schema.intersect([
+  import_koishi2.Schema.object({
+    enableChannelWhitelist: import_koishi2.Schema.boolean().default(false),
+    channelWhitelist: import_koishi2.Schema.array(String).role("table").default([])
+  }).description("\u7FA4\u804A\u767D\u540D\u5355"),
   import_koishi2.Schema.object({
     adminMessageProtection: import_koishi2.Schema.boolean().default(false),
     adminIds: import_koishi2.Schema.array(String).role("table").default([]),
@@ -4135,7 +4142,8 @@ var Config = import_koishi2.Schema.intersect([
     enableForwardUserSelection: import_koishi2.Schema.boolean().default(true),
     forwardSelectTimeout: import_koishi2.Schema.number().default(20),
     autoBindSingleForwardUser: import_koishi2.Schema.boolean().default(false),
-    forwardSpecialUserHandlingMode: import_koishi2.Schema.union(["ignore", "reject", "confirm"]).default("ignore")
+    forwardSpecialUserHandlingMode: import_koishi2.Schema.union(["ignore", "reject", "confirm"]).default("ignore"),
+    enablePokeTrigger: import_koishi2.Schema.boolean().default(true)
   }).description("\u6D88\u606F\u884C\u4E3A"),
   import_koishi2.Schema.object({
     deleteMediaWhenDeletingMsg: import_koishi2.Schema.boolean().default(true),
@@ -4266,6 +4274,24 @@ function apply(ctx, cfg) {
       primary: "userId"
     }
   );
+  const isCaveCommandWord = (word) => word === "cave" || word.startsWith("cave.");
+  const isChannelAllowed = (channelId) => {
+    if (!cfg.enableChannelWhitelist) return true;
+    if (!channelId) return true;
+    return (cfg.channelWhitelist ?? []).includes(channelId);
+  };
+  ctx.middleware(async (session, next) => {
+    if (!cfg.enableChannelWhitelist) return next();
+    if (!session.guildId) return next();
+    if (isChannelAllowed(session.channelId)) return next();
+    const parsedContent = session.parsed?.content;
+    const content = (parsedContent ?? session.content ?? "").trim();
+    const firstWord = content.split(/\s+/)[0] ?? "";
+    if (isCaveCommandWord(firstWord)) {
+      return;
+    }
+    return next();
+  }, true);
   ctx.model.migrate("echo_cave_v2", {}, async (database) => {
     const existing = await database.get(ACTIVE_CAVE_TABLE, {});
     if (existing.length > 0) {
@@ -4277,6 +4303,26 @@ function apply(ctx, cfg) {
     }
   });
   ctx.command("cave [target:text]").action(async ({ session }, target) => await getCave(ctx, session, cfg, target));
+  const pokeCooldown = /* @__PURE__ */ new Map();
+  const POKE_COOLDOWN_MS = 5e3;
+  ctx.on("notice", async (session) => {
+    if (session.platform !== "onebot") return;
+    if (session.subtype !== "poke") return;
+    if (!session.guildId) return;
+    if (session["targetId"] !== session.selfId) return;
+    if (cfg.enablePokeTrigger === false) return;
+    if (!isChannelAllowed(session.channelId)) return;
+    const key = `${session.channelId}:${session.userId}`;
+    const now = Date.now();
+    if (now - (pokeCooldown.get(key) ?? 0) < POKE_COOLDOWN_MS) return;
+    if (pokeCooldown.size >= 256) {
+      for (const [k, t] of pokeCooldown) {
+        if (now - t > POKE_COOLDOWN_MS) pokeCooldown.delete(k);
+      }
+    }
+    pokeCooldown.set(key, now);
+    await session.execute("cave");
+  });
   ctx.command("cave.pic").action(async ({ session }) => await getCave(ctx, session, cfg, void 0, true));
   ctx.command("cave.listen").action(async ({ session }) => await getCaveListByUser(ctx, session));
   ctx.command("cave.trace").action(async ({ session }) => await getCaveListByOriginUser(ctx, session));

package/lib/index.d.ts

@@ -42,5 +42,8 @@ declare module 'koishi' {
         echo_cave_send_failure: EchoCaveSendFailure;
         echo_cave_user_state: EchoCaveUserState;
     }
+    interface Events {
+        notice(session: Session): void;
+    }
 }
 export declare function apply(ctx: Context, cfg: Config): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.32.3",
+  "version": "1.34.0",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",