refactor: remove helper directory in onebot

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';
 

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';

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';

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';

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';

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';

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';

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';
 

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';

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';

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;

src/onebot/cqcode.ts

@@ -1,4 +1,4 @@
-import { OB11MessageData } from '../types';
+import { OB11MessageData } from './types';
 
 const pattern = /\[CQ:(\w+)((,\w+=[^,\]]*)*)]/;
 

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 {

src/onebot/helper/index.ts

@@ -1,2 +0,0 @@
-export * from './config';
-export * from './entities';

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,

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;

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' },