koishi-plugin-echo-cave 1.29.14 → 1.30.0

package/README.md

@@ -21,6 +21,7 @@
 - 📏 **媒体限制**：支持配置媒体文件大小限制
 - 👥 **转发消息用户选择**：支持从转发消息中选择相关用户进行绑定
 - 🎯 **按人随机抽取**：支持通过 `@用户` 或用户 ID 定向随机抽取该用户相关的回声洞，且不影响全局抽取权重
+- 🖼️ **图片回声洞抽取**：支持通过 `cave.pic` 单独随机抽取包含图片的普通消息，并使用独立的图片抽取计数参与加权随机
 - 🧭 **转发绑定体验优化**：转发消息关联用户的详细输入指南仅在用户首次成功完成选择前显示，选择完成或超时后会尝试撤回提示消息
 - 🤖 **特殊转发用户处理**：可配置在检测到转发记录中包含特殊用户 `1094950020` 时直接拒绝存储，或要求二次确认后再存储
 - 🛠️ **回声洞 ID 重排**：提供管理员维护命令，可在写入备份后安全重排现有回声洞 public ID，而不抬高数据库内部自增主键
@@ -32,6 +33,7 @@
   概率 = 权重 / 总权重
   ```
   其中，`drawCount` 为消息被抽取次数，`α` 为调整因子（可配置，默认0.2）
+  `cave.pic` 仅抽取 `type=msg` 且消息内容中包含图片元素的回声洞，并使用独立的 `picDrawCount` 按同一公式计算权重，不影响普通 `cave` 命令使用的 `drawCount`
 
 ## 📋 命令列表
 
@@ -40,6 +42,7 @@
 | `cave`                        | 随机获取一条回声洞消息      | 所有人             |
 | `cave <id>`                   | 获取特定 ID 的回声洞消息   | 所有人             |
 | `cave <@用户/用户ID>`          | 随机获取与该用户相关的一条回声洞消息（不计入抽取次数） | 所有人 |
+| `cave.pic`                    | 随机获取一条包含图片的回声洞消息 | 所有人 |
 | `cave.echo [...userIds]`      | 将引用的消息存入回声洞      | 所有人             |
 | `cave.drop <id>`              | 删除特定 ID 的回声洞消息   | 消息存储者、原始发送者或管理员 |
 | `cave.listen`                 | 获取自己投稿的回声洞列表     | 所有人             |
@@ -90,6 +93,7 @@ npm install koishi-plugin-echo-cave
 - 插件仅在群聊中可用，私聊模式下无法正常工作
 - 使用 `cave.echo` 命令前必须先引用一条消息
 - 使用 `cave @用户`、`cave <用户ID>` 可定向随机抽取该用户相关的回声洞，这类抽取不会增加 `drawCount`
+- 使用 `cave.pic` 会单独增加图片抽取计数 `picDrawCount`，不会影响普通 `cave` 使用的 `drawCount`
 - 删除消息权限可通过配置项灵活控制
 - 存储的消息会保留原始发送者信息
 - 支持媒体文件大小限制，可通过配置项调整

package/lib/core/cave-store.d.ts

@@ -11,6 +11,7 @@ export interface CaveSnapshotRecord {
     content: string;
     relatedUsers: string[];
     drawCount: number;
+    picDrawCount: number;
 }
 export interface CaveBackupRecord extends CaveSnapshotRecord {
     entryId?: number;

package/lib/core/command/get-cave.d.ts

@@ -2,4 +2,4 @@ import { Config } from '../../config/config';
 import { Context, Session } from 'koishi';
 export declare function getCaveListByUser(ctx: Context, session: Session): Promise<string>;
 export declare function getCaveListByOriginUser(ctx: Context, session: Session): Promise<string>;
-export declare function getCave(ctx: Context, session: Session, cfg: Config, target?: string): Promise<string>;
+export declare function getCave(ctx: Context, session: Session, cfg: Config, target?: string, pictureOnly?: boolean): Promise<string>;

package/lib/index.cjs

@@ -33321,9 +33321,9 @@ var require_dist_cjs72 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+s3-request-presigner@3.1029.0/node_modules/@aws-sdk/s3-request-presigner/dist-cjs/index.js
+// node_modules/.pnpm/@aws-sdk+s3-request-presigner@3.1030.0/node_modules/@aws-sdk/s3-request-presigner/dist-cjs/index.js
 var require_dist_cjs73 = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+s3-request-presigner@3.1029.0/node_modules/@aws-sdk/s3-request-presigner/dist-cjs/index.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+s3-request-presigner@3.1030.0/node_modules/@aws-sdk/s3-request-presigner/dist-cjs/index.js"(exports2) {
     "use strict";
     var utilFormatUrl = require_dist_cjs72();
     var middlewareEndpoint = require_dist_cjs45();
@@ -33470,7 +33470,8 @@ function toCaveSnapshotRecord(cave) {
     type: cave.type,
     content: cave.content,
     relatedUsers: [...cave.relatedUsers],
-    drawCount: cave.drawCount
+    drawCount: cave.drawCount,
+    picDrawCount: cave.picDrawCount ?? 0
   };
 }
 function toCaveBackupRecord(cave) {
@@ -33509,7 +33510,8 @@ async function createCaveRecord(ctx, cave) {
     type: cave.type,
     content: cave.content,
     relatedUsers: [...cave.relatedUsers],
-    drawCount: cave.drawCount
+    drawCount: cave.drawCount,
+    picDrawCount: cave.picDrawCount ?? 0
   });
 }
 async function updateCaveByEntryId(ctx, entryId, data2) {
@@ -34805,7 +34807,8 @@ async function mergeChannelCaves(ctx, cfg, sourceChannelId, targetChannelId, kee
           type: cave.type,
           content: rewritten.content,
           relatedUsers: cave.relatedUsers,
-          drawCount: cave.drawCount
+          drawCount: cave.drawCount,
+          picDrawCount: cave.picDrawCount ?? 0
         });
       } else {
         if (typeof cave.entryId !== "number") {
@@ -34966,6 +34969,7 @@ function normalizeCaveRecord(cave) {
     content: cave.content,
     createTime: new Date(cave.createTime).toISOString(),
     drawCount: cave.drawCount,
+    picDrawCount: cave.picDrawCount ?? 0,
     id: cave.id,
     originUserId: cave.originUserId,
     relatedUsers: [...cave.relatedUsers],
@@ -34986,7 +34990,7 @@ function isEchoCaveRecord(value) {
   if (!isRecordObject(value)) {
     return false;
   }
-  return typeof value.id === "number" && typeof value.channelId === "string" && (value.createTime instanceof Date || typeof value.createTime === "string" || typeof value.createTime === "number") && typeof value.userId === "string" && typeof value.originUserId === "string" && (value.type === "forward" || value.type === "msg") && typeof value.content === "string" && Array.isArray(value.relatedUsers) && value.relatedUsers.every((user) => typeof user === "string") && typeof value.drawCount === "number";
+  return typeof value.id === "number" && typeof value.channelId === "string" && (value.createTime instanceof Date || typeof value.createTime === "string" || typeof value.createTime === "number") && typeof value.userId === "string" && typeof value.originUserId === "string" && (value.type === "forward" || value.type === "msg") && typeof value.content === "string" && Array.isArray(value.relatedUsers) && value.relatedUsers.every((user) => typeof user === "string") && typeof value.drawCount === "number" && (typeof value.picDrawCount === "number" || typeof value.picDrawCount === "undefined");
 }
 function isCaveBackupRecord(value) {
   if (!isEchoCaveRecord(value)) {
@@ -35747,7 +35751,8 @@ async function addCave(ctx, session, cfg, userIds) {
       originUserId: quote.user.id,
       type,
       content,
-      relatedUsers: finalParsedUserIds
+      relatedUsers: finalParsedUserIds,
+      picDrawCount: 0
     });
     return session.text(".msgSaved", { id: result.id, relatedUsers: relatedUsersFormatted });
   } catch (error2) {
@@ -36426,7 +36431,7 @@ async function getCaveIdsByField(ctx, session, field, emptyText) {
   }
   return session.text(".msgListHeader") + "\n" + formatCaveIdList(caves);
 }
-async function incrementDrawCount(ctx, caveMsg) {
+async function incrementDrawCount(ctx, caveMsg, field = "drawCount") {
   await ctx.database.set(
     ACTIVE_CAVE_TABLE,
     {
@@ -36434,7 +36439,7 @@ async function incrementDrawCount(ctx, caveMsg) {
       channelId: caveMsg.channelId
     },
     {
-      drawCount: caveMsg.drawCount + 1
+      [field]: (caveMsg[field] ?? 0) + 1
     }
   );
 }
@@ -36447,8 +36452,8 @@ async function getCaveListByOriginUser(ctx, session) {
 function selectRandomCave(caves) {
   return caves[Math.floor(Math.random() * caves.length)];
 }
-function selectWeightedRandomCave(caves, alpha) {
-  const weights = caves.map((cave) => 1 / (1 + cave.drawCount * alpha));
+function selectWeightedRandomCave(caves, alpha, field = "drawCount") {
+  const weights = caves.map((cave) => 1 / (1 + (cave[field] ?? 0) * alpha));
   const totalWeight = weights.reduce((sum, weight) => sum + weight, 0);
   let random = Math.random() * totalWeight;
   let selectedIndex = 0;
@@ -36458,6 +36463,17 @@ function selectWeightedRandomCave(caves, alpha) {
   }
   return caves[selectedIndex];
 }
+function isPictureMsgCave(cave) {
+  if (cave.type !== "msg") {
+    return false;
+  }
+  try {
+    const content = JSON.parse(cave.content);
+    return Array.isArray(content) && content.some((element) => element?.type === "image");
+  } catch {
+    return false;
+  }
+}
 async function getTargetedUserCave(ctx, session, targetUserId) {
   const isUserInGroup = await checkUsersInGroup(ctx, session, [targetUserId]);
   if (!isUserInGroup) {
@@ -36474,7 +36490,7 @@ async function getTargetedUserCave(ctx, session, targetUserId) {
   }
   return selectRandomCave(matchingCaves);
 }
-async function getCave(ctx, session, cfg, target) {
+async function getCave(ctx, session, cfg, target, pictureOnly = false) {
   const guildAccessError = ensureGuildSession2(session);
   if (guildAccessError) {
     return session.text(guildAccessError);
@@ -36485,16 +36501,21 @@ async function getCave(ctx, session, cfg, target) {
   }
   let caveMsg;
   let shouldIncrementDrawCount = true;
+  const drawCountField = pictureOnly ? "picDrawCount" : "drawCount";
   const { channelId } = session;
+  if (pictureOnly && target) {
+    return session.text("echo-cave.general.noMsgWithId");
+  }
   if (!target) {
     const caves = await ctx.database.get(ACTIVE_CAVE_TABLE, {
       channelId
     });
-    if (caves.length === 0) {
-      return session.text(".noMsgInCave");
+    const selectableCaves = pictureOnly ? caves.filter(isPictureMsgCave) : caves;
+    if (selectableCaves.length === 0) {
+      return session.text(pictureOnly ? ".noPicMsgInCave" : ".noMsgInCave");
     }
     const alpha = cfg.alpha ?? 0.2;
-    caveMsg = selectWeightedRandomCave(caves, alpha);
+    caveMsg = selectWeightedRandomCave(selectableCaves, alpha, drawCountField);
   } else {
     const trimmedTarget = target.trim();
     const parseResult = parseUserIds(trimmedTarget);
@@ -36515,7 +36536,7 @@ async function getCave(ctx, session, cfg, target) {
         } catch (error2) {
           return await handleCaveSendFailure(ctx, session, caveMsg, cfg, error2);
         }
-        await incrementDrawCount(ctx, caveMsg);
+        await incrementDrawCount(ctx, caveMsg, drawCountField);
         return;
       }
     }
@@ -36538,7 +36559,7 @@ async function getCave(ctx, session, cfg, target) {
     return await handleCaveSendFailure(ctx, session, caveMsg, cfg, error2);
   }
   if (shouldIncrementDrawCount) {
-    await incrementDrawCount(ctx, caveMsg);
+    await incrementDrawCount(ctx, caveMsg, drawCountField);
   }
 }
 
@@ -36855,6 +36876,12 @@ var zh_CN_default = {
         failureSummaryDetail: "#{caveId}\uFF08\u7FA4 {channelId}\uFF09\u5931\u8D25 {count} \u6B21\uFF0C\u6700\u8FD1 {lastFailTime}\uFF0C\u9519\u8BEF\uFF1A{errorMessage}"
       }
     },
+    "cave.pic": {
+      description: "\u968F\u673A\u83B7\u53D6\u4E00\u6761\u5305\u542B\u56FE\u7247\u7684\u56DE\u58F0\u6D1E\u6D88\u606F",
+      messages: {
+        noPicMsgInCave: '\u{1F5BC}\uFE0F \u5F53\u524D\u56DE\u58F0\u6D1E\u4E2D\u6682\u65E0\u5305\u542B\u56FE\u7247\u7684\u6D88\u606F\uFF0C\u5FEB\u4F7F\u7528 "cave.echo" \u6DFB\u52A0\u4E00\u6761\u5427\uFF01'
+      }
+    },
     "cave.echo": {
       description: "\u5C06\u6D88\u606F\u5B58\u5165\u56DE\u58F0\u6D1E",
       messages: {
@@ -37143,7 +37170,8 @@ function toV3Record(record) {
     type: record.type,
     content: record.content,
     relatedUsers: [...record.relatedUsers],
-    drawCount: record.drawCount
+    drawCount: record.drawCount,
+    picDrawCount: record.picDrawCount ?? 0
   };
 }
 function apply(ctx, cfg) {
@@ -37159,7 +37187,8 @@ function apply(ctx, cfg) {
       type: "string",
       content: "text",
       relatedUsers: "list",
-      drawCount: { type: "unsigned", initial: 0 }
+      drawCount: { type: "unsigned", initial: 0 },
+      picDrawCount: { type: "unsigned", initial: 0 }
     },
     {
       primary: "id",
@@ -37178,7 +37207,8 @@ function apply(ctx, cfg) {
       type: "string",
       content: "text",
       relatedUsers: "list",
-      drawCount: { type: "unsigned", initial: 0 }
+      drawCount: { type: "unsigned", initial: 0 },
+      picDrawCount: { type: "unsigned", initial: 0 }
     },
     {
       primary: "entryId",
@@ -37197,7 +37227,8 @@ function apply(ctx, cfg) {
       type: "string",
       content: "text",
       relatedUsers: "list",
-      drawCount: { type: "unsigned", initial: 0 }
+      drawCount: { type: "unsigned", initial: 0 },
+      picDrawCount: { type: "unsigned", initial: 0 }
     },
     {
       primary: "id",
@@ -37252,6 +37283,7 @@ function apply(ctx, cfg) {
     }
   });
   ctx.command("cave [target:text]").action(async ({ session }, target) => await getCave(ctx, session, cfg, target));
+  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));
   ctx.command("cave.echo [...userIds]").action(async ({ session }, ...userIds) => await addCave(ctx, session, cfg, userIds));

package/lib/index.d.ts

@@ -14,6 +14,7 @@ export interface EchoCave {
     content: string;
     relatedUsers: string[];
     drawCount: number;
+    picDrawCount: number;
 }
 export interface EchoCaveSendFailure {
     id: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.29.14",
+  "version": "1.30.0",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1029.0",
-    "@aws-sdk/s3-request-presigner": "^3.1029.0",
+    "@aws-sdk/s3-request-presigner": "^3.1030.0",
     "@pynickle/koishi-plugin-adapter-onebot": "^1.0.0",
     "axios": "^1.15.0",
     "uuid": "^11.1.0"