@kotori-bot/kotori-plugin-core 1.3.1 → 1.4.0

package/lib/index.d.ts

@@ -1,3 +1,3 @@
-import { Context } from 'kotori-bot';
+import { type Context } from 'kotori-bot';
 export declare const lang: string[];
 export declare function main(ctx: Context): void;

package/lib/index.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/kotori-plugin-core
- * @Version 1.3.0
- * @Author Hotaru <biyuehuya@gmail.com>
+ * @Version 1.4.0
+ * @Author Hotaru <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/6/7 11:22:14
+ * @Date 2024/8/8 20:54:06
  */
 
 "use strict";
@@ -36,18 +36,18 @@ module.exports = __toCommonJS(src_exports);
 var import_kotori_bot = require("kotori-bot");
 const lang = [__dirname, "../locales"];
 function main(ctx) {
-  ctx.on("parse", (data) => {
-    const { quick } = data.session;
+  ctx.on("before_command", (data) => {
+    const quick = data.session.quick.bind(data.session);
     if (!(data.result instanceof import_kotori_bot.CommandError)) {
       const { scope, access } = data.command.meta;
       if (scope && scope !== "all" && data.session.type !== scope) {
         quick("corei18n.template.scope");
         data.cancel();
-      } else if (data.session.userId !== data.session.api.adapter.config.master) {
-        if (access === import_kotori_bot.CommandAccess.ADMIN) {
+      } else if (String(data.session.userId) !== String(data.session.api.adapter.config.master)) {
+        if (access === import_kotori_bot.UserAccess.ADMIN) {
           quick("corei18n.template.no_access_admin");
           data.cancel();
-        } else if (access === import_kotori_bot.CommandAccess.MANGER && (data.session.type === import_kotori_bot.MessageScope.PRIVATE || data.session.sender.role === "member")) {
+        } else if (access === import_kotori_bot.UserAccess.MANGER && (data.session.type === import_kotori_bot.MessageScope.PRIVATE || data.session.type === import_kotori_bot.MessageScope.GROUP && !["owner", "admin"].includes(data.session.sender.role))) {
           quick("corei18n.template.no_access_manger");
           data.cancel();
         }
@@ -72,17 +72,17 @@ function main(ctx) {
       case "syntax":
         quick(["corei18n.template.syntax", [value.index, value.char]]);
         break;
-      case "unknown":
-        quick(["corei18n.template.unknown", [value.input]]);
-        break;
       default:
     }
   });
-  ctx.on("command", (data) => {
-    if (!(data.result instanceof import_kotori_bot.CommandError)) return;
-    const { value } = data.result;
-    const { quick } = data.session;
+  ctx.on("command", ({ result, session }) => {
+    if (!(result instanceof import_kotori_bot.CommandError)) return;
+    const { value } = result;
+    const quick = session.quick.bind(session);
     switch (value.type) {
+      case "unknown":
+        quick(["corei18n.template.unknown", [value.input]]);
+        break;
       case "res_error":
         quick(["corei18n.template.res_error", [value.error.message]]);
         break;
@@ -105,7 +105,7 @@ function main(ctx) {
         quick(["corei18n.template.no_exists", [value.target]]);
         break;
       case "error":
-        ctx.logger.error(value.error);
+        ctx.emit("error", value.error instanceof Error ? value.error : new import_kotori_bot.ModuleError(String(value.error)));
         if (value.error instanceof import_kotori_bot.TsuError) {
           quick(["corei18n.template.res_error", [value.error.message]]);
           return;
@@ -121,99 +121,96 @@ function main(ctx) {
         quick(["corei18n.template.error", [String(value.error)]]);
         break;
       case "data_error":
-        quick([
-          `corei18n.template.data_error.${typeof value.target === "string" ? "options" : "args"}`,
-          [value.target]
-        ]);
+        quick([`corei18n.template.data_error.${typeof value.target === "string" ? "options" : "args"}`, [value.target]]);
         break;
       default:
     }
   });
-  ctx.command("core - core.descr.core").action((_, session) => {
+  ctx.filter({
+    test: import_kotori_bot.FilterTestList.USER_ID,
+    operator: "==",
+    value: "114514"
+  }).command("core - core.descr.core").action((_, session) => {
     const { config, baseDir, options } = session.api.adapter.ctx;
-    let botsLength = 0;
-    ctx[import_kotori_bot.Symbols.bot].forEach(
-      (bots) => bots.forEach(() => {
-        botsLength += 1;
-      })
-    );
-    return [
-      "core.msg.core",
-      {
-        lang: config.global.lang,
-        root: baseDir.root,
-        mode: options.mode,
-        modules: ctx[import_kotori_bot.Symbols.modules] ? ctx[import_kotori_bot.Symbols.modules].size : 0,
-        services: ctx[import_kotori_bot.Symbols.adapter].size,
-        bots: botsLength,
-        midwares: ctx[import_kotori_bot.Symbols.midware].size,
-        commands: ctx[import_kotori_bot.Symbols.command].size,
-        regexps: ctx[import_kotori_bot.Symbols.regexp].size
-      }
-    ];
+    const botsLength = Array.from(ctx[import_kotori_bot.Symbols.bot].values()).map((set) => Array.from(set.values()).length).reduce((a, b) => a + b, 0);
+    return session.format("core.msg.core", {
+      lang: config.global.lang,
+      root: baseDir.root,
+      mode: options.mode,
+      modules: ctx[import_kotori_bot.Symbols.modules] ? ctx[import_kotori_bot.Symbols.modules].size : 0,
+      services: ctx[import_kotori_bot.Symbols.adapter].size,
+      bots: botsLength,
+      midwares: ctx[import_kotori_bot.Symbols.midware].size,
+      commands: ctx[import_kotori_bot.Symbols.command].size,
+      regexps: ctx[import_kotori_bot.Symbols.regexp].size
+    });
   });
   ctx.command("bot - core.descr.bot").action((_, session) => {
     const { identity, platform, selfId, config, status } = session.api.adapter;
-    return [
-      "core.msg.bot",
-      {
-        identity,
-        lang: config.lang,
-        platform,
-        self_id: selfId,
-        create_time: session.i18n.time(status.createTime),
-        last_msg_time: status.lastMsgTime ? session.i18n.time(status.lastMsgTime) : "",
-        received_msg: status.receivedMsg,
-        sent_msg: status.sentMsg,
-        offline_times: status.offlineTimes
-      }
-    ];
-  });
-  ctx.command("bots - core.descr.bots").action((_, session) => {
-    let list = "";
-    ctx[import_kotori_bot.Symbols.bot].forEach(
-      (bots) => bots.forEach((bot) => {
-        const { identity, platform, config, status } = bot.adapter;
-        list += session.format("core.msg.bots.list", {
-          identity,
-          lang: config.lang,
-          platform,
-          status: status.value
-        });
-      })
-    );
-    return ["core.msg.bots", { list }];
+    return session.format("core.msg.bot", {
+      identity,
+      lang: config.lang,
+      platform,
+      self_id: selfId,
+      create_time: session.i18n.time(status.createTime),
+      last_msg_time: status.lastMsgTime ? session.i18n.time(status.lastMsgTime) : "",
+      received_msg: status.receivedMsg,
+      sent_msg: status.sentMsg,
+      offline_times: status.offlineTimes
+    });
   });
-  ctx.command("about - core.descr.about").action((_, session) => {
-    const { version, license } = session.api.adapter.ctx.pkg;
-    return ["core.msg.about", { version, license, node_version: process.version }];
+  ctx.command("bots - core.descr.bots").action(
+    (_, session) => session.format("core.msg.bots", {
+      list: Array.from(ctx[import_kotori_bot.Symbols.bot].values()).map(
+        (bots) => Array.from(bots.values()).map(
+          ({ adapter: { identity, platform, config, status } }) => session.format("core.msg.bots.list", {
+            identity,
+            lang: config.lang,
+            platform,
+            status: status.value
+          })
+        ).join("")
+      ).join("")
+    })
+  );
+  ctx.command("about - core.descr.about").alias("version").shortcut(["\u5C0F\u9E1F", "\u5C0F\u9CE5", "\u3053\u3068\u308A", "kotori", "Kotori"]).hide().action((_, session) => {
+    const { version, license, coreVersion, loaderVersion } = session.api.adapter.ctx.meta;
+    return session.format("core.msg.about", {
+      version,
+      license,
+      core_version: coreVersion,
+      loader_version: loaderVersion,
+      node_version: process.version
+    });
   });
-  ctx.command("locale <lang> - core.descr.locale").option("G", "global:boolean - core.option.locale.global").action(({ args: [lang2], options: { global } }, session) => {
+  ctx.command("locale <lang> - core.descr.locale").option("G", "global:boolean core.option.locale.global").action(({ args: [lang2], options: { global } }, session) => {
     const { adapter } = session.api;
     if (!["en_US", "ja_JP", "zh_CN", "zh_TW"].includes(lang2)) return "core.msg.locale.invalid";
     if (global) {
       adapter.ctx.root.config.global.lang = lang2;
-      adapter.ctx[import_kotori_bot.Symbols.bot].forEach(
-        (apis) => apis.forEach((api) => {
-          const { adapter: adapter2 } = api;
-          adapter2.config.lang = lang2;
-        })
-      );
+      for (const apis of adapter.ctx[import_kotori_bot.Symbols.bot].values()) {
+        for (const { adapter: adapter2 } of apis.values()) adapter2.config.lang = lang2;
+      }
     } else {
       adapter.config.lang = lang2;
     }
-    return session.quick([`core.msg.locale${global ? ".global" : ""}`, { lang: lang2 }]);
+    return session.format(`core.msg.locale${global ? ".global" : ""}`, { lang: lang2 });
   });
-  ctx.command("module - core.descr.module").action((_, session) => {
-    let list = "";
-    ctx[import_kotori_bot.Symbols.modules].forEach(([{ pkg }]) => {
-      list += session.format("core.msg.module.list", {
-        name: pkg.name,
-        version: pkg.version,
-        description: pkg.description
-      });
+  ctx.command("module [name] - core.descr.module").action(({ args: [name] }, session) => {
+    let modulesList = Array.from(ctx[import_kotori_bot.Symbols.modules].values());
+    if (name) {
+      modulesList = modulesList.filter(([{ pkg }]) => pkg.name.startsWith(name));
+      if (modulesList.length === 0) return session.format("core.msg.module.not_found", { name });
+    }
+    return session.format("core.msg.module", {
+      list: modulesList.map(
+        ([{ pkg }]) => session.format("core.msg.module.list", {
+          name: pkg.name,
+          version: pkg.version,
+          description: pkg.description
+        })
+      ).join("")
     });
-    return ["core.msg.module", { list }];
   });
 }
 // Annotate the CommonJS export names for ESM import in node:

package/locales/en_US.json

@@ -31,10 +31,11 @@
   "core.msg.core": "Global language: %lang%\nInstance directory: %root%\nRunning mode: %mode%\nNumber of modules: %modules%\nNumber of services: %services%\nNumber of bot instances: %bots%\nNumber of middlewares: %midwares%\nNumber of commands: %commands%\nNumber of regular expressions: %regexps%",
   "core.msg.bots": "Instance list: %list%",
   "core.msg.bots.list": "\n----------\nID: %identity%\nLanguage: %lang%\nPlatform: %platform%\nStatus: %status%",
-  "core.msg.about": "Kotori version: %version%\nLicense: %license%\nNodeJS version: %node_version%",
+  "core.msg.about": "Kotori version: %version%\nCore version: %core_version%\n%Loader version: %loader_version%%\nLicense: %license%\nNodeJS version: %node_version%",
   "core.msg.locale": "Successfully set the display language for the current instance to: %lang%",
   "core.msg.locale.global": "Successfully set the global display language to: %lang%",
   "core.msg.locale.invalid": "Parameter is invalid, must be one of the following values: en_US, ja_JP, zh_CN, zh_TW",
   "core.msg.module": "Module list: %list%",
-  "core.msg.module.list": "\n----------\nName: %name%\nDescription: %description%\nVersion: %version%"
+  "core.msg.module.list": "\n----------\nName: %name%\nDescription: %description%\nVersion: %version%",
+  "core.msg.module.not_found": "Module %name% not found"
 }

package/locales/ja_JP.json

@@ -36,5 +36,6 @@
   "core.msg.locale.global": "グローバル表示言語を %lang% に設定しました",
   "core.msg.locale.invalid": "パラメータが無効です。以下の値のいずれかでなければなりません：en_US、ja_JP、zh_CN、zh_TW",
   "core.msg.module": "モジュールリスト：%list%",
-  "core.msg.module.list": "\n----------\n名前：%name%\n説明：%description%\nバージョン：%version%"
+  "core.msg.module.list": "\n----------\n名前：%name%\n説明：%description%\nバージョン：%version%",
+  "core.msg.module.not_found": "%name% モジュールが見つかりませんでした"
 }

package/locales/zh_CN.json

@@ -31,10 +31,11 @@
   "core.msg.core": "全局语言：%lang%\n实例目录：%root%\n运行模式：%mode%\n模块数量：%modules%\n服务数量：%services%\nbot 实例数量：%bots%\n中间件数量：%midwares%\n指令数量：%commands%\n正则数量：%regexps%",
   "core.msg.bots": "实例列表：%list%",
   "core.msg.bots.list": "\n----------\nID：%identity%\n语言：%lang%\n平台：%platform%\n状态：%status%",
-  "core.msg.about": "Kotori 版本：%version%\n协议：%license%\nNodeJS 版本：%node_version%",
+  "core.msg.about": "Kotori 版本：%version%\n核心版本：%core_version%\n加载器版本：%loader_version%\n协议：%license%\nNodeJS 版本：%node_version%",
   "core.msg.locale": "成功将当前实例显示语言设置为：%lang%",
   "core.msg.locale.global": "成功将全局显示语言设置为：%lang%",
   "core.msg.locale.invalid": "参数无效，必须是以下中的一个值：en_US、ja_JP、zh_CN、zh_TW",
   "core.msg.module": "模块列表：%list%",
-  "core.msg.module.list": "\n----------\n名称：%name%\n描述：%description%\n版本：%version%"
+  "core.msg.module.list": "\n----------\n名称：%name%\n描述：%description%\n版本：%version%",
+  "core.msg.module.not_found": "未找到模块：%name%"
 }

package/locales/zh_TW.json

@@ -36,5 +36,6 @@
   "core.msg.locale.global": "成功將全局顯示語言設置爲：%lang%",
   "core.msg.locale.invalid": "參數無效，必須是以下中的壹個值：en_US、ja_JP、zh_CN、zh_TW",
   "core.msg.module": "模塊列表：%list%",
-  "core.msg.module.list": "\n----------\n名稱：%name%\n描述：%description%\n版本：%version%"
+  "core.msg.module.list": "\n----------\n名稱：%name%\n描述：%description%\n版本：%version%",
+  "core.msg.module.not_found": "未找到模塊"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kotori-bot/kotori-plugin-core",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "core plugin",
   "main": "lib/index.js",
   "keywords": [
@@ -15,9 +15,9 @@
     "LICENSE",
     "README.md"
   ],
-  "author": "Hotaru <biyuehuya@gmail.com>",
+  "author": "Hotaru <me@hotaru.icu>",
   "peerDependencies": {
-    "kotori-bot": "^1.5.1"
+    "kotori-bot": "^1.6.0-rc.1"
   },
   "kotori": {
     "meta": {