koishi-plugin-cocoyyy-console 1.0.14-beta.7 → 1.0.15

package/lib/index.js

@@ -1158,6 +1158,9 @@ async function instead_person(guild_id, source_uid, target_uid) {
     if (!list.includes(source_uid)) {
       throw new Error("not found source_uid in " + guild_id);
     }
+    if (list.includes(target_uid)) {
+      throw new Error("target_uid already in rbqlist");
+    }
     uidList = uidList.replaceAll(source_uid, target_uid);
     existed.set("uid_list", uidList);
     await existed.save();
@@ -1265,6 +1268,9 @@ function registerRbqCommands(ctx, connected) {
     logger.info(`[rbqinstead] info: input_uid: ${session.uid}, sourceId: ${source_uid}, targetId: ${target_uid}, botId: ${session.selfId}`);
     if (target_uid == session.selfId || target_uid == "2440587103") {
       let new_target = session.uid.replace("onebot:", "").toString();
+      if (new_target == source_uid) {
+        return "自救不了一点，乖乖挨草！";
+      }
       exec = await instead_person(session.guildId, source_uid, new_target);
       if (!exec.result)
         return `替换rbq失败：${exec.error}`;
@@ -1290,6 +1296,25 @@ function registerRbqCommands(ctx, connected) {
           return `${target_uid}不在当前群聊中`;
       }
     }
+    let user_id = session.uid.replace("onebot:", "").toString();
+    if (user_id == target_uid) {
+      const personMap2 = get_person_map();
+      const rbqList = personMap2.get(session.guildId);
+      if (!rbqList || rbqList.length === 0) return "不能给自己设置文本，请输入其他qq号";
+      if (!rbqList.includes(user_id)) return "不能给自己设置文本，请输入其他qq号";
+      try {
+        const contents = await get_content_list(session.guildId, target_uid);
+        let content2 = "*死你";
+        if (contents && contents.length > 0) {
+          const random = new import_koishi8.Random(() => Math.random());
+          content2 = contents[random.int(0, contents.length)];
+        }
+        return (0, import_koishi8.h)("at", { id: target_uid }) + "还想自己加文本？！\n" + content2;
+      } catch (error) {
+        logger.error("[rbq rbqadd_txt] Error:", error);
+        return "不能给自己设置文本，请输入其他qq号";
+      }
+    }
     let exec = await create_content(session.guildId, content, target_uid);
     if (!exec.result)
       return `添加自定义文本失败：${exec.error}`;

package/package.json

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