koishi-plugin-node-async-bot-all 2.14.0 → 2.16.0

package/lib/commands.d.ts

@@ -13,4 +13,4 @@ export declare function getRW(ctx: Context, session: Session): Promise<Object>;
 export declare function getBA(ctx: Context, session: Session): Promise<Number>;
 export declare function serverTest(ctx: Context, session: Session): Promise<Object>;
 export declare function getSteam(ctx: Context, session: Session, id: number): Promise<Object>;
-export declare function getMeme(ctx: Context, session: Session): Promise<Object>;
+export declare function getMeme(ctx: Context, session: Session, count: number): Promise<Number>;

package/lib/index.js

@@ -34,7 +34,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/zh-CN.yml
 var require_zh_CN = __commonJS({
   "src/locales/zh-CN.yml"(exports2, module2) {
-    module2.exports = { commands: { cxgame: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", list: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 备注：{note}", listNoPlayer: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 备注：{note}", listFailed: "【MC 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}", timeout: "请求超时。", timeout2: "响应超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", error: "执行错误。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n--- 系统状态 ---\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\n--- 机器人状态 ---\n昨日收/发消息数量：{msgCount}\n机器人版本：{version}\n运行时间：{online}", failed: "{time}\n状态获取失败。" } }, random: { description: "随机数生成器。", usage: "缺少参数时默认生成 0-10000 的随机数。\n使用示例：", examples: "random 1 128 生成1到128范围的随机数", messages: { msg: "{time}\n生成的随机数：{data}" } }, info: { description: "查询机器人信息。", messages: { msg: "{data}", failed: "{time}\n读取信息失败。" } }, rw: { description: "随机名言名句。", messages: { msg: "{time}\n{data}", error: "执行错误。", failed1: "{time}\n获取失败（1）。", failed2: "{time}\n获取失败（{data}）。" } }, randomba: { description: "随机BA图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。" } }, servertest: { description: "Ping服务器。", messages: { msg: "{time}\n== Ping {host} ==\n状态：{alive}\n丢包率：{packetLoss}\n返回IP：{ip}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\nPing 失败：{data}" } }, steamid: { description: "将 Steam 好友码（SteamID 3）转为 SteamID 64。", messages: { msg: "{time}\n转换结果：{data}", failed: "{time}\n转换失败：{data}", null: "参数 Steam 好友码（SteamID 3） 不得为空。", command: "执行错误。" } }, meme: { description: "群友的怪话！", messages: { msg: "{quote}{time}\n{image}\n{title}", failed: "{quote}{time}\n获取失败：{data}", forbidden: "{quote}{time}\n此指令不允许在本群使用。", error: "执行错误。" } } } };
+    module2.exports = { commands: { cxgame: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", list: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 备注：{note}", listNoPlayer: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 备注：{note}", listFailed: "【MC 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}", timeout: "请求超时。", timeout2: "响应超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", error: "执行错误。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n--- 系统状态 ---\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\n--- 机器人状态 ---\n昨日收/发消息数量：{msgCount}\n机器人版本：{version}\n运行时间：{online}", failed: "{time}\n状态获取失败。" } }, random: { description: "随机数生成器。", usage: "缺少参数时默认生成 0-10000 的随机数。\n使用示例：", examples: "random 1 128 生成1到128范围的随机数", messages: { msg: "{time}\n生成的随机数：{data}" } }, info: { description: "查询机器人信息。", messages: { msg: "{data}", failed: "{time}\n读取信息失败。" } }, rw: { description: "随机名言名句。", messages: { msg: "{time}\n{data}", error: "执行错误。", failed1: "{time}\n获取失败（1）。", failed2: "{time}\n获取失败（{data}）。" } }, randomba: { description: "随机BA图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。" } }, servertest: { description: "Ping服务器。", messages: { msg: "{time}\n== Ping {host} ==\n状态：{alive}\n丢包率：{packetLoss}\n返回IP：{ip}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\nPing 失败：{data}" } }, steamid: { description: "将 Steam 好友码（SteamID 3）转为 SteamID 64。", messages: { msg: "{time}\n转换结果：{data}", failed: "{time}\n转换失败：{data}", null: "参数 Steam 好友码（SteamID 3） 不得为空。", command: "执行错误。" } }, meme: { description: "群友的怪话！", messages: { msg: "{quote}{time}\n{image}\n{title}", failed: "{quote}{time}\n获取失败：{data}", forbidden: "{quote}{time}\n此指令不允许在本群使用。", error: "执行错误。", e: "未能发送消息。" } } } };
   }
 });
 
@@ -591,7 +591,7 @@ async function getSteam(ctx, session, id) {
   return msg;
 }
 __name(getSteam, "getSteam");
-async function getMeme(ctx, session) {
+async function getMeme(ctx, session, count) {
   const log = ctx.logger("getMeme");
   log.info(`Got: {"form":"${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
   let msg;
@@ -602,13 +602,14 @@ async function getMeme(ctx, session) {
     msg = {
       "time": time,
       "quote": import_koishi2.h.quote(session.messageId),
-      "success": 2
+      "success": ".forbidden"
     };
     log.info("Sent:");
     log.info(msg);
-    return msg;
+    await session.send(session.text(msg["success"], msg));
+    return 0;
   }
-  const response = await getHttp(log, api, ctx.config.timeout);
+  const response = count ? await getHttp(log, api + `&type=1&count=${count}`, ctx.config.timeout) : await getHttp(log, api, ctx.config.timeout);
   if (response.success) {
     data = response.data;
     msg = {
@@ -616,7 +617,7 @@ async function getMeme(ctx, session) {
       "title": data["data"]["title"],
       "image": import_koishi2.h.image(data["data"]["image"]),
       "quote": import_koishi2.h.quote(session.messageId),
-      "success": 0
+      "success": ".msg"
     };
     log.info("Sent:");
     log.info(msg);
@@ -627,7 +628,7 @@ async function getMeme(ctx, session) {
         "time": time,
         "data": data["name"] === "AbortError" ? session.text(".error") : data["message"],
         "quote": import_koishi2.h.quote(session.messageId),
-        "success": 1
+        "success": ".failed"
       };
       log.info("Sent:");
       log.info(msg);
@@ -637,18 +638,19 @@ async function getMeme(ctx, session) {
         "time": time,
         "data": data["data"],
         "quote": import_koishi2.h.quote(session.messageId),
-        "success": 1
+        "success": ".failed"
       };
       log.info("Sent:");
       log.info(msg);
     }
   }
-  return msg;
+  await session.send(session.text(msg["success"], msg));
+  return 0;
 }
 __name(getMeme, "getMeme");
 
 // package.json
-var version = "2.14.0";
+var version = "2.16.0";
 
 // src/index.ts
 var inject = ["database", "installer"];
@@ -761,14 +763,11 @@ function apply(ctx) {
       return session?.text(".failed", steam);
     }
   });
-  ctx.command("meme").alias("memes").action(async ({ session }) => {
-    const meme = await getMeme(ctx, session);
-    if (meme["success"] == 0) {
-      return session?.text(".msg", meme);
-    } else if (meme["success"] == 1) {
-      return session?.text(".failed", meme);
-    } else {
-      return session?.text(".forbidden", meme);
+  ctx.command("meme [序号:posint]").alias("memes").action(async ({ session }, count) => {
+    try {
+      await getMeme(ctx, session, count);
+    } catch (e) {
+      await session?.send(session?.text(".e"));
     }
   });
 }

package/package.json

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