hotcat-bot-qq 0.1.6 → 0.1.8

package/dist/botEvent.js

@@ -24,11 +24,16 @@ export class MessageEvent {
         });
         this.napcat = napcat;
         this.client = client;
+        this.napcat.on('message.group', (event) => {
+            new BotConsole('groupMessage', event).log();
+        });
+        this.napcat.on('message.private', (event) => {
+            new BotConsole('privateMessage', event).log();
+        });
     }
     onGroupMessage(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('groupMessage', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -48,7 +53,6 @@ export class MessageEvent {
     onGroupNormal(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('groupMessage', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -68,7 +72,6 @@ export class MessageEvent {
     onPrivateMessage(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('privateMessage', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -88,7 +91,6 @@ export class MessageEvent {
     onPrivateFriend(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('privateMessage', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -108,7 +110,6 @@ export class MessageEvent {
     onPrivateGroup(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('privateMessage', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -151,11 +152,16 @@ export class MessageSent {
         });
         this.napcat = napcat;
         this.client = client;
+        this.napcat.on('message_sent.group', (event) => {
+            new BotConsole('groupMessageSelf', event).log();
+        });
+        this.napcat.on('message_sent.private', (event) => {
+            new BotConsole('privateMessageSelf', event).log();
+        });
     }
     onGroupSent(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('groupMessageSelf', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -175,7 +181,6 @@ export class MessageSent {
     onGroupNormal(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('groupMessageSelf', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -195,7 +200,6 @@ export class MessageSent {
     onPrivateSent(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('privateMessageSelf', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -215,7 +219,6 @@ export class MessageSent {
     onPrivateFriend(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('privateMessageSelf', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -235,7 +238,6 @@ export class MessageSent {
     onPrivateGroup(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('privateMessageSelf', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -278,11 +280,19 @@ export class RequestEvent {
         });
         this.napcat = napcat;
         this.client = client;
+        this.napcat.on('request.friend', (event) => {
+            new BotConsole('requestFriend', event).log();
+        });
+        this.napcat.on('request.group.add', (event) => {
+            new BotConsole('requestGroupAdd', event).log();
+        });
+        this.napcat.on('request.group.invite', (event) => {
+            new BotConsole('requestGroupInvite', event).log();
+        });
     }
     onFriend(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('requestFriend', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -302,7 +312,6 @@ export class RequestEvent {
     onGroupAdd(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('requestGroupAdd', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -322,7 +331,6 @@ export class RequestEvent {
     onGroupInvite(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('requestGroupInvite', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -342,8 +350,6 @@ export class RequestEvent {
     onGroupRequest(fn) {
         const w = async (event) => {
             try {
-                const type = event.sub_type === 'add' ? 'requestGroupAdd' : 'requestGroupInvite';
-                new BotConsole(type, event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -386,11 +392,29 @@ export class NoticeEvent {
         });
         this.napcat = napcat;
         this.client = client;
+        const log = (event) => {
+            new BotConsole('notice', event).log();
+        };
+        this.napcat.on('notice.friend_add', log);
+        this.napcat.on('notice.friend_recall', log);
+        this.napcat.on('notice.group_admin', log);
+        this.napcat.on('notice.group_ban', log);
+        this.napcat.on('notice.group_card', log);
+        this.napcat.on('notice.group_decrease', log);
+        this.napcat.on('notice.group_increase', log);
+        this.napcat.on('notice.group_recall', log);
+        this.napcat.on('notice.group_upload', log);
+        this.napcat.on('notice.group_msg_emoji_like', log);
+        this.napcat.on('notice.essence', log);
+        this.napcat.on('notice.notify.poke', log);
+        this.napcat.on('notice.notify.group_name', log);
+        this.napcat.on('notice.notify.title', log);
+        this.napcat.on('notice.notify.profile_like', log);
+        this.napcat.on('notice.bot_offline', log);
     }
     onFriendAdd(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -410,7 +434,6 @@ export class NoticeEvent {
     onFriendRecall(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -430,7 +453,6 @@ export class NoticeEvent {
     onGroupAdmin(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -450,7 +472,6 @@ export class NoticeEvent {
     onGroupBan(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -470,7 +491,6 @@ export class NoticeEvent {
     onGroupCard(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -490,7 +510,6 @@ export class NoticeEvent {
     onGroupDecrease(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -510,7 +529,6 @@ export class NoticeEvent {
     onGroupIncrease(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -530,7 +548,6 @@ export class NoticeEvent {
     onGroupRecall(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -550,7 +567,6 @@ export class NoticeEvent {
     onGroupUpload(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -570,7 +586,6 @@ export class NoticeEvent {
     onGroupEmojiLike(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -590,7 +605,6 @@ export class NoticeEvent {
     onGroupEssence(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -610,7 +624,6 @@ export class NoticeEvent {
     onPoke(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -630,7 +643,6 @@ export class NoticeEvent {
     onGroupNameChange(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -650,7 +662,6 @@ export class NoticeEvent {
     onTitleChange(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -670,7 +681,6 @@ export class NoticeEvent {
     onProfileLike(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {
@@ -690,7 +700,6 @@ export class NoticeEvent {
     onBotOffline(fn) {
         const w = async (event) => {
             try {
-                new BotConsole('notice', event).log();
                 await fn(this.client, event);
             }
             catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hotcat-bot-qq",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "基于 node-napcat-ts 的 TypeScript QQ 机器人框架",
   "type": "module",
   "main": "dist/index.js",
@@ -52,7 +52,8 @@
   ],
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
-    "prepublishOnly": "bun run build",
+    "build:plugin": "tsc --outDir plugins/hotCatPlugin --rootDir plugins/hotCatPlugin --module ESNext --target ES2020 --moduleResolution bundler --declaration --skipLibCheck plugins/hotCatPlugin/index.ts",
+    "prepublishOnly": "bun run build && bun run build:plugin",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs"

package/plugins/hotCatPlugin/index.d.ts

@@ -0,0 +1,17 @@
+import { PluginBase } from 'hotcat-bot-qq/plugin';
+import { BotApi } from 'hotcat-bot-qq/botApi';
+import { BotClient } from 'hotcat-bot-qq/botClient';
+export declare class HotCatPlugin extends PluginBase {
+    static meta: {
+        name: string;
+        version: string;
+        description: string;
+        author: string;
+    };
+    private startTime;
+    static create(api: BotApi, bot: BotClient): HotCatPlugin;
+    load(): Promise<void>;
+    unload(): Promise<void>;
+    private onGroupMsg;
+    private formatUptime;
+}

package/plugins/hotCatPlugin/index.js

@@ -0,0 +1,51 @@
+import { PluginBase } from 'hotcat-bot-qq/plugin';
+import { Message } from 'hotcat-bot-qq/message';
+import * as os from 'os';
+export class HotCatPlugin extends PluginBase {
+    constructor() {
+        super(...arguments);
+        this.startTime = 0;
+        this.onGroupMsg = async (_bot, event) => {
+            const msg = event.raw_message.trim();
+            if (msg === '#hotCat' || msg === '#hotcat') {
+                const uptime = this.formatUptime(Date.now() - this.startTime);
+                const platform = os.platform();
+                const arch = os.arch();
+                await this.api.sendGroupMessage(event.group_id, Message.reply(event.message_id), Message.text(`HotCat 信息\n` +
+                    `版本：${this.meta.version}\n` +
+                    `平台：${platform} ${arch}\n` +
+                    `运行时间：${uptime}`));
+            }
+        };
+    }
+    static create(api, bot) {
+        return new HotCatPlugin(api, bot);
+    }
+    async load() {
+        this.startTime = Date.now();
+        this.bot.event.message.onGroupMessage(this.onGroupMsg);
+    }
+    async unload() {
+        this.bot.event.message.offGroupMessage(this.onGroupMsg);
+    }
+    formatUptime(ms) {
+        const s = Math.floor(ms / 1000);
+        const d = Math.floor(s / 86400);
+        const h = Math.floor((s % 86400) / 3600);
+        const m = Math.floor((s % 3600) / 60);
+        const parts = [];
+        if (d > 0)
+            parts.push(`${d}天`);
+        if (h > 0)
+            parts.push(`${h}小时`);
+        if (m > 0)
+            parts.push(`${m}分钟`);
+        return parts.length > 0 ? parts.join(' ') : '小于1分钟';
+    }
+}
+HotCatPlugin.meta = {
+    name: 'hotCatPlugin',
+    version: '0.1.8',
+    description: 'HotCat 默认插件（#hotCat 指令查询 bot 状态）',
+    author: 'CHCAT1320',
+};

package/plugins/hotCatPlugin/index.ts

@@ -7,7 +7,7 @@ import * as os from 'os'
 export class HotCatPlugin extends PluginBase {
     static meta = {
         name: 'hotCatPlugin',
-        version: '0.1.6',
+        version: '0.1.8',
         description: 'HotCat 默认插件（#hotCat 指令查询 bot 状态）',
         author: 'CHCAT1320',
     }