koishi-plugin-echo-cave 1.18.1 → 1.18.3

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

@@ -1,2 +1,2 @@
 import { Context, Session } from 'koishi';
-export declare function searchCave(ctx: Context, session: Session, userIds: number): Promise<string>;
+export declare function searchCave(ctx: Context, session: Session, userIds: string): Promise<string>;

package/lib/index.cjs

@@ -206,7 +206,7 @@ async function checkUsersInGroup(ctx, session, userIds) {
 var import_koishi = require("koishi");
 function parseUserIds(userIds) {
   const parsedUserIds = [];
-  for (const userId of userIds) {
+  for (const userId of typeof userIds === "string" ? [userIds] : userIds) {
     const num = Number(userId);
     if (!Number.isNaN(num)) {
       parsedUserIds.push(userId);
@@ -818,7 +818,6 @@ async function bindUsersToCave(ctx, session, id, userIds) {
 }
 
 // src/core/command/search-cave.ts
-var import_koishi2 = require("koishi");
 async function searchCave(ctx, session, userIds) {
   if (!session.guildId) {
     return session.text("echo-cave.general.privateChatReminder");
@@ -826,7 +825,7 @@ async function searchCave(ctx, session, userIds) {
   if (!userIds) {
     return session.text(".noUserIdProvided");
   }
-  const result = parseUserIds(userIds.toString());
+  const result = parseUserIds(userIds);
   if (result.error === "invalid_all_mention") {
     return session.text("echo-cave.user.invalidAllMention");
   }
@@ -840,12 +839,11 @@ async function searchCave(ctx, session, userIds) {
   }
   const targetUserId = parsedUserIds[0];
   const { channelId } = session;
-  const matchingCaves = await ctx.database.get(
-    "echo_cave",
-    (row) => import_koishi2.$.and(
-      import_koishi2.$.eq(row.channelId, channelId),
-      import_koishi2.$.or(import_koishi2.$.eq(row.originUserId, targetUserId), import_koishi2.$.in(targetUserId, row.relatedUsers))
-    )
+  const caves = await ctx.database.get("echo_cave", {
+    channelId
+  });
+  const matchingCaves = caves.filter(
+    (cave) => cave.originUserId === targetUserId || cave.relatedUsers.includes(targetUserId)
   );
   if (matchingCaves.length === 0) {
     return session.text(".noMatchingCaves", [targetUserId]);
@@ -893,7 +891,7 @@ function apply(ctx, cfg) {
   ctx.command("cave.purge <...ids:number>").action(
     async ({ session }, ...ids) => await deleteCaves(ctx, session, cfg, ids)
   );
-  ctx.command("cave.search <id:number>").action(
+  ctx.command("cave.search <id>").action(
     async ({ session }, id) => await searchCave(ctx, session, id)
   );
   ctx.command("cave.bind <id:number> <...userIds>", { authority: 4 }).action(

package/package.json

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