From 941978b5783255a05b91e12d3d22b9c1794e91bd 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, 15 Apr 2025 12:34:33 +0800 Subject: [PATCH] fix: checker --- src/onebot/action/extends/MoveGroupFile.ts | 2 +- src/onebot/action/extends/RenameGroupFile.ts | 2 +- src/onebot/action/extends/SetDiyOnlineStatus.ts | 4 ++-- src/onebot/action/extends/SetGroupSign.ts | 2 +- src/onebot/action/extends/SetInputStatus.ts | 2 +- src/onebot/action/extends/SetOnlineStatus.ts | 6 +++--- src/onebot/action/extends/SetSpecialTitle.ts | 4 ++-- src/onebot/action/extends/ShareContact.ts | 6 +++--- src/onebot/action/extends/TransGroupFile.ts | 2 +- src/onebot/action/file/GetGroupFileUrl.ts | 2 +- src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts | 2 +- src/onebot/action/go-cqhttp/DeleteGroupFile.ts | 2 +- src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts | 2 +- src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts | 6 +++--- src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts | 2 +- .../action/go-cqhttp/GetGroupFileSystemInfo.ts | 2 +- src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts | 4 ++-- src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts | 2 +- src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts | 6 +++--- src/onebot/action/go-cqhttp/GetGroupRootFiles.ts | 4 ++-- src/onebot/action/go-cqhttp/GetStrangerInfo.ts | 2 +- src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts | 4 ++-- src/onebot/action/go-cqhttp/SendGroupNotice.ts | 12 ++++++------ src/onebot/action/go-cqhttp/SetGroupPortrait.ts | 2 +- src/onebot/action/go-cqhttp/SetQQProfile.ts | 2 +- src/onebot/action/go-cqhttp/UploadGroupFile.ts | 2 +- src/onebot/action/go-cqhttp/UploadPrivateFile.ts | 2 +- src/onebot/action/group/DelEssenceMsg.ts | 4 ++-- src/onebot/action/group/DelGroupNotice.ts | 2 +- src/onebot/action/group/GetAiRecord.ts | 2 +- src/onebot/action/group/GetGroupEssence.ts | 2 +- src/onebot/action/group/GetGroupInfo.ts | 2 +- src/onebot/action/group/GetGroupMemberInfo.ts | 4 ++-- src/onebot/action/group/GetGroupMemberList.ts | 2 +- src/onebot/action/group/GetGroupNotice.ts | 2 +- src/onebot/action/group/GetGroupShutList.ts | 2 +- src/onebot/action/group/GroupPoke.ts | 4 ++-- src/onebot/action/group/SendGroupAiRecord.ts | 2 +- src/onebot/action/group/SetEssenceMsg.ts | 2 +- src/onebot/action/group/SetGroupAddRequest.ts | 4 ++-- src/onebot/action/group/SetGroupAdmin.ts | 4 ++-- src/onebot/action/group/SetGroupBan.ts | 6 +++--- src/onebot/action/group/SetGroupCard.ts | 4 ++-- src/onebot/action/group/SetGroupKick.ts | 6 +++--- src/onebot/action/group/SetGroupLeave.ts | 2 +- src/onebot/action/group/SetGroupName.ts | 2 +- src/onebot/action/group/SetGroupWholeBan.ts | 4 ++-- src/onebot/action/msg/DeleteMsg.ts | 2 +- src/onebot/action/msg/ForwardSingleMsg.ts | 2 +- src/onebot/action/msg/GetMsg.ts | 4 ++-- src/onebot/action/msg/MarkMsgAsRead.ts | 6 +++--- src/onebot/action/msg/SetMsgEmojiLike.ts | 4 ++-- src/onebot/action/packet/SendPoke.ts | 4 ++-- src/onebot/action/user/FriendPoke.ts | 2 +- src/onebot/action/user/SendLike.ts | 4 ++-- src/onebot/action/user/SetFriendAddRequest.ts | 6 +++--- 56 files changed, 93 insertions(+), 93 deletions(-) diff --git a/src/onebot/action/extends/MoveGroupFile.ts b/src/onebot/action/extends/MoveGroupFile.ts index 7e8e6f89..05c92220 100644 --- a/src/onebot/action/extends/MoveGroupFile.ts +++ b/src/onebot/action/extends/MoveGroupFile.ts @@ -4,7 +4,7 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), file_id: z.coerce.string(), current_parent_directory: z.coerce.string(), target_parent_directory: z.coerce.string(), diff --git a/src/onebot/action/extends/RenameGroupFile.ts b/src/onebot/action/extends/RenameGroupFile.ts index 918bcfd2..06bb1f48 100644 --- a/src/onebot/action/extends/RenameGroupFile.ts +++ b/src/onebot/action/extends/RenameGroupFile.ts @@ -4,7 +4,7 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), file_id: z.coerce.string(), current_parent_directory: z.coerce.string(), new_name: z.coerce.string(), diff --git a/src/onebot/action/extends/SetDiyOnlineStatus.ts b/src/onebot/action/extends/SetDiyOnlineStatus.ts index c7962d62..df36e0be 100644 --- a/src/onebot/action/extends/SetDiyOnlineStatus.ts +++ b/src/onebot/action/extends/SetDiyOnlineStatus.ts @@ -3,8 +3,8 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - face_id: z.union([z.coerce.number(), z.coerce.string()]),// 参考 face_config.json 的 QSid - face_type: z.union([z.coerce.number(), z.coerce.string()]).default('1'), + face_id: z.coerce.string(),// 参考 face_config.json 的 QSid + face_type: z.coerce.string().default('1'), wording: z.coerce.string().default(' '), }); diff --git a/src/onebot/action/extends/SetGroupSign.ts b/src/onebot/action/extends/SetGroupSign.ts index 67687b34..3d22da22 100644 --- a/src/onebot/action/extends/SetGroupSign.ts +++ b/src/onebot/action/extends/SetGroupSign.ts @@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.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 397957e6..76324901 100644 --- a/src/onebot/action/extends/SetInputStatus.ts +++ b/src/onebot/action/extends/SetInputStatus.ts @@ -4,7 +4,7 @@ import { ChatType } from '@/core'; import { z } from 'zod'; const SchemaData = z.object({ - user_id: z.union([z.coerce.number(), z.coerce.string()]), + user_id: z.coerce.string(), event_type: z.coerce.number(), }); diff --git a/src/onebot/action/extends/SetOnlineStatus.ts b/src/onebot/action/extends/SetOnlineStatus.ts index 53051824..10101b9a 100644 --- a/src/onebot/action/extends/SetOnlineStatus.ts +++ b/src/onebot/action/extends/SetOnlineStatus.ts @@ -3,9 +3,9 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - status: z.union([z.coerce.number(), z.coerce.string()]), - ext_status: z.union([z.coerce.number(), z.coerce.string()]), - battery_status: z.union([z.coerce.number(), z.coerce.string()]), + 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/SetSpecialTitle.ts b/src/onebot/action/extends/SetSpecialTitle.ts index 88c81e4f..2665a373 100644 --- a/src/onebot/action/extends/SetSpecialTitle.ts +++ b/src/onebot/action/extends/SetSpecialTitle.ts @@ -3,8 +3,8 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), - user_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), + user_id: z.coerce.string(), special_title: z.coerce.string().default(''), }); diff --git a/src/onebot/action/extends/ShareContact.ts b/src/onebot/action/extends/ShareContact.ts index 6194b445..d1419683 100644 --- a/src/onebot/action/extends/ShareContact.ts +++ b/src/onebot/action/extends/ShareContact.ts @@ -4,8 +4,8 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - user_id: z.union([z.coerce.number(), z.coerce.string()]).optional(), - group_id: z.union([z.coerce.number(), z.coerce.string()]).optional(), + user_id: z.coerce.string().optional(), + group_id: z.coerce.string().optional(), phoneNumber: z.coerce.string().default(''), }); @@ -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 c7b1f7bf..2c1da8c9 100644 --- a/src/onebot/action/extends/TransGroupFile.ts +++ b/src/onebot/action/extends/TransGroupFile.ts @@ -4,7 +4,7 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), file_id: z.coerce.string(), }); diff --git a/src/onebot/action/file/GetGroupFileUrl.ts b/src/onebot/action/file/GetGroupFileUrl.ts index f191a112..ea475659 100644 --- a/src/onebot/action/file/GetGroupFileUrl.ts +++ b/src/onebot/action/file/GetGroupFileUrl.ts @@ -4,7 +4,7 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), file_id: z.coerce.string(), }); diff --git a/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts b/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts index 900e7b74..f1f4c8ff 100644 --- a/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts +++ b/src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts @@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), folder_name: z.coerce.string(), }); diff --git a/src/onebot/action/go-cqhttp/DeleteGroupFile.ts b/src/onebot/action/go-cqhttp/DeleteGroupFile.ts index 80c71247..54b5ff6f 100644 --- a/src/onebot/action/go-cqhttp/DeleteGroupFile.ts +++ b/src/onebot/action/go-cqhttp/DeleteGroupFile.ts @@ -6,7 +6,7 @@ import { z } from 'zod'; import { NTQQGroupApi } from '@/core/apis'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), file_id: z.coerce.string(), }); diff --git a/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts b/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts index 94e5ade5..44c7767e 100644 --- a/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts +++ b/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts @@ -4,7 +4,7 @@ import { z } from 'zod'; import { NTQQGroupApi } from '@/core/apis'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), folder_id: z.coerce.string().optional(), folder: z.coerce.string().optional(), }); diff --git a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts index 1a585561..08500dee 100644 --- a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts @@ -10,9 +10,9 @@ interface Response { messages: OB11Message[]; } const SchemaData = z.object({ - user_id: z.union([z.coerce.number(), z.coerce.string()]), - message_seq: z.union([z.coerce.number(), z.coerce.string()]).optional(), - count: z.union([z.coerce.number(), z.coerce.string()]).default(20), + 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 cad70698..c5ff5d3c 100644 --- a/src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts +++ b/src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts @@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.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 81e78e27..7f9cc99f 100644 --- a/src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts +++ b/src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts @@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.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 e366fef3..f0431963 100644 --- a/src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts +++ b/src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts @@ -5,10 +5,10 @@ import { OB11Construct } from '@/onebot/helper/data'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), folder_id: z.coerce.string().optional(), folder: z.coerce.string().optional(), - file_count: z.union([z.coerce.number(), z.coerce.string()]).default(50), + 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 749b9412..9f30542a 100644 --- a/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts +++ b/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts @@ -4,7 +4,7 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.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 fff77c91..f9328d7f 100644 --- a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts @@ -11,9 +11,9 @@ interface Response { } const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), - message_seq: z.union([z.coerce.number(), z.coerce.string()]).optional(), - count: z.union([z.coerce.number(), z.coerce.string()]).default(20), + 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 737d54ec..9604e804 100644 --- a/src/onebot/action/go-cqhttp/GetGroupRootFiles.ts +++ b/src/onebot/action/go-cqhttp/GetGroupRootFiles.ts @@ -6,8 +6,8 @@ import { OB11Construct } from '@/onebot/helper/data'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), - file_count: z.union([z.coerce.number(), z.coerce.string()]).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 e0faf91d..480daa8d 100644 --- a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts +++ b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts @@ -6,7 +6,7 @@ import { calcQQLevel } from '@/common/helper'; import { z } from 'zod'; const SchemaData = z.object({ - user_id: z.union([z.coerce.number(), z.coerce.string()]), + user_id: z.coerce.string(), no_cache: z.coerce.boolean().default(false), }); diff --git a/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts b/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts index 3643e5d2..f828306a 100644 --- a/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts +++ b/src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts @@ -3,8 +3,8 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - friend_id: z.union([z.coerce.string(), z.coerce.number()]).optional(), - user_id: z.union([z.coerce.string(), z.coerce.number()]).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(), }); diff --git a/src/onebot/action/go-cqhttp/SendGroupNotice.ts b/src/onebot/action/go-cqhttp/SendGroupNotice.ts index b8df9c9c..e51c2355 100644 --- a/src/onebot/action/go-cqhttp/SendGroupNotice.ts +++ b/src/onebot/action/go-cqhttp/SendGroupNotice.ts @@ -5,14 +5,14 @@ import { unlink } from 'node:fs/promises'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), content: z.coerce.string(), image: z.coerce.string().optional(), - pinned: z.union([z.coerce.number(), z.coerce.string()]).default(0), - type: z.union([z.coerce.number(), z.coerce.string()]).default(1), - confirm_required: z.union([z.coerce.number(), z.coerce.string()]).default(1), - is_show_edit_card: z.union([z.coerce.number(), z.coerce.string()]).default(0), - tip_window_type: z.union([z.coerce.number(), z.coerce.string()]).default(0), + 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 c82b11b2..5c9e7091 100644 --- a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts +++ b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts @@ -6,7 +6,7 @@ import fs from 'node:fs/promises'; import { GeneralCallResult } from '@/core'; const SchemaData = z.object({ file: z.coerce.string(), - group_id: z.union([z.coerce.number(), 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 40ca8fe3..e7832fbc 100644 --- a/src/onebot/action/go-cqhttp/SetQQProfile.ts +++ b/src/onebot/action/go-cqhttp/SetQQProfile.ts @@ -6,7 +6,7 @@ import { z } from 'zod'; const SchemaData = z.object({ nickname: z.coerce.string(), personal_note: z.coerce.string().optional(), - sex: z.union([z.coerce.number(), z.coerce.string()]).optional(), // 传Sex值？建议传0 + 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 e9903f0f..32f63065 100644 --- a/src/onebot/action/go-cqhttp/UploadGroupFile.ts +++ b/src/onebot/action/go-cqhttp/UploadGroupFile.ts @@ -7,7 +7,7 @@ import { SendMessageContext } from '@/onebot/api'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), file: z.coerce.string(), name: z.coerce.string(), folder: z.coerce.string().optional(), diff --git a/src/onebot/action/go-cqhttp/UploadPrivateFile.ts b/src/onebot/action/go-cqhttp/UploadPrivateFile.ts index f43a3223..83379916 100644 --- a/src/onebot/action/go-cqhttp/UploadPrivateFile.ts +++ b/src/onebot/action/go-cqhttp/UploadPrivateFile.ts @@ -8,7 +8,7 @@ import { ContextMode, createContext } from '@/onebot/action/msg/SendMsg'; import { z } from 'zod'; const SchemaData = z.object({ - user_id: z.union([z.coerce.number(), z.coerce.string()]), + user_id: z.coerce.string(), file: z.coerce.string(), name: z.coerce.string(), }); diff --git a/src/onebot/action/group/DelEssenceMsg.ts b/src/onebot/action/group/DelEssenceMsg.ts index 644e5dbf..5f6490cc 100644 --- a/src/onebot/action/group/DelEssenceMsg.ts +++ b/src/onebot/action/group/DelEssenceMsg.ts @@ -4,7 +4,7 @@ import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; const SchemaData = z.object({ - message_id: z.union([z.coerce.number(), z.coerce.string()]), + message_id: z.coerce.string(), }); type Payload = z.infer; @@ -16,7 +16,7 @@ export default class DelEssenceMsg extends OneBotAction { const msg = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id); if (!msg) { const data = this.core.apis.GroupApi.essenceLRU.getValue(+payload.message_id); - if(!data) throw new Error('消息不存在'); + if (!data) throw new Error('消息不存在'); const { msg_seq, msg_random, group_id } = JSON.parse(data) as { msg_seq: string, msg_random: string, group_id: string }; return await this.core.apis.GroupApi.removeGroupEssenceBySeq(group_id, msg_seq, msg_random); } diff --git a/src/onebot/action/group/DelGroupNotice.ts b/src/onebot/action/group/DelGroupNotice.ts index 5668414c..11d23234 100644 --- a/src/onebot/action/group/DelGroupNotice.ts +++ b/src/onebot/action/group/DelGroupNotice.ts @@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), notice_id: z.coerce.string() }); diff --git a/src/onebot/action/group/GetAiRecord.ts b/src/onebot/action/group/GetAiRecord.ts index 86deeca0..8837551f 100644 --- a/src/onebot/action/group/GetAiRecord.ts +++ b/src/onebot/action/group/GetAiRecord.ts @@ -5,7 +5,7 @@ import { z } from 'zod'; const SchemaData = z.object({ character: z.coerce.string(), - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), text: z.coerce.string(), }); diff --git a/src/onebot/action/group/GetGroupEssence.ts b/src/onebot/action/group/GetGroupEssence.ts index 4f284e6f..9b46eb40 100644 --- a/src/onebot/action/group/GetGroupEssence.ts +++ b/src/onebot/action/group/GetGroupEssence.ts @@ -7,7 +7,7 @@ import { z } from 'zod'; import { NetworkAdapterConfig } from '@/onebot/config/config'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.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 1b8a3e64..d9695061 100644 --- a/src/onebot/action/group/GetGroupInfo.ts +++ b/src/onebot/action/group/GetGroupInfo.ts @@ -5,7 +5,7 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index ac14e3a9..79f9c4e7 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -5,8 +5,8 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), - user_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), + user_id: z.coerce.string(), no_cache: z.coerce.boolean().default(false), }); diff --git a/src/onebot/action/group/GetGroupMemberList.ts b/src/onebot/action/group/GetGroupMemberList.ts index 3afca128..6e0aac63 100644 --- a/src/onebot/action/group/GetGroupMemberList.ts +++ b/src/onebot/action/group/GetGroupMemberList.ts @@ -6,7 +6,7 @@ import { z } from 'zod'; import { GroupMember } from '@/core'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), no_cache: z.coerce.boolean().default(false) }); diff --git a/src/onebot/action/group/GetGroupNotice.ts b/src/onebot/action/group/GetGroupNotice.ts index 2a1cf2cf..50dd50b5 100644 --- a/src/onebot/action/group/GetGroupNotice.ts +++ b/src/onebot/action/group/GetGroupNotice.ts @@ -17,7 +17,7 @@ interface GroupNotice { } const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.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 e48d25ae..ba24fea1 100644 --- a/src/onebot/action/group/GetGroupShutList.ts +++ b/src/onebot/action/group/GetGroupShutList.ts @@ -4,7 +4,7 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.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 084effb1..a0efd74f 100644 --- a/src/onebot/action/group/GroupPoke.ts +++ b/src/onebot/action/group/GroupPoke.ts @@ -3,8 +3,8 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), - user_id: z.union([z.coerce.number(), z.coerce.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 88ed5118..d845e793 100644 --- a/src/onebot/action/group/SendGroupAiRecord.ts +++ b/src/onebot/action/group/SendGroupAiRecord.ts @@ -5,7 +5,7 @@ import { z } from 'zod'; const SchemaData = z.object({ character: z.coerce.string(), - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), text: z.coerce.string(), }); diff --git a/src/onebot/action/group/SetEssenceMsg.ts b/src/onebot/action/group/SetEssenceMsg.ts index 998f3e0b..80b7df56 100644 --- a/src/onebot/action/group/SetEssenceMsg.ts +++ b/src/onebot/action/group/SetEssenceMsg.ts @@ -4,7 +4,7 @@ import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; const SchemaData = z.object({ - message_id: z.union([z.coerce.number(), z.coerce.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 1bae2c48..a2fcb662 100644 --- a/src/onebot/action/group/SetGroupAddRequest.ts +++ b/src/onebot/action/group/SetGroupAddRequest.ts @@ -4,9 +4,9 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - flag: z.union([z.coerce.string(), z.coerce.number()]), + flag: z.coerce.string(), approve: z.coerce.boolean().default(true), - reason: z.union([z.coerce.string(), z.null()]).default(' '), + 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 97afba3b..d9e91397 100644 --- a/src/onebot/action/group/SetGroupAdmin.ts +++ b/src/onebot/action/group/SetGroupAdmin.ts @@ -4,8 +4,8 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), - user_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), + user_id: z.coerce.string(), enable: z.coerce.boolean().default(false), }); diff --git a/src/onebot/action/group/SetGroupBan.ts b/src/onebot/action/group/SetGroupBan.ts index 37fe0484..cb146e9d 100644 --- a/src/onebot/action/group/SetGroupBan.ts +++ b/src/onebot/action/group/SetGroupBan.ts @@ -3,9 +3,9 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), - user_id: z.union([z.coerce.number(), z.coerce.string()]), - duration: z.union([z.coerce.number(), z.coerce.string()]).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 1d4e59ca..a3a61ee5 100644 --- a/src/onebot/action/group/SetGroupCard.ts +++ b/src/onebot/action/group/SetGroupCard.ts @@ -3,8 +3,8 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), - user_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), + user_id: z.coerce.string(), card: z.coerce.string().optional(), }); diff --git a/src/onebot/action/group/SetGroupKick.ts b/src/onebot/action/group/SetGroupKick.ts index 98fa39e8..9aa31341 100644 --- a/src/onebot/action/group/SetGroupKick.ts +++ b/src/onebot/action/group/SetGroupKick.ts @@ -3,9 +3,9 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), - user_id: z.union([z.coerce.number(), z.coerce.string()]), - reject_add_request: z.union([z.coerce.boolean(), z.coerce.string()]).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 3cf7cd31..a830ad78 100644 --- a/src/onebot/action/group/SetGroupLeave.ts +++ b/src/onebot/action/group/SetGroupLeave.ts @@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), is_dismiss: z.coerce.boolean().optional(), }); diff --git a/src/onebot/action/group/SetGroupName.ts b/src/onebot/action/group/SetGroupName.ts index 61ebc27c..4b70af1a 100644 --- a/src/onebot/action/group/SetGroupName.ts +++ b/src/onebot/action/group/SetGroupName.ts @@ -4,7 +4,7 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string(), group_name: z.coerce.string(), }); diff --git a/src/onebot/action/group/SetGroupWholeBan.ts b/src/onebot/action/group/SetGroupWholeBan.ts index 75ce019c..06b16a27 100644 --- a/src/onebot/action/group/SetGroupWholeBan.ts +++ b/src/onebot/action/group/SetGroupWholeBan.ts @@ -3,8 +3,8 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]), - enable: z.union([z.coerce.boolean(), z.coerce.string()]).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 e6a345d7..87f38743 100644 --- a/src/onebot/action/msg/DeleteMsg.ts +++ b/src/onebot/action/msg/DeleteMsg.ts @@ -4,7 +4,7 @@ import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; const SchemaData = z.object({ - message_id: z.union([z.coerce.number(), z.coerce.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 b2a5f940..a737b8ab 100644 --- a/src/onebot/action/msg/ForwardSingleMsg.ts +++ b/src/onebot/action/msg/ForwardSingleMsg.ts @@ -5,7 +5,7 @@ import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; const SchemaData = z.object({ - message_id: z.union([z.coerce.number(), z.coerce.string()]), + message_id: z.coerce.string(), group_id: z.coerce.string().optional(), user_id: z.coerce.string().optional(), }); diff --git a/src/onebot/action/msg/GetMsg.ts b/src/onebot/action/msg/GetMsg.ts index da324844..83095c89 100644 --- a/src/onebot/action/msg/GetMsg.ts +++ b/src/onebot/action/msg/GetMsg.ts @@ -9,7 +9,7 @@ import { NetworkAdapterConfig } from '@/onebot/config/config'; export type ReturnDataType = OB11Message const SchemaData = z.object({ - message_id: z.union([z.coerce.number(), z.coerce.string()]), + message_id: z.coerce.string(), }); type Payload = z.infer; @@ -29,7 +29,7 @@ class GetMsg extends OneBotAction { } const peer = { guildId: '', peerUid: msgIdWithPeer?.Peer.peerUid, chatType: msgIdWithPeer.Peer.chatType }; const orimsg = this.obContext.recallMsgCache.get(msgIdWithPeer.MsgId); - let msg: RawMessage|undefined; + let msg: RawMessage | undefined; if (orimsg) { msg = orimsg; } else { diff --git a/src/onebot/action/msg/MarkMsgAsRead.ts b/src/onebot/action/msg/MarkMsgAsRead.ts index 65506445..7bb6f9eb 100644 --- a/src/onebot/action/msg/MarkMsgAsRead.ts +++ b/src/onebot/action/msg/MarkMsgAsRead.ts @@ -5,9 +5,9 @@ import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; const SchemaData = z.object({ - user_id: z.union([z.coerce.string(), z.coerce.number()]).optional(), - group_id: z.union([z.coerce.string(), z.coerce.number()]).optional(), - message_id: z.union([z.coerce.string(), z.coerce.number()]).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 7f4e173a..9d2c5bb0 100644 --- a/src/onebot/action/msg/SetMsgEmojiLike.ts +++ b/src/onebot/action/msg/SetMsgEmojiLike.ts @@ -4,8 +4,8 @@ import { MessageUnique } from '@/common/message-unique'; import { z } from 'zod'; const SchemaData = z.object({ - message_id: z.union([z.coerce.number(), z.coerce.string()]), - emoji_id: z.union([z.coerce.number(), z.coerce.string()]), + message_id: z.coerce.string(), + emoji_id: z.coerce.string(), set: z.coerce.boolean().optional(), }); diff --git a/src/onebot/action/packet/SendPoke.ts b/src/onebot/action/packet/SendPoke.ts index c362cc8f..02e06c90 100644 --- a/src/onebot/action/packet/SendPoke.ts +++ b/src/onebot/action/packet/SendPoke.ts @@ -3,8 +3,8 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; const SchemaData = z.object({ - group_id: z.union([z.coerce.number(), z.coerce.string()]).optional(), - user_id: z.union([z.coerce.number(), z.coerce.string()]), + group_id: z.coerce.string().optional(), + user_id: z.coerce.string(), }); type Payload = z.infer; diff --git a/src/onebot/action/user/FriendPoke.ts b/src/onebot/action/user/FriendPoke.ts index 625eaa16..3eccae07 100644 --- a/src/onebot/action/user/FriendPoke.ts +++ b/src/onebot/action/user/FriendPoke.ts @@ -3,7 +3,7 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { z } from 'zod'; const SchemaData = z.object({ - user_id: z.union([z.coerce.number(), z.coerce.string()]) + user_id: z.coerce.string() }); type Payload = z.infer; diff --git a/src/onebot/action/user/SendLike.ts b/src/onebot/action/user/SendLike.ts index 215d2440..4804184b 100644 --- a/src/onebot/action/user/SendLike.ts +++ b/src/onebot/action/user/SendLike.ts @@ -3,8 +3,8 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - times: z.union([z.coerce.number(), z.coerce.string()]).default(1), - user_id: z.union([z.coerce.number(), z.coerce.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 070901c9..ef1fa7fb 100644 --- a/src/onebot/action/user/SetFriendAddRequest.ts +++ b/src/onebot/action/user/SetFriendAddRequest.ts @@ -3,9 +3,9 @@ import { ActionName } from '@/onebot/action/router'; import { z } from 'zod'; const SchemaData = z.object({ - flag: z.union([z.coerce.string(), z.coerce.number()]), - approve: z.union([z.coerce.string(), z.coerce.boolean()]).default(true), - remark: z.union([z.coerce.string(), z.null()]).nullable().optional() + flag: z.coerce.string(), + approve: z.coerce.boolean().default(true), + remark: z.coerce.string().nullable().optional() }); type Payload = z.infer;