koishi-plugin-echo-cave 1.18.6 → 1.19.0

package/lib/index.cjs

@@ -540,13 +540,13 @@ async function addCave(ctx, session, cfg, userIds) {
     }
     content = JSON.stringify(await processMessageContent(ctx, msgJson, cfg));
   }
-  await ctx.database.get("echo_cave", { content }).then((existing) => {
+  await ctx.database.get("echo_cave_v2", { content }).then((existing) => {
     if (existing) {
       return session.text(".existingMsg");
     }
   });
   try {
-    const result = await ctx.database.create("echo_cave", {
+    const result = await ctx.database.create("echo_cave_v2", {
       channelId,
       createTime: /* @__PURE__ */ new Date(),
       userId,
@@ -569,7 +569,7 @@ async function deleteCave(ctx, session, cfg, id) {
   if (!id) {
     return session.text(".noIdProvided");
   }
-  const caves = await ctx.database.get("echo_cave", id);
+  const caves = await ctx.database.get("echo_cave_v2", id);
   if (caves.length === 0) {
     return session.text("echo-cave.general.noMsgWithId");
   }
@@ -601,7 +601,7 @@ async function deleteCave(ctx, session, cfg, id) {
   if (cfg.deleteMediaWhenDeletingMsg) {
     await deleteMediaFilesFromMessage(ctx, caveMsg.content);
   }
-  await ctx.database.remove("echo_cave", id);
+  await ctx.database.remove("echo_cave_v2", id);
   return session.text(".msgDeleted", [id]);
 }
 async function deleteCaves(ctx, session, cfg, ids) {
@@ -616,7 +616,7 @@ async function deleteCaves(ctx, session, cfg, ids) {
   const user = await ctx.database.getUser(session.platform, currentUserId);
   const userAuthority = user.authority;
   const isCurrentUserAdmin = userAuthority >= 4;
-  const caves = await ctx.database.get("echo_cave", ids);
+  const caves = await ctx.database.get("echo_cave_v2", ids);
   for (const cave of caves) {
     const caveMsg = caves[0];
     if (cfg.adminMessageProtection) {
@@ -642,7 +642,7 @@ async function deleteCaves(ctx, session, cfg, ids) {
     if (cfg.deleteMediaWhenDeletingMsg) {
       await deleteMediaFilesFromMessage(ctx, caveMsg.content);
     }
-    await ctx.database.remove("echo_cave", cave.id);
+    await ctx.database.remove("echo_cave_v2", cave.id);
   }
   const foundIds = new Set(caves.map((r) => r.id));
   const missingIds = ids.filter((id) => !foundIds.has(id));
@@ -745,7 +745,7 @@ async function getCaveListByUser(ctx, session) {
   }
   const { userId, channelId } = session;
   const caves = await ctx.database.get(
-    "echo_cave",
+    "echo_cave_v2",
     {
       userId,
       channelId
@@ -764,7 +764,7 @@ async function getCaveListByOriginUser(ctx, session) {
   }
   const { userId, channelId } = session;
   const caves = await ctx.database.get(
-    "echo_cave",
+    "echo_cave_v2",
     {
       originUserId: userId,
       channelId
@@ -784,7 +784,7 @@ async function getCave(ctx, session, cfg, id) {
   let caveMsg;
   const { channelId } = session;
   if (!id) {
-    const caves = await ctx.database.get("echo_cave", {
+    const caves = await ctx.database.get("echo_cave_v2", {
       channelId
     });
     if (caves.length === 0) {
@@ -792,7 +792,7 @@ async function getCave(ctx, session, cfg, id) {
     }
     caveMsg = caves[Math.floor(Math.random() * caves.length)];
   } else {
-    const caves = await ctx.database.get("echo_cave", {
+    const caves = await ctx.database.get("echo_cave_v2", {
       id,
       channelId
     });
@@ -823,7 +823,7 @@ async function bindUsersToCave(ctx, session, id, userIds) {
   if (parsedUserIds.length === 0) {
     return session.text(".noValidUserIdProvided");
   }
-  const caves = await ctx.database.get("echo_cave", id);
+  const caves = await ctx.database.get("echo_cave_v2", id);
   if (caves.length === 0) {
     return session.text("echo-cave.general.noMsgWithId");
   }
@@ -831,7 +831,7 @@ async function bindUsersToCave(ctx, session, id, userIds) {
   if (!isAllUsersInGroup) {
     return session.text("echo-cave.user.userNotInGroup");
   }
-  await ctx.database.set("echo_cave", id, {
+  await ctx.database.set("echo_cave_v2", id, {
     relatedUsers: parsedUserIds
   });
   return session.text(".userBoundSuccess", [id]);
@@ -859,7 +859,7 @@ async function searchCave(ctx, session, userIds) {
   }
   const targetUserId = parsedUserIds[0];
   const { channelId } = session;
-  const caves = await ctx.database.get("echo_cave", {
+  const caves = await ctx.database.get("echo_cave_v2", {
     channelId
   });
   const matchingCaves = caves.filter(
@@ -912,6 +912,33 @@ function apply(ctx, cfg) {
       autoInc: true
     }
   );
+  ctx.model.extend(
+    "echo_cave_v2",
+    {
+      id: "unsigned",
+      channelId: "string",
+      createTime: "timestamp",
+      userId: "string",
+      originUserId: "string",
+      type: "string",
+      content: "text",
+      relatedUsers: "list"
+    },
+    {
+      primary: "id",
+      autoInc: true
+    }
+  );
+  ctx.model.migrate(
+    "echo_cave",
+    {
+      id: "unsigned"
+    },
+    async (database) => {
+      const data = await database.get("echo_cave", {});
+      await database.upsert("echo_cave_v2", data);
+    }
+  );
   ctx.command("cave [id:number]").action(
     async ({ session }, id) => await getCave(ctx, session, cfg, id)
   );

package/lib/index.d.ts

@@ -17,6 +17,7 @@ export interface EchoCave {
 declare module 'koishi' {
     interface Tables {
         echo_cave: EchoCave;
+        echo_cave_v2: EchoCave;
     }
 }
 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.18.6",
+  "version": "1.19.0",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",