node-karin 0.12.14 → 0.12.16

package/lib/adapter/input/index.d.ts

@@ -1,6 +1,6 @@
 import { KarinAdapter, Contact, KarinElement, LoggerLevel } from '../../types/index.js';
 /**
- * - 标准输入输出适配器
+ * 标准输入输出适配器
  */
 export declare class AdapterInput implements KarinAdapter {
     #private;

package/lib/adapter/input/index.js

@@ -5,7 +5,7 @@ import { config, common, YamlEditor, logger } from '../../utils/index.js';
 import { KarinMessage } from '../../types/index.js';
 const { enable, msgToFile, token: oldToken, ip } = config.Config.AdapterInput;
 /**
- * - 标准输入输出适配器
+ * 标准输入输出适配器
  */
 export class AdapterInput {
     token;

package/lib/adapter/onebot/11/event.js

@@ -1,4 +1,4 @@
-import { listener } from '../../../core/index.js';
+import { karin } from '../../../core/index.js';
 import { KarinMessage, KarinNotice, KarinRequest } from '../../../types/index.js';
 export class OB11Event {
     adapter;
@@ -41,8 +41,8 @@ export class OB11Event {
                 disable: 'OneBot停用',
                 connect: 'WebSocket连接成功',
             };
-            const sub_type = data.sub_type;
-            this.adapter.logger('debug', `[生命周期]：${typeMap[sub_type]}`);
+            const subType = data.sub_type;
+            this.adapter.logger('debug', `[生命周期]：${typeMap[subType]}`);
         }
     }
     /**
@@ -77,25 +77,22 @@ export class OB11Event {
         };
         const e = new KarinMessage(message);
         e.bot = this.adapter;
-        /**
-         * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
-         */
         e.replyCallback = async (elements) => await this.adapter.SendMessage(e.contact, elements);
-        listener.emit('adapter.message', e);
+        karin.emit('adapter.message', e);
     }
     /**
      * 通知事件
      */
     noticeEvent(data) {
         const time = data.time;
-        const self_id = data.self_id + '';
+        const selfId = data.self_id + '';
         let notice = {};
         /** 别问为啥any... 我是any糕手~ */
-        const user_id = (data.user_id || data.operator_id) + '';
-        const event_id = `notice.${time}`;
+        const userId = (data.user_id || data.operator_id) + '';
+        const eventId = `notice.${time}`;
         const sender = {
-            uid: user_id,
-            uin: user_id,
+            uid: userId,
+            uin: userId,
             nick: '',
             role: "unknown" /* Role.Unknown */,
         };
@@ -107,9 +104,9 @@ export class OB11Event {
         switch (data.notice_type) {
             // 群文件上传
             case 'group_upload': {
-                const group_id = data.group_id + '';
+                const groupId = data.group_id + '';
                 const content = {
-                    group_id,
+                    group_id: groupId,
                     operator_uid: data.user_id + '',
                     operator_uin: data.user_id + '',
                     file_id: data.file.id,
@@ -122,13 +119,13 @@ export class OB11Event {
                 const options = {
                     raw_event: data,
                     time,
-                    self_id,
-                    user_id,
-                    event_id,
+                    self_id: selfId,
+                    user_id: userId,
+                    event_id: eventId,
                     content,
                     sender,
                     contact,
-                    group_id,
+                    group_id: groupId,
                     sub_event: "group_file_uploaded" /* NoticeSubType.GroupFileUploaded */,
                 };
                 notice = new KarinNotice(options);
@@ -136,9 +133,9 @@ export class OB11Event {
             }
             // 群管理员变动
             case 'group_admin': {
-                const group_id = data.group_id + '';
+                const groupId = data.group_id + '';
                 const content = {
-                    group_id,
+                    group_id: groupId,
                     target_uid: data.user_id + '',
                     target_uin: data.user_id + '',
                     is_admin: data.sub_type === 'set',
@@ -146,13 +143,13 @@ export class OB11Event {
                 const options = {
                     raw_event: data,
                     time,
-                    self_id,
-                    user_id,
-                    event_id,
+                    self_id: selfId,
+                    user_id: userId,
+                    event_id: eventId,
                     sender,
                     contact,
                     content,
-                    group_id,
+                    group_id: groupId,
                     sub_event: "group_admin_changed" /* NoticeSubType.GroupAdminChanged */,
                 };
                 notice = new KarinNotice(options);
@@ -160,9 +157,9 @@ export class OB11Event {
             }
             // 群成员减少
             case 'group_decrease': {
-                const group_id = data.group_id + '';
+                const groupId = data.group_id + '';
                 const content = {
-                    group_id,
+                    group_id: groupId,
                     operator_uid: (data.operator_id + '') || '',
                     operator_uin: (data.operator_id + '') || '',
                     target_uid: data.user_id || '',
@@ -172,13 +169,13 @@ export class OB11Event {
                 const options = {
                     raw_event: data,
                     time,
-                    self_id,
-                    user_id,
-                    event_id,
+                    self_id: selfId,
+                    user_id: userId,
+                    event_id: eventId,
                     sender,
                     contact,
                     content,
-                    group_id,
+                    group_id: groupId,
                     sub_event: "group_member_decrease" /* NoticeSubType.GroupMemberDecrease */,
                 };
                 notice = new KarinNotice(options);
@@ -186,9 +183,9 @@ export class OB11Event {
             }
             // 群成员增加
             case 'group_increase': {
-                const group_id = data.group_id + '';
+                const groupId = data.group_id + '';
                 const content = {
-                    group_id,
+                    group_id: groupId,
                     operator_uid: (data.operator_id || '') + '',
                     operator_uin: (data.operator_id || '') + '',
                     target_uid: (data.user_id || '') + '',
@@ -198,13 +195,13 @@ export class OB11Event {
                 const options = {
                     raw_event: data,
                     time,
-                    self_id,
-                    user_id,
-                    event_id,
+                    self_id: selfId,
+                    user_id: userId,
+                    event_id: eventId,
                     sender,
                     contact,
                     content,
-                    group_id,
+                    group_id: groupId,
                     sub_event: "group_member_increase" /* NoticeSubType.GroupMemberIncrease */,
                 };
                 notice = new KarinNotice(options);
@@ -212,9 +209,9 @@ export class OB11Event {
             }
             // 群禁言事件
             case 'group_ban': {
-                const group_id = data.group_id + '';
+                const groupId = data.group_id + '';
                 const content = {
-                    group_id,
+                    group_id: groupId,
                     operator_uid: (data.operator_id + '') || '',
                     operator_uin: (data.operator_id + '') || '',
                     target_uid: data.user_id || '',
@@ -225,26 +222,42 @@ export class OB11Event {
                 const options = {
                     raw_event: data,
                     time,
-                    self_id,
-                    user_id,
-                    event_id,
+                    self_id: selfId,
+                    user_id: userId,
+                    event_id: eventId,
                     sender,
                     contact,
                     content,
-                    group_id,
+                    group_id: groupId,
                     sub_event: "group_member_ban" /* NoticeSubType.GroupMemberBan */,
                 };
                 notice = new KarinNotice(options);
                 break;
             }
-            case 'friend_add':
-                // todo kritor没有这个事件
-                this.adapter.logger('info', `[好友添加]：${JSON.stringify(data)}`);
+            case 'friend_add': {
+                const content = {
+                    target_uid: userId,
+                    target_uin: userId,
+                };
+                const options = {
+                    raw_event: data,
+                    time,
+                    self_id: selfId,
+                    user_id: userId,
+                    event_id: eventId,
+                    sender,
+                    contact,
+                    content,
+                    group_id: '',
+                    sub_event: "friend_increase" /* NoticeSubType.FriendIncrease */,
+                };
+                notice = new KarinNotice(options);
                 break;
+            }
             case 'group_recall': {
-                const group_id = data.group_id + '';
+                const groupId = data.group_id + '';
                 const content = {
-                    group_id,
+                    group_id: groupId,
                     operator_uid: (data.operator_id + '') || '',
                     operator_uin: (data.operator_id + '') || '',
                     target_uid: data.user_id || '',
@@ -255,13 +268,13 @@ export class OB11Event {
                 const options = {
                     raw_event: data,
                     time,
-                    self_id,
-                    user_id,
-                    event_id,
+                    self_id: selfId,
+                    user_id: userId,
+                    event_id: eventId,
                     sender,
                     contact,
                     content,
-                    group_id,
+                    group_id: groupId,
                     sub_event: "group_recall" /* NoticeSubType.GroupRecall */,
                 };
                 notice = new KarinNotice(options);
@@ -277,9 +290,9 @@ export class OB11Event {
                 const options = {
                     raw_event: data,
                     time,
-                    self_id,
-                    user_id,
-                    event_id,
+                    self_id: selfId,
+                    user_id: userId,
+                    event_id: eventId,
                     sender,
                     contact,
                     content,
@@ -291,9 +304,9 @@ export class OB11Event {
             case 'notify':
                 switch (data.sub_type) {
                     case 'poke': {
-                        const group_id = 'group_id' in data ? data.group_id + '' : '';
+                        const groupId = 'group_id' in data ? data.group_id + '' : '';
                         const content = {
-                            group_id,
+                            group_id: groupId,
                             operator_uid: data.user_id + '',
                             operator_uin: data.user_id + '',
                             target_uid: data.target_id + '',
@@ -305,13 +318,13 @@ export class OB11Event {
                         const options = {
                             raw_event: data,
                             time,
-                            self_id,
-                            user_id,
-                            event_id,
+                            self_id: selfId,
+                            user_id: userId,
+                            event_id: eventId,
                             sender,
                             contact,
                             content,
-                            group_id,
+                            group_id: groupId,
                             sub_event: data.group_id ? "group_poke" /* NoticeSubType.GroupPoke */ : "private_poke" /* NoticeSubType.PrivatePoke */,
                         };
                         notice = new KarinNotice(options);
@@ -330,9 +343,9 @@ export class OB11Event {
                 }
                 break;
             case 'group_msg_emoji_like': {
-                const group_id = data.group_id + '';
+                const groupId = data.group_id + '';
                 const content = {
-                    group_id,
+                    group_id: groupId,
                     message_id: data.message_id,
                     face_id: data.likes[0].emoji_id,
                     is_set: true,
@@ -340,13 +353,13 @@ export class OB11Event {
                 const options = {
                     raw_event: data,
                     time,
-                    self_id,
-                    user_id,
-                    event_id,
+                    self_id: selfId,
+                    user_id: userId,
+                    event_id: eventId,
                     sender,
                     contact,
                     content,
-                    group_id,
+                    group_id: groupId,
                     sub_event: "group_message_reaction" /* NoticeSubType.GroupMessageReaction */,
                 };
                 notice = new KarinNotice(options);
@@ -354,9 +367,9 @@ export class OB11Event {
             }
             // Language表情动态上报
             case 'reaction': {
-                const group_id = data.group_id + '';
+                const groupId = data.group_id + '';
                 const content = {
-                    group_id,
+                    group_id: groupId,
                     message_id: data.message_id,
                     face_id: Number(data.code),
                     is_set: data.sub_type === 'add',
@@ -364,13 +377,13 @@ export class OB11Event {
                 const options = {
                     raw_event: data,
                     time,
-                    self_id,
-                    user_id,
-                    event_id,
+                    self_id: selfId,
+                    user_id: userId,
+                    event_id: eventId,
                     sender,
                     contact,
                     content,
-                    group_id,
+                    group_id: groupId,
                     sub_event: "group_message_reaction" /* NoticeSubType.GroupMessageReaction */,
                 };
                 notice = new KarinNotice(options);
@@ -381,11 +394,8 @@ export class OB11Event {
             }
         }
         notice.bot = this.adapter;
-        /**
-         * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
-         */
         notice.replyCallback = async (elements) => await this.adapter.SendMessage(notice.contact, elements);
-        listener.emit('adapter.notice', notice);
+        karin.emit('adapter.notice', notice);
     }
     /** 请求事件 */
     requestEvent(data) {
@@ -413,14 +423,12 @@ export class OB11Event {
                         applier_uid: data.user_id + '',
                         applier_uin: data.user_id + '',
                         message: data.comment,
+                        flag: data.flag,
                     },
                 });
                 request.bot = this.adapter;
-                /**
-                 * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
-                 */
                 request.replyCallback = async (elements) => await this.adapter.SendMessage(request.contact, elements);
-                listener.emit('adapter.request', request);
+                karin.emit('adapter.request', request);
                 return;
             }
             case 'group': {
@@ -449,14 +457,12 @@ export class OB11Event {
                         inviter_uid: data.user_id + '',
                         inviter_uin: data.user_id + '',
                         message: data.comment,
+                        flag: data.flag,
                     },
                 });
                 request.bot = this.adapter;
-                /**
-                 * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
-                 */
                 request.replyCallback = async (elements) => await this.adapter.SendMessage(request.contact, elements);
-                listener.emit('adapter.request', request);
+                karin.emit('adapter.request', request);
                 return;
             }
             default: {