koishi-plugin-cocoyyy-console 1.0.13-beta.0 → 1.0.14-beta.0

package/lib/index.js

@@ -506,7 +506,7 @@ async function randomImgByTag(tag_name, guild_id) {
     if (!existed) {
       throw new Error(`not found tag '${tag_name}'!`);
     }
-    if (existed.status == 0) {
+    if (existed.status == 1) {
       throw new Error(`not found tag '${tag_name}'!`);
     }
     let ImgList = await Img.findAll({
@@ -580,7 +580,6 @@ __name(endBatchAddImg, "endBatchAddImg");
 // src/services/tag_func/tag_service.ts
 async function findTagByName(tag_name, guild_id) {
   const Tag = getTagsModel();
-  logger.info("search guild:" + guild_id + ", tag:" + tag_name);
   return await Tag.findOne({
     where: {
       status: 0,
@@ -1264,10 +1263,14 @@ ${list.map((item) => (0, import_koishi8.h)("at", { id: item })).join(",")}`;
       if (!exec.result)
         return `${target_uid}不在当前群聊中`;
     }
+    if (ctx.bots[session.uid]) {
+      logger.info(`[rbqinstead] botId: ${session.uid}, sourceId: ${source_uid}, targetId: ${target_uid}`);
+      return `已替换rbq：${(0, import_koishi8.h)("at", { id: source_uid })} -> ${(0, import_koishi8.h)("at", { id: target_uid })}`;
+    }
     exec = await instead_person(session.guildId, source_uid, target_uid);
     if (!exec.result)
       return `替换rbq失败：${exec.error}`;
-    return `已替换rbq：${source_uid} -> ${target_uid}`;
+    return `已替换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) => {
     if (!dev_mode) {
@@ -1319,62 +1322,16 @@ ${list.map((item) => (0, import_koishi8.h)("at", { id: item })).join(",")}`;
 __name(registerRbqCommands, "registerRbqCommands");
 
 // src/services/test_command.ts
-var import_axios = __toESM(require("axios"));
-var import_qs = __toESM(require("qs"));
-var userMap = /* @__PURE__ */ new Map();
 function registerTestCommands(ctx) {
   ctx.command("test <参数>", "test").action(async ({ session }, phoneNumber, code) => {
-    if (!phoneNumber || !code) return "请提供手机号和验证码";
     try {
-      const token = await getToken(phoneNumber, code);
-      if (token.status) {
-        return `验证码登录成功，库街区用户: ${token.data.userName}`;
-      } else {
-        return `验证码登录失败: ${token.msg}`;
-      }
     } catch (err) {
       console.error(err);
       return `test error: ${err.message}`;
     }
   });
-  ctx.command("getuser <参数>", "getuser").action(async ({ session }, mobile) => {
-    if (!mobile) return "请提供手机号";
-    const user = userMap.get(mobile);
-    if (user) {
-      return `库街区用户: ${JSON.stringify(user)}`;
-    } else {
-      return `库街区用户不存在`;
-    }
-  });
 }
 __name(registerTestCommands, "registerTestCommands");
-var CONSTANTS = {
-  REQUEST_HEADERS_BASE: {
-    "source": "ios"
-  }
-};
-async function getToken(mobile, code) {
-  const devCode = [...Array(40)].map(() => "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"[Math.random() * 36 | 0]).join("");
-  let data = import_qs.default.stringify({
-    mobile,
-    code
-  });
-  try {
-    const response = await import_axios.default.post("https://api.kurobbs.com/user/sdkLogin", data, { headers: { ...CONSTANTS.REQUEST_HEADERS_BASE, devCode } });
-    if (response.data.code === 200) {
-      userMap.set(mobile, response.data.data);
-      logger.info(`验证码登录成功，库街区用户: ${response.data.data.userName}`);
-      return { status: true, data: response.data.data };
-    } else {
-      logger.error(`验证码登录失败: ${response.data.msg}`);
-      return { status: false, msg: response.data.msg };
-    }
-  } catch (error) {
-    logger.error(`验证码登录失败，疑似网络问题: ${error}`);
-    return { status: false, msg: "登录失败，疑似网络问题，请检查控制台日志" };
-  }
-}
-__name(getToken, "getToken");
 
 // src/infra/redis_init.ts
 var import_ioredis = __toESM(require("ioredis"));
@@ -1395,8 +1352,8 @@ function init_redis(config) {
 __name(init_redis, "init_redis");
 
 // src/services/kuro_func/kuro_service.ts
-var import_axios2 = __toESM(require("axios"));
-var import_qs2 = __toESM(require("qs"));
+var import_axios = __toESM(require("axios"));
+var import_qs = __toESM(require("qs"));
 
 // src/models/kuro_user.ts
 var import_sequelize8 = require("sequelize");
@@ -1504,7 +1461,7 @@ __name(createUpdateUser, "createUpdateUser");
 
 // src/services/kuro_func/kuro_service.ts
 var userTokenMap = /* @__PURE__ */ new Map();
-var CONSTANTS2 = {
+var CONSTANTS = {
   BASE_URL: "https://api.kurobbs.com",
   LOGIN_URL: "/user/sdkLogin",
   GAME_DATA_URL: "/gamer/role/list",
@@ -1528,11 +1485,11 @@ var CONSTANTS2 = {
     "source": "ios"
   }
 };
-var wavesApi = import_axios2.default.create();
+var wavesApi = import_axios.default.create();
 wavesApi.interceptors.request.use(
   async (config) => {
     if (config.url.startsWith("/")) {
-      config.url = CONSTANTS2.BASE_URL + config.url;
+      config.url = CONSTANTS.BASE_URL + config.url;
     }
     return config;
   },
@@ -1574,18 +1531,18 @@ async function checkUserToken(qq_uid) {
   return userInfo;
 }
 __name(checkUserToken, "checkUserToken");
-async function getToken2(session, mobile, code) {
+async function getToken(session, mobile, code) {
   const existed = await checkUserToken(session.uid);
   if (existed) {
     return { status: true, data: existed };
   }
   const devCode = [...Array(40)].map(() => "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"[Math.random() * 36 | 0]).join("");
-  let data = import_qs2.default.stringify({
+  let data = import_qs.default.stringify({
     mobile,
     code
   });
   try {
-    const user_response = await wavesApi.post(CONSTANTS2.LOGIN_URL, data, { headers: { ...CONSTANTS2.REQUEST_HEADERS_BASE, devCode } });
+    const user_response = await wavesApi.post(CONSTANTS.LOGIN_URL, data, { headers: { ...CONSTANTS.REQUEST_HEADERS_BASE, devCode } });
     if (user_response.data.code != 200) {
       logger.error(`验证码登录失败: ${user_response.data.msg}`);
       return { status: false, msg: user_response.data.msg };
@@ -1619,13 +1576,13 @@ async function getToken2(session, mobile, code) {
     return { status: false, msg: "疑似网络问题，请检查控制台日志" };
   }
 }
-__name(getToken2, "getToken");
+__name(getToken, "getToken");
 async function getGameData(token) {
   try {
-    let data = import_qs2.default.stringify({
+    let data = import_qs.default.stringify({
       "gameId": 3
     });
-    const response = await wavesApi.post(CONSTANTS2.GAME_DATA_URL, data, { headers: { ...CONSTANTS2.REQUEST_HEADERS_BASE, "token": token } });
+    const response = await wavesApi.post(CONSTANTS.GAME_DATA_URL, data, { headers: { ...CONSTANTS.REQUEST_HEADERS_BASE, "token": token } });
     if (response.data.code === 200) {
       return { status: true, data: response.data.data[0] };
     } else {
@@ -1639,12 +1596,12 @@ async function getGameData(token) {
 }
 __name(getGameData, "getGameData");
 async function isAvailable(serverId, roleId, token) {
-  let data = import_qs2.default.stringify({
+  let data = import_qs.default.stringify({
     "serverId": serverId,
     "roleId": roleId
   });
   try {
-    const response = await wavesApi.post(CONSTANTS2.TOKEN_REFRESH_URL, data, { headers: { ...CONSTANTS2.REQUEST_HEADERS_BASE, "token": token } });
+    const response = await wavesApi.post(CONSTANTS.TOKEN_REFRESH_URL, data, { headers: { ...CONSTANTS.REQUEST_HEADERS_BASE, "token": token } });
     if (response.data.code === 220) {
       logger.info(`${roleId} 获取可用性成功，账号已过期`);
       return { status: false, msg: "账号已过期" };
@@ -1659,13 +1616,13 @@ async function isAvailable(serverId, roleId, token) {
 }
 __name(isAvailable, "isAvailable");
 async function refreshData(bat, serverId, roleId, token) {
-  let data = import_qs2.default.stringify({
+  let data = import_qs.default.stringify({
     "gameId": 3,
     "serverId": serverId,
     "roleId": roleId
   });
   try {
-    const response = await wavesApi.post(CONSTANTS2.REFRESH_URL, data, { headers: { ...CONSTANTS2.REQUEST_HEADERS_BASE, "token": token, "b-at": bat } });
+    const response = await wavesApi.post(CONSTANTS.REFRESH_URL, data, { headers: { ...CONSTANTS.REQUEST_HEADERS_BASE, "token": token, "b-at": bat } });
     if (response.data.code === 10902 || response.data.code === 200) {
       return { status: true, data: response.data.data };
     } else {
@@ -1684,7 +1641,7 @@ async function signIn(qq_uid) {
     return { status: false, msg: "未检测到登录信息或信息已过期，请重新登录！" };
   }
   await refreshData(userInfo.bat, userInfo.server_id, userInfo.role_id, userInfo.token);
-  let data = import_qs2.default.stringify({
+  let data = import_qs.default.stringify({
     "gameId": 3,
     "serverId": userInfo.server_id,
     "roleId": userInfo.role_id,
@@ -1692,7 +1649,7 @@ async function signIn(qq_uid) {
     "reqMonth": ((/* @__PURE__ */ new Date()).getMonth() + 1).toString().padStart(2, "0")
   });
   try {
-    const response = await wavesApi.post(CONSTANTS2.SIGNIN_URL, data, { headers: { ...CONSTANTS2.REQUEST_HEADERS_BASE, "token": userInfo.token, devcode: "", "b-at": userInfo.bat } });
+    const response = await wavesApi.post(CONSTANTS.SIGNIN_URL, data, { headers: { ...CONSTANTS.REQUEST_HEADERS_BASE, "token": userInfo.token, devcode: "", "b-at": userInfo.bat } });
     if (response.data.code === 200) {
       if (response.data.data === null) {
         logger.info(`[signIn Info]: ${qq_uid} 签到失败，返回空数据`);
@@ -1715,13 +1672,13 @@ async function getRoleData(qq_uid) {
     return { status: false, msg: "未检测到登录信息或信息已过期，请重新登录！" };
   }
   await refreshData(userInfo.bat, userInfo.server_id, userInfo.role_id, userInfo.token);
-  let data = import_qs2.default.stringify({
+  let data = import_qs.default.stringify({
     "gameId": 3,
     "serverId": userInfo.server_id,
     "roleId": userInfo.role_id
   });
   try {
-    const response = await wavesApi.post(CONSTANTS2.ROLE_DATA_URL, data, { headers: { ...CONSTANTS2.REQUEST_HEADERS_BASE, "token": userInfo.token, "b-at": userInfo.bat } });
+    const response = await wavesApi.post(CONSTANTS.ROLE_DATA_URL, data, { headers: { ...CONSTANTS.REQUEST_HEADERS_BASE, "token": userInfo.token, "b-at": userInfo.bat } });
     if (response.data.code === 10902 || response.data.code === 200) {
       response.data.data = JSON.parse(response.data.data);
       if (response.data.data === null || !response.data.data.showToGuest) {
@@ -1751,7 +1708,7 @@ function registerKuroCommands(ctx, connected) {
     }
     if (!phoneNumber || !code) return "请提供手机号和验证码，如：@bot login [手机号] [验证码]";
     try {
-      const result = await getToken2(session, phoneNumber, code);
+      const result = await getToken(session, phoneNumber, code);
       if (result.status) {
         return `登录成功，库街区用户: ${result.data.user_name}`;
       } else {

package/package.json

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