koishi-plugin-cocoyyy-console 1.0.9-beta.3 → 1.0.10-beta.1

package/lib/index.js

@@ -1189,23 +1189,19 @@ __name(create_content, "create_content");
 async function get_content_list(guild_id, tar_uid) {
   try {
     const RbqContent = getRbqContentModel();
+    const whereBase = { guild_id };
     const existed = await RbqContent.findAll({
-      where: {
-        guild_id,
-        tag_uid: null
-      }
+      where: { ...whereBase, tag_uid: null }
     });
-    let result_list = [];
+    let result_list = existed.map((item) => item.get("content")).filter(Boolean);
     result_list.push(...existed.map((item) => item.get("content")).filter(Boolean));
     if (tar_uid) {
       const tar_existed = await RbqContent.findAll({
-        where: {
-          guild_id,
-          tag_uid: tar_uid
-        }
+        where: { ...whereBase, tag_uid: tar_uid }
       });
       result_list.push(...tar_existed.map((item) => item.get("content")).filter(Boolean));
     }
+    result_list = Array.from(new Set(result_list.map((s) => s.trim()).filter((s) => s.length > 0)));
     return result_list;
   } catch (e) {
     logger.error("[get_content_list Error]: " + e?.message || String(e));
@@ -1222,9 +1218,14 @@ function registerRbqCommands(ctx, connected) {
       if (!connected) return;
       if (!is_at_bot(session)) return;
     }
-    const list = await get_person_list(session.guildId);
+    const guildId = session.guildId;
+    if (!guildId) return "无法获取群号";
+    const list = await get_person_list(guildId);
+    if (!list || list.length === 0) {
+      return "当前群聊还没有设置任何rbq";
+    }
     return `当前群聊rbq列表：
-${list.join(",")}`;
+${list.map((item) => (0, import_koishi8.h)("at", { id: item })).join(",")}`;
   });
   ctx.command("rbqadd <参数>", "添加rbq").action(async ({ session }, ...args) => {
     if (!dev_mode) {
@@ -1233,9 +1234,12 @@ ${list.join(",")}`;
     }
     const uid = args?.[0];
     if (!uid) return "请提供正确格式，如：@bot rbqadd [QQ号]";
-    let exec = await check_in_group(ctx, session, uid);
-    if (!exec.result)
-      return `${uid}不在当前群聊中`;
+    let exec = null;
+    if (!dev_mode) {
+      exec = await check_in_group(ctx, session, uid);
+      if (!exec.result)
+        return `${uid}不在当前群聊中`;
+    }
     exec = await create_person(session.guildId, uid);
     if (!exec.result)
       return `添加rbq失败：${exec.error}`;
@@ -1249,9 +1253,12 @@ ${list.join(",")}`;
     const source_uid = args?.[0];
     const target_uid = args?.[1];
     if (!source_uid || !target_uid) return "请提供正确格式，如：@bot rbqinstead [已存在QQ号] [替换QQ号]";
-    let exec = await check_in_group(ctx, session, target_uid);
-    if (!exec.result)
-      return `${target_uid}不在当前群聊中`;
+    let exec = null;
+    if (!dev_mode) {
+      exec = await check_in_group(ctx, session, target_uid);
+      if (!exec.result)
+        return `${target_uid}不在当前群聊中`;
+    }
     exec = await instead_person(session.guildId, source_uid, target_uid);
     if (!exec.result)
       return `替换rbq失败：${exec.error}`;
@@ -1265,10 +1272,12 @@ ${list.join(",")}`;
     const content = args?.[0];
     const target_uid = args?.[1] ?? null;
     if (!content) return "请提供正确格式，如：@bot rbqadd_txt [文本] [目标QQ号(可选)]";
-    if (target_uid) {
-      let exec2 = await check_in_group(ctx, session, target_uid);
-      if (!exec2.result)
-        return `${target_uid}不在当前群聊中`;
+    if (!dev_mode) {
+      if (target_uid) {
+        let exec2 = await check_in_group(ctx, session, target_uid);
+        if (!exec2.result)
+          return `${target_uid}不在当前群聊中`;
+      }
     }
     let exec = await create_content(session.guildId, content, target_uid);
     if (!exec.result)
@@ -1293,9 +1302,9 @@ ${list.join(",")}`;
       let content = "*死你";
       if (contents && contents.length > 0) {
         const random = new import_koishi8.Random(() => Math.random());
-        content = contents[random.int(0, contents.length - 1)];
+        content = contents[random.int(0, contents.length)];
       }
-      return session.send((0, import_koishi8.h)("at", { id: matchedUid }) + " " + content);
+      return (0, import_koishi8.h)("at", { id: matchedUid }) + " " + content;
     } catch (error) {
       logger.error("[rbq middleware] Error:", error);
       return next();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cocoyyy-console",
   "description": "自用koishi插件，功能包含复读，记录黑历史，*人等",
-  "version": "1.0.9-beta.3",
+  "version": "1.0.10-beta.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [