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

package/lib/index.js

@@ -1143,6 +1143,32 @@ async function get_person_list(guild_id) {
   }
 }
 __name(get_person_list, "get_person_list");
+async function instead_person(guild_id, source_uid, target_uid) {
+  try {
+    const Rbq = getRbqPersonModel();
+    const existed = await findGuildRecord(guild_id);
+    if (!existed) {
+      throw new Error("not found record in " + guild_id);
+    }
+    let uidList = existed.get("uid_list");
+    if (uidList == null) {
+      throw new Error("not found source_uid in " + guild_id);
+    }
+    let list = uidList.split(";");
+    if (!list.includes(source_uid)) {
+      throw new Error("not found source_uid in " + guild_id);
+    }
+    uidList = uidList.replaceAll(source_uid, target_uid);
+    existed.set("uid_list", uidList);
+    await existed.save();
+    personMap.set(guild_id, uidList.split(";"));
+    return { result: true, error: null };
+  } catch (e) {
+    logger.error("[instead_person Error]: " + e?.message || String(e));
+    return { result: false, error: e?.message || String(e) };
+  }
+}
+__name(instead_person, "instead_person");
 function get_person_map() {
   return personMap;
 }
@@ -1237,11 +1263,16 @@ function registerRbqCommands(ctx, connected) {
         return `${target_uid}不在当前群聊中`;
     }
     logger.info(`[rbqinstead] info: input_uid: ${session.uid}, sourceId: ${source_uid}, targetId: ${target_uid}, botId: ${session.selfId}`);
-    if (target_uid == session.selfId) {
-      let new_target = session.uid;
-      logger.info(`[rbqinstead] info: new_target: ${new_target}`);
-      return "还想让我变rbq？进去吧你，已替换rbq：\n" + (0, import_koishi8.h)("at", { id: source_uid }) + " -> " + (0, import_koishi8.h)("at", { id: new_target });
+    if (target_uid == session.selfId || target_uid == "2440587103") {
+      let new_target = session.uid.replace("onebot:", "").toString();
+      exec = await instead_person(session.guildId, source_uid, new_target);
+      if (!exec.result)
+        return `替换rbq失败：${exec.error}`;
+      return "倒反天罡！进去吧你，已替换rbq：\n" + (0, import_koishi8.h)("at", { id: source_uid }) + " -> " + (0, import_koishi8.h)("at", { id: new_target });
     }
+    exec = await instead_person(session.guildId, source_uid, target_uid);
+    if (!exec.result)
+      return `替换rbq失败：${exec.error}`;
     return (0, import_koishi8.h)("p", "已替换rbq：", (0, import_koishi8.h)("at", { id: source_uid }), " -> ", (0, import_koishi8.h)("at", { id: target_uid }));
   });
   ctx.command("rbqadd_txt <参数>", "添加自定义文本").action(async ({ session }, ...args) => {
@@ -1266,7 +1297,9 @@ function registerRbqCommands(ctx, connected) {
   });
   ctx.middleware(async (session, next) => {
     const { guildId, elements } = session;
+    let user_id = session.uid.replace("onebot:", "").toString();
     if (ctx.bots[session.uid]) return next();
+    if (ctx.bots[user_id]) return next();
     const personMap2 = get_person_map();
     const rbqList = personMap2.get(guildId);
     if (!rbqList || rbqList.length === 0) return next();
@@ -1504,7 +1537,8 @@ async function checkUserToken(qq_uid) {
 }
 __name(checkUserToken, "checkUserToken");
 async function getToken(session, mobile, code) {
-  const existed = await checkUserToken(session.uid);
+  let user_id = session.uid.replace("onebot:", "").toString();
+  const existed = await checkUserToken(user_id);
   if (existed) {
     return { status: true, data: existed };
   }
@@ -1531,7 +1565,7 @@ async function getToken(session, mobile, code) {
       return { status: false, msg: available_response.msg };
     }
     const userInfo = {
-      qq_uid: session.uid,
+      qq_uid: user_id,
       user_id: user_response.data.data.userId,
       user_name: user_response.data.data.userName,
       role_id: game_response.data.roleId,
@@ -1540,7 +1574,7 @@ async function getToken(session, mobile, code) {
       bat: available_response.data
     };
     createUpdateUser(userInfo);
-    userTokenMap.set(session.uid, userInfo);
+    userTokenMap.set(user_id, userInfo);
     logger.info(`[getToken Info]: 验证码登录成功，库街区用户: ${user_response.data.data.userName}`);
     return { status: true, data: userInfo };
   } catch (error) {
@@ -1697,7 +1731,7 @@ function registerKuroCommands(ctx, connected) {
       if (!is_at_bot(session)) return;
     }
     try {
-      const result = await signIn(session.uid);
+      const result = await signIn(session.uid.replace("onebot:", "").toString());
       if (result.status) {
         return "库街区签到成功";
       } else {
@@ -1715,7 +1749,7 @@ function registerKuroCommands(ctx, connected) {
     }
     if (!roleName) {
       try {
-        const result = await getRoleData(session.uid);
+        const result = await getRoleData(session.uid.replace("onebot:", "").toString());
         if (result.status) {
           return result.data;
         } else {

package/package.json

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