kokkoro-plugin-hitokoto 0.2.0 → 0.3.1

package/README.md

@@ -12,16 +12,16 @@ cd bot
 npm i kokkoro-plugin-hitokoto
 ```
 
-在 [kokkoro](https://github.com/kokkorojs/kokkoro) 成功运行并登录后，发送 `enable hitokoto` 即可为 bot 启用插件  
+在 [kokkoro](https://github.com/kokkorojs/kokkoro) 成功运行并登录后，发送 `mount hitokoto` 即可为 bot 挂载插件  
 使用 `hitokoto update <key> <value>` 可修改当前群聊的插件参数，例如关闭每日自动发送 `hitokoto update auto_send false`
 
 ## 参数
 
-``` typescript
-interface HitokotoOption {
+```typescript
+interface HitokotoSetting {
   // 在每天凌晨自动发送
   auto_send: boolean;
-  // 一言接口 get 请求参数
+  // 一言接口 get 请求参数，默认 "?c=a&c=b&c=c"
   param: string;
 }
 ```

package/lib/index.js

@@ -1,35 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.plugin = void 0;
 const kokkoro_1 = require("kokkoro");
 const service_1 = require("./service");
-const option = {
+const setting = {
     apply: true,
     lock: false,
     auto_send: true,
     param: '?c=a&c=b&c=c',
 };
-exports.plugin = new kokkoro_1.Plugin('hitokoto', option).version(require('../package.json').version);
-exports.plugin
-    .schedule('0 0 0 * * ?', async () => {
-    const bot_list = (0, kokkoro_1.getBotList)();
-    const hitokoto = await (0, service_1.getHitokoto)(option.param);
-    for (const [_, bot] of bot_list) {
-        const group_list = bot.getGroupList();
-        // 判断开启服务的群
-        group_list.forEach(async (group) => {
-            const { group_id } = group;
-            const { apply, auto_send } = bot.getOption(group_id, 'hitokoto');
-            if (apply && auto_send) {
-                bot.sendGroupMsg(group_id, hitokoto);
+const { version } = require('../package.json');
+const plugin = new kokkoro_1.Plugin('hitokoto', setting);
+plugin
+    .version(version)
+    .schedule('0 0 0 * * *', async () => {
+    const hitokoto = await (0, service_1.getHitokoto)(setting.param);
+    const uins = plugin.getBotUins();
+    uins.forEach(async (uin) => {
+        const gl = await plugin.botApi(uin, 'gl');
+        gl.forEach(async (info) => {
+            const { group_id } = info;
+            const { apply } = await plugin.botApi(uin, 'getSetting', group_id, 'hitokoto');
+            if (!apply) {
+                return;
             }
+            plugin.botApi(uin, 'sendGroupMsg', group_id, hitokoto);
         });
-    }
-})
-    .command('say', 'group')
+    });
+});
+plugin
+    .command('say')
     .description('发送一言')
     .sugar(/^(来|说)(点|句|段)骚话$/)
-    .action(async function () {
-    const hitokoto = await (0, service_1.getHitokoto)(this.option.param);
-    this.event.reply(hitokoto);
+    .action(async (ctx) => {
+    const param = ctx.setting?.param;
+    const hitokoto = await (0, service_1.getHitokoto)(param);
+    ctx.reply(hitokoto);
 });

package/lib/service.js

@@ -3,21 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHitokoto = exports.api = void 0;
+exports.getHitokoto = void 0;
 const axios_1 = __importDefault(require("axios"));
-// 定时发送任务
-exports.api = 'https://v1.hitokoto.cn';
+const api = 'https://v1.hitokoto.cn';
 async function getHitokoto(param = '') {
-    let message = '';
-    await axios_1.default.get(exports.api + param)
-        .then(response => {
-        const { data } = response;
+    let message;
+    try {
+        const { data } = await axios_1.default.get(api + param);
         const { hitokoto, from } = data;
         message = `${hitokoto}\n\t\t\t\t———— 「${from}」`;
-    })
-        .catch(error => {
+    }
+    catch (error) {
         message = error.message;
-    });
+    }
     return message;
 }
 exports.getHitokoto = getHitokoto;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "kokkoro-plugin-hitokoto",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "ヒトコト",
-  "main": "./lib/index.js",
+  "main": "lib/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -20,8 +20,8 @@
   },
   "homepage": "https://github.com/kokkorojs/kokkoro-plugin-hitokoto#readme",
   "devDependencies": {
-    "@types/node": "^17.0.23",
-    "kokkoro": "^0.3.0"
+    "@types/node": "^18.8.5",
+    "kokkoro": "^1.0.4"
   },
   "files": [
     "lib"

package/lib/type.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });