From 78ddf36e35aea8032c36daeb6cb9b28063ae37da Mon Sep 17 00:00:00 2001 From: "Wesley F. Young" Date: Wed, 15 May 2024 17:02:24 +0800 Subject: [PATCH] refactor: split types.ts into separate files --- src/onebot11/types/entity.ts | 63 +++++++++++++++ src/onebot11/types/index.ts | 3 + src/onebot11/{types.ts => types/message.ts} | 85 +-------------------- src/onebot11/types/meta.ts | 13 ++++ 4 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 src/onebot11/types/entity.ts create mode 100644 src/onebot11/types/index.ts rename src/onebot11/{types.ts => types/message.ts} (72%) create mode 100644 src/onebot11/types/meta.ts diff --git a/src/onebot11/types/entity.ts b/src/onebot11/types/entity.ts new file mode 100644 index 00000000..32df147a --- /dev/null +++ b/src/onebot11/types/entity.ts @@ -0,0 +1,63 @@ +export interface OB11User { + user_id: number; + nickname: string; + remark?: string; + sex?: OB11UserSex; + level?: number; + age?: number; + qid?: string; + login_days?: number; +} + +export enum OB11UserSex { + male = 'male', + female = 'female', + unknown = 'unknown' +} + +export enum OB11GroupMemberRole { + owner = 'owner', + admin = 'admin', + member = 'member', +} + +export interface OB11GroupMember { + group_id: number + user_id: number + nickname: string + card?: string + sex?: OB11UserSex + age?: number + join_time?: number + last_sent_time?: number + level?: number + qq_level?: number + role?: OB11GroupMemberRole + title?: string + area?: string + unfriendly?: boolean + title_expire_time?: number + card_changeable?: boolean + // 以下为gocq字段 + shut_up_timestamp?: number + // 以下为扩展字段 + is_robot?: boolean + qage?: number +} + +export interface OB11Group { + group_id: number + group_name: string + member_count?: number + max_member_count?: number +} + +export interface OB11Sender { + user_id: number, + nickname: string, + sex?: OB11UserSex, + age?: number, + card?: string, // 群名片 + level?: string, // 群等级 + role?: OB11GroupMemberRole +} diff --git a/src/onebot11/types/index.ts b/src/onebot11/types/index.ts new file mode 100644 index 00000000..e640c90d --- /dev/null +++ b/src/onebot11/types/index.ts @@ -0,0 +1,3 @@ +export * from './entity'; +export * from './message'; +export * from './meta'; diff --git a/src/onebot11/types.ts b/src/onebot11/types/message.ts similarity index 72% rename from src/onebot11/types.ts rename to src/onebot11/types/message.ts index 679bada6..8b709975 100644 --- a/src/onebot11/types.ts +++ b/src/onebot11/types/message.ts @@ -1,71 +1,6 @@ -import { PicSubType, RawMessage } from '@/core'; -import { EventType } from './event/OB11BaseEvent'; -import { CustomMusicSignPostData, IdMusicSignPostData } from '@/core/apis/sign'; -import { stat } from '@/core/data'; - -export interface OB11User { - user_id: number; - nickname: string; - remark?: string; - sex?: OB11UserSex; - level?: number; - age?: number; - qid?: string; - login_days?: number; -} - -export enum OB11UserSex { - male = 'male', - female = 'female', - unknown = 'unknown' -} - -export enum OB11GroupMemberRole { - owner = 'owner', - admin = 'admin', - member = 'member', -} - -export interface OB11GroupMember { - group_id: number - user_id: number - nickname: string - card?: string - sex?: OB11UserSex - age?: number - join_time?: number - last_sent_time?: number - level?: number - qq_level?: number - role?: OB11GroupMemberRole - title?: string - area?: string - unfriendly?: boolean - title_expire_time?: number - card_changeable?: boolean - // 以下为gocq字段 - shut_up_timestamp?: number - // 以下为扩展字段 - is_robot?: boolean - qage?: number -} - -export interface OB11Group { - group_id: number - group_name: string - member_count?: number - max_member_count?: number -} - -interface OB11Sender { - user_id: number, - nickname: string, - sex?: OB11UserSex, - age?: number, - card?: string, // 群名片 - level?: string, // 群等级 - role?: OB11GroupMemberRole -} +import { OB11Sender } from './entity'; +import { EventType } from '@/onebot11/event/OB11BaseEvent'; +import { CustomMusicSignPostData, IdMusicSignPostData, PicSubType, RawMessage } from '@/core'; export enum OB11MessageType { private = 'private', @@ -256,17 +191,3 @@ export interface OB11PostSendMsg { messages?: OB11MessageMixType; // 兼容 go-cqhttp auto_escape?: boolean | string } - -export interface OB11Version { - app_name: string - app_version: string - protocol_version: 'v11' -} - - -export interface OB11Status { - online: boolean | null, - good: boolean, - stat: typeof stat -} - diff --git a/src/onebot11/types/meta.ts b/src/onebot11/types/meta.ts new file mode 100644 index 00000000..768dde54 --- /dev/null +++ b/src/onebot11/types/meta.ts @@ -0,0 +1,13 @@ +import { stat } from '@/core/data'; + +export interface OB11Version { + app_name: string + app_version: string + protocol_version: 'v11' +} + +export interface OB11Status { + online: boolean | null, + good: boolean, + stat: typeof stat +}