diff --git a/src/core/adapters/NodeIDependsAdapter.ts b/src/core/adapters/NodeIDependsAdapter.ts index 72723f56..897b31e0 100644 --- a/src/core/adapters/NodeIDependsAdapter.ts +++ b/src/core/adapters/NodeIDependsAdapter.ts @@ -1,4 +1,4 @@ -import { MsfChangeReasonType, MsfStatusType } from "../entities/adapter"; +import { MsfChangeReasonType, MsfStatusType } from "../types/adapter"; export class NodeIDependsAdapter { onMSFStatusChange(statusType: MsfStatusType, changeReasonType: MsfChangeReasonType) { diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index fbcf9d08..9f722170 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -12,7 +12,7 @@ import { SendPicElement, SendPttElement, SendVideoElement, -} from '@/core/entities'; +} from '@/core/types'; import path from 'path'; import fs from 'fs'; import fsPromises from 'fs/promises'; diff --git a/src/core/apis/friend.ts b/src/core/apis/friend.ts index c05102b5..eff2fcd1 100644 --- a/src/core/apis/friend.ts +++ b/src/core/apis/friend.ts @@ -1,4 +1,4 @@ -import { FriendV2 } from '@/core/entities'; +import { FriendV2 } from '@/core/types'; import { BuddyListReqType, InstanceContext, NapCatCore } from '@/core'; import { LimitedHashTable } from '@/common/message-unique'; diff --git a/src/core/apis/msg.ts b/src/core/apis/msg.ts index 8d575043..239ce18f 100644 --- a/src/core/apis/msg.ts +++ b/src/core/apis/msg.ts @@ -1,4 +1,4 @@ -import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/entities'; +import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/types'; import { GroupFileInfoUpdateItem, InstanceContext, NapCatCore } from '@/core'; import { GeneralCallResult } from '@/core/services/common'; diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts index de985b3e..48ad0cfd 100644 --- a/src/core/apis/user.ts +++ b/src/core/apis/user.ts @@ -1,4 +1,4 @@ -import { ModifyProfileParams, User, UserDetailSource } from '@/core/entities'; +import { ModifyProfileParams, User, UserDetailSource } from '@/core/types'; import { RequestUtil } from '@/common/request'; import { InstanceContext, NapCatCore, ProfileBizType } from '..'; import { solveAsyncProblem } from '@/common/helper'; diff --git a/src/core/index.ts b/src/core/index.ts index 123aa9f6..7faa4027 100644 --- a/src/core/index.ts +++ b/src/core/index.ts @@ -24,14 +24,14 @@ import path from 'node:path'; import fs from 'node:fs'; import { hostname, systemName, systemVersion } from '@/common/system'; import { NTEventWrapper } from '@/common/event'; -import { DataSource, GroupMember, KickedOffLineInfo, SelfInfo, SelfStatusInfo } from '@/core/entities'; +import { DataSource, GroupMember, KickedOffLineInfo, SelfInfo, SelfStatusInfo } from '@/core/types'; import { NapCatConfigLoader } from '@/core/helper/config'; import os from 'node:os'; import { NodeIKernelGroupListener, NodeIKernelMsgListener, NodeIKernelProfileListener } from '@/core/listeners'; import { proxiedListenerOf } from '@/common/proxy-handler'; import { NTQQPacketApi } from './apis/packet'; export * from './wrapper'; -export * from './entities'; +export * from './types'; export * from './services'; export * from './listeners'; diff --git a/src/core/listeners/NodeIKernelBuddyListener.ts b/src/core/listeners/NodeIKernelBuddyListener.ts index 94cce080..5dcfe243 100644 --- a/src/core/listeners/NodeIKernelBuddyListener.ts +++ b/src/core/listeners/NodeIKernelBuddyListener.ts @@ -1,4 +1,4 @@ -import { BuddyCategoryType, FriendRequestNotify } from '@/core/entities'; +import { BuddyCategoryType, FriendRequestNotify } from '@/core/types'; export type OnBuddyChangeParams = BuddyCategoryType[]; diff --git a/src/core/listeners/NodeIKernelGroupListener.ts b/src/core/listeners/NodeIKernelGroupListener.ts index eada28ab..962e2410 100644 --- a/src/core/listeners/NodeIKernelGroupListener.ts +++ b/src/core/listeners/NodeIKernelGroupListener.ts @@ -1,4 +1,4 @@ -import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify, ShutUpGroupMember } from '@/core/entities'; +import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify, ShutUpGroupMember } from '@/core/types'; export class NodeIKernelGroupListener { onGroupListInited(listEmpty: boolean): any { } diff --git a/src/core/listeners/NodeIKernelMsgListener.ts b/src/core/listeners/NodeIKernelMsgListener.ts index f0ebdb37..bdfcd0a5 100644 --- a/src/core/listeners/NodeIKernelMsgListener.ts +++ b/src/core/listeners/NodeIKernelMsgListener.ts @@ -1,4 +1,4 @@ -import { ChatType, KickedOffLineInfo, RawMessage } from '@/core/entities'; +import { ChatType, KickedOffLineInfo, RawMessage } from '@/core/types'; import { CommonFileInfo } from '@/core'; export interface OnRichMediaDownloadCompleteParams { diff --git a/src/core/listeners/NodeIKernelProfileListener.ts b/src/core/listeners/NodeIKernelProfileListener.ts index 4b8fad1c..5ba11be0 100644 --- a/src/core/listeners/NodeIKernelProfileListener.ts +++ b/src/core/listeners/NodeIKernelProfileListener.ts @@ -1,4 +1,4 @@ -import { User, UserDetailInfoListenerArg } from '@/core/entities'; +import { User, UserDetailInfoListenerArg } from '@/core/types'; export class NodeIKernelProfileListener { onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void { diff --git a/src/core/services/NodeIKernelBuddyService.ts b/src/core/services/NodeIKernelBuddyService.ts index 0deef0d7..c4167690 100644 --- a/src/core/services/NodeIKernelBuddyService.ts +++ b/src/core/services/NodeIKernelBuddyService.ts @@ -1,6 +1,6 @@ import { GeneralCallResult } from '@/core/services/common'; import { NodeIKernelBuddyListener } from '@/core/listeners'; -import { BuddyListReqType } from '../entities/user'; +import { BuddyListReqType } from '../types/user'; export interface NodeIKernelBuddyService { getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise