diff --git a/src/onebot/action/extends/MoveGroupFile.ts b/src/onebot/action/extends/MoveGroupFile.ts index 05c92220..7e8e6f89 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 06bb1f48..918bcfd2 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 df36e0be..c7962d62 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.coerce.string(),// 参考 face_config.json 的 QSid - face_type: z.coerce.string().default('1'), + 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'), wording: z.coerce.string().default(' '), }); diff --git a/src/onebot/action/extends/SetGroupSign.ts b/src/onebot/action/extends/SetGroupSign.ts index 3d22da22..67687b34 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.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SetInputStatus.ts b/src/onebot/action/extends/SetInputStatus.ts index 76324901..397957e6 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.coerce.string(), + user_id: z.union([z.coerce.number(), 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 10101b9a..53051824 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.coerce.number(), - ext_status: z.coerce.number(), - battery_status: z.coerce.number(), + 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()]), }); type Payload = z.infer; diff --git a/src/onebot/action/extends/SetSpecialTitle.ts b/src/onebot/action/extends/SetSpecialTitle.ts index 2665a373..88c81e4f 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.coerce.string(), - user_id: z.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), + user_id: z.union([z.coerce.number(), 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 d1419683..6194b445 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.coerce.string().optional(), - group_id: z.coerce.string().optional(), + user_id: z.union([z.coerce.number(), z.coerce.string()]).optional(), + group_id: z.union([z.coerce.number(), 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 2c1da8c9..c7b1f7bf 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 ea475659..f191a112 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 f1f4c8ff..900e7b74 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 54b5ff6f..80c71247 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 44c7767e..94e5ade5 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 08500dee..1a585561 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.coerce.string(), - message_seq: z.coerce.string().optional(), - count: z.coerce.number().default(20), + 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), 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 c5ff5d3c..cad70698 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.coerce.string() + group_id: z.union([z.coerce.number(), 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 7f9cc99f..81e78e27 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.coerce.string() + group_id: z.union([z.coerce.number(), 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 f0431963..e366fef3 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.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), folder_id: z.coerce.string().optional(), folder: z.coerce.string().optional(), - file_count: z.coerce.number().default(50), + file_count: z.union([z.coerce.number(), z.coerce.string()]).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 9f30542a..749b9412 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 f9328d7f..fff77c91 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.coerce.string(), - message_seq: z.coerce.string().optional(), - count: z.coerce.number().default(20), + 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), 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 9604e804..737d54ec 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.coerce.string(), - file_count: z.coerce.number().default(50), + group_id: z.union([z.coerce.number(), z.coerce.string()]), + file_count: z.union([z.coerce.number(), z.coerce.string()]).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 480daa8d..e0faf91d 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.coerce.string(), + user_id: z.union([z.coerce.number(), 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 f828306a..3643e5d2 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.coerce.string().optional(), - user_id: z.coerce.string().optional(), + friend_id: z.union([z.coerce.string(), z.coerce.number()]).optional(), + user_id: z.union([z.coerce.string(), z.coerce.number()]).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 e51c2355..b8df9c9c 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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), + 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), }); type Payload = z.infer; diff --git a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts index 5c9e7091..c82b11b2 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.coerce.string() + group_id: z.union([z.coerce.number(), 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 e7832fbc..40ca8fe3 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.coerce.string().optional(), // 传Sex值?建议传0 + sex: z.union([z.coerce.number(), 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 32f63065..e9903f0f 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 83379916..f43a3223 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.coerce.string(), + user_id: z.union([z.coerce.number(), 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 5f6490cc..644e5dbf 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.coerce.string(), + message_id: z.union([z.coerce.number(), 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 11d23234..5668414c 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 8837551f..86deeca0 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.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), text: z.coerce.string(), }); diff --git a/src/onebot/action/group/GetGroupEssence.ts b/src/onebot/action/group/GetGroupEssence.ts index 9b46eb40..4f284e6f 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.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupInfo.ts b/src/onebot/action/group/GetGroupInfo.ts index d9695061..1b8a3e64 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.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index 79f9c4e7..ac14e3a9 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.coerce.string(), - user_id: z.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), + user_id: z.union([z.coerce.number(), 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 6e0aac63..3afca128 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 50dd50b5..2a1cf2cf 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.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GetGroupShutList.ts b/src/onebot/action/group/GetGroupShutList.ts index ba24fea1..e48d25ae 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.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), }); type Payload = z.infer; diff --git a/src/onebot/action/group/GroupPoke.ts b/src/onebot/action/group/GroupPoke.ts index a0efd74f..084effb1 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.coerce.string(), - user_id: z.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), + user_id: z.union([z.coerce.number(), z.coerce.string()]), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SendGroupAiRecord.ts b/src/onebot/action/group/SendGroupAiRecord.ts index d845e793..88ed5118 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.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), text: z.coerce.string(), }); diff --git a/src/onebot/action/group/SetEssenceMsg.ts b/src/onebot/action/group/SetEssenceMsg.ts index 80b7df56..998f3e0b 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.coerce.string(), + message_id: z.union([z.coerce.number(), z.coerce.string()]), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupAddRequest.ts b/src/onebot/action/group/SetGroupAddRequest.ts index a2fcb662..1bae2c48 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.coerce.string(), + flag: z.union([z.coerce.string(), z.coerce.number()]), approve: z.coerce.boolean().default(true), - reason: z.coerce.string().nullable().default(' '), + reason: z.union([z.coerce.string(), z.null()]).default(' '), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupAdmin.ts b/src/onebot/action/group/SetGroupAdmin.ts index d9e91397..97afba3b 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.coerce.string(), - user_id: z.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), + user_id: z.union([z.coerce.number(), 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 cb146e9d..37fe0484 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.coerce.string(), - user_id: z.coerce.string(), - duration: z.coerce.number().default(0), + 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), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupCard.ts b/src/onebot/action/group/SetGroupCard.ts index a3a61ee5..1d4e59ca 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.coerce.string(), - user_id: z.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), + user_id: z.union([z.coerce.number(), 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 9aa31341..98fa39e8 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.coerce.string(), - user_id: z.coerce.string(), - reject_add_request: z.coerce.boolean().optional(), + 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(), }); type Payload = z.infer; diff --git a/src/onebot/action/group/SetGroupLeave.ts b/src/onebot/action/group/SetGroupLeave.ts index a830ad78..3cf7cd31 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 4b70af1a..61ebc27c 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.coerce.string(), + group_id: z.union([z.coerce.number(), 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 06b16a27..75ce019c 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.coerce.string(), - enable: z.coerce.boolean().optional(), + group_id: z.union([z.coerce.number(), z.coerce.string()]), + enable: z.union([z.coerce.boolean(), z.coerce.string()]).optional(), }); type Payload = z.infer; diff --git a/src/onebot/action/msg/DeleteMsg.ts b/src/onebot/action/msg/DeleteMsg.ts index 87f38743..e6a345d7 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.coerce.string(), + message_id: z.union([z.coerce.number(), z.coerce.string()]), }); type Payload = z.infer; diff --git a/src/onebot/action/msg/ForwardSingleMsg.ts b/src/onebot/action/msg/ForwardSingleMsg.ts index a737b8ab..b2a5f940 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.coerce.string(), + message_id: z.union([z.coerce.number(), 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 83095c89..da324844 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.coerce.string(), + message_id: z.union([z.coerce.number(), 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 7bb6f9eb..65506445 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.coerce.string().optional(), - group_id: z.coerce.string().optional(), - message_id: z.coerce.string().optional(), + 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(), }); type PlayloadType = z.infer; diff --git a/src/onebot/action/msg/SetMsgEmojiLike.ts b/src/onebot/action/msg/SetMsgEmojiLike.ts index 9d2c5bb0..7f4e173a 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.coerce.string(), - emoji_id: z.coerce.string(), + message_id: z.union([z.coerce.number(), z.coerce.string()]), + emoji_id: z.union([z.coerce.number(), 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 02e06c90..c362cc8f 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.coerce.string().optional(), - user_id: z.coerce.string(), + group_id: z.union([z.coerce.number(), z.coerce.string()]).optional(), + user_id: z.union([z.coerce.number(), z.coerce.string()]), }); type Payload = z.infer; diff --git a/src/onebot/action/user/FriendPoke.ts b/src/onebot/action/user/FriendPoke.ts index 3eccae07..625eaa16 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.coerce.string() + user_id: z.union([z.coerce.number(), z.coerce.string()]) }); type Payload = z.infer; diff --git a/src/onebot/action/user/SendLike.ts b/src/onebot/action/user/SendLike.ts index 4804184b..215d2440 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.coerce.number().default(1), - user_id: z.coerce.string() + times: z.union([z.coerce.number(), z.coerce.string()]).default(1), + user_id: z.union([z.coerce.number(), z.coerce.string()]) }); type Payload = z.infer; diff --git a/src/onebot/action/user/SetFriendAddRequest.ts b/src/onebot/action/user/SetFriendAddRequest.ts index ef1fa7fb..070901c9 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.coerce.string(), - approve: z.coerce.boolean().default(true), - remark: z.coerce.string().nullable().optional() + 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() }); type Payload = z.infer;