koishi-plugin-node-async-bot-all 2.28.0 → 2.29.0

package/lib/index.js

@@ -939,7 +939,7 @@ async function getUse(ctx, session, qq, desc) {
 __name(getUse, "getUse");
 
 // package.json
-var version = "2.28.0";
+var version = "2.29.0";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer", "cron"];
@@ -1006,6 +1006,11 @@ async function endReaction(session) {
   await session.bot.createReaction(session.channelId, session.messageId, `face|144`);
 }
 __name(endReaction, "endReaction");
+async function endReactionFailed(session) {
+  await session.bot.deleteReaction(session.channelId, session.messageId, `face|424`);
+  await session.bot.createReaction(session.channelId, session.messageId, `face|41`);
+}
+__name(endReactionFailed, "endReactionFailed");
 function apply(ctx) {
   ctx.i18n.define("zh-CN", require_zh_CN());
   ctx.on("ready", async () => {
@@ -1058,49 +1063,54 @@ ${import_koishi3.h.image(outMsg.data, "image/png")}`);
   na.subcommand("cxGame").action(async ({ session }) => {
     await startReaction(session);
     const cx = await getServer(ctx, session);
-    await endReaction(session);
     if (cx["success"] == 0) {
-      return session?.text(".msg", cx);
+      await session?.send(session?.text(".msg", cx));
+      await endReaction(session);
     } else if (cx["success"] == 1) {
-      return session?.text(".forbidden", cx);
+      await session?.send(session?.text(".forbidden", cx));
+      await endReactionFailed(session);
     } else if (cx["success"] == 2) {
-      return session?.text(".failed", cx);
+      await session?.send(session?.text(".failed", cx));
+      await endReactionFailed(session);
     }
   });
   na.subcommand("status").alias("stats").alias("状态").action(async ({ session }) => {
     await startReaction(session);
     const status2 = await getStatus(ctx, session);
-    await endReaction(session);
     if (status2["success"] == 0) {
-      return session?.text(".msg", status2);
+      await session?.send(session?.text(".msg", status2));
+      await endReaction(session);
     } else {
-      return session?.text(".failed", status2);
+      await session?.send(session?.text(".failed", status2));
+      await endReactionFailed(session);
     }
   });
   na.subcommand("random [最小数:number] [最大数:number]").alias("随机数").action(async ({ session }, min, max) => {
     await startReaction(session);
     const random2 = await getRandom(ctx, session, min, max);
+    await session?.send(session?.text(".msg", random2));
     await endReaction(session);
-    return session?.text(".msg", random2);
   });
   na.subcommand("info").action(async ({ session }) => {
     await startReaction(session);
     const info = await getInfo(ctx, session);
-    await endReaction(session);
     if (info["success"] == 0) {
-      return session?.text(".msg", info);
+      await session?.send(session?.text(".msg", info));
+      await endReaction(session);
     } else {
-      return session?.text(".failed", info);
+      await session?.send(session?.text(".failed", info));
+      await endReactionFailed(session);
     }
   });
   na.subcommand("rw").action(async ({ session }) => {
     await startReaction(session);
     const rw = await getRandomWord(ctx, session);
-    await endReaction(session);
     if (rw["success"] == 0) {
-      return session?.text(".msg", rw);
+      await session?.send(session?.text(".msg", rw));
+      await endReaction(session);
     } else {
-      return session?.text(".failed", rw);
+      await session?.send(session?.text(".failed", rw));
+      await endReactionFailed(session);
     }
   });
   na.subcommand("randomBA").alias("随机ba图").action(async ({ session }) => {
@@ -1111,8 +1121,8 @@ ${import_koishi3.h.image(outMsg.data, "image/png")}`);
   na.subcommand("centerServerTest").alias("测测中心服务器").action(async ({ session }) => {
     await startReaction(session);
     const msg = await centerServerTest(ctx, session);
+    await session?.send(session?.text(msg.success, msg.data));
     await endReaction(session);
-    return session?.text(msg.success, msg.data);
   });
   na.subcommand("meme [序号:posint]").alias("memes").action(async ({ session }, count) => {
     await startReaction(session);
@@ -1125,8 +1135,11 @@ ${import_koishi3.h.image(outMsg.data, "image/png")}`);
     await endReaction(session);
   });
   na.subcommand("getQQInfo <QQ号:string>").alias("获取QQ信息").action(async ({ session }, qq) => {
-    if (qq == void 0 || isNaN(Number(qq))) return session?.text(".command");
     await startReaction(session);
+    if (qq == void 0 || isNaN(Number(qq))) {
+      await endReactionFailed(session);
+      return session?.text(".command");
+    }
     await getQQInfo(ctx, session, qq);
     await endReaction(session);
   });
@@ -1136,9 +1149,12 @@ ${import_koishi3.h.image(outMsg.data, "image/png")}`);
     await endReaction(session);
   });
   na.subcommand("use <user:user> [方法:string]").alias("u").action(async ({ session }, user, desc) => {
-    const qq = user?.split(":")?.[1];
-    if (qq == void 0 || isNaN(Number(qq))) return session?.text(".command");
     await startReaction(session);
+    const qq = user?.split(":")?.[1];
+    if (qq == void 0 || isNaN(Number(qq))) {
+      await endReactionFailed(session);
+      return session?.text(".command");
+    }
     await getUse(ctx, session, qq, desc);
     await endReaction(session);
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "2.28.0",
+  "version": "2.29.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [