diff --git a/src/onebot/action/extends/GetFriendWithCategory.ts b/src/onebot/action/extends/GetFriendWithCategory.ts index 9ecaf9e4..5fca6445 100644 --- a/src/onebot/action/extends/GetFriendWithCategory.ts +++ b/src/onebot/action/extends/GetFriendWithCategory.ts @@ -1,4 +1,4 @@ -import { OB11Entities } from '@/onebot/helper/entities'; +import { OB11Entities } from '@/onebot/entities'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; diff --git a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts index bcb3cb39..a39a0100 100644 --- a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts +++ b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts @@ -1,6 +1,6 @@ import BaseAction from '../BaseAction'; import { OB11User, OB11UserSex } from '@/onebot'; -import { OB11Entities } from '@/onebot/helper/entities'; +import { OB11Entities } from '@/onebot/entities'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { calcQQLevel } from '@/common/helper'; diff --git a/src/onebot/action/group/GetGroupInfo.ts b/src/onebot/action/group/GetGroupInfo.ts index feeb6ebe..f25d1e34 100644 --- a/src/onebot/action/group/GetGroupInfo.ts +++ b/src/onebot/action/group/GetGroupInfo.ts @@ -1,5 +1,5 @@ import { OB11Group } from '@/onebot'; -import { OB11Entities } from '@/onebot/helper/entities'; +import { OB11Entities } from '@/onebot/entities'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; diff --git a/src/onebot/action/group/GetGroupList.ts b/src/onebot/action/group/GetGroupList.ts index 6e59f941..2ec0ec2f 100644 --- a/src/onebot/action/group/GetGroupList.ts +++ b/src/onebot/action/group/GetGroupList.ts @@ -1,5 +1,5 @@ import { OB11Group } from '@/onebot'; -import { OB11Entities } from '@/onebot/helper/entities'; +import { OB11Entities } from '@/onebot/entities'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; import { Group } from '@/core/entities'; diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index facc565b..3c2db5b3 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -1,5 +1,5 @@ import { OB11GroupMember } from '@/onebot'; -import { OB11Entities } from '@/onebot/helper/entities'; +import { OB11Entities } from '@/onebot/entities'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; diff --git a/src/onebot/action/group/GetGroupMemberList.ts b/src/onebot/action/group/GetGroupMemberList.ts index 980053e8..773a9d7a 100644 --- a/src/onebot/action/group/GetGroupMemberList.ts +++ b/src/onebot/action/group/GetGroupMemberList.ts @@ -1,5 +1,5 @@ import { OB11GroupMember } from '@/onebot'; -import { OB11Entities } from '@/onebot/helper/entities'; +import { OB11Entities } from '@/onebot/entities'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index c1ea2cd9..2c65ae0d 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/src/onebot/action/msg/SendMsg.ts @@ -6,7 +6,7 @@ import { OB11PostSendMsg, } from '@/onebot/types'; import { ActionName, BaseCheckResult } from '@/onebot/action/types'; -import { decodeCQCode } from '@/onebot/helper/cqcode'; +import { decodeCQCode } from '@/onebot/cqcode'; import { MessageUnique } from '@/common/message-unique'; import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendMessageElement } from '@/core'; import BaseAction from '../BaseAction'; diff --git a/src/onebot/action/system/GetLoginInfo.ts b/src/onebot/action/system/GetLoginInfo.ts index 05949dbc..b9ca26f9 100644 --- a/src/onebot/action/system/GetLoginInfo.ts +++ b/src/onebot/action/system/GetLoginInfo.ts @@ -1,5 +1,5 @@ import { OB11User } from '@/onebot'; -import { OB11Entities } from '@/onebot/helper/entities'; +import { OB11Entities } from '@/onebot/entities'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; diff --git a/src/onebot/action/user/GetFriendList.ts b/src/onebot/action/user/GetFriendList.ts index 6dd517da..eeff67a8 100644 --- a/src/onebot/action/user/GetFriendList.ts +++ b/src/onebot/action/user/GetFriendList.ts @@ -1,5 +1,5 @@ import { OB11User } from '@/onebot'; -import { OB11Entities } from '@/onebot/helper/entities'; +import { OB11Entities } from '@/onebot/entities'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index 61245792..05a4b2e4 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -24,9 +24,9 @@ import { OB11MessageFileBase, OB11MessageForward, } from '@/onebot'; -import { OB11Entities } from '../helper'; +import { OB11Entities } from '@/onebot/entities'; import { EventType } from '@/onebot/event/OB11BaseEvent'; -import { encodeCQCode } from '@/onebot/helper/cqcode'; +import { encodeCQCode } from '@/onebot/cqcode'; import { uri2local } from '@/common/file'; import { RequestUtil } from '@/common/request'; import fs from 'node:fs'; diff --git a/src/onebot/helper/config.ts b/src/onebot/config/index.ts similarity index 82% rename from src/onebot/helper/config.ts rename to src/onebot/config/index.ts index 8a57c41d..7d517095 100644 --- a/src/onebot/helper/config.ts +++ b/src/onebot/config/index.ts @@ -1,5 +1,5 @@ import { ConfigBase } from '@/common/config-base'; -import ob11DefaultConfig from '@/onebot/external/onebot11.json'; +import ob11DefaultConfig from './onebot11.json'; import { NapCatCore } from '@/core'; export type OB11Config = typeof ob11DefaultConfig; diff --git a/src/onebot/external/onebot11.json b/src/onebot/config/onebot11.json similarity index 100% rename from src/onebot/external/onebot11.json rename to src/onebot/config/onebot11.json diff --git a/src/onebot/helper/cqcode.ts b/src/onebot/cqcode.ts similarity index 98% rename from src/onebot/helper/cqcode.ts rename to src/onebot/cqcode.ts index 247f94d6..b64b85fe 100644 --- a/src/onebot/helper/cqcode.ts +++ b/src/onebot/cqcode.ts @@ -1,4 +1,4 @@ -import { OB11MessageData } from '../types'; +import { OB11MessageData } from './types'; const pattern = /\[CQ:(\w+)((,\w+=[^,\]]*)*)]/; diff --git a/src/onebot/helper/entities.ts b/src/onebot/entities.ts similarity index 98% rename from src/onebot/helper/entities.ts rename to src/onebot/entities.ts index d781147b..516ea5e8 100644 --- a/src/onebot/helper/entities.ts +++ b/src/onebot/entities.ts @@ -1,6 +1,6 @@ import { calcQQLevel } from '@/common/helper'; import { Friend, FriendV2, Group, GroupMember, SelfInfo, Sex, User } from '@/core'; -import { OB11Group, OB11GroupMember, OB11GroupMemberRole, OB11User, OB11UserSex } from '../types'; +import { OB11Group, OB11GroupMember, OB11GroupMemberRole, OB11User, OB11UserSex } from './types'; export class OB11Entities { static selfInfo(selfInfo: SelfInfo): OB11User { diff --git a/src/onebot/helper/index.ts b/src/onebot/helper/index.ts deleted file mode 100644 index 6e403291..00000000 --- a/src/onebot/helper/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './config'; -export * from './entities'; diff --git a/src/onebot/index.ts b/src/onebot/index.ts index aa58860e..67c5a53d 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -13,7 +13,7 @@ import { RawMessage, SendStatusType, } from '@/core'; -import { OB11Config, OB11ConfigLoader } from '@/onebot/helper/config'; +import { OB11Config, OB11ConfigLoader } from '@/onebot/config'; import { OB11ActiveHttpAdapter, OB11ActiveWebSocketAdapter, diff --git a/src/webui/src/helper/Data.ts b/src/webui/src/helper/Data.ts index 184f0b7c..c569d912 100644 --- a/src/webui/src/helper/Data.ts +++ b/src/webui/src/helper/Data.ts @@ -1,4 +1,4 @@ -import { OB11Config } from '@/onebot/helper/config'; +import { OB11Config } from '@/onebot/config'; interface LoginRuntimeType { LoginCurrentTime: number; diff --git a/vite.config.ts b/vite.config.ts index 9444deb5..38c25103 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -46,7 +46,7 @@ const FrameworkBaseConfigPlugin: PluginOption[] = [ { src: './manifest.json', dest: 'dist' }, { src: './src/core/external/napcat.json', dest: 'dist/config/' }, { src: './static/', dest: 'dist/static/', flatten: false }, - { src: './src/onebot/external/onebot11.json', dest: 'dist/config/' }, + { src: './src/onebot/config/onebot11.json', dest: 'dist/config/' }, { src: './src/framework/liteloader.cjs', dest: 'dist' }, { src: './src/framework/napcat.cjs', dest: 'dist' }, { src: './src/framework/preload.cjs', dest: 'dist' },