From 9ffaab178aefc9e0f251e160f68f7b545f8092a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Tue, 19 Nov 2024 12:49:51 +0800 Subject: [PATCH] refactor: Action --- src/onebot/action/OB11Response.ts | 32 ----------- .../action/{BaseAction.ts => OneBotAction.ts} | 53 ++++++++++++------- src/onebot/action/extends/CreateCollection.ts | 4 +- src/onebot/action/extends/FetchCustomFace.ts | 4 +- src/onebot/action/extends/FetchEmojiLike.ts | 4 +- .../action/extends/FetchUserProfileLike.ts | 4 +- .../action/extends/GetCollectionList.ts | 4 +- .../action/extends/GetFriendWithCategory.ts | 4 +- .../action/extends/GetGroupAddRequest.ts | 4 +- src/onebot/action/extends/GetGroupInfoEx.ts | 4 +- src/onebot/action/extends/GetProfileLike.ts | 4 +- src/onebot/action/extends/GetRobotUinRange.ts | 4 +- src/onebot/action/extends/OCRImage.ts | 4 +- src/onebot/action/extends/SetInputStatus.ts | 4 +- src/onebot/action/extends/SetLongNick.ts | 4 +- src/onebot/action/extends/SetOnlineStatus.ts | 4 +- src/onebot/action/extends/SetQQAvatar.ts | 4 +- src/onebot/action/extends/ShareContact.ts | 6 +-- .../action/extends/TranslateEnWordToZn.ts | 4 +- src/onebot/action/file/GetFile.ts | 4 +- .../action/go-cqhttp/CreateGroupFileFolder.ts | 4 +- .../action/go-cqhttp/DeleteGroupFile.ts | 4 +- .../action/go-cqhttp/DeleteGroupFileFolder.ts | 4 +- src/onebot/action/go-cqhttp/DownloadFile.ts | 4 +- src/onebot/action/go-cqhttp/GetForwardMsg.ts | 4 +- .../action/go-cqhttp/GetFriendMsgHistory.ts | 4 +- .../action/go-cqhttp/GetGroupAtAllRemain.ts | 4 +- .../go-cqhttp/GetGroupFileSystemInfo.ts | 4 +- .../action/go-cqhttp/GetGroupFilesByFolder.ts | 4 +- .../action/go-cqhttp/GetGroupHonorInfo.ts | 4 +- .../action/go-cqhttp/GetGroupMsgHistory.ts | 4 +- .../action/go-cqhttp/GetGroupRootFiles.ts | 4 +- .../action/go-cqhttp/GetOnlineClient.ts | 4 +- .../action/go-cqhttp/GetStrangerInfo.ts | 4 +- .../go-cqhttp/GoCQHTTPCheckUrlSafely.ts | 4 +- .../action/go-cqhttp/GoCQHTTPDeleteFriend.ts | 4 +- .../action/go-cqhttp/GoCQHTTPGetModelShow.ts | 4 +- .../action/go-cqhttp/GoCQHTTPSetModelShow.ts | 4 +- src/onebot/action/go-cqhttp/QuickAction.ts | 4 +- .../action/go-cqhttp/SendGroupNotice.ts | 4 +- .../action/go-cqhttp/SetGroupPortrait.ts | 4 +- src/onebot/action/go-cqhttp/SetQQProfile.ts | 4 +- .../action/go-cqhttp/UploadGroupFile.ts | 4 +- .../action/go-cqhttp/UploadPrivateFile.ts | 4 +- src/onebot/action/group/DelEssenceMsg.ts | 4 +- src/onebot/action/group/DelGroupNotice.ts | 4 +- src/onebot/action/group/GetGroupEssence.ts | 4 +- .../action/group/GetGroupIgnoredNotifies.ts | 4 +- src/onebot/action/group/GetGroupInfo.ts | 4 +- src/onebot/action/group/GetGroupList.ts | 4 +- src/onebot/action/group/GetGroupMemberInfo.ts | 4 +- src/onebot/action/group/GetGroupMemberList.ts | 4 +- src/onebot/action/group/GetGroupNotice.ts | 4 +- src/onebot/action/group/GetGroupShutList.ts | 4 +- src/onebot/action/group/SetEssenceMsg.ts | 4 +- src/onebot/action/group/SetGroupAddRequest.ts | 4 +- src/onebot/action/group/SetGroupAdmin.ts | 4 +- src/onebot/action/group/SetGroupBan.ts | 4 +- src/onebot/action/group/SetGroupCard.ts | 4 +- src/onebot/action/group/SetGroupKick.ts | 4 +- src/onebot/action/group/SetGroupLeave.ts | 4 +- src/onebot/action/group/SetGroupName.ts | 4 +- src/onebot/action/group/SetGroupWholeBan.ts | 4 +- src/onebot/action/guild/GetGuildList.ts | 4 +- src/onebot/action/guild/GetGuildProfile.ts | 4 +- src/onebot/action/index.ts | 4 +- src/onebot/action/msg/DeleteMsg.ts | 4 +- src/onebot/action/msg/ForwardSingleMsg.ts | 4 +- src/onebot/action/msg/GetMsg.ts | 4 +- src/onebot/action/msg/MarkMsgAsRead.ts | 6 +-- src/onebot/action/msg/SendMsg.ts | 4 +- src/onebot/action/msg/SetMsgEmojiLike.ts | 4 +- src/onebot/action/packet/GetPacketStatus.ts | 4 +- src/onebot/action/system/CanSendRecord.ts | 4 +- src/onebot/action/system/GetCSRF.ts | 4 +- src/onebot/action/system/GetCredentials.ts | 4 +- src/onebot/action/system/GetLoginInfo.ts | 4 +- src/onebot/action/system/GetStatus.ts | 4 +- src/onebot/action/system/GetSystemMsg.ts | 4 +- src/onebot/action/system/GetVersionInfo.ts | 4 +- src/onebot/action/user/GetCookies.ts | 4 +- src/onebot/action/user/GetFriendList.ts | 4 +- src/onebot/action/user/GetRecentContact.ts | 4 +- src/onebot/action/user/SendLike.ts | 4 +- src/onebot/action/user/SetFriendAddRequest.ts | 4 +- src/onebot/network/active-websocket.ts | 2 +- src/onebot/network/passive-http.ts | 2 +- src/onebot/network/passive-websocket.ts | 2 +- 88 files changed, 206 insertions(+), 221 deletions(-) delete mode 100644 src/onebot/action/OB11Response.ts rename src/onebot/action/{BaseAction.ts => OneBotAction.ts} (58%) diff --git a/src/onebot/action/OB11Response.ts b/src/onebot/action/OB11Response.ts deleted file mode 100644 index 3fecfbb44..000000000 --- a/src/onebot/action/OB11Response.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { OB11Return } from '../types'; - -import { isNull } from '@/common/helper'; - -export class OB11Response { - static res(data: T, status: string, retcode: number, message: string = ''): OB11Return { - return { - status: status, - retcode: retcode, - data: data, - message: message, - wording: message, - echo: null, - }; - } - - static ok(data: T, echo: any = null) { - const res = OB11Response.res(data, 'ok', 0); - if (!isNull(echo)) { - res.echo = echo; - } - return res; - } - - static error(err: string, retcode: number, echo: any = null) { - const res = OB11Response.res(null, 'failed', retcode, err); - if (!isNull(echo)) { - res.echo = echo; - } - return res; - } -} diff --git a/src/onebot/action/BaseAction.ts b/src/onebot/action/OneBotAction.ts similarity index 58% rename from src/onebot/action/BaseAction.ts rename to src/onebot/action/OneBotAction.ts index cace27236..8651fb34c 100644 --- a/src/onebot/action/BaseAction.ts +++ b/src/onebot/action/OneBotAction.ts @@ -1,15 +1,38 @@ import { ActionName, BaseCheckResult } from './types'; -import { OB11Response } from './OB11Response'; -import { OB11Return } from '@/onebot/types'; import Ajv, { ErrorObject, ValidateFunction } from 'ajv'; import { NapCatCore } from '@/core'; +import { isNull } from '@/common/helper'; +import { NapCatOneBot11Adapter, OB11Return } from '@/onebot'; -import { NapCatOneBot11Adapter } from '@/onebot'; +export class OB11Response { + private static createResponse(data: T, status: string, retcode: number, message: string = '', echo: any = null): OB11Return { + return { + status, + retcode, + data, + message, + wording: message, + echo, + }; + } + + static res(data: T, status: string, retcode: number, message: string = ''): OB11Return { + return this.createResponse(data, status, retcode, message); + } + + static ok(data: T, echo: any = null): OB11Return { + return this.createResponse(data, 'ok', 0, '', echo); + } -abstract class BaseAction { + static error(err: string, retcode: number, echo: any = null): OB11Return { + return this.createResponse(null, 'failed', retcode, err, echo); + } +} + +export abstract class OneBotAction { actionName: ActionName = ActionName.Unknown; core: NapCatCore; - private validate: undefined | ValidateFunction = undefined; + private validate: ValidateFunction | undefined = undefined; payloadSchema: any = undefined; obContext: NapCatOneBot11Adapter; @@ -24,17 +47,13 @@ abstract class BaseAction { } if (this.validate && !this.validate(payload)) { const errors = this.validate.errors as ErrorObject[]; - const errorMessages: string[] = errors.map((e) => { - return `Key: ${e.instancePath.split('/').slice(1).join('.')}, Message: ${e.message}`; - }); + const errorMessages = errors.map(e => `Key: ${e.instancePath.split('/').slice(1).join('.')}, Message: ${e.message}`); return { valid: false, message: errorMessages.join('\n') ?? '未知错误', }; } - return { - valid: true, - }; + return { valid: true }; } public async handle(payload: PayloadType, adaptername: string): Promise> { @@ -46,8 +65,8 @@ abstract class BaseAction { const resData = await this._handle(payload, adaptername); return OB11Response.ok(resData); } catch (e: any) { - this.core.context.logger.logError.bind(this.core.context.logger)('发生错误', e); - return OB11Response.error(e?.stack?.toString() || e?.toString() || '未知错误，可能操作超时', 200); + this.core.context.logger.logError('发生错误', e); + return OB11Response.error(e?.toString() || e?.stack?.toString() || '未知错误，可能操作超时', 200); } } @@ -60,12 +79,10 @@ abstract class BaseAction { const resData = await this._handle(payload, adaptername); return OB11Response.ok(resData, echo); } catch (e: any) { - this.core.context.logger.logError.bind(this.core.context.logger)('发生错误', e); - return OB11Response.error(e.stack?.toString() || e.toString(), 1200, echo); + this.core.context.logger.logError('发生错误', e); + return OB11Response.error(e.toString() || e.stack?.toString(), 1200, echo); } } abstract _handle(payload: PayloadType, adaptername: string): PromiseLike; -} - -export default BaseAction; +} \ No newline at end of file diff --git a/src/onebot/action/extends/CreateCollection.ts b/src/onebot/action/extends/CreateCollection.ts index d7a5e58cf..1f62a15d8 100644 --- a/src/onebot/action/extends/CreateCollection.ts +++ b/src/onebot/action/extends/CreateCollection.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -13,7 +13,7 @@ const SchemaData = { type Payload = FromSchema; -export class CreateCollection extends BaseAction { +export class CreateCollection extends OneBotAction { actionName = ActionName.CreateCollection; payloadSchema = SchemaData; diff --git a/src/onebot/action/extends/FetchCustomFace.ts b/src/onebot/action/extends/FetchCustomFace.ts index 041e38f69..ea4dd11c3 100644 --- a/src/onebot/action/extends/FetchCustomFace.ts +++ b/src/onebot/action/extends/FetchCustomFace.ts @@ -1,5 +1,5 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; const SchemaData = { @@ -11,7 +11,7 @@ const SchemaData = { type Payload = FromSchema; -export class FetchCustomFace extends BaseAction { +export class FetchCustomFace extends OneBotAction { actionName = ActionName.FetchCustomFace; payloadSchema = SchemaData; diff --git a/src/onebot/action/extends/FetchEmojiLike.ts b/src/onebot/action/extends/FetchEmojiLike.ts index f53a78b86..68ddcb5af 100644 --- a/src/onebot/action/extends/FetchEmojiLike.ts +++ b/src/onebot/action/extends/FetchEmojiLike.ts @@ -1,6 +1,6 @@ //getMsgEmojiLikesList import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { MessageUnique } from '@/common/message-unique'; @@ -19,7 +19,7 @@ const SchemaData = { type Payload = FromSchema; -export class FetchEmojiLike extends BaseAction { +export class FetchEmojiLike extends OneBotAction { actionName = ActionName.FetchEmojiLike; payloadSchema = SchemaData; diff --git a/src/onebot/action/extends/FetchUserProfileLike.ts b/src/onebot/action/extends/FetchUserProfileLike.ts index c420014ba..07a7bb02e 100644 --- a/src/onebot/action/extends/FetchUserProfileLike.ts +++ b/src/onebot/action/extends/FetchUserProfileLike.ts @@ -1,7 +1,7 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; -export class FetchUserProfileLike extends BaseAction<{ qq: number }, any> { +export class FetchUserProfileLike extends OneBotAction<{ qq: number }, any> { actionName = ActionName.FetchUserProfileLike; async _handle(payload: { qq: number }) { diff --git a/src/onebot/action/extends/GetCollectionList.ts b/src/onebot/action/extends/GetCollectionList.ts index f84ad214a..0e4263b0a 100644 --- a/src/onebot/action/extends/GetCollectionList.ts +++ b/src/onebot/action/extends/GetCollectionList.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -13,7 +13,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetCollectionList extends BaseAction { +export class GetCollectionList extends OneBotAction { actionName = ActionName.GetCollectionList; payloadSchema = SchemaData; diff --git a/src/onebot/action/extends/GetFriendWithCategory.ts b/src/onebot/action/extends/GetFriendWithCategory.ts index 0a5a67f5c..e4f0f0778 100644 --- a/src/onebot/action/extends/GetFriendWithCategory.ts +++ b/src/onebot/action/extends/GetFriendWithCategory.ts @@ -1,8 +1,8 @@ import { OB11Entities } from '@/onebot/entities'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; -export class GetFriendWithCategory extends BaseAction { +export class GetFriendWithCategory extends OneBotAction { actionName = ActionName.GetFriendsWithCategory; async _handle(payload: void) { diff --git a/src/onebot/action/extends/GetGroupAddRequest.ts b/src/onebot/action/extends/GetGroupAddRequest.ts index 5e1f3edbb..7eb62a8fd 100644 --- a/src/onebot/action/extends/GetGroupAddRequest.ts +++ b/src/onebot/action/extends/GetGroupAddRequest.ts @@ -1,5 +1,5 @@ import { GroupNotifyMsgStatus } from '@/core'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; interface OB11GroupRequestNotify { @@ -8,7 +8,7 @@ interface OB11GroupRequestNotify { flag: string } -export default class GetGroupAddRequest extends BaseAction { +export default class GetGroupAddRequest extends OneBotAction { actionName = ActionName.GetGroupIgnoreAddRequest; async _handle(payload: null): Promise { diff --git a/src/onebot/action/extends/GetGroupInfoEx.ts b/src/onebot/action/extends/GetGroupInfoEx.ts index bfd15eb1f..3551997b4 100644 --- a/src/onebot/action/extends/GetGroupInfoEx.ts +++ b/src/onebot/action/extends/GetGroupInfoEx.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -12,7 +12,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetGroupInfoEx extends BaseAction { +export class GetGroupInfoEx extends OneBotAction { actionName = ActionName.GetGroupInfoEx; payloadSchema = SchemaData; diff --git a/src/onebot/action/extends/GetProfileLike.ts b/src/onebot/action/extends/GetProfileLike.ts index 38e12e49c..ce9c8beb1 100644 --- a/src/onebot/action/extends/GetProfileLike.ts +++ b/src/onebot/action/extends/GetProfileLike.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; interface Payload { @@ -6,7 +6,7 @@ interface Payload { count: number } -export class GetProfileLike extends BaseAction { +export class GetProfileLike extends OneBotAction { actionName = ActionName.GetProfileLike; async _handle(payload: Payload) { diff --git a/src/onebot/action/extends/GetRobotUinRange.ts b/src/onebot/action/extends/GetRobotUinRange.ts index 011e5ce25..8e6af8674 100644 --- a/src/onebot/action/extends/GetRobotUinRange.ts +++ b/src/onebot/action/extends/GetRobotUinRange.ts @@ -1,7 +1,7 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; -export class GetRobotUinRange extends BaseAction> { +export class GetRobotUinRange extends OneBotAction> { actionName = ActionName.GetRobotUinRange; async _handle(payload: void) { diff --git a/src/onebot/action/extends/OCRImage.ts b/src/onebot/action/extends/OCRImage.ts index b6bb568ba..876b3e6b4 100644 --- a/src/onebot/action/extends/OCRImage.ts +++ b/src/onebot/action/extends/OCRImage.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { checkFileReceived, uri2local } from '@/common/file'; @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -export class OCRImage extends BaseAction { +export class OCRImage extends OneBotAction { actionName = ActionName.OCRImage; payloadSchema = SchemaData; diff --git a/src/onebot/action/extends/SetInputStatus.ts b/src/onebot/action/extends/SetInputStatus.ts index db694b07d..7e0d3eca3 100644 --- a/src/onebot/action/extends/SetInputStatus.ts +++ b/src/onebot/action/extends/SetInputStatus.ts @@ -1,5 +1,5 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { ChatType } from '@/core'; @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -export class SetInputStatus extends BaseAction { +export class SetInputStatus extends OneBotAction { actionName = ActionName.SetInputStatus; async _handle(payload: Payload) { diff --git a/src/onebot/action/extends/SetLongNick.ts b/src/onebot/action/extends/SetLongNick.ts index 75968001b..35bf2f0a3 100644 --- a/src/onebot/action/extends/SetLongNick.ts +++ b/src/onebot/action/extends/SetLongNick.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -12,7 +12,7 @@ const SchemaData = { type Payload = FromSchema; -export class SetLongNick extends BaseAction { +export class SetLongNick extends OneBotAction { actionName = ActionName.SetLongNick; payloadSchema = SchemaData; diff --git a/src/onebot/action/extends/SetOnlineStatus.ts b/src/onebot/action/extends/SetOnlineStatus.ts index e7dcbcbc5..4d80ac6dc 100644 --- a/src/onebot/action/extends/SetOnlineStatus.ts +++ b/src/onebot/action/extends/SetOnlineStatus.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; // 设置在线状态 @@ -15,7 +15,7 @@ const SchemaData = { type Payload = FromSchema; -export class SetOnlineStatus extends BaseAction { +export class SetOnlineStatus extends OneBotAction { actionName = ActionName.SetOnlineStatus; payloadSchema = SchemaData; diff --git a/src/onebot/action/extends/SetQQAvatar.ts b/src/onebot/action/extends/SetQQAvatar.ts index 0f149b929..73e26f6d9 100644 --- a/src/onebot/action/extends/SetQQAvatar.ts +++ b/src/onebot/action/extends/SetQQAvatar.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName, BaseCheckResult } from '../types'; import * as fs from 'node:fs'; import { checkFileReceived, uri2local } from '@/common/file'; @@ -7,7 +7,7 @@ interface Payload { file: string; } -export default class SetAvatar extends BaseAction { +export default class SetAvatar extends OneBotAction { actionName = ActionName.SetQQAvatar; // 用不着复杂检测 diff --git a/src/onebot/action/extends/ShareContact.ts b/src/onebot/action/extends/ShareContact.ts index 6f72756d7..9c9b2c744 100644 --- a/src/onebot/action/extends/ShareContact.ts +++ b/src/onebot/action/extends/ShareContact.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -export class SharePeer extends BaseAction { +export class SharePeer extends OneBotAction { actionName = ActionName.SharePeer; payloadSchema = SchemaData; @@ -37,7 +37,7 @@ const SchemaDataGroupEx = { type PayloadGroupEx = FromSchema; -export class ShareGroupEx extends BaseAction { +export class ShareGroupEx extends OneBotAction { actionName = ActionName.ShareGroupEx; payloadSchema = SchemaDataGroupEx; diff --git a/src/onebot/action/extends/TranslateEnWordToZn.ts b/src/onebot/action/extends/TranslateEnWordToZn.ts index 488ccb331..d3353e32d 100644 --- a/src/onebot/action/extends/TranslateEnWordToZn.ts +++ b/src/onebot/action/extends/TranslateEnWordToZn.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -15,7 +15,7 @@ const SchemaData = { type Payload = FromSchema; -export class TranslateEnWordToZn extends BaseAction | null> { +export class TranslateEnWordToZn extends OneBotAction | null> { actionName = ActionName.TranslateEnWordToZn; payloadSchema = SchemaData; diff --git a/src/onebot/action/file/GetFile.ts b/src/onebot/action/file/GetFile.ts index 521d82a40..099ea535b 100644 --- a/src/onebot/action/file/GetFile.ts +++ b/src/onebot/action/file/GetFile.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import fs from 'fs/promises'; import { FileNapCatOneBotUUID } from '@/common/helper'; import { ActionName } from '../types'; @@ -30,7 +30,7 @@ const GetFileBase_PayloadSchema = { export type GetFilePayload = FromSchema; -export class GetFileBase extends BaseAction { +export class GetFileBase extends OneBotAction { payloadSchema = GetFileBase_PayloadSchema; async _handle(payload: GetFilePayload): Promise { diff --git a/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts b/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts index b20255892..f290bcef5 100644 --- a/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts +++ b/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts @@ -1,5 +1,5 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; const SchemaData = { @@ -13,7 +13,7 @@ const SchemaData = { type Payload = FromSchema; -export class CreateGroupFileFolder extends BaseAction { +export class CreateGroupFileFolder extends OneBotAction { actionName = ActionName.GoCQHTTP_CreateGroupFileFolder; payloadSchema = SchemaData; async _handle(payload: Payload) { diff --git a/src/onebot/action/go-cqhttp/DeleteGroupFile.ts b/src/onebot/action/go-cqhttp/DeleteGroupFile.ts index ee287a92e..aaeee8c77 100644 --- a/src/onebot/action/go-cqhttp/DeleteGroupFile.ts +++ b/src/onebot/action/go-cqhttp/DeleteGroupFile.ts @@ -1,5 +1,5 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FileNapCatOneBotUUID } from '@/common/helper'; @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -export class DeleteGroupFile extends BaseAction { +export class DeleteGroupFile extends OneBotAction { actionName = ActionName.GOCQHTTP_DeleteGroupFile; payloadSchema = SchemaData; async _handle(payload: Payload) { diff --git a/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts b/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts index be8dbda5a..4650815fb 100644 --- a/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts +++ b/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts @@ -1,6 +1,6 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { ActionName } from '../types'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; const SchemaData = { type: 'object', @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -export class DeleteGroupFileFolder extends BaseAction { +export class DeleteGroupFileFolder extends OneBotAction { actionName = ActionName.GoCQHTTP_DeleteGroupFileFolder; payloadSchema = SchemaData; async _handle(payload: Payload) { diff --git a/src/onebot/action/go-cqhttp/DownloadFile.ts b/src/onebot/action/go-cqhttp/DownloadFile.ts index c95150d25..6f5732fe0 100644 --- a/src/onebot/action/go-cqhttp/DownloadFile.ts +++ b/src/onebot/action/go-cqhttp/DownloadFile.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import fs from 'fs'; import { join as joinPath } from 'node:path'; @@ -28,7 +28,7 @@ const SchemaData = { type Payload = FromSchema; -export default class GoCQHTTPDownloadFile extends BaseAction { +export default class GoCQHTTPDownloadFile extends OneBotAction { actionName = ActionName.GoCQHTTP_DownloadFile; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/GetForwardMsg.ts b/src/onebot/action/go-cqhttp/GetForwardMsg.ts index 7db98ba1d..fa201b6f4 100644 --- a/src/onebot/action/go-cqhttp/GetForwardMsg.ts +++ b/src/onebot/action/go-cqhttp/GetForwardMsg.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward, OB11MessageNodePlain as OB11MessageNode } from '@/onebot'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -16,7 +16,7 @@ const SchemaData = { type Payload = FromSchema; -export class GoCQHTTPGetForwardMsgAction extends BaseAction { +export class GoCQHTTPGetForwardMsgAction extends OneBotAction { actionName = ActionName.GoCQHTTP_GetForwardMsg; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts index dd72e1bd3..204e9830c 100644 --- a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OB11Message } from '@/onebot'; import { ActionName } from '../types'; import { ChatType } from '@/core/entities'; @@ -23,7 +23,7 @@ const SchemaData = { type Payload = FromSchema; -export default class GetFriendMsgHistory extends BaseAction { +export default class GetFriendMsgHistory extends OneBotAction { actionName = ActionName.GetFriendMsgHistory; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts b/src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts index c95bd2fa4..49a2342e5 100644 --- a/src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts +++ b/src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -11,7 +11,7 @@ const SchemaData = { } as const satisfies JSONSchema; type Payload = FromSchema; -export class GoCQHTTPGetGroupAtAllRemain extends BaseAction { +export class GoCQHTTPGetGroupAtAllRemain extends OneBotAction { actionName = ActionName.GoCQHTTP_GetGroupAtAllRemain; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts b/src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts index 9f819e20c..7e8be16a1 100644 --- a/src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts +++ b/src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts @@ -1,5 +1,5 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; const SchemaData = { @@ -12,7 +12,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetGroupFileSystemInfo extends BaseAction; -export class GetGroupFilesByFolder extends BaseAction { +export class GetGroupFilesByFolder extends OneBotAction { actionName = ActionName.GoCQHTTP_GetGroupFilesByFolder; payloadSchema = SchemaData; async _handle(payload: Payload) { diff --git a/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts b/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts index bb0bd0770..83dcf282c 100644 --- a/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts +++ b/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { WebHonorType } from '@/core/entities'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -14,7 +14,7 @@ const SchemaData = { // enum是不是有点抽象 type Payload = FromSchema; -export class GetGroupHonorInfo extends BaseAction> { +export class GetGroupHonorInfo extends OneBotAction> { actionName = ActionName.GetGroupHonorInfo; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts index 3020a15ef..49fe601e5 100644 --- a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OB11Message } from '@/onebot'; import { ActionName } from '../types'; import { ChatType, Peer } from '@/core/entities'; @@ -23,7 +23,7 @@ const SchemaData = { type Payload = FromSchema; -export default class GoCQHTTPGetGroupMsgHistory extends BaseAction { +export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction { actionName = ActionName.GoCQHTTP_GetGroupMsgHistory; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/GetGroupRootFiles.ts b/src/onebot/action/go-cqhttp/GetGroupRootFiles.ts index 4ed57ae26..38f4def36 100644 --- a/src/onebot/action/go-cqhttp/GetGroupRootFiles.ts +++ b/src/onebot/action/go-cqhttp/GetGroupRootFiles.ts @@ -1,5 +1,5 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot'; import { OB11Entities } from '@/onebot/entities'; @@ -15,7 +15,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetGroupRootFiles extends BaseAction { diff --git a/src/onebot/action/go-cqhttp/GetOnlineClient.ts b/src/onebot/action/go-cqhttp/GetOnlineClient.ts index 9a40d33eb..473796c39 100644 --- a/src/onebot/action/go-cqhttp/GetOnlineClient.ts +++ b/src/onebot/action/go-cqhttp/GetOnlineClient.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { JSONSchema } from 'json-schema-to-ts'; import { sleep } from '@/common/helper'; @@ -10,7 +10,7 @@ const SchemaData = { }, } as const satisfies JSONSchema; -export class GetOnlineClient extends BaseAction> { +export class GetOnlineClient extends OneBotAction> { actionName = ActionName.GetOnlineClient; async _handle(payload: void) { diff --git a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts index d3b19d3c9..9955dd7fe 100644 --- a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts +++ b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OB11User, OB11UserSex } from '@/onebot'; import { OB11Entities } from '@/onebot/entities'; import { ActionName } from '../types'; @@ -15,7 +15,7 @@ const SchemaData = { type Payload = FromSchema; -export default class GoCQHTTPGetStrangerInfo extends BaseAction { +export default class GoCQHTTPGetStrangerInfo extends OneBotAction { actionName = ActionName.GoCQHTTP_GetStrangerInfo; async _handle(payload: Payload): Promise { diff --git a/src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts b/src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts index 7d026d101..2c325f603 100644 --- a/src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts +++ b/src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -11,7 +11,7 @@ const SchemaData = { } as const satisfies JSONSchema; type Payload = FromSchema; -export class GoCQHTTPCheckUrlSafely extends BaseAction { +export class GoCQHTTPCheckUrlSafely extends OneBotAction { actionName = ActionName.GoCQHTTP_CheckUrlSafely; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts b/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts index ea1b4c53d..615587a1c 100644 --- a/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts +++ b/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -18,7 +18,7 @@ const SchemaData = { } as const satisfies JSONSchema; type Payload = FromSchema; -export class GoCQHTTPDeleteFriend extends BaseAction { +export class GoCQHTTPDeleteFriend extends OneBotAction { actionName = ActionName.GoCQHTTP_DeleteFriend; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts b/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts index 9b442b636..e7c62b7e0 100644 --- a/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts +++ b/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -10,7 +10,7 @@ const SchemaData = { } as const satisfies JSONSchema; type Payload = FromSchema; -export class GoCQHTTPGetModelShow extends BaseAction { +export class GoCQHTTPGetModelShow extends OneBotAction { actionName = ActionName.GoCQHTTP_GetModelShow; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/GoCQHTTPSetModelShow.ts b/src/onebot/action/go-cqhttp/GoCQHTTPSetModelShow.ts index f50eb5f2e..22d63127e 100644 --- a/src/onebot/action/go-cqhttp/GoCQHTTPSetModelShow.ts +++ b/src/onebot/action/go-cqhttp/GoCQHTTPSetModelShow.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -9,7 +9,7 @@ const SchemaData = { type Payload = FromSchema; //兼容性代码 -export class GoCQHTTPSetModelShow extends BaseAction { +export class GoCQHTTPSetModelShow extends OneBotAction { actionName = ActionName.GoCQHTTP_SetModelShow; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/QuickAction.ts b/src/onebot/action/go-cqhttp/QuickAction.ts index 191130ed3..b423dafa0 100644 --- a/src/onebot/action/go-cqhttp/QuickAction.ts +++ b/src/onebot/action/go-cqhttp/QuickAction.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { QuickAction, QuickActionEvent } from '@/onebot/types'; @@ -7,7 +7,7 @@ interface Payload { operation: QuickAction } -export class GoCQHTTPHandleQuickAction extends BaseAction { +export class GoCQHTTPHandleQuickAction extends OneBotAction { actionName = ActionName.GoCQHTTP_HandleQuickAction; async _handle(payload: Payload): Promise { diff --git a/src/onebot/action/go-cqhttp/SendGroupNotice.ts b/src/onebot/action/go-cqhttp/SendGroupNotice.ts index 81dbf9af6..790e8899b 100644 --- a/src/onebot/action/go-cqhttp/SendGroupNotice.ts +++ b/src/onebot/action/go-cqhttp/SendGroupNotice.ts @@ -1,5 +1,5 @@ import { checkFileReceived, uri2local } from '@/common/file'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { unlink } from 'node:fs'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -21,7 +21,7 @@ const SchemaData = { type Payload = FromSchema; -export class SendGroupNotice extends BaseAction { +export class SendGroupNotice extends OneBotAction { actionName = ActionName.GoCQHTTP_SendGroupNotice; async _handle(payload: Payload) { diff --git a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts index 2fc9e8189..80ebcc9eb 100644 --- a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts +++ b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName, BaseCheckResult } from '../types'; import * as fs from 'node:fs'; import { checkFileReceived, uri2local } from '@/common/file'; @@ -8,7 +8,7 @@ interface Payload { group_id: number } -export default class SetGroupPortrait extends BaseAction { +export default class SetGroupPortrait extends OneBotAction { actionName = ActionName.SetGroupPortrait; // 用不着复杂检测 diff --git a/src/onebot/action/go-cqhttp/SetQQProfile.ts b/src/onebot/action/go-cqhttp/SetQQProfile.ts index e010d6ccf..ba76d82d7 100644 --- a/src/onebot/action/go-cqhttp/SetQQProfile.ts +++ b/src/onebot/action/go-cqhttp/SetQQProfile.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -export class SetQQProfile extends BaseAction { +export class SetQQProfile extends OneBotAction { actionName = ActionName.SetQQProfile; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/UploadGroupFile.ts b/src/onebot/action/go-cqhttp/UploadGroupFile.ts index 6645ed5ef..00486a4c1 100644 --- a/src/onebot/action/go-cqhttp/UploadGroupFile.ts +++ b/src/onebot/action/go-cqhttp/UploadGroupFile.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { ChatType, Peer } from '@/core/entities'; import fs from 'fs'; @@ -20,7 +20,7 @@ const SchemaData = { type Payload = FromSchema; -export default class GoCQHTTPUploadGroupFile extends BaseAction { +export default class GoCQHTTPUploadGroupFile extends OneBotAction { actionName = ActionName.GoCQHTTP_UploadGroupFile; payloadSchema = SchemaData; diff --git a/src/onebot/action/go-cqhttp/UploadPrivateFile.ts b/src/onebot/action/go-cqhttp/UploadPrivateFile.ts index dfbaf0cc5..9cf3ba0c0 100644 --- a/src/onebot/action/go-cqhttp/UploadPrivateFile.ts +++ b/src/onebot/action/go-cqhttp/UploadPrivateFile.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { ChatType, Peer, SendFileElement } from '@/core/entities'; import fs from 'fs'; @@ -19,7 +19,7 @@ const SchemaData = { type Payload = FromSchema; -export default class GoCQHTTPUploadPrivateFile extends BaseAction { +export default class GoCQHTTPUploadPrivateFile extends OneBotAction { actionName = ActionName.GOCQHTTP_UploadPrivateFile; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/DelEssenceMsg.ts b/src/onebot/action/group/DelEssenceMsg.ts index b7f6a0e51..f7dca3af8 100644 --- a/src/onebot/action/group/DelEssenceMsg.ts +++ b/src/onebot/action/group/DelEssenceMsg.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { MessageUnique } from '@/common/message-unique'; @@ -13,7 +13,7 @@ const SchemaData = { type Payload = FromSchema; -export default class DelEssenceMsg extends BaseAction { +export default class DelEssenceMsg extends OneBotAction { actionName = ActionName.DelEssenceMsg; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/DelGroupNotice.ts b/src/onebot/action/group/DelGroupNotice.ts index de6a262fb..2c19eb6fc 100644 --- a/src/onebot/action/group/DelGroupNotice.ts +++ b/src/onebot/action/group/DelGroupNotice.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -export class DelGroupNotice extends BaseAction { +export class DelGroupNotice extends OneBotAction { actionName = ActionName.DelGroupNotice; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/GetGroupEssence.ts b/src/onebot/action/group/GetGroupEssence.ts index 1895bda1f..66d50467a 100644 --- a/src/onebot/action/group/GetGroupEssence.ts +++ b/src/onebot/action/group/GetGroupEssence.ts @@ -1,5 +1,5 @@ import { ChatType, Peer } from '@/core'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { MessageUnique } from '@/common/message-unique'; @@ -16,7 +16,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetGroupEssence extends BaseAction { +export class GetGroupEssence extends OneBotAction { actionName = ActionName.GoCQHTTP_GetEssenceMsg; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/GetGroupIgnoredNotifies.ts b/src/onebot/action/group/GetGroupIgnoredNotifies.ts index b70895eb8..ab0770736 100644 --- a/src/onebot/action/group/GetGroupIgnoredNotifies.ts +++ b/src/onebot/action/group/GetGroupIgnoredNotifies.ts @@ -1,5 +1,5 @@ import { GroupNotifyMsgStatus } from '@/core'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -12,7 +12,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetGroupIgnoredNotifies extends BaseAction { +export class GetGroupIgnoredNotifies extends OneBotAction { actionName = ActionName.GetGroupIgnoredNotifies; async _handle(payload: void) { diff --git a/src/onebot/action/group/GetGroupInfo.ts b/src/onebot/action/group/GetGroupInfo.ts index ba00a8930..ed9583928 100644 --- a/src/onebot/action/group/GetGroupInfo.ts +++ b/src/onebot/action/group/GetGroupInfo.ts @@ -1,6 +1,6 @@ import { OB11Group } from '@/onebot'; import { OB11Entities } from '@/onebot/entities'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -class GetGroupInfo extends BaseAction { +class GetGroupInfo extends OneBotAction { actionName = ActionName.GetGroupInfo; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/GetGroupList.ts b/src/onebot/action/group/GetGroupList.ts index 5aee518c6..08ce74492 100644 --- a/src/onebot/action/group/GetGroupList.ts +++ b/src/onebot/action/group/GetGroupList.ts @@ -1,6 +1,6 @@ import { OB11Group } from '@/onebot'; import { OB11Entities } from '@/onebot/entities'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; // no_cache get时传字符串 @@ -13,7 +13,7 @@ const SchemaData = { type Payload = FromSchema; -class GetGroupList extends BaseAction { +class GetGroupList extends OneBotAction { actionName = ActionName.GetGroupList; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index 3dbf606db..58fc0475e 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -1,6 +1,6 @@ import { OB11GroupMember } from '@/onebot'; import { OB11Entities } from '@/onebot/entities'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -16,7 +16,7 @@ const SchemaData = { type Payload = FromSchema; -class GetGroupMemberInfo extends BaseAction { +class GetGroupMemberInfo extends OneBotAction { actionName = ActionName.GetGroupMemberInfo; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/GetGroupMemberList.ts b/src/onebot/action/group/GetGroupMemberList.ts index eb4a62a15..751086c22 100644 --- a/src/onebot/action/group/GetGroupMemberList.ts +++ b/src/onebot/action/group/GetGroupMemberList.ts @@ -1,6 +1,6 @@ import { OB11GroupMember } from '@/onebot'; import { OB11Entities } from '@/onebot/entities'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -15,7 +15,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetGroupMemberList extends BaseAction { +export class GetGroupMemberList extends OneBotAction { actionName = ActionName.GetGroupMemberList; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/GetGroupNotice.ts b/src/onebot/action/group/GetGroupNotice.ts index dcadc1455..80d047387 100644 --- a/src/onebot/action/group/GetGroupNotice.ts +++ b/src/onebot/action/group/GetGroupNotice.ts @@ -1,5 +1,5 @@ import { WebApiGroupNoticeFeed } from '@/core'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -29,7 +29,7 @@ type Payload = FromSchema; type ApiGroupNotice = GroupNotice & WebApiGroupNoticeFeed; -export class GetGroupNotice extends BaseAction { +export class GetGroupNotice extends OneBotAction { actionName = ActionName.GoCQHTTP_GetGroupNotice; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/GetGroupShutList.ts b/src/onebot/action/group/GetGroupShutList.ts index f7aa70ec2..4193428c9 100644 --- a/src/onebot/action/group/GetGroupShutList.ts +++ b/src/onebot/action/group/GetGroupShutList.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -12,7 +12,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetGroupShutList extends BaseAction { +export class GetGroupShutList extends OneBotAction { actionName = ActionName.GetGroupShutList; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/SetEssenceMsg.ts b/src/onebot/action/group/SetEssenceMsg.ts index 3fbfe58cb..1d9a2149c 100644 --- a/src/onebot/action/group/SetEssenceMsg.ts +++ b/src/onebot/action/group/SetEssenceMsg.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { MessageUnique } from '@/common/message-unique'; @@ -13,7 +13,7 @@ const SchemaData = { type Payload = FromSchema; -export default class SetEssenceMsg extends BaseAction { +export default class SetEssenceMsg extends OneBotAction { actionName = ActionName.SetEssenceMsg; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/SetGroupAddRequest.ts b/src/onebot/action/group/SetGroupAddRequest.ts index 9efa7280c..3a6a65a49 100644 --- a/src/onebot/action/group/SetGroupAddRequest.ts +++ b/src/onebot/action/group/SetGroupAddRequest.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { GroupRequestOperateTypes } from '@/core/entities'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -15,7 +15,7 @@ const SchemaData = { type Payload = FromSchema; -export default class SetGroupAddRequest extends BaseAction { +export default class SetGroupAddRequest extends OneBotAction { actionName = ActionName.SetGroupAddRequest; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/SetGroupAdmin.ts b/src/onebot/action/group/SetGroupAdmin.ts index 3f214036d..efa0309f4 100644 --- a/src/onebot/action/group/SetGroupAdmin.ts +++ b/src/onebot/action/group/SetGroupAdmin.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { GroupMemberRole } from '@/core/entities'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -15,7 +15,7 @@ const SchemaData = { type Payload = FromSchema; -export default class SetGroupAdmin extends BaseAction { +export default class SetGroupAdmin extends OneBotAction { actionName = ActionName.SetGroupAdmin; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/SetGroupBan.ts b/src/onebot/action/group/SetGroupBan.ts index 57e60dc71..6c9210ecb 100644 --- a/src/onebot/action/group/SetGroupBan.ts +++ b/src/onebot/action/group/SetGroupBan.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -export default class SetGroupBan extends BaseAction { +export default class SetGroupBan extends OneBotAction { actionName = ActionName.SetGroupBan; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/SetGroupCard.ts b/src/onebot/action/group/SetGroupCard.ts index 248bb9a2d..f3e90b001 100644 --- a/src/onebot/action/group/SetGroupCard.ts +++ b/src/onebot/action/group/SetGroupCard.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -export default class SetGroupCard extends BaseAction { +export default class SetGroupCard extends OneBotAction { actionName = ActionName.SetGroupCard; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/SetGroupKick.ts b/src/onebot/action/group/SetGroupKick.ts index 8c972a3a3..3c8a92d8f 100644 --- a/src/onebot/action/group/SetGroupKick.ts +++ b/src/onebot/action/group/SetGroupKick.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -15,7 +15,7 @@ const SchemaData = { type Payload = FromSchema; -export default class SetGroupKick extends BaseAction { +export default class SetGroupKick extends OneBotAction { actionName = ActionName.SetGroupKick; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/SetGroupLeave.ts b/src/onebot/action/group/SetGroupLeave.ts index cade6c1d3..13077d225 100644 --- a/src/onebot/action/group/SetGroupLeave.ts +++ b/src/onebot/action/group/SetGroupLeave.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -12,7 +12,7 @@ const SchemaData = { } as const satisfies JSONSchema; type Payload = FromSchema; -export default class SetGroupLeave extends BaseAction { +export default class SetGroupLeave extends OneBotAction { actionName = ActionName.SetGroupLeave; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/SetGroupName.ts b/src/onebot/action/group/SetGroupName.ts index 8da05b075..58eca7a78 100644 --- a/src/onebot/action/group/SetGroupName.ts +++ b/src/onebot/action/group/SetGroupName.ts @@ -1,5 +1,5 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; const SchemaData = { @@ -12,7 +12,7 @@ const SchemaData = { } as const satisfies JSONSchema; type Payload = FromSchema; -export default class SetGroupName extends BaseAction { +export default class SetGroupName extends OneBotAction { actionName = ActionName.SetGroupName; payloadSchema = SchemaData; diff --git a/src/onebot/action/group/SetGroupWholeBan.ts b/src/onebot/action/group/SetGroupWholeBan.ts index 87d00332f..7df00a0c6 100644 --- a/src/onebot/action/group/SetGroupWholeBan.ts +++ b/src/onebot/action/group/SetGroupWholeBan.ts @@ -1,5 +1,5 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; const SchemaData = { @@ -13,7 +13,7 @@ const SchemaData = { type Payload = FromSchema; -export default class SetGroupWholeBan extends BaseAction { +export default class SetGroupWholeBan extends OneBotAction { actionName = ActionName.SetGroupWholeBan; payloadSchema = SchemaData; diff --git a/src/onebot/action/guild/GetGuildList.ts b/src/onebot/action/guild/GetGuildList.ts index cfba4ad36..1195ea3e2 100644 --- a/src/onebot/action/guild/GetGuildList.ts +++ b/src/onebot/action/guild/GetGuildList.ts @@ -1,7 +1,7 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; -export default class GetGuildList extends BaseAction { +export default class GetGuildList extends OneBotAction { actionName = ActionName.GetGuildList; async _handle(payload: null): Promise { diff --git a/src/onebot/action/guild/GetGuildProfile.ts b/src/onebot/action/guild/GetGuildProfile.ts index 431fb561a..5a6233882 100644 --- a/src/onebot/action/guild/GetGuildProfile.ts +++ b/src/onebot/action/guild/GetGuildProfile.ts @@ -1,7 +1,7 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; -export default class GetGuildProfile extends BaseAction { +export default class GetGuildProfile extends OneBotAction { actionName = ActionName.GetGuildProfile; async _handle(payload: null): Promise { diff --git a/src/onebot/action/index.ts b/src/onebot/action/index.ts index ecdd24189..edbf83218 100644 --- a/src/onebot/action/index.ts +++ b/src/onebot/action/index.ts @@ -8,7 +8,7 @@ import SendGroupMsg from './group/SendGroupMsg'; import SendPrivateMsg from './msg/SendPrivateMsg'; import SendMsg from './msg/SendMsg'; import DeleteMsg from './msg/DeleteMsg'; -import BaseAction from './BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import GetVersionInfo from './system/GetVersionInfo'; import CanSendRecord from './system/CanSendRecord'; import CanSendImage from './system/CanSendImage'; @@ -104,7 +104,7 @@ import { SendGroupAiRecord } from "@/onebot/action/group/SendGroupAiRecord"; import { GetAiCharacters } from "@/onebot/action/extends/GetAiCharacters"; -export type ActionMap = Map>; +export type ActionMap = Map>; export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore): ActionMap { diff --git a/src/onebot/action/msg/DeleteMsg.ts b/src/onebot/action/msg/DeleteMsg.ts index d4c314d92..c3df9a76e 100644 --- a/src/onebot/action/msg/DeleteMsg.ts +++ b/src/onebot/action/msg/DeleteMsg.ts @@ -1,5 +1,5 @@ import { ActionName } from '../types'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { MessageUnique } from '@/common/message-unique'; @@ -18,7 +18,7 @@ const SchemaData = { type Payload = FromSchema; -class DeleteMsg extends BaseAction { +class DeleteMsg extends OneBotAction { actionName = ActionName.DeleteMsg; payloadSchema = SchemaData; diff --git a/src/onebot/action/msg/ForwardSingleMsg.ts b/src/onebot/action/msg/ForwardSingleMsg.ts index 2a2beef91..4a2ba50da 100644 --- a/src/onebot/action/msg/ForwardSingleMsg.ts +++ b/src/onebot/action/msg/ForwardSingleMsg.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ChatType, Peer } from '@/core/entities'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -16,7 +16,7 @@ const SchemaData = { type Payload = FromSchema; -class ForwardSingleMsg extends BaseAction { +class ForwardSingleMsg extends OneBotAction { protected async getTargetPeer(payload: Payload): Promise { if (payload.user_id) { const peerUid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString()); diff --git a/src/onebot/action/msg/GetMsg.ts b/src/onebot/action/msg/GetMsg.ts index f5a85814e..c0fed8111 100644 --- a/src/onebot/action/msg/GetMsg.ts +++ b/src/onebot/action/msg/GetMsg.ts @@ -1,5 +1,5 @@ import { OB11Message } from '@/onebot'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { MessageUnique } from '@/common/message-unique'; @@ -19,7 +19,7 @@ const SchemaData = { type Payload = FromSchema; -class GetMsg extends BaseAction { +class GetMsg extends OneBotAction { actionName = ActionName.GetMsg; payloadSchema = SchemaData; diff --git a/src/onebot/action/msg/MarkMsgAsRead.ts b/src/onebot/action/msg/MarkMsgAsRead.ts index 188d80e03..d63f1e008 100644 --- a/src/onebot/action/msg/MarkMsgAsRead.ts +++ b/src/onebot/action/msg/MarkMsgAsRead.ts @@ -1,6 +1,6 @@ import { ChatType, Peer } from '@/core/entities'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { MessageUnique } from '@/common/message-unique'; @@ -15,7 +15,7 @@ const SchemaData = { type PlayloadType = FromSchema; -class MarkMsgAsRead extends BaseAction { +class MarkMsgAsRead extends OneBotAction { async getPeer(payload: PlayloadType): Promise { if (payload.message_id) { const s_peer = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)?.Peer; @@ -65,7 +65,7 @@ export class GoCQHTTPMarkMsgAsRead extends MarkMsgAsRead { actionName = ActionName.GoCQHTTP_MarkMsgAsRead; } -export class MarkAllMsgAsRead extends BaseAction { +export class MarkAllMsgAsRead extends OneBotAction { actionName = ActionName._MarkAllMsgAsRead; async _handle(): Promise { diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index 58fbc8076..9b1dccf38 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/src/onebot/action/msg/SendMsg.ts @@ -10,7 +10,7 @@ import { ActionName, BaseCheckResult } from '@/onebot/action/types'; import { decodeCQCode } from '@/onebot/cqcode'; import { MessageUnique } from '@/common/message-unique'; import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendArkElement, SendMessageElement } from '@/core'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ForwardMsgBuilder } from "@/common/forward-msg-builder"; import { stringifyWithBigInt } from "@/common/helper"; import { PacketMsg } from "@/core/packet/message/message"; @@ -88,7 +88,7 @@ function getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType return 0; } -export class SendMsg extends BaseAction { +export class SendMsg extends OneBotAction { actionName = ActionName.SendMsg; contextMode = ContextMode.Normal; diff --git a/src/onebot/action/msg/SetMsgEmojiLike.ts b/src/onebot/action/msg/SetMsgEmojiLike.ts index 065538f03..e0e9305b8 100644 --- a/src/onebot/action/msg/SetMsgEmojiLike.ts +++ b/src/onebot/action/msg/SetMsgEmojiLike.ts @@ -1,5 +1,5 @@ import { ActionName } from '../types'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { MessageUnique } from '@/common/message-unique'; @@ -15,7 +15,7 @@ const SchemaData = { type Payload = FromSchema; -export class SetMsgEmojiLike extends BaseAction { +export class SetMsgEmojiLike extends OneBotAction { actionName = ActionName.SetMsgEmojiLike; payloadSchema = SchemaData; diff --git a/src/onebot/action/packet/GetPacketStatus.ts b/src/onebot/action/packet/GetPacketStatus.ts index 63c3020e5..13359864c 100644 --- a/src/onebot/action/packet/GetPacketStatus.ts +++ b/src/onebot/action/packet/GetPacketStatus.ts @@ -1,8 +1,8 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName, BaseCheckResult } from '../types'; -export abstract class GetPacketStatusDepends extends BaseAction { +export abstract class GetPacketStatusDepends extends OneBotAction { actionName = ActionName.GetPacketStatus; protected async check(payload: PT): Promise{ diff --git a/src/onebot/action/system/CanSendRecord.ts b/src/onebot/action/system/CanSendRecord.ts index 6e17abe77..ab19c99d6 100644 --- a/src/onebot/action/system/CanSendRecord.ts +++ b/src/onebot/action/system/CanSendRecord.ts @@ -1,11 +1,11 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; interface ReturnType { yes: boolean; } -export default class CanSendRecord extends BaseAction { +export default class CanSendRecord extends OneBotAction { actionName = ActionName.CanSendRecord; async _handle(_payload: void): Promise { diff --git a/src/onebot/action/system/GetCSRF.ts b/src/onebot/action/system/GetCSRF.ts index 68945adfe..8f44b3274 100644 --- a/src/onebot/action/system/GetCSRF.ts +++ b/src/onebot/action/system/GetCSRF.ts @@ -1,7 +1,7 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; -export class GetCSRF extends BaseAction { +export class GetCSRF extends OneBotAction { actionName = ActionName.GetCSRF; async _handle(payload: any) { diff --git a/src/onebot/action/system/GetCredentials.ts b/src/onebot/action/system/GetCredentials.ts index 96293905b..4a04a468b 100644 --- a/src/onebot/action/system/GetCredentials.ts +++ b/src/onebot/action/system/GetCredentials.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -17,7 +17,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetCredentials extends BaseAction { +export class GetCredentials extends OneBotAction { actionName = ActionName.GetCredentials; payloadSchema = SchemaData; diff --git a/src/onebot/action/system/GetLoginInfo.ts b/src/onebot/action/system/GetLoginInfo.ts index b9ca26f93..d617824d8 100644 --- a/src/onebot/action/system/GetLoginInfo.ts +++ b/src/onebot/action/system/GetLoginInfo.ts @@ -1,9 +1,9 @@ import { OB11User } from '@/onebot'; import { OB11Entities } from '@/onebot/entities'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; -class GetLoginInfo extends BaseAction { +class GetLoginInfo extends OneBotAction { actionName = ActionName.GetLoginInfo; async _handle(payload: null) { diff --git a/src/onebot/action/system/GetStatus.ts b/src/onebot/action/system/GetStatus.ts index e543b8f6f..3de171818 100644 --- a/src/onebot/action/system/GetStatus.ts +++ b/src/onebot/action/system/GetStatus.ts @@ -1,7 +1,7 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; -export default class GetStatus extends BaseAction { +export default class GetStatus extends OneBotAction { actionName = ActionName.GetStatus; async _handle(payload: any): Promise { diff --git a/src/onebot/action/system/GetSystemMsg.ts b/src/onebot/action/system/GetSystemMsg.ts index cceb2477f..2fef4a38d 100644 --- a/src/onebot/action/system/GetSystemMsg.ts +++ b/src/onebot/action/system/GetSystemMsg.ts @@ -1,5 +1,5 @@ import { GroupNotifyMsgStatus } from '@/core'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -12,7 +12,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetGroupSystemMsg extends BaseAction { +export class GetGroupSystemMsg extends OneBotAction { actionName = ActionName.GetGroupSystemMsg; async _handle(payload: void) { diff --git a/src/onebot/action/system/GetVersionInfo.ts b/src/onebot/action/system/GetVersionInfo.ts index db559554a..51541b079 100644 --- a/src/onebot/action/system/GetVersionInfo.ts +++ b/src/onebot/action/system/GetVersionInfo.ts @@ -1,9 +1,9 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { napCatVersion } from '@/common/version'; -export default class GetVersionInfo extends BaseAction { +export default class GetVersionInfo extends OneBotAction { actionName = ActionName.GetVersionInfo; async _handle(payload: any): Promise { diff --git a/src/onebot/action/user/GetCookies.ts b/src/onebot/action/user/GetCookies.ts index 3d8c244ac..32c9edc85 100644 --- a/src/onebot/action/user/GetCookies.ts +++ b/src/onebot/action/user/GetCookies.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -17,7 +17,7 @@ const SchemaData = { type Payload = FromSchema; -export class GetCookies extends BaseAction { +export class GetCookies extends OneBotAction { actionName = ActionName.GetCookies; payloadSchema = SchemaData; diff --git a/src/onebot/action/user/GetFriendList.ts b/src/onebot/action/user/GetFriendList.ts index f305a11d4..ac1e6d3e8 100644 --- a/src/onebot/action/user/GetFriendList.ts +++ b/src/onebot/action/user/GetFriendList.ts @@ -1,6 +1,6 @@ import { OB11User } from '@/onebot'; import { OB11Entities } from '@/onebot/entities'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -13,7 +13,7 @@ const SchemaData = { } as const satisfies JSONSchema; type Payload = FromSchema; -export default class GetFriendList extends BaseAction { +export default class GetFriendList extends OneBotAction { actionName = ActionName.GetFriendList; payloadSchema = SchemaData; diff --git a/src/onebot/action/user/GetRecentContact.ts b/src/onebot/action/user/GetRecentContact.ts index 05df160a1..1cf5e6a1e 100644 --- a/src/onebot/action/user/GetRecentContact.ts +++ b/src/onebot/action/user/GetRecentContact.ts @@ -1,5 +1,5 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { AdapterConfigWrap } from '@/onebot/config/config'; @@ -12,7 +12,7 @@ const SchemaData = { type Payload = FromSchema; -export default class GetRecentContact extends BaseAction { +export default class GetRecentContact extends OneBotAction { actionName = ActionName.GetRecentContact; payloadSchema = SchemaData; diff --git a/src/onebot/action/user/SendLike.ts b/src/onebot/action/user/SendLike.ts index e63409b4d..1d8459d01 100644 --- a/src/onebot/action/user/SendLike.ts +++ b/src/onebot/action/user/SendLike.ts @@ -1,4 +1,4 @@ -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; @@ -13,7 +13,7 @@ const SchemaData = { type Payload = FromSchema; -export default class SendLike extends BaseAction { +export default class SendLike extends OneBotAction { actionName = ActionName.SendLike; payloadSchema = SchemaData; diff --git a/src/onebot/action/user/SetFriendAddRequest.ts b/src/onebot/action/user/SetFriendAddRequest.ts index a06f0fb25..4e39ed841 100644 --- a/src/onebot/action/user/SetFriendAddRequest.ts +++ b/src/onebot/action/user/SetFriendAddRequest.ts @@ -1,5 +1,5 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import BaseAction from '../BaseAction'; +import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '../types'; const SchemaData = { @@ -14,7 +14,7 @@ const SchemaData = { type Payload = FromSchema; -export default class SetFriendAddRequest extends BaseAction { +export default class SetFriendAddRequest extends OneBotAction { actionName = ActionName.SetFriendAddRequest; payloadSchema = SchemaData; diff --git a/src/onebot/network/active-websocket.ts b/src/onebot/network/active-websocket.ts index ce2a1130a..9b477545a 100644 --- a/src/onebot/network/active-websocket.ts +++ b/src/onebot/network/active-websocket.ts @@ -3,7 +3,7 @@ import { WebSocket } from 'ws'; import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent'; import { NapCatCore } from '@/core'; import { ActionName } from '@/onebot/action/types'; -import { OB11Response } from '@/onebot/action/OB11Response'; +import { OB11Response } from '@/onebot/action/OneBotAction'; import { LogWrapper } from '@/common/log'; import { ActionMap } from '@/onebot/action'; import { LifeCycleSubType, OB11LifeCycleEvent } from '../event/meta/OB11LifeCycleEvent'; diff --git a/src/onebot/network/passive-http.ts b/src/onebot/network/passive-http.ts index c1ca6afcd..08f47cd76 100644 --- a/src/onebot/network/passive-http.ts +++ b/src/onebot/network/passive-http.ts @@ -2,7 +2,7 @@ import { IOB11NetworkAdapter, OB11NetworkReloadType } from './index'; import express, { Express, Request, Response } from 'express'; import http from 'http'; import { NapCatCore } from '@/core'; -import { OB11Response } from '../action/OB11Response'; +import { OB11Response } from '@/onebot/action/OneBotAction'; import { ActionMap } from '@/onebot/action'; import cors from 'cors'; import { HttpServerConfig } from '../config/config'; diff --git a/src/onebot/network/passive-websocket.ts b/src/onebot/network/passive-websocket.ts index 1e47cc02e..4d60cf24f 100644 --- a/src/onebot/network/passive-websocket.ts +++ b/src/onebot/network/passive-websocket.ts @@ -2,7 +2,7 @@ import { IOB11NetworkAdapter, OB11EmitEventContent, OB11NetworkReloadType } from import urlParse from 'url'; import { WebSocket, WebSocketServer } from 'ws'; import { Mutex } from 'async-mutex'; -import { OB11Response } from '../action/OB11Response'; +import { OB11Response } from '@/onebot/action/OneBotAction'; import { ActionName } from '../action/types'; import { NapCatCore } from '@/core'; import { LogWrapper } from '@/common/log';