diff --git a/src/core/adapters/NodeIDependsAdapter.ts b/src/core/adapters/NodeIDependsAdapter.ts index 897b31e0..8af142c5 100644 --- a/src/core/adapters/NodeIDependsAdapter.ts +++ b/src/core/adapters/NodeIDependsAdapter.ts @@ -1,4 +1,4 @@ -import { MsfChangeReasonType, MsfStatusType } from "../types/adapter"; +import { MsfChangeReasonType, MsfStatusType } from "@/core/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 9f722170..5040ebc7 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -20,7 +20,7 @@ import { InstanceContext, NapCatCore, SearchResultItem } from '@/core'; import * as fileType from 'file-type'; import imageSize from 'image-size'; import { ISizeCalculationResult } from 'image-size/dist/types/interface'; -import { RkeyManager } from '../helper/rkey'; +import { RkeyManager } from '@/core/helper/rkey'; import { calculateFileMD5, isGIF } from '@/common/file'; import pathLib from 'node:path'; import { defaultVideoThumbB64, getVideoInfo } from '@/common/video'; diff --git a/src/core/services/NodeIKernelBuddyService.ts b/src/core/services/NodeIKernelBuddyService.ts index c4167690..69dcfb05 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 '../types/user'; +import { BuddyListReqType } from '@/core/types/user'; export interface NodeIKernelBuddyService { getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise extends OneBotAction { diff --git a/src/onebot/api/friend.ts b/src/onebot/api/friend.ts index 329e59b1..a8db7682 100644 --- a/src/onebot/api/friend.ts +++ b/src/onebot/api/friend.ts @@ -1,7 +1,6 @@ import { GrayTipElement, NapCatCore } from '@/core'; - import { NapCatOneBot11Adapter } from '@/onebot'; -import { OB11FriendPokeEvent } from '../event/notice/OB11PokeEvent'; +import { OB11FriendPokeEvent } from '@/onebot/event/notice/OB11PokeEvent'; export class OneBotFriendApi { obContext: NapCatOneBot11Adapter; diff --git a/src/onebot/api/group.ts b/src/onebot/api/group.ts index 351f3c57..bd3300d4 100644 --- a/src/onebot/api/group.ts +++ b/src/onebot/api/group.ts @@ -8,11 +8,11 @@ import { TipGroupElementType, } from '@/core'; import { NapCatOneBot11Adapter } from '@/onebot'; -import { OB11GroupBanEvent } from '../event/notice/OB11GroupBanEvent'; -import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent'; -import { OB11GroupDecreaseEvent } from '../event/notice/OB11GroupDecreaseEvent'; +import { OB11GroupBanEvent } from '@/onebot/event/notice/OB11GroupBanEvent'; +import { OB11GroupIncreaseEvent } from '@/onebot/event/notice/OB11GroupIncreaseEvent'; +import { OB11GroupDecreaseEvent } from '@/onebot/event/notice/OB11GroupDecreaseEvent'; import fastXmlParser from 'fast-xml-parser'; -import { OB11GroupMsgEmojiLikeEvent } from '../event/notice/OB11MsgEmojiLikeEvent'; +import { OB11GroupMsgEmojiLikeEvent } from '@/onebot/event/notice/OB11MsgEmojiLikeEvent'; import { MessageUnique } from '@/common/message-unique'; import { OB11GroupCardEvent } from '@/onebot/event/notice/OB11GroupCardEvent'; import { OB11GroupUploadNoticeEvent } from '@/onebot/event/notice/OB11GroupUploadNoticeEvent'; diff --git a/src/onebot/api/user.ts b/src/onebot/api/user.ts index d22add6a..eeb1fcc2 100644 --- a/src/onebot/api/user.ts +++ b/src/onebot/api/user.ts @@ -1,6 +1,6 @@ import { NapCatCore } from '@/core'; import { NapCatOneBot11Adapter } from '@/onebot'; -import { OB11ProfileLikeEvent } from '../event/notice/OB11ProfileLikeEvent'; +import { OB11ProfileLikeEvent } from '@/onebot/event/notice/OB11ProfileLikeEvent'; import { decodeProfileLikeTip } from "@/core/helper/adaptDecoder"; export class OneBotUserApi { diff --git a/src/onebot/event/message/OB11BaseMessageEvent.ts b/src/onebot/event/message/OB11BaseMessageEvent.ts index 89bfed05..f2f1d139 100644 --- a/src/onebot/event/message/OB11BaseMessageEvent.ts +++ b/src/onebot/event/message/OB11BaseMessageEvent.ts @@ -1,4 +1,4 @@ -import { EventType, OneBotEvent } from '../OneBotEvent'; +import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent'; export abstract class OB11BaseMessageEvent extends OneBotEvent { post_type = EventType.MESSAGE; diff --git a/src/onebot/event/request/OB11FriendRequest.ts b/src/onebot/event/request/OB11FriendRequest.ts index 41f3505a..660d2b1a 100644 --- a/src/onebot/event/request/OB11FriendRequest.ts +++ b/src/onebot/event/request/OB11FriendRequest.ts @@ -1,5 +1,5 @@ -import { OB11BaseNoticeEvent } from '../notice/OB11BaseNoticeEvent'; -import { EventType } from '../OneBotEvent'; +import { OB11BaseNoticeEvent } from '@/onebot/event/notice/OB11BaseNoticeEvent'; +import { EventType } from '@/onebot/event/OneBotEvent'; import { NapCatCore } from '@/core'; export class OB11FriendRequestEvent extends OB11BaseNoticeEvent { diff --git a/src/onebot/event/request/OB11GroupRequest.ts b/src/onebot/event/request/OB11GroupRequest.ts index 1576be0e..de1ca026 100644 --- a/src/onebot/event/request/OB11GroupRequest.ts +++ b/src/onebot/event/request/OB11GroupRequest.ts @@ -1,5 +1,5 @@ -import { OB11GroupNoticeEvent } from '../notice/OB11GroupNoticeEvent'; -import { EventType } from '../OneBotEvent'; +import { OB11GroupNoticeEvent } from '@/onebot/event/notice/OB11GroupNoticeEvent'; +import { EventType } from '@/onebot/event/OneBotEvent'; import { NapCatCore } from '@/core'; export class OB11GroupRequestEvent extends OB11GroupNoticeEvent { diff --git a/src/onebot/network/active-http.ts b/src/onebot/network/active-http.ts index b4d6c5ef..2b4d549d 100644 --- a/src/onebot/network/active-http.ts +++ b/src/onebot/network/active-http.ts @@ -5,8 +5,8 @@ import { QuickAction, QuickActionEvent } from '@/onebot/types'; import { NapCatCore } from '@/core'; import { NapCatOneBot11Adapter } from '..'; import { RequestUtil } from '@/common/request'; -import { HttpClientConfig } from '../config/config'; -import { ActionMap } from '../action'; +import { HttpClientConfig } from '@/onebot/config/config'; +import { ActionMap } from '@/onebot/action'; export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter { logger: LogWrapper; diff --git a/src/onebot/network/active-websocket.ts b/src/onebot/network/active-websocket.ts index c8c9435e..d41bd7f7 100644 --- a/src/onebot/network/active-websocket.ts +++ b/src/onebot/network/active-websocket.ts @@ -1,13 +1,13 @@ import { IOB11NetworkAdapter, OB11EmitEventContent, OB11NetworkReloadType } from '@/onebot/network/index'; import { WebSocket } from 'ws'; -import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent'; +import { OB11HeartbeatEvent } from '@/onebot/event/meta/OB11HeartbeatEvent'; import { NapCatCore } from '@/core'; import { ActionName } from '@/onebot/action/router'; import { OB11Response } from '@/onebot/action/OneBotAction'; import { LogWrapper } from '@/common/log'; import { ActionMap } from '@/onebot/action'; -import { LifeCycleSubType, OB11LifeCycleEvent } from '../event/meta/OB11LifeCycleEvent'; -import { WebsocketClientConfig } from '../config/config'; +import { LifeCycleSubType, OB11LifeCycleEvent } from '@/onebot/event/meta/OB11LifeCycleEvent'; +import { WebsocketClientConfig } from '@/onebot/config/config'; export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter { isEnable: boolean = false; diff --git a/src/onebot/network/index.ts b/src/onebot/network/index.ts index be019fd7..d7f46c59 100644 --- a/src/onebot/network/index.ts +++ b/src/onebot/network/index.ts @@ -1,7 +1,7 @@ import { OneBotEvent } from '@/onebot/event/OneBotEvent'; import { OB11Message } from '@/onebot'; import { ActionMap } from '@/onebot/action'; -import { NetworkConfigAdapter } from '../config/config'; +import { NetworkConfigAdapter } from '@/onebot/config/config'; export type OB11EmitEventContent = OneBotEvent | OB11Message; export enum OB11NetworkReloadType { diff --git a/src/onebot/network/passive-http.ts b/src/onebot/network/passive-http.ts index 464312c1..80d862bd 100644 --- a/src/onebot/network/passive-http.ts +++ b/src/onebot/network/passive-http.ts @@ -5,7 +5,7 @@ import { NapCatCore } from '@/core'; import { OB11Response } from '@/onebot/action/OneBotAction'; import { ActionMap } from '@/onebot/action'; import cors from 'cors'; -import { HttpServerConfig } from '../config/config'; +import { HttpServerConfig } from '@/onebot/config/config'; export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter { private app: Express | undefined; diff --git a/src/onebot/network/passive-websocket.ts b/src/onebot/network/passive-websocket.ts index 1459f04a..cb7d89fe 100644 --- a/src/onebot/network/passive-websocket.ts +++ b/src/onebot/network/passive-websocket.ts @@ -3,14 +3,14 @@ import urlParse from 'url'; import { WebSocket, WebSocketServer } from 'ws'; import { Mutex } from 'async-mutex'; import { OB11Response } from '@/onebot/action/OneBotAction'; -import { ActionName } from '../action/router'; +import { ActionName } from '@/onebot/action/router'; import { NapCatCore } from '@/core'; import { LogWrapper } from '@/common/log'; -import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent'; +import { OB11HeartbeatEvent } from '@/onebot/event/meta/OB11HeartbeatEvent'; import { IncomingMessage } from 'http'; import { ActionMap } from '@/onebot/action'; -import { LifeCycleSubType, OB11LifeCycleEvent } from '../event/meta/OB11LifeCycleEvent'; -import { WebsocketServerConfig } from '../config/config'; +import { LifeCycleSubType, OB11LifeCycleEvent } from '@/onebot/event/meta/OB11LifeCycleEvent'; +import { WebsocketServerConfig } from '@/onebot/config/config'; export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter { wsServer: WebSocketServer; diff --git a/src/onebot/types/quick.ts b/src/onebot/types/quick.ts index b0fcd1ca..7c0f9dd0 100644 --- a/src/onebot/types/quick.ts +++ b/src/onebot/types/quick.ts @@ -1,6 +1,6 @@ -import { OB11BaseMetaEvent } from '../event/meta/OB11BaseMetaEvent'; -import { OB11BaseNoticeEvent } from '../event/notice/OB11BaseNoticeEvent'; -import { OB11Message } from './message'; +import { OB11BaseMetaEvent } from '@/onebot/event/meta/OB11BaseMetaEvent'; +import { OB11BaseNoticeEvent } from '@/onebot/event/notice/OB11BaseNoticeEvent'; +import { OB11Message } from '@/onebot/types/message'; export type QuickActionEvent = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent; export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent; diff --git a/src/webui/src/api/BaseInfo.ts b/src/webui/src/api/BaseInfo.ts index d7e9a825..53ea87a0 100644 --- a/src/webui/src/api/BaseInfo.ts +++ b/src/webui/src/api/BaseInfo.ts @@ -1,5 +1,4 @@ import { RequestHandler } from 'express'; -import { WebUiDataRuntime } from '../helper/Data'; export const LogFileListHandler: RequestHandler = async (req, res) => { res.send({