koishi-plugin-node-async-bot-all 2.24.1 → 2.24.2

package/lib/commands.d.ts

@@ -76,7 +76,7 @@ export declare function getQQInfo(ctx: Context, session: Session, qq: string): P
 export declare function getMsg(ctx: Context, session: Session): Promise<number>;
 export declare function getNewsMsg(ctx: Context, type: number): Promise<{
     success: boolean;
-    data: string;
-    msg?: string;
+    data?: Buffer;
+    msg: string;
 }>;
 export {};

package/lib/index.js

@@ -858,10 +858,10 @@ async function getNewsMsg(ctx, type) {
   if (response.success) {
     if ((await ctx.database.get("botData", "newsId"))[0]?.data == response.data.appnews.newsitems[0].gid && type != 1) {
       log.debug("无新闻");
-      return { success: false, data: "" };
+      return { success: false, msg: "无可用新闻" };
     }
     const html = await readNewsFile(response.data, log);
-    if (html[1]) return { success: false, data: `渲染图片失败` };
+    if (html[1]) return { success: false, msg: `渲染图片失败` };
     const page = await ctx.puppeteer.page();
     try {
       await page.setViewport({
@@ -884,21 +884,21 @@ async function getNewsMsg(ctx, type) {
       if (type == 0) await ctx.database.upsert("botData", [
         { id: "newsId", data: response.data.appnews.newsitems[0].gid }
       ]);
-      return { success: true, data: Buffer.from(image).toString("base64"), msg: "NorthWood 发布了一个新闻（原文+机翻）：" + response.data.appnews.newsitems[0].title };
+      return { success: true, data: image, msg: "NorthWood 发布了一个新闻（原文+机翻）：" + response.data.appnews.newsitems[0].title };
     } catch (err) {
       log.error("图片渲染失败:", err);
-      return { success: false, data: "图片渲染失败" };
+      return { success: false, msg: "图片渲染失败" };
     } finally {
       if (page && !page.isClosed()) await page.close();
     }
   } else {
-    return { success: false, data: "请求 Steam API 失败" };
+    return { success: false, msg: "请求 Steam API 失败" };
   }
 }
 __name(getNewsMsg, "getNewsMsg");
 
 // package.json
-var version = "2.24.1";
+var version = "2.24.2";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer", "cron"];
@@ -967,13 +967,12 @@ function apply(ctx) {
   ctx.command("slnews").action(async () => {
     const log = ctx.logger("slnews");
     const outMsg = await getNewsMsg(ctx, 1);
-    if (outMsg.success) {
+    if (outMsg.data) {
       return `${outMsg.msg}
-${(0, import_koishi3.h)("image", { url: `data:image/jpg;base64,${outMsg.data}` })}`;
+${import_koishi3.h.image(outMsg.data, "image/png")}`;
     } else {
       log.warn(outMsg);
-      if (outMsg.data == "") return "无可用新闻";
-      return outMsg.data;
+      return outMsg.msg;
     }
   });
   ctx.cron("0 * * * *", async () => {
@@ -984,12 +983,12 @@ ${(0, import_koishi3.h)("image", { url: `data:image/jpg;base64,${outMsg.data}` }
   });
   ctx.on("node-async/news", async () => {
     const outMsg = await getNewsMsg(ctx, 0);
-    if (outMsg.success) {
+    if (outMsg.data) {
       await ctx.broadcast(ctx.config.slNews, `${outMsg.msg}
-${(0, import_koishi3.h)("image", { url: `data:image/jpg;base64,${outMsg.data}` })}`);
+${import_koishi3.h.image(outMsg.data, "image/png")}`);
     } else {
-      if (outMsg.data == "") return;
-      await ctx.broadcast(ctx.config.slNews, outMsg.data);
+      if (outMsg.msg == "") return;
+      await ctx.broadcast(ctx.config.slNews, outMsg.msg);
     }
   });
   ctx.command("cxGame").action(async ({ session }) => {

package/package.json

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