diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index fa5e83c2..ab616aae 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -21,7 +21,6 @@ import { InstanceContext, NapCatCore } from '@/core'; import * as fileType from 'file-type'; import imageSize from 'image-size'; import { ISizeCalculationResult } from 'image-size/dist/types/interface'; -import { NodeIKernelSearchService } from '../services/NodeIKernelSearchService'; import { RkeyManager } from '../helper/rkey'; import { calculateFileMD5, isGIF } from '@/common/file'; import pathLib from 'node:path'; diff --git a/src/core/apis/friend.ts b/src/core/apis/friend.ts index 937a7bcb..4a966229 100644 --- a/src/core/apis/friend.ts +++ b/src/core/apis/friend.ts @@ -1,5 +1,5 @@ import { FriendV2 } from '@/core/entities'; -import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelProfileService } from '@/core'; +import { BuddyListReqType, InstanceContext, NapCatCore } from '@/core'; import { LimitedHashTable } from '@/common/message-unique'; export class NTQQFriendApi { diff --git a/src/core/apis/system.ts b/src/core/apis/system.ts index 229f7e2c..7f804737 100644 --- a/src/core/apis/system.ts +++ b/src/core/apis/system.ts @@ -1,4 +1,4 @@ -import { GeneralCallResult, InstanceContext, NapCatCore } from '@/core'; +import { InstanceContext, NapCatCore } from '@/core'; export class NTQQSystemApi { context: InstanceContext; diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts index 682aa3e0..37af1a3a 100644 --- a/src/core/apis/user.ts +++ b/src/core/apis/user.ts @@ -1,4 +1,4 @@ -import type { ModifyProfileParams, User, UserDetailInfoByUinV2 } from '@/core/entities'; +import type { ModifyProfileParams, User } from '@/core/entities'; import { RequestUtil } from '@/common/request'; import { ProfileBizType, UserDetailSource } from '@/core/services'; import { InstanceContext, NapCatCore } from '..'; diff --git a/src/core/listeners/index.ts b/src/core/listeners/index.ts index 49759116..e485f87c 100644 --- a/src/core/listeners/index.ts +++ b/src/core/listeners/index.ts @@ -19,10 +19,10 @@ import type { NodeIKernelMsgListener, NodeIKernelProfileListener, NodeIKernelRobotListener, + NodeIKernelSearchListener_Polyfill, NodeIKernelSessionListener, NodeIKernelStorageCleanListener, NodeIKernelTicketListener, - NodeIKernelSearchListener_Polyfill, } from '.'; export type ListenerNamingMapping = { diff --git a/src/core/services/NodeIKernelProfileService.ts b/src/core/services/NodeIKernelProfileService.ts index 0cafa0cc..9987aa7e 100644 --- a/src/core/services/NodeIKernelProfileService.ts +++ b/src/core/services/NodeIKernelProfileService.ts @@ -1,6 +1,5 @@ import { AnyCnameRecord } from 'node:dns'; -import { BizKey, ModifyProfileParams, SimpleInfo, UserDetailInfoByUin, UserDetailInfoByUinV2 } from '@/core'; -import { NodeIKernelProfileListener } from '@/core'; +import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, SimpleInfo, UserDetailInfoByUinV2 } from '@/core'; import { GeneralCallResult } from '@/core/services/common'; export enum UserDetailSource { diff --git a/src/core/services/index.ts b/src/core/services/index.ts index a1ca5256..a36de20f 100644 --- a/src/core/services/index.ts +++ b/src/core/services/index.ts @@ -20,6 +20,7 @@ export * from './NodeIKernelCollectionService'; import type { NodeIKernelAvatarService, NodeIKernelBuddyService, + NodeIKernelCollectionService, NodeIKernelDbToolsService, NodeIKernelFileAssistantService, NodeIKernelGroupService, @@ -30,11 +31,10 @@ import type { NodeIKernelProfileService, NodeIKernelRichMediaService, NodeIKernelRobotService, + NodeIKernelSearchService, NodeIKernelStorageCleanService, NodeIKernelTicketService, NodeIKernelTipOffService, - NodeIKernelSearchService, - NodeIKernelCollectionService, } from '.'; export type ServiceNamingMapping = { diff --git a/src/core/wrapper/wrapper.ts b/src/core/wrapper/wrapper.ts index 1859fcaa..bb7c16c7 100644 --- a/src/core/wrapper/wrapper.ts +++ b/src/core/wrapper/wrapper.ts @@ -1,5 +1,4 @@ import { NodeIDependsAdapter, NodeIDispatcherAdapter, NodeIGlobalAdapter } from '../adapters'; -import { NodeIKernelSessionListener } from '@/core'; import { NodeIKernelAvatarService, NodeIKernelBuddyService, @@ -9,11 +8,12 @@ import { NodeIKernelProfileLikeService, NodeIKernelProfileService, NodeIKernelRichMediaService, + NodeIKernelRobotService, + NodeIKernelSessionListener, + NodeIKernelStorageCleanService, NodeIKernelTicketService, NodeIKernelTipOffService, } from '@/core'; -import { NodeIKernelStorageCleanService } from '@/core'; -import { NodeIKernelRobotService } from '@/core'; import { NodeIKernelNodeMiscService } from '../services/NodeIKernelNodeMiscService'; import { NodeIKernelUixConvertService } from '../services/NodeIKernelUixConvertService'; import { NodeIKernelMsgBackupService } from '../services/NodeIKernelMsgBackupService'; diff --git a/src/onebot/action/file/GetFile.ts b/src/onebot/action/file/GetFile.ts index 6686c0b3..759691e4 100644 --- a/src/onebot/action/file/GetFile.ts +++ b/src/onebot/action/file/GetFile.ts @@ -2,7 +2,7 @@ import BaseAction from '../BaseAction'; import fs from 'fs/promises'; import { UUIDConverter } from '@/common/helper'; import { ActionName } from '../types'; -import { ChatType, ElementType, FileElement, Peer, RawMessage, VideoElement } from '@/core/entities'; +import { ChatType, ElementType, Peer, RawMessage } from '@/core/entities'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; export interface GetFilePayload { diff --git a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts index fb23689d..6e139719 100644 --- a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts +++ b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts @@ -53,6 +53,5 @@ export default class SetGroupPortrait extends BaseAction { } throw `头像${payload.file}设置失败,无法获取头像,文件可能不存在`; } - return null; } } diff --git a/src/onebot/action/msg/DeleteMsg.ts b/src/onebot/action/msg/DeleteMsg.ts index c11b6c21..d3491ad9 100644 --- a/src/onebot/action/msg/DeleteMsg.ts +++ b/src/onebot/action/msg/DeleteMsg.ts @@ -2,7 +2,6 @@ import { ActionName } from '../types'; import BaseAction from '../BaseAction'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { MessageUnique } from '@/common/message-unique'; -import { NodeIKernelMsgListener } from '@/core'; const SchemaData = { type: 'object', diff --git a/src/onebot/event/OB11BaseEvent.ts b/src/onebot/event/OB11BaseEvent.ts index fc072c00..1ae7d7b1 100644 --- a/src/onebot/event/OB11BaseEvent.ts +++ b/src/onebot/event/OB11BaseEvent.ts @@ -1,4 +1,4 @@ -import { InstanceContext, NapCatCore } from '@/core'; +import { NapCatCore } from '@/core'; export enum EventType { META = 'meta_event', diff --git a/src/onebot/helper/event.ts b/src/onebot/helper/event.ts index 5017442d..251959c9 100644 --- a/src/onebot/helper/event.ts +++ b/src/onebot/helper/event.ts @@ -9,7 +9,7 @@ import { OB11GroupPokeEvent } from '../event/notice/OB11PokeEvent'; import { OB11GroupEssenceEvent } from '../event/notice/OB11GroupEssenceEvent'; import { MessageUnique } from '@/common/message-unique'; import { OB11GroupTitleEvent } from '../event/notice/OB11GroupTitleEvent'; -import { NapCatCore, RawMessage, ChatType, NTGrayTipElementSubTypeV2, TipGroupElementType, Peer } from '@/core'; +import { ChatType, NapCatCore, NTGrayTipElementSubTypeV2, Peer, RawMessage, TipGroupElementType } from '@/core'; export async function NT2PrivateEvent(core: NapCatCore, obContext: NapCatOneBot11Adapter, msg: RawMessage): Promise { if (msg.chatType !== ChatType.KCHATTYPEC2C) { diff --git a/src/onebot/index.ts b/src/onebot/index.ts index d7643455..781cc479 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -1,17 +1,17 @@ import { - NodeIKernelBuddyListener, BuddyReqType, ChatType, + DataSource, + GroupMemberRole, + GroupNotifyMsgStatus, + GroupNotifyMsgType, InstanceContext, - NodeIKernelMsgListener, NapCatCore, + NodeIKernelBuddyListener, + NodeIKernelGroupListener, + NodeIKernelMsgListener, RawMessage, SendStatusType, - GroupMemberRole, - GroupNotifyMsgType, - GroupNotifyMsgStatus, - DataSource, - NodeIKernelGroupListener, } from '@/core'; import { OB11Config, OB11ConfigLoader } from '@/onebot/helper/config'; import { diff --git a/src/onebot/network/index.ts b/src/onebot/network/index.ts index 941b3cfc..9d4b16b5 100644 --- a/src/onebot/network/index.ts +++ b/src/onebot/network/index.ts @@ -1,4 +1,3 @@ -import BaseAction from '@/onebot/action/BaseAction'; import { OB11BaseEvent } from '@/onebot/event/OB11BaseEvent'; import { OB11Message } from '@/onebot'; import { ActionMap } from '@/onebot/action';