diff --git a/src/core/helper/config.ts b/src/core/helper/config.ts index 1b11467a..94cfbeb5 100644 --- a/src/core/helper/config.ts +++ b/src/core/helper/config.ts @@ -1,16 +1,15 @@ import { ConfigBase } from '@/common/config-base'; import { NapCatCore } from '@/core'; -import { actionType } from '@/onebot/action/type'; import { z } from 'zod'; export const NapcatConfigSchema = z.object({ - fileLog: actionType.boolean().default(false), - consoleLog: actionType.boolean().default(true), - fileLogLevel: actionType.string().default('debug'), - consoleLogLevel: actionType.string().default('info'), - packetBackend: actionType.string().default('auto'), - packetServer: actionType.string().default(''), - o3HookMode: actionType.number().default(0), + fileLog: z.coerce.boolean().default(false), + consoleLog: z.coerce.boolean().default(true), + fileLogLevel: z.coerce.string().default('debug'), + consoleLogLevel: z.coerce.string().default('info'), + packetBackend: z.coerce.string().default('auto'), + packetServer: z.coerce.string().default(''), + o3HookMode: z.coerce.number().default(0), }); export type NapcatConfig = z.infer; diff --git a/src/onebot/action/extends/ClickInlineKeyboardButton.ts b/src/onebot/action/extends/ClickInlineKeyboardButton.ts index aaca0481..c06947cf 100644 --- a/src/onebot/action/extends/ClickInlineKeyboardButton.ts +++ b/src/onebot/action/extends/ClickInlineKeyboardButton.ts @@ -1,14 +1,13 @@ import { ActionName } from '@/onebot/action/router'; import { OneBotAction } from '../OneBotAction'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - group_id: actionType.string(), - bot_appid: actionType.string(), - button_id: actionType.string().default(''), - callback_data: actionType.string().default(''), - msg_seq: actionType.string().default('10086'), + group_id: z.coerce.string(), + bot_appid: z.coerce.string(), + button_id: z.coerce.string().default(''), + callback_data: z.coerce.string().default(''), + msg_seq: z.coerce.string().default('10086'), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/CreateCollection.ts b/src/onebot/action/extends/CreateCollection.ts index 8451664e..e1c5903b 100644 --- a/src/onebot/action/extends/CreateCollection.ts +++ b/src/onebot/action/extends/CreateCollection.ts @@ -1,10 +1,10 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - rawData: actionType.string(), - brief: actionType.string(), + rawData: z.coerce.string(), + brief: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/FetchCustomFace.ts b/src/onebot/action/extends/FetchCustomFace.ts index 8e068060..cd7d7645 100644 --- a/src/onebot/action/extends/FetchCustomFace.ts +++ b/src/onebot/action/extends/FetchCustomFace.ts @@ -1,9 +1,9 @@ import { z } from 'zod'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; -import { actionType } from '../type'; + const SchemaData = z.object({ - count: actionType.number().default(48), + count: z.coerce.number().default(48), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/FetchEmojiLike.ts b/src/onebot/action/extends/FetchEmojiLike.ts index 263311ad..11505d9a 100644 --- a/src/onebot/action/extends/FetchEmojiLike.ts +++ b/src/onebot/action/extends/FetchEmojiLike.ts @@ -3,12 +3,12 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { MessageUnique } from '@/common/message-unique'; import { type NTQQMsgApi } from '@/core/apis'; -import { actionType } from '../type'; + const SchemaData = z.object({ - message_id: actionType.string(), - emojiId: actionType.string(), - emojiType: actionType.string(), - count: actionType.number().default(20), + message_id: z.coerce.string(), + emojiId: z.coerce.string(), + emojiType: z.coerce.string(), + count: z.coerce.number().default(20), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/GetAiCharacters.ts b/src/onebot/action/extends/GetAiCharacters.ts index 5706cfec..e2f2045a 100644 --- a/src/onebot/action/extends/GetAiCharacters.ts +++ b/src/onebot/action/extends/GetAiCharacters.ts @@ -2,10 +2,10 @@ import { ActionName } from '@/onebot/action/router'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { AIVoiceChatType } from '@/core/packet/entities/aiChat'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - chat_type: actionType.number().default(1), + group_id: z.coerce.string(), + chat_type: z.coerce.number().default(1), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/GetCollectionList.ts b/src/onebot/action/extends/GetCollectionList.ts index d1593a02..4399c349 100644 --- a/src/onebot/action/extends/GetCollectionList.ts +++ b/src/onebot/action/extends/GetCollectionList.ts @@ -2,10 +2,10 @@ import { type NTQQCollectionApi } from '@/core/apis/collection'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - category: actionType.number(), - count: actionType.number().default(1), + category: z.coerce.number(), + count: z.coerce.number().default(1), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/GetGroupInfoEx.ts b/src/onebot/action/extends/GetGroupInfoEx.ts index ec3f685d..4dcd05ee 100644 --- a/src/onebot/action/extends/GetGroupInfoEx.ts +++ b/src/onebot/action/extends/GetGroupInfoEx.ts @@ -1,9 +1,8 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - group_id: actionType.string(), + group_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/GetMiniAppArk.ts b/src/onebot/action/extends/GetMiniAppArk.ts index 50e1629d..699d6661 100644 --- a/src/onebot/action/extends/GetMiniAppArk.ts +++ b/src/onebot/action/extends/GetMiniAppArk.ts @@ -3,34 +3,34 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { MiniAppInfo, MiniAppInfoHelper } from '@/core/packet/utils/helper/miniAppHelper'; import { MiniAppData, MiniAppRawData, MiniAppReqCustomParams, MiniAppReqParams } from '@/core/packet/entities/miniApp'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.union([ z.object({ type: z.union([z.literal('bili'), z.literal('weibo')]), - title: actionType.string(), - desc: actionType.string(), - picUrl: actionType.string(), - jumpUrl: actionType.string(), - webUrl: actionType.string().optional(), - rawArkData: actionType.string().optional() + title: z.coerce.string(), + desc: z.coerce.string(), + picUrl: z.coerce.string(), + jumpUrl: z.coerce.string(), + webUrl: z.coerce.string().optional(), + rawArkData: z.coerce.string().optional() }), z.object({ - title: actionType.string(), - desc: actionType.string(), - picUrl: actionType.string(), - jumpUrl: actionType.string(), - iconUrl: actionType.string(), - webUrl: actionType.string().optional(), - appId: actionType.string(), - scene: z.union([actionType.number(), actionType.string()]), - templateType: z.union([actionType.number(), actionType.string()]), - businessType: z.union([actionType.number(), actionType.string()]), - verType: z.union([actionType.number(), actionType.string()]), - shareType: z.union([actionType.number(), actionType.string()]), - versionId: actionType.string(), - sdkId: actionType.string(), - withShareTicket: z.union([actionType.number(), actionType.string()]), - rawArkData: actionType.string().optional() + title: z.coerce.string(), + desc: z.coerce.string(), + picUrl: z.coerce.string(), + jumpUrl: z.coerce.string(), + iconUrl: z.coerce.string(), + webUrl: z.coerce.string().optional(), + appId: z.coerce.string(), + scene: z.union([z.coerce.number(), z.coerce.string()]), + templateType: z.union([z.coerce.number(), z.coerce.string()]), + businessType: z.union([z.coerce.number(), z.coerce.string()]), + verType: z.union([z.coerce.number(), z.coerce.string()]), + shareType: z.union([z.coerce.number(), z.coerce.string()]), + versionId: z.coerce.string(), + sdkId: z.coerce.string(), + withShareTicket: z.union([z.coerce.number(), z.coerce.string()]), + rawArkData: z.coerce.string().optional() }) ]); type Payload = z.infer; diff --git a/src/onebot/action/extends/GetProfileLike.ts b/src/onebot/action/extends/GetProfileLike.ts index 3e06b75b..7e727a7a 100644 --- a/src/onebot/action/extends/GetProfileLike.ts +++ b/src/onebot/action/extends/GetProfileLike.ts @@ -2,11 +2,11 @@ import { NTVoteInfo } from '@/core'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - user_id: actionType.string().optional(), - start: actionType.number().default(0), - count: actionType.number().default(10), + user_id: z.coerce.string().optional(), + start: z.coerce.number().default(0), + count: z.coerce.number().default(10), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/GetUserStatus.ts b/src/onebot/action/extends/GetUserStatus.ts index 3256b6fe..7fe274e8 100644 --- a/src/onebot/action/extends/GetUserStatus.ts +++ b/src/onebot/action/extends/GetUserStatus.ts @@ -1,9 +1,9 @@ import { ActionName } from '@/onebot/action/router'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - user_id: actionType.number(), + user_id: z.coerce.number(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/MoveGroupFile.ts b/src/onebot/action/extends/MoveGroupFile.ts index cdad0987..05c92220 100644 --- a/src/onebot/action/extends/MoveGroupFile.ts +++ b/src/onebot/action/extends/MoveGroupFile.ts @@ -2,12 +2,12 @@ import { ActionName } from '@/onebot/action/router'; import { FileNapCatOneBotUUID } from '@/common/file-uuid'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - file_id: actionType.string(), - current_parent_directory: actionType.string(), - target_parent_directory: actionType.string(), + group_id: z.coerce.string(), + file_id: z.coerce.string(), + current_parent_directory: z.coerce.string(), + target_parent_directory: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/OCRImage.ts b/src/onebot/action/extends/OCRImage.ts index 6e4baf61..d3dd45a8 100644 --- a/src/onebot/action/extends/OCRImage.ts +++ b/src/onebot/action/extends/OCRImage.ts @@ -4,9 +4,9 @@ import { checkFileExist, uriToLocalFile } from '@/common/file'; import fs from 'fs'; import { z } from 'zod'; import { GeneralCallResultStatus } from '@/core'; -import { actionType } from '../type'; + const SchemaData = z.object({ - image: actionType.string(), + image: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/RenameGroupFile.ts b/src/onebot/action/extends/RenameGroupFile.ts index fe0fd2d7..06bb1f48 100644 --- a/src/onebot/action/extends/RenameGroupFile.ts +++ b/src/onebot/action/extends/RenameGroupFile.ts @@ -2,12 +2,12 @@ import { ActionName } from '@/onebot/action/router'; import { FileNapCatOneBotUUID } from '@/common/file-uuid'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - file_id: actionType.string(), - current_parent_directory: actionType.string(), - new_name: actionType.string(), + group_id: z.coerce.string(), + file_id: z.coerce.string(), + current_parent_directory: z.coerce.string(), + new_name: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SendPacket.ts b/src/onebot/action/extends/SendPacket.ts index b472109a..ac23b9c4 100644 --- a/src/onebot/action/extends/SendPacket.ts +++ b/src/onebot/action/extends/SendPacket.ts @@ -2,12 +2,11 @@ import { PacketHexStr } from '@/core/packet/transformer/base'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - cmd: actionType.string(), - data: actionType.string(), - rsp: actionType.boolean().default(true), + cmd: z.coerce.string(), + data: z.coerce.string(), + rsp: z.coerce.boolean().default(true), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SetDiyOnlineStatus.ts b/src/onebot/action/extends/SetDiyOnlineStatus.ts index 7c1d609a..df36e0be 100644 --- a/src/onebot/action/extends/SetDiyOnlineStatus.ts +++ b/src/onebot/action/extends/SetDiyOnlineStatus.ts @@ -1,11 +1,11 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - face_id: actionType.string(),// 参考 face_config.json 的 QSid - face_type: actionType.string().default('1'), - wording: actionType.string().default(' '), + face_id: z.coerce.string(),// 参考 face_config.json 的 QSid + face_type: z.coerce.string().default('1'), + wording: z.coerce.string().default(' '), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SetGroupRemark.ts b/src/onebot/action/extends/SetGroupRemark.ts index c30fb31c..a6e5edaf 100644 --- a/src/onebot/action/extends/SetGroupRemark.ts +++ b/src/onebot/action/extends/SetGroupRemark.ts @@ -1,10 +1,10 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - remark: actionType.string(), + group_id: z.coerce.string(), + remark: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SetGroupSign.ts b/src/onebot/action/extends/SetGroupSign.ts index bb66c12f..3d22da22 100644 --- a/src/onebot/action/extends/SetGroupSign.ts +++ b/src/onebot/action/extends/SetGroupSign.ts @@ -1,9 +1,9 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), + group_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SetInputStatus.ts b/src/onebot/action/extends/SetInputStatus.ts index 2dd00a44..76324901 100644 --- a/src/onebot/action/extends/SetInputStatus.ts +++ b/src/onebot/action/extends/SetInputStatus.ts @@ -2,10 +2,10 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { ChatType } from '@/core'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - user_id: actionType.string(), - event_type: actionType.number(), + user_id: z.coerce.string(), + event_type: z.coerce.number(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SetLongNick.ts b/src/onebot/action/extends/SetLongNick.ts index d84344e3..be68fea2 100644 --- a/src/onebot/action/extends/SetLongNick.ts +++ b/src/onebot/action/extends/SetLongNick.ts @@ -1,9 +1,9 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - longNick: actionType.string(), + longNick: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SetOnlineStatus.ts b/src/onebot/action/extends/SetOnlineStatus.ts index d9d76019..10101b9a 100644 --- a/src/onebot/action/extends/SetOnlineStatus.ts +++ b/src/onebot/action/extends/SetOnlineStatus.ts @@ -1,11 +1,11 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - status: actionType.number(), - ext_status: actionType.number(), - battery_status: actionType.number(), + status: z.coerce.number(), + ext_status: z.coerce.number(), + battery_status: z.coerce.number(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SetQQAvatar.ts b/src/onebot/action/extends/SetQQAvatar.ts index 9a84a5a0..eee209c8 100644 --- a/src/onebot/action/extends/SetQQAvatar.ts +++ b/src/onebot/action/extends/SetQQAvatar.ts @@ -3,9 +3,9 @@ import { ActionName } from '@/onebot/action/router'; import fs from 'node:fs/promises'; import { checkFileExist, uriToLocalFile } from '@/common/file'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - file: actionType.string(), + file: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SetSpecialTitle.ts b/src/onebot/action/extends/SetSpecialTitle.ts index dcb0dff4..2665a373 100644 --- a/src/onebot/action/extends/SetSpecialTitle.ts +++ b/src/onebot/action/extends/SetSpecialTitle.ts @@ -1,11 +1,11 @@ import { ActionName } from '@/onebot/action/router'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - user_id: actionType.string(), - special_title: actionType.string().default(''), + group_id: z.coerce.string(), + user_id: z.coerce.string(), + special_title: z.coerce.string().default(''), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/ShareContact.ts b/src/onebot/action/extends/ShareContact.ts index 732ac990..d1419683 100644 --- a/src/onebot/action/extends/ShareContact.ts +++ b/src/onebot/action/extends/ShareContact.ts @@ -2,11 +2,11 @@ import { GeneralCallResult } from '@/core'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - user_id: actionType.string().optional(), - group_id: actionType.string().optional(), - phoneNumber: actionType.string().default(''), + user_id: z.coerce.string().optional(), + group_id: z.coerce.string().optional(), + phoneNumber: z.coerce.string().default(''), }); type Payload = z.infer; @@ -29,7 +29,7 @@ export class SharePeer extends OneBotAction; diff --git a/src/onebot/action/extends/TransGroupFile.ts b/src/onebot/action/extends/TransGroupFile.ts index c802d160..2c1da8c9 100644 --- a/src/onebot/action/extends/TransGroupFile.ts +++ b/src/onebot/action/extends/TransGroupFile.ts @@ -2,10 +2,10 @@ import { ActionName } from '@/onebot/action/router'; import { FileNapCatOneBotUUID } from '@/common/file-uuid'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - file_id: actionType.string(), + group_id: z.coerce.string(), + file_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/TranslateEnWordToZn.ts b/src/onebot/action/extends/TranslateEnWordToZn.ts index 77ce0647..bc4977b2 100644 --- a/src/onebot/action/extends/TranslateEnWordToZn.ts +++ b/src/onebot/action/extends/TranslateEnWordToZn.ts @@ -1,9 +1,9 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - words: z.array(actionType.string()), + words: z.array(z.coerce.string()), }); type Payload = z.infer; diff --git a/src/onebot/action/file/GetFile.ts b/src/onebot/action/file/GetFile.ts index 4116f4c4..8d373676 100644 --- a/src/onebot/action/file/GetFile.ts +++ b/src/onebot/action/file/GetFile.ts @@ -4,7 +4,7 @@ import { FileNapCatOneBotUUID } from '@/common/file-uuid'; import { ActionName } from '@/onebot/action/router'; import { OB11MessageImage, OB11MessageVideo } from '@/onebot/types'; import { z } from 'zod'; -import { actionType } from '../type'; + export interface GetFileResponse { file?: string; // path url?: string; @@ -14,8 +14,8 @@ export interface GetFileResponse { } const GetFileBase_PayloadSchema = z.object({ - file: actionType.string().optional(), - file_id: actionType.string().optional(), + file: z.coerce.string().optional(), + file_id: z.coerce.string().optional(), }); diff --git a/src/onebot/action/file/GetGroupFileUrl.ts b/src/onebot/action/file/GetGroupFileUrl.ts index e454ea9f..ea475659 100644 --- a/src/onebot/action/file/GetGroupFileUrl.ts +++ b/src/onebot/action/file/GetGroupFileUrl.ts @@ -2,10 +2,10 @@ import { ActionName } from '@/onebot/action/router'; import { FileNapCatOneBotUUID } from '@/common/file-uuid'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - file_id: actionType.string(), + group_id: z.coerce.string(), + file_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/file/GetPrivateFileUrl.ts b/src/onebot/action/file/GetPrivateFileUrl.ts index 2dbb615d..f2ea65e3 100644 --- a/src/onebot/action/file/GetPrivateFileUrl.ts +++ b/src/onebot/action/file/GetPrivateFileUrl.ts @@ -2,9 +2,9 @@ import { ActionName } from '@/onebot/action/router'; import { FileNapCatOneBotUUID } from '@/common/file-uuid'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - file_id: actionType.string(), + file_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts b/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts index 2b1e3a18..f1f4c8ff 100644 --- a/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts +++ b/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts @@ -1,10 +1,10 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - folder_name: actionType.string(), + group_id: z.coerce.string(), + folder_name: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/DeleteGroupFile.ts b/src/onebot/action/go-cqhttp/DeleteGroupFile.ts index 5a4895fe..54b5ff6f 100644 --- a/src/onebot/action/go-cqhttp/DeleteGroupFile.ts +++ b/src/onebot/action/go-cqhttp/DeleteGroupFile.ts @@ -4,10 +4,10 @@ import { ActionName } from '@/onebot/action/router'; import { FileNapCatOneBotUUID } from '@/common/file-uuid'; import { z } from 'zod'; import { NTQQGroupApi } from '@/core/apis'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - file_id: actionType.string(), + group_id: z.coerce.string(), + file_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts b/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts index 170bb703..44c7767e 100644 --- a/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts +++ b/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts @@ -2,11 +2,11 @@ import { ActionName } from '@/onebot/action/router'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { z } from 'zod'; import { NTQQGroupApi } from '@/core/apis'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - folder_id: actionType.string().optional(), - folder: actionType.string().optional(), + group_id: z.coerce.string(), + folder_id: z.coerce.string().optional(), + folder: z.coerce.string().optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/DownloadFile.ts b/src/onebot/action/go-cqhttp/DownloadFile.ts index 3b5b7965..a5fb7222 100644 --- a/src/onebot/action/go-cqhttp/DownloadFile.ts +++ b/src/onebot/action/go-cqhttp/DownloadFile.ts @@ -5,16 +5,16 @@ import { join as joinPath } from 'node:path'; import { calculateFileMD5, uriToLocalFile } from '@/common/file'; import { randomUUID } from 'crypto'; import { z } from 'zod'; -import { actionType } from '../type'; + interface FileResponse { file: string; } const SchemaData = z.object({ - url: actionType.string().optional(), - base64: actionType.string().optional(), - name: actionType.string().optional(), - headers: z.union([actionType.string(), z.array(actionType.string())]).optional(), + url: z.coerce.string().optional(), + base64: z.coerce.string().optional(), + name: z.coerce.string().optional(), + headers: z.union([z.coerce.string(), z.array(z.coerce.string())]).optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/GetForwardMsg.ts b/src/onebot/action/go-cqhttp/GetForwardMsg.ts index 62cbd438..e85546fe 100644 --- a/src/onebot/action/go-cqhttp/GetForwardMsg.ts +++ b/src/onebot/action/go-cqhttp/GetForwardMsg.ts @@ -5,10 +5,10 @@ import { MessageUnique } from '@/common/message-unique'; import { ChatType, ElementType, MsgSourceType, NTMsgType, RawMessage } from '@/core'; import { z } from 'zod'; import { isNumeric } from '@/common/helper'; -import { actionType } from '../type'; + const SchemaData = z.object({ - message_id: actionType.string().optional(), - id: actionType.string().optional(), + message_id: z.coerce.string().optional(), + id: z.coerce.string().optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts index be7a52d0..08500dee 100644 --- a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts @@ -5,16 +5,15 @@ import { ChatType } from '@/core/types'; import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; import { NetworkAdapterConfig } from '@/onebot/config/config'; -import { actionType } from '../type'; interface Response { messages: OB11Message[]; } const SchemaData = z.object({ - user_id: actionType.string(), - message_seq: actionType.string().optional(), - count: actionType.number().default(20), - reverseOrder: actionType.boolean().default(false) + user_id: z.coerce.string(), + message_seq: z.coerce.string().optional(), + count: z.coerce.number().default(20), + reverseOrder: z.coerce.boolean().default(false) }); diff --git a/src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts b/src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts index 67d2eb8d..c5ff5d3c 100644 --- a/src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts +++ b/src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts @@ -1,9 +1,9 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string() + group_id: z.coerce.string() }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts b/src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts index 9d161641..7f9cc99f 100644 --- a/src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts +++ b/src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts @@ -1,9 +1,9 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string() + group_id: z.coerce.string() }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts b/src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts index fb993dba..f0431963 100644 --- a/src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts +++ b/src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts @@ -3,12 +3,12 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { OB11Construct } from '@/onebot/helper/data'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - folder_id: actionType.string().optional(), - folder: actionType.string().optional(), - file_count: actionType.number().default(50), + group_id: z.coerce.string(), + folder_id: z.coerce.string().optional(), + folder: z.coerce.string().optional(), + file_count: z.coerce.number().default(50), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts b/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts index a6c666a3..9f30542a 100644 --- a/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts +++ b/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts @@ -2,9 +2,9 @@ import { WebHonorType } from '@/core'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), + group_id: z.coerce.string(), type: z.nativeEnum(WebHonorType).optional() }); diff --git a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts index 0952bb86..f9328d7f 100644 --- a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts @@ -5,17 +5,16 @@ import { ChatType, Peer } from '@/core/types'; import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; import { NetworkAdapterConfig } from '@/onebot/config/config'; -import { actionType } from '../type'; interface Response { messages: OB11Message[]; } const SchemaData = z.object({ - group_id: actionType.string(), - message_seq: actionType.string().optional(), - count: actionType.number().default(20), - reverseOrder: actionType.boolean().default(false) + group_id: z.coerce.string(), + message_seq: z.coerce.string().optional(), + count: z.coerce.number().default(20), + reverseOrder: z.coerce.boolean().default(false) }); diff --git a/src/onebot/action/go-cqhttp/GetGroupRootFiles.ts b/src/onebot/action/go-cqhttp/GetGroupRootFiles.ts index d3a8efbc..9604e804 100644 --- a/src/onebot/action/go-cqhttp/GetGroupRootFiles.ts +++ b/src/onebot/action/go-cqhttp/GetGroupRootFiles.ts @@ -4,10 +4,10 @@ import { ActionName } from '@/onebot/action/router'; import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot'; import { OB11Construct } from '@/onebot/helper/data'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - file_count: actionType.number().default(50), + group_id: z.coerce.string(), + file_count: z.coerce.number().default(50), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts index 6052c1b7..480daa8d 100644 --- a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts +++ b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts @@ -4,11 +4,10 @@ import { OB11Construct } from '@/onebot/helper/data'; import { ActionName } from '@/onebot/action/router'; import { calcQQLevel } from '@/common/helper'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - user_id: actionType.string(), - no_cache: actionType.boolean().default(false), + user_id: z.coerce.string(), + no_cache: z.coerce.boolean().default(false), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts b/src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts index 18013147..0f4d4424 100644 --- a/src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts +++ b/src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts @@ -1,9 +1,9 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - url: actionType.string(), + url: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts b/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts index 27831852..f828306a 100644 --- a/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts +++ b/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts @@ -1,13 +1,12 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - friend_id: actionType.string().optional(), - user_id: actionType.string().optional(), - temp_block: actionType.boolean().optional(), - temp_both_del: actionType.boolean().optional(), + friend_id: z.coerce.string().optional(), + user_id: z.coerce.string().optional(), + temp_block: z.coerce.boolean().optional(), + temp_both_del: z.coerce.boolean().optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts b/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts index 962cf137..ea791d3e 100644 --- a/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts +++ b/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts @@ -1,9 +1,9 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - model: actionType.string(), + model: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/SendGroupNotice.ts b/src/onebot/action/go-cqhttp/SendGroupNotice.ts index b3b6a795..e51c2355 100644 --- a/src/onebot/action/go-cqhttp/SendGroupNotice.ts +++ b/src/onebot/action/go-cqhttp/SendGroupNotice.ts @@ -3,16 +3,16 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { unlink } from 'node:fs/promises'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - content: actionType.string(), - image: actionType.string().optional(), - pinned: actionType.number().default(0), - type: actionType.number().default(1), - confirm_required: actionType.number().default(1), - is_show_edit_card: actionType.number().default(0), - tip_window_type: actionType.number().default(0), + group_id: z.coerce.string(), + content: z.coerce.string(), + image: z.coerce.string().optional(), + pinned: z.coerce.number().default(0), + type: z.coerce.number().default(1), + confirm_required: z.coerce.number().default(1), + is_show_edit_card: z.coerce.number().default(0), + tip_window_type: z.coerce.number().default(0), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts index b009f267..5c9e7091 100644 --- a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts +++ b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts @@ -4,10 +4,9 @@ import { checkFileExistV2, uriToLocalFile } from '@/common/file'; import { z } from 'zod'; import fs from 'node:fs/promises'; import { GeneralCallResult } from '@/core'; -import { actionType } from '../type'; const SchemaData = z.object({ - file: actionType.string(), - group_id: actionType.string() + file: z.coerce.string(), + group_id: z.coerce.string() }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/SetQQProfile.ts b/src/onebot/action/go-cqhttp/SetQQProfile.ts index f61872e9..e7832fbc 100644 --- a/src/onebot/action/go-cqhttp/SetQQProfile.ts +++ b/src/onebot/action/go-cqhttp/SetQQProfile.ts @@ -2,11 +2,11 @@ import { NTQQUserApi } from '@/core/apis'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - nickname: actionType.string(), - personal_note: actionType.string().optional(), - sex: actionType.string().optional(), // 传Sex值?建议传0 + nickname: z.coerce.string(), + personal_note: z.coerce.string().optional(), + sex: z.coerce.string().optional(), // 传Sex值?建议传0 }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/UploadGroupFile.ts b/src/onebot/action/go-cqhttp/UploadGroupFile.ts index 3381f198..32f63065 100644 --- a/src/onebot/action/go-cqhttp/UploadGroupFile.ts +++ b/src/onebot/action/go-cqhttp/UploadGroupFile.ts @@ -5,13 +5,13 @@ import fs from 'fs'; import { uriToLocalFile } from '@/common/file'; import { SendMessageContext } from '@/onebot/api'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - file: actionType.string(), - name: actionType.string(), - folder: actionType.string().optional(), - folder_id: actionType.string().optional(),//临时扩展 + group_id: z.coerce.string(), + file: z.coerce.string(), + name: z.coerce.string(), + folder: z.coerce.string().optional(), + folder_id: z.coerce.string().optional(),//临时扩展 }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/UploadPrivateFile.ts b/src/onebot/action/go-cqhttp/UploadPrivateFile.ts index 6d53fda6..83379916 100644 --- a/src/onebot/action/go-cqhttp/UploadPrivateFile.ts +++ b/src/onebot/action/go-cqhttp/UploadPrivateFile.ts @@ -6,11 +6,11 @@ import { uriToLocalFile } from '@/common/file'; import { SendMessageContext } from '@/onebot/api'; import { ContextMode, createContext } from '@/onebot/action/msg/SendMsg'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - user_id: actionType.string(), - file: actionType.string(), - name: actionType.string(), + user_id: z.coerce.string(), + file: z.coerce.string(), + name: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/DelEssenceMsg.ts b/src/onebot/action/group/DelEssenceMsg.ts index 1d108bec..5f6490cc 100644 --- a/src/onebot/action/group/DelEssenceMsg.ts +++ b/src/onebot/action/group/DelEssenceMsg.ts @@ -2,9 +2,9 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - message_id: actionType.string(), + message_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/DelGroupNotice.ts b/src/onebot/action/group/DelGroupNotice.ts index 7ec4de9c..11d23234 100644 --- a/src/onebot/action/group/DelGroupNotice.ts +++ b/src/onebot/action/group/DelGroupNotice.ts @@ -1,10 +1,10 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - notice_id: actionType.string() + group_id: z.coerce.string(), + notice_id: z.coerce.string() }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetAiRecord.ts b/src/onebot/action/group/GetAiRecord.ts index 58d40b1d..8837551f 100644 --- a/src/onebot/action/group/GetAiRecord.ts +++ b/src/onebot/action/group/GetAiRecord.ts @@ -2,11 +2,11 @@ import { ActionName } from '@/onebot/action/router'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { AIVoiceChatType } from '@/core/packet/entities/aiChat'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - character: actionType.string(), - group_id: actionType.string(), - text: actionType.string(), + character: z.coerce.string(), + group_id: z.coerce.string(), + text: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupEssence.ts b/src/onebot/action/group/GetGroupEssence.ts index 0176994e..9b46eb40 100644 --- a/src/onebot/action/group/GetGroupEssence.ts +++ b/src/onebot/action/group/GetGroupEssence.ts @@ -5,9 +5,9 @@ import { MessageUnique } from '@/common/message-unique'; import crypto from 'crypto'; import { z } from 'zod'; import { NetworkAdapterConfig } from '@/onebot/config/config'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), + group_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupInfo.ts b/src/onebot/action/group/GetGroupInfo.ts index 9a24c3c0..d9695061 100644 --- a/src/onebot/action/group/GetGroupInfo.ts +++ b/src/onebot/action/group/GetGroupInfo.ts @@ -3,9 +3,9 @@ import { OB11Construct } from '@/onebot/helper/data'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), + group_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupList.ts b/src/onebot/action/group/GetGroupList.ts index 98f7d407..0b219646 100644 --- a/src/onebot/action/group/GetGroupList.ts +++ b/src/onebot/action/group/GetGroupList.ts @@ -3,10 +3,9 @@ import { OB11Construct } from '@/onebot/helper/data'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - no_cache: actionType.boolean().default(false), + no_cache: z.coerce.boolean().default(false), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index 0aa72dde..79f9c4e7 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -3,12 +3,11 @@ import { OB11Construct } from '@/onebot/helper/data'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - group_id: actionType.string(), - user_id: actionType.string(), - no_cache: actionType.boolean().default(false), + group_id: z.coerce.string(), + user_id: z.coerce.string(), + no_cache: z.coerce.boolean().default(false), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupMemberList.ts b/src/onebot/action/group/GetGroupMemberList.ts index 746efbaa..6e0aac63 100644 --- a/src/onebot/action/group/GetGroupMemberList.ts +++ b/src/onebot/action/group/GetGroupMemberList.ts @@ -4,11 +4,10 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; import { GroupMember } from '@/core'; -import { actionType } from '../type'; const SchemaData = z.object({ - group_id: actionType.string(), - no_cache: actionType.boolean().default(false) + group_id: z.coerce.string(), + no_cache: z.coerce.boolean().default(false) }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupNotice.ts b/src/onebot/action/group/GetGroupNotice.ts index 89f30a32..50dd50b5 100644 --- a/src/onebot/action/group/GetGroupNotice.ts +++ b/src/onebot/action/group/GetGroupNotice.ts @@ -2,7 +2,6 @@ import { WebApiGroupNoticeFeed } from '@/core'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; interface GroupNotice { sender_id: number; publish_time: number; @@ -18,7 +17,7 @@ interface GroupNotice { } const SchemaData = z.object({ - group_id: actionType.string(), + group_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupShutList.ts b/src/onebot/action/group/GetGroupShutList.ts index 3133b412..ba24fea1 100644 --- a/src/onebot/action/group/GetGroupShutList.ts +++ b/src/onebot/action/group/GetGroupShutList.ts @@ -2,9 +2,9 @@ import { ShutUpGroupMember } from '@/core'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), + group_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GroupPoke.ts b/src/onebot/action/group/GroupPoke.ts index 09d958e5..a0efd74f 100644 --- a/src/onebot/action/group/GroupPoke.ts +++ b/src/onebot/action/group/GroupPoke.ts @@ -1,10 +1,10 @@ import { ActionName } from '@/onebot/action/router'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - user_id: actionType.string(), + group_id: z.coerce.string(), + user_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SendGroupAiRecord.ts b/src/onebot/action/group/SendGroupAiRecord.ts index bb1c85fd..d845e793 100644 --- a/src/onebot/action/group/SendGroupAiRecord.ts +++ b/src/onebot/action/group/SendGroupAiRecord.ts @@ -2,11 +2,11 @@ import { ActionName } from '@/onebot/action/router'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { AIVoiceChatType } from '@/core/packet/entities/aiChat'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - character: actionType.string(), - group_id: actionType.string(), - text: actionType.string(), + character: z.coerce.string(), + group_id: z.coerce.string(), + text: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetEssenceMsg.ts b/src/onebot/action/group/SetEssenceMsg.ts index de3c7f43..80b7df56 100644 --- a/src/onebot/action/group/SetEssenceMsg.ts +++ b/src/onebot/action/group/SetEssenceMsg.ts @@ -2,9 +2,9 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - message_id: actionType.string(), + message_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupAddRequest.ts b/src/onebot/action/group/SetGroupAddRequest.ts index f0ced956..a2fcb662 100644 --- a/src/onebot/action/group/SetGroupAddRequest.ts +++ b/src/onebot/action/group/SetGroupAddRequest.ts @@ -2,12 +2,11 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { NTGroupRequestOperateTypes } from '@/core/types'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - flag: actionType.string(), - approve: actionType.boolean().default(true), - reason: actionType.string().nullable().default(' '), + flag: z.coerce.string(), + approve: z.coerce.boolean().default(true), + reason: z.coerce.string().nullable().default(' '), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupAdmin.ts b/src/onebot/action/group/SetGroupAdmin.ts index 4067b4ff..d9e91397 100644 --- a/src/onebot/action/group/SetGroupAdmin.ts +++ b/src/onebot/action/group/SetGroupAdmin.ts @@ -2,12 +2,11 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { NTGroupMemberRole } from '@/core/types'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - group_id: actionType.string(), - user_id: actionType.string(), - enable: actionType.boolean().default(false), + group_id: z.coerce.string(), + user_id: z.coerce.string(), + enable: z.coerce.boolean().default(false), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupBan.ts b/src/onebot/action/group/SetGroupBan.ts index e4fe3c03..cb146e9d 100644 --- a/src/onebot/action/group/SetGroupBan.ts +++ b/src/onebot/action/group/SetGroupBan.ts @@ -1,11 +1,11 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - user_id: actionType.string(), - duration: actionType.number().default(0), + group_id: z.coerce.string(), + user_id: z.coerce.string(), + duration: z.coerce.number().default(0), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupCard.ts b/src/onebot/action/group/SetGroupCard.ts index 870af15f..a3a61ee5 100644 --- a/src/onebot/action/group/SetGroupCard.ts +++ b/src/onebot/action/group/SetGroupCard.ts @@ -1,11 +1,11 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - user_id: actionType.string(), - card: actionType.string().optional(), + group_id: z.coerce.string(), + user_id: z.coerce.string(), + card: z.coerce.string().optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupKick.ts b/src/onebot/action/group/SetGroupKick.ts index a394b9c8..9aa31341 100644 --- a/src/onebot/action/group/SetGroupKick.ts +++ b/src/onebot/action/group/SetGroupKick.ts @@ -1,12 +1,11 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - group_id: actionType.string(), - user_id: actionType.string(), - reject_add_request: actionType.boolean().optional(), + group_id: z.coerce.string(), + user_id: z.coerce.string(), + reject_add_request: z.coerce.boolean().optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupLeave.ts b/src/onebot/action/group/SetGroupLeave.ts index a21c890e..a830ad78 100644 --- a/src/onebot/action/group/SetGroupLeave.ts +++ b/src/onebot/action/group/SetGroupLeave.ts @@ -1,11 +1,10 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - group_id: actionType.string(), - is_dismiss: actionType.boolean().optional(), + group_id: z.coerce.string(), + is_dismiss: z.coerce.boolean().optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupName.ts b/src/onebot/action/group/SetGroupName.ts index b1949b45..4b70af1a 100644 --- a/src/onebot/action/group/SetGroupName.ts +++ b/src/onebot/action/group/SetGroupName.ts @@ -2,10 +2,10 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - group_id: actionType.string(), - group_name: actionType.string(), + group_id: z.coerce.string(), + group_name: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupWholeBan.ts b/src/onebot/action/group/SetGroupWholeBan.ts index e35b85b8..06b16a27 100644 --- a/src/onebot/action/group/SetGroupWholeBan.ts +++ b/src/onebot/action/group/SetGroupWholeBan.ts @@ -1,11 +1,10 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - group_id: actionType.string(), - enable: actionType.boolean().optional(), + group_id: z.coerce.string(), + enable: z.coerce.boolean().optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/msg/DeleteMsg.ts b/src/onebot/action/msg/DeleteMsg.ts index 3d88c5a8..87f38743 100644 --- a/src/onebot/action/msg/DeleteMsg.ts +++ b/src/onebot/action/msg/DeleteMsg.ts @@ -2,10 +2,9 @@ import { ActionName } from '@/onebot/action/router'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - message_id: actionType.string(), + message_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/msg/ForwardSingleMsg.ts b/src/onebot/action/msg/ForwardSingleMsg.ts index 3497a40c..a737b8ab 100644 --- a/src/onebot/action/msg/ForwardSingleMsg.ts +++ b/src/onebot/action/msg/ForwardSingleMsg.ts @@ -3,11 +3,11 @@ import { ChatType, Peer } from '@/core/types'; import { ActionName } from '@/onebot/action/router'; import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - message_id: actionType.string(), - group_id: actionType.string().optional(), - user_id: actionType.string().optional(), + message_id: z.coerce.string(), + group_id: z.coerce.string().optional(), + user_id: z.coerce.string().optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/msg/GetMsg.ts b/src/onebot/action/msg/GetMsg.ts index 347b1502..83095c89 100644 --- a/src/onebot/action/msg/GetMsg.ts +++ b/src/onebot/action/msg/GetMsg.ts @@ -5,11 +5,11 @@ import { MessageUnique } from '@/common/message-unique'; import { RawMessage } from '@/core'; import { z } from 'zod'; import { NetworkAdapterConfig } from '@/onebot/config/config'; -import { actionType } from '../type'; + export type ReturnDataType = OB11Message const SchemaData = z.object({ - message_id: actionType.string(), + message_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/msg/MarkMsgAsRead.ts b/src/onebot/action/msg/MarkMsgAsRead.ts index fcb8e271..7bb6f9eb 100644 --- a/src/onebot/action/msg/MarkMsgAsRead.ts +++ b/src/onebot/action/msg/MarkMsgAsRead.ts @@ -3,11 +3,11 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; -import { actionType } from '../type'; + const SchemaData = z.object({ - user_id: actionType.string().optional(), - group_id: actionType.string().optional(), - message_id: actionType.string().optional(), + user_id: z.coerce.string().optional(), + group_id: z.coerce.string().optional(), + message_id: z.coerce.string().optional(), }); type PlayloadType = z.infer; diff --git a/src/onebot/action/msg/SetMsgEmojiLike.ts b/src/onebot/action/msg/SetMsgEmojiLike.ts index b71983ef..9d2c5bb0 100644 --- a/src/onebot/action/msg/SetMsgEmojiLike.ts +++ b/src/onebot/action/msg/SetMsgEmojiLike.ts @@ -2,12 +2,11 @@ import { ActionName } from '@/onebot/action/router'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - message_id: actionType.string(), - emoji_id: actionType.string(), - set: actionType.boolean().optional(), + message_id: z.coerce.string(), + emoji_id: z.coerce.string(), + set: z.coerce.boolean().optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/packet/SendPoke.ts b/src/onebot/action/packet/SendPoke.ts index dcd9da64..02e06c90 100644 --- a/src/onebot/action/packet/SendPoke.ts +++ b/src/onebot/action/packet/SendPoke.ts @@ -1,11 +1,10 @@ import { ActionName } from '@/onebot/action/router'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - group_id: actionType.string().optional(), - user_id: actionType.string(), + group_id: z.coerce.string().optional(), + user_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/system/GetCredentials.ts b/src/onebot/action/system/GetCredentials.ts index 07228128..0d6a72fb 100644 --- a/src/onebot/action/system/GetCredentials.ts +++ b/src/onebot/action/system/GetCredentials.ts @@ -1,7 +1,6 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; interface Response { cookies: string, @@ -9,7 +8,7 @@ interface Response { } const SchemaData = z.object({ - domain: actionType.string() + domain: z.coerce.string() }); type Payload = z.infer; diff --git a/src/onebot/action/type.ts b/src/onebot/action/type.ts deleted file mode 100644 index f480fda0..00000000 --- a/src/onebot/action/type.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { z } from "zod"; - -const boolean = () => z.preprocess( - val => typeof val === 'string' && val.toLowerCase() === 'false' ? false : Boolean(val), - z.boolean() -); -const number = () => z.preprocess( - val => typeof val !== 'number' ? Number(val) : val, - z.number() -); -const string = () => z.preprocess( - val => typeof val !== 'string' ? String(val) : val, - z.string() -); -export const actionType = { boolean, number, string }; \ No newline at end of file diff --git a/src/onebot/action/user/FriendPoke.ts b/src/onebot/action/user/FriendPoke.ts index 68493c94..3eccae07 100644 --- a/src/onebot/action/user/FriendPoke.ts +++ b/src/onebot/action/user/FriendPoke.ts @@ -1,10 +1,9 @@ import { ActionName } from '@/onebot/action/router'; import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - user_id: actionType.string() + user_id: z.coerce.string() }); type Payload = z.infer; diff --git a/src/onebot/action/user/GetCookies.ts b/src/onebot/action/user/GetCookies.ts index 60c34424..82df5bcc 100644 --- a/src/onebot/action/user/GetCookies.ts +++ b/src/onebot/action/user/GetCookies.ts @@ -1,14 +1,13 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; interface Response { cookies: string, bkn: string } const SchemaData = z.object({ - domain: actionType.string() + domain: z.coerce.string() }); type Payload = z.infer; diff --git a/src/onebot/action/user/GetFriendList.ts b/src/onebot/action/user/GetFriendList.ts index 74cc6815..e804bf1c 100644 --- a/src/onebot/action/user/GetFriendList.ts +++ b/src/onebot/action/user/GetFriendList.ts @@ -3,10 +3,9 @@ import { OB11Construct } from '@/onebot/helper/data'; import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - no_cache: actionType.boolean().optional(), + no_cache: z.coerce.boolean().optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/user/GetRecentContact.ts b/src/onebot/action/user/GetRecentContact.ts index 8a551b54..b79d7aec 100644 --- a/src/onebot/action/user/GetRecentContact.ts +++ b/src/onebot/action/user/GetRecentContact.ts @@ -3,10 +3,9 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { NetworkAdapterConfig } from '@/onebot/config/config'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - count: actionType.number().default(10), + count: z.coerce.number().default(10), }); type Payload = z.infer; diff --git a/src/onebot/action/user/SendLike.ts b/src/onebot/action/user/SendLike.ts index 5ac5078e..4804184b 100644 --- a/src/onebot/action/user/SendLike.ts +++ b/src/onebot/action/user/SendLike.ts @@ -1,11 +1,10 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - times: actionType.number().default(1), - user_id: actionType.string() + times: z.coerce.number().default(1), + user_id: z.coerce.string() }); type Payload = z.infer; diff --git a/src/onebot/action/user/SetFriendAddRequest.ts b/src/onebot/action/user/SetFriendAddRequest.ts index 3fb71e18..ef1fa7fb 100644 --- a/src/onebot/action/user/SetFriendAddRequest.ts +++ b/src/onebot/action/user/SetFriendAddRequest.ts @@ -1,12 +1,11 @@ import { OneBotAction } from '@/onebot/action/OneBotAction'; import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; -import { actionType } from '../type'; const SchemaData = z.object({ - flag: actionType.string(), - approve: actionType.boolean().default(true), - remark: actionType.string().nullable().optional() + flag: z.coerce.string(), + approve: z.coerce.boolean().default(true), + remark: z.coerce.string().nullable().optional() }); type Payload = z.infer; diff --git a/src/onebot/config/config.ts b/src/onebot/config/config.ts index 7ee9d3b7..9a9b8a00 100644 --- a/src/onebot/config/config.ts +++ b/src/onebot/config/config.ts @@ -1,72 +1,71 @@ import { z } from 'zod'; -import { actionType } from '../action/type'; const HttpServerConfigSchema = z.object({ - name: actionType.string().default('http-server'), - enable: actionType.boolean().default(false), - port: actionType.number().default(3000), - host: actionType.string().default('0.0.0.0'), - enableCors: actionType.boolean().default(true), - enableWebsocket: actionType.boolean().default(true), - messagePostFormat: actionType.string().default('array'), - token: actionType.string().default(''), - debug: actionType.boolean().default(false) + name: z.coerce.string().default('http-server'), + enable: z.coerce.boolean().default(false), + port: z.coerce.number().default(3000), + host: z.coerce.string().default('0.0.0.0'), + enableCors: z.coerce.boolean().default(true), + enableWebsocket: z.coerce.boolean().default(true), + messagePostFormat: z.coerce.string().default('array'), + token: z.coerce.string().default(''), + debug: z.coerce.boolean().default(false) }); const HttpSseServerConfigSchema = z.object({ - name: actionType.string().default('http-sse-server'), - enable: actionType.boolean().default(false), - port: actionType.number().default(3000), - host: actionType.string().default('0.0.0.0'), - enableCors: actionType.boolean().default(true), - enableWebsocket: actionType.boolean().default(true), - messagePostFormat: actionType.string().default('array'), - token: actionType.string().default(''), - debug: actionType.boolean().default(false), - reportSelfMessage: actionType.boolean().default(false) + name: z.coerce.string().default('http-sse-server'), + enable: z.coerce.boolean().default(false), + port: z.coerce.number().default(3000), + host: z.coerce.string().default('0.0.0.0'), + enableCors: z.coerce.boolean().default(true), + enableWebsocket: z.coerce.boolean().default(true), + messagePostFormat: z.coerce.string().default('array'), + token: z.coerce.string().default(''), + debug: z.coerce.boolean().default(false), + reportSelfMessage: z.coerce.boolean().default(false) }); const HttpClientConfigSchema = z.object({ - name: actionType.string().default('http-client'), - enable: actionType.boolean().default(false), - url: actionType.string().default('http://localhost:8080'), - messagePostFormat: actionType.string().default('array'), - reportSelfMessage: actionType.boolean().default(false), - token: actionType.string().default(''), - debug: actionType.boolean().default(false) + name: z.coerce.string().default('http-client'), + enable: z.coerce.boolean().default(false), + url: z.coerce.string().default('http://localhost:8080'), + messagePostFormat: z.coerce.string().default('array'), + reportSelfMessage: z.coerce.boolean().default(false), + token: z.coerce.string().default(''), + debug: z.coerce.boolean().default(false) }); const WebsocketServerConfigSchema = z.object({ - name: actionType.string().default('websocket-server'), - enable: actionType.boolean().default(false), - host: actionType.string().default('0.0.0.0'), - port: actionType.number().default(3001), - messagePostFormat: actionType.string().default('array'), - reportSelfMessage: actionType.boolean().default(false), - token: actionType.string().default(''), - enableForcePushEvent: actionType.boolean().default(true), - debug: actionType.boolean().default(false), - heartInterval: actionType.number().default(30000) + name: z.coerce.string().default('websocket-server'), + enable: z.coerce.boolean().default(false), + host: z.coerce.string().default('0.0.0.0'), + port: z.coerce.number().default(3001), + messagePostFormat: z.coerce.string().default('array'), + reportSelfMessage: z.coerce.boolean().default(false), + token: z.coerce.string().default(''), + enableForcePushEvent: z.coerce.boolean().default(true), + debug: z.coerce.boolean().default(false), + heartInterval: z.coerce.number().default(30000) }); const WebsocketClientConfigSchema = z.object({ - name: actionType.string().default('websocket-client'), - enable: actionType.boolean().default(false), - url: actionType.string().default('ws://localhost:8082'), - messagePostFormat: actionType.string().default('array'), - reportSelfMessage: actionType.boolean().default(false), - reconnectInterval: actionType.number().default(5000), - token: actionType.string().default(''), - debug: actionType.boolean().default(false), - heartInterval: actionType.number().default(30000) + name: z.coerce.string().default('websocket-client'), + enable: z.coerce.boolean().default(false), + url: z.coerce.string().default('ws://localhost:8082'), + messagePostFormat: z.coerce.string().default('array'), + reportSelfMessage: z.coerce.boolean().default(false), + reconnectInterval: z.coerce.number().default(5000), + token: z.coerce.string().default(''), + debug: z.coerce.boolean().default(false), + heartInterval: z.coerce.number().default(30000) }); const PluginConfigSchema = z.object({ - name: actionType.string().default('plugin'), - enable: actionType.boolean().default(false), - messagePostFormat: actionType.string().default('array'), - reportSelfMessage: actionType.boolean().default(false), - debug: actionType.boolean().default(false), + name: z.coerce.string().default('plugin'), + enable: z.coerce.boolean().default(false), + messagePostFormat: z.coerce.string().default('array'), + reportSelfMessage: z.coerce.boolean().default(false), + debug: z.coerce.boolean().default(false), }); const NetworkConfigSchema = z.object({ @@ -80,9 +79,9 @@ const NetworkConfigSchema = z.object({ export const OneBotConfigSchema = z.object({ network: NetworkConfigSchema, - musicSignUrl: actionType.string().default(''), - enableLocalFile2Url: actionType.boolean().default(false), - parseMultMsg: actionType.boolean().default(false) + musicSignUrl: z.coerce.string().default(''), + enableLocalFile2Url: z.coerce.boolean().default(false), + parseMultMsg: z.coerce.boolean().default(false) }); export type OneBotConfig = z.infer; diff --git a/src/webui/src/helper/config.ts b/src/webui/src/helper/config.ts index ffaf6df1..06562859 100644 --- a/src/webui/src/helper/config.ts +++ b/src/webui/src/helper/config.ts @@ -4,14 +4,13 @@ import { resolve } from 'node:path'; import { deepMerge } from '../utils/object'; import { themeType } from '../types/theme'; import { z } from 'zod'; -import { actionType } from '@/onebot/action/type'; // 定义配置的类型 const WebUiConfigSchema = z.object({ - host: actionType.string().default('0.0.0.0'), - port: actionType.number().default(6099), - token: actionType.string().default('napcat'), - loginRate: actionType.number().default(10), - autoLoginAccount: actionType.string().default(''), + host: z.coerce.string().default('0.0.0.0'), + port: z.coerce.number().default(6099), + token: z.coerce.string().default('napcat'), + loginRate: z.coerce.number().default(10), + autoLoginAccount: z.coerce.string().default(''), theme: themeType, }); diff --git a/src/webui/src/types/theme.ts b/src/webui/src/types/theme.ts index d62d0821..dcbe3a47 100644 --- a/src/webui/src/types/theme.ts +++ b/src/webui/src/types/theme.ts @@ -1,10 +1,9 @@ -import { actionType } from '@/onebot/action/type'; import { z } from 'zod'; export const themeType = z.object( { - dark: z.record(actionType.string(), actionType.string()), - light: z.record(actionType.string(), actionType.string()), + dark: z.record(z.coerce.string(), z.coerce.string()), + light: z.record(z.coerce.string(), z.coerce.string()), } ).default({ dark: {