From 12cb500818ceb2e5928c21f76a6330ede33fc8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Tue, 19 Nov 2024 12:55:42 +0800 Subject: [PATCH] refactor: rename OB11BaseEvent --- src/onebot/api/msg.ts | 2 +- src/onebot/event/{OB11BaseEvent.ts => OneBotEvent.ts} | 2 +- src/onebot/event/message/OB11BaseMessageEvent.ts | 4 ++-- src/onebot/event/meta/OB11BaseMetaEvent.ts | 4 ++-- src/onebot/event/notice/OB11BaseNoticeEvent.ts | 4 ++-- src/onebot/event/request/OB11FriendRequest.ts | 2 +- src/onebot/event/request/OB11GroupRequest.ts | 2 +- src/onebot/network/index.ts | 6 +++--- src/onebot/types/message.ts | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) rename src/onebot/event/{OB11BaseEvent.ts => OneBotEvent.ts} (91%) diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index 85299bb5..558d4e7c 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -20,7 +20,7 @@ import { import faceConfig from '@/core/external/face_config.json'; import { NapCatOneBot11Adapter, OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageFileBase, } from '@/onebot'; import { OB11Entities } from '@/onebot/entities'; -import { EventType } from '@/onebot/event/OB11BaseEvent'; +import { EventType } from '@/onebot/event/OneBotEvent'; import { encodeCQCode } from '@/onebot/cqcode'; import { uri2local } from '@/common/file'; import { RequestUtil } from '@/common/request'; diff --git a/src/onebot/event/OB11BaseEvent.ts b/src/onebot/event/OneBotEvent.ts similarity index 91% rename from src/onebot/event/OB11BaseEvent.ts rename to src/onebot/event/OneBotEvent.ts index 1ae7d7b1..713d38c9 100644 --- a/src/onebot/event/OB11BaseEvent.ts +++ b/src/onebot/event/OneBotEvent.ts @@ -8,7 +8,7 @@ export enum EventType { MESSAGE_SENT = 'message_sent', } -export abstract class OB11BaseEvent { +export abstract class OneBotEvent { time = Math.floor(Date.now() / 1000); self_id: number; abstract post_type: EventType; diff --git a/src/onebot/event/message/OB11BaseMessageEvent.ts b/src/onebot/event/message/OB11BaseMessageEvent.ts index 63960ef3..89bfed05 100644 --- a/src/onebot/event/message/OB11BaseMessageEvent.ts +++ b/src/onebot/event/message/OB11BaseMessageEvent.ts @@ -1,5 +1,5 @@ -import { EventType, OB11BaseEvent } from '../OB11BaseEvent'; +import { EventType, OneBotEvent } from '../OneBotEvent'; -export abstract class OB11BaseMessageEvent extends OB11BaseEvent { +export abstract class OB11BaseMessageEvent extends OneBotEvent { post_type = EventType.MESSAGE; } \ No newline at end of file diff --git a/src/onebot/event/meta/OB11BaseMetaEvent.ts b/src/onebot/event/meta/OB11BaseMetaEvent.ts index 26386a20..015a5958 100644 --- a/src/onebot/event/meta/OB11BaseMetaEvent.ts +++ b/src/onebot/event/meta/OB11BaseMetaEvent.ts @@ -1,6 +1,6 @@ -import { EventType, OB11BaseEvent } from '../OB11BaseEvent'; +import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent'; -export abstract class OB11BaseMetaEvent extends OB11BaseEvent { +export abstract class OB11BaseMetaEvent extends OneBotEvent { post_type = EventType.META; abstract meta_event_type: string; } diff --git a/src/onebot/event/notice/OB11BaseNoticeEvent.ts b/src/onebot/event/notice/OB11BaseNoticeEvent.ts index 982d7448..d8e34f78 100644 --- a/src/onebot/event/notice/OB11BaseNoticeEvent.ts +++ b/src/onebot/event/notice/OB11BaseNoticeEvent.ts @@ -1,5 +1,5 @@ -import { EventType, OB11BaseEvent } from '../OB11BaseEvent'; +import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent'; -export abstract class OB11BaseNoticeEvent extends OB11BaseEvent { +export abstract class OB11BaseNoticeEvent extends OneBotEvent { post_type = EventType.NOTICE; } \ No newline at end of file diff --git a/src/onebot/event/request/OB11FriendRequest.ts b/src/onebot/event/request/OB11FriendRequest.ts index 0f40ecdf..41f3505a 100644 --- a/src/onebot/event/request/OB11FriendRequest.ts +++ b/src/onebot/event/request/OB11FriendRequest.ts @@ -1,5 +1,5 @@ import { OB11BaseNoticeEvent } from '../notice/OB11BaseNoticeEvent'; -import { EventType } from '../OB11BaseEvent'; +import { EventType } from '../OneBotEvent'; import { NapCatCore } from '@/core'; export class OB11FriendRequestEvent extends OB11BaseNoticeEvent { diff --git a/src/onebot/event/request/OB11GroupRequest.ts b/src/onebot/event/request/OB11GroupRequest.ts index d5ee9465..1576be0e 100644 --- a/src/onebot/event/request/OB11GroupRequest.ts +++ b/src/onebot/event/request/OB11GroupRequest.ts @@ -1,5 +1,5 @@ import { OB11GroupNoticeEvent } from '../notice/OB11GroupNoticeEvent'; -import { EventType } from '../OB11BaseEvent'; +import { EventType } from '../OneBotEvent'; import { NapCatCore } from '@/core'; export class OB11GroupRequestEvent extends OB11GroupNoticeEvent { diff --git a/src/onebot/network/index.ts b/src/onebot/network/index.ts index dc8b8b67..be019fd7 100644 --- a/src/onebot/network/index.ts +++ b/src/onebot/network/index.ts @@ -1,9 +1,9 @@ -import { OB11BaseEvent } from '@/onebot/event/OB11BaseEvent'; +import { OneBotEvent } from '@/onebot/event/OneBotEvent'; import { OB11Message } from '@/onebot'; import { ActionMap } from '@/onebot/action'; import { NetworkConfigAdapter } from '../config/config'; -export type OB11EmitEventContent = OB11BaseEvent | OB11Message; +export type OB11EmitEventContent = OneBotEvent | OB11Message; export enum OB11NetworkReloadType { Normal = 0, ConfigChange = 1, @@ -16,7 +16,7 @@ export interface IOB11NetworkAdapter { name: string; isEnable: boolean; config: NetworkConfigAdapter; - + onEvent(event: T): void; open(): void | Promise; diff --git a/src/onebot/types/message.ts b/src/onebot/types/message.ts index c97357fe..fe4e26e4 100644 --- a/src/onebot/types/message.ts +++ b/src/onebot/types/message.ts @@ -1,5 +1,5 @@ import { OB11Sender } from './entity'; -import { EventType } from '@/onebot/event/OB11BaseEvent'; +import { EventType } from '@/onebot/event/OneBotEvent'; import { CustomMusicSignPostData, IdMusicSignPostData, PicSubType, RawMessage } from '@/core'; export enum OB11MessageType {