koishi-plugin-node-async-bot-all 2.24.8 → 2.24.10

package/lib/commands.d.ts

@@ -73,7 +73,7 @@ export declare function centerServerTest(ctx: Context, session: Session): Promis
 export declare function getMeme(ctx: Context, session: Session, count: number): Promise<Number>;
 export declare function getCat(ctx: Context, session: Session): Promise<Number>;
 export declare function getQQInfo(ctx: Context, session: Session, qq: string): Promise<number>;
-export declare function getMsg(ctx: Context, session: Session): Promise<number>;
+export declare function getMsg(ctx: Context, session: Session, inversion: boolean | undefined): Promise<number>;
 export declare function getNewsMsg(ctx: Context, type: number): Promise<{
     success: boolean;
     data?: Buffer;

package/lib/fun.d.ts

@@ -37,7 +37,7 @@ export declare function getMsgCount(ctx: Context): Promise<Object>;
 export declare function random(type: number | undefined, data: any, data2?: any): number;
 export declare function request<T = any>(url: string, options?: RequestInit, timeout?: number, log?: any): Promise<HttpResponse<T>>;
 export declare function readUserCardFile(userInfo: APIUserInfo): Promise<string>;
-export declare function readUserMsgFile(userName: string, userAvatar: string, msg: string): Promise<string>;
+export declare function readUserMsgFile(userName: string, userAvatar: string, msg: string, inversion: boolean | undefined): Promise<string>;
 export declare function queryA2S(host: string, log: any): Promise<serverInfo>;
 export declare function readNewsFile(info: APINews, log: any): Promise<string[]>;
 export declare function translateAPI(log: any, text: string): Promise<string>;

package/lib/index.js

@@ -253,12 +253,19 @@ async function readUserCardFile(userInfo) {
   return card;
 }
 __name(readUserCardFile, "readUserCardFile");
-async function readUserMsgFile(userName, userAvatar, msg) {
+async function readUserMsgFile(userName, userAvatar, msg, inversion) {
   let html;
   try {
     const aPath = import_path.default.resolve(__dirname, "..") + import_path.default.sep + "res" + import_path.default.sep + "userMsg.html";
     html = await import_fs.default.promises.readFile(aPath, "utf8");
-    html = html.toString().replace("{userData.avatarUrl}", userAvatar).replace("{userData.username}", userName).replace("{userData.message}", msg);
+    html = html.toString().replace("{userData.avatarUrl}", userAvatar).replace("{userData.username}", userName).replace("{userData.message}", msg).replace(
+      /<at\s+(?:id=["']([^"']*)["']\s+name=["']([^"']*)["']|name=["']([^"']*)["']\s+id=["']([^"']*)["'])\s*\/?>/g,
+      (match, id1, name1, name2, id2) => {
+        const name3 = name1 || name2 || id1 || id2 || match;
+        return `@${name3}`;
+      }
+    );
+    if (inversion) html.replace("//// ", "");
   } catch (error) {
     html = error.message;
   }
@@ -372,6 +379,7 @@ async function getServer(ctx, session) {
       if (type == "a2s") {
         const info = await queryA2S(api, log);
         if (info.success) {
+          log.debug(info);
           const temp = {
             "count": count,
             "players": info.players,
@@ -402,6 +410,7 @@ async function getServer(ctx, session) {
         const host = api.split(":");
         const serverInfo = await slpInfo(log, host[0], Number(host[1]), ctx.config.timeout);
         if (serverInfo.success) {
+          log.debug(serverInfo);
           if (serverInfo.data.players.sample == null) {
             const temp = {
               "count": count,
@@ -566,6 +575,7 @@ async function getRandomWord(ctx, session) {
   }
   const response = await request(ctx.config.rwAPI + "?format=json", {}, ctx.config.timeout, log);
   if (response.success) {
+    log.debug(response.data);
     msg = {
       "time": time,
       "data": response.data.data,
@@ -602,7 +612,7 @@ async function getBlueArchive(ctx, session) {
   const vid = await session.send(session.text(".wait", { "quote": import_koishi2.h.quote(session.messageId), "time": time }));
   const ms = random(0, 0, 1500);
   const link = random(2, ctx.config.baAPI) + `?cacheBuster=${random(1, 1, 2147483647)}`;
-  log.info(`Link: ${link}`);
+  log.debug(`Link: ${link}`);
   await (0, import_koishi2.sleep)(ms);
   const status2 = await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(link) }));
   if (!status2) await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(link) }));
@@ -628,6 +638,7 @@ async function centerServerTest(ctx, session) {
   });
   const response = await request("https://status.scpslgame.com/api/status-page/heartbeat/nw", {}, ctx.config.timeout, log);
   if (response.success) {
+    log.debug(response.data);
     for (const server of ctx.config.slTest) {
       const lastTime = response.data.heartbeatList[server.id].at(-1);
       if (lastTime) {
@@ -725,6 +736,7 @@ async function getCat(ctx, session) {
   const time = getHongKongTime();
   if (ctx.config.catAPI == void 0) {
     await session.send(session.text(".failed", { "quote": import_koishi2.h.quote(session.messageId), "data": "未指定 API", "time": time }));
+    log.warn("未指定 API");
     return 1;
   }
   const vid = await session.send(session.text(".wait", { "quote": import_koishi2.h.quote(session.messageId), "time": time }));
@@ -756,11 +768,13 @@ async function getQQInfo(ctx, session, qq) {
   const time = getHongKongTime();
   if (ctx.config.qqAPI == void 0) {
     await session.send(session.text(".failed", { "quote": import_koishi2.h.quote(session.messageId), "data": "未指定 API", "time": time }));
+    log.warn("未指定 API");
     return 1;
   }
   const response = await request(ctx.config.qqAPI + `?qq=${qq}`, {}, ctx.config.timeout, log);
   if (response.success) {
     const fullHtml = await readUserCardFile(response.data);
+    log.debug(fullHtml);
     const page = await ctx.puppeteer.page();
     try {
       await page.setViewport({
@@ -798,8 +812,8 @@ async function getQQInfo(ctx, session, qq) {
   return 0;
 }
 __name(getQQInfo, "getQQInfo");
-async function getMsg(ctx, session) {
-  const log = ctx.logger("getQQInfo");
+async function getMsg(ctx, session, inversion) {
+  const log = ctx.logger("getMsg");
   log.debug(`Got: {"form":"${session.platform}:${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
   const time = getHongKongTime();
   if (!session.quote || !session.quote.user) {
@@ -809,6 +823,7 @@ async function getMsg(ctx, session) {
   }
   if (session.quote.user.id == session.event.selfId) {
     await session.send(session.text(".matroska", { "quote": import_koishi2.h.quote(session.messageId) }));
+    log.debug("套娃");
     return 1;
   }
   const user = await session.bot.getUser(session.quote.user.id, session.channelId);
@@ -820,7 +835,8 @@ async function getMsg(ctx, session) {
     return 1;
   }
   const page = await ctx.puppeteer.page();
-  const html = await readUserMsgFile(user.name, user.avatar, msg.replace(/<at id=\{([^}]+)}\/>/g, "@{$1}"));
+  const html = await readUserMsgFile(user.name, user.avatar, msg, inversion);
+  log.debug(html);
   try {
     await page.setViewport({
       width: 450,
@@ -876,6 +892,7 @@ async function getNewsMsg(ctx, type) {
         { id: response.data.appnews.newsitems[0].gid, data: html[0] }
       ]);
     }
+    log.debug(html);
     const page = await ctx.puppeteer.page();
     try {
       await page.setViewport({
@@ -912,7 +929,7 @@ async function getNewsMsg(ctx, type) {
 __name(getNewsMsg, "getNewsMsg");
 
 // package.json
-var version = "2.24.8";
+var version = "2.24.10";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer", "cron"];
@@ -1061,8 +1078,8 @@ ${import_koishi3.h.image(outMsg.data, "image/png")}`);
     if (qq == void 0 || isNaN(Number(qq))) return session?.text(".command");
     await getQQInfo(ctx, session, qq);
   });
-  ctx.command("msg2img").alias("消息转图").alias("m").action(async ({ session }) => {
-    await getMsg(ctx, session);
+  ctx.command("msg2img").option("inversion", "-i").alias("消息转图").alias("m").action(async ({ session, options }) => {
+    await getMsg(ctx, session, options?.inversion);
   });
 }
 __name(apply, "apply");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "2.24.8",
+  "version": "2.24.10",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [
@@ -28,7 +28,7 @@
     "url": "git+https://github.com/ccd2s/node-async-bot-all.git"
   },
   "devDependencies": {
-    "@koishijs/client": "^5.30.4"
+    "@koishijs/client": "^5.30.11"
   },
   "peerDependencies": {
     "@koishijs/plugin-database-sqlite": "^4.6.0",

package/res/userMsg.html

@@ -10,6 +10,7 @@
       font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
       background: transparent;
       padding: 20px; /* 给截图留一点边缘留白 */
+      //// transform: rotate(180deg); /* 顺时针旋转180° */
     }
 
     /* 核心容器 */