diff --git a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts index 646a0e94..5490ae7c 100644 --- a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts @@ -15,7 +15,7 @@ const SchemaData = { user_id: { type: ['number', 'string'] }, message_seq: { type: 'number' }, count: { type: ['number', 'string'] }, - reverseOrder: { type: 'boolean' }, + reverseOrder: { type: ['boolean', 'string'] }, }, required: ['user_id'], } as const satisfies JSONSchema; @@ -33,7 +33,7 @@ export default class GetFriendMsgHistory extends BaseAction { //处理参数 const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); const MsgCount = +(payload.count ?? 20); - const isReverseOrder = payload.reverseOrder || true; + const isReverseOrder = typeof payload.reverseOrder === 'string' ? payload.reverseOrder === 'true' : !!payload.reverseOrder; if (!uid) throw `记录${payload.user_id}不存在`; const friend = await NTQQFriendApi.isBuddy(uid); const peer = { chatType: friend ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid: uid }; diff --git a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts index a14067a1..9897a84c 100644 --- a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts @@ -15,7 +15,7 @@ const SchemaData = { group_id: { type: ['number', 'string'] }, message_seq: { type: 'number' }, count: { type: ['number', 'string'] }, - reverseOrder: { type: 'boolean' }, + reverseOrder: { type: ['boolean', 'string'] }, }, required: ['group_id'], } as const satisfies JSONSchema; @@ -29,7 +29,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction { const NTQQMsgApi = this.core.apis.MsgApi; //处理参数 - const isReverseOrder = payload.reverseOrder || true; + const isReverseOrder = typeof payload.reverseOrder === 'string' ? payload.reverseOrder === 'true' : !!payload.reverseOrder; const MsgCount = +(payload.count ?? 20); const peer: Peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() }; //拉取消息 diff --git a/src/onebot/action/go-cqhttp/SendGroupNotice.ts b/src/onebot/action/go-cqhttp/SendGroupNotice.ts index 6a5a52bc..34e42fca 100644 --- a/src/onebot/action/go-cqhttp/SendGroupNotice.ts +++ b/src/onebot/action/go-cqhttp/SendGroupNotice.ts @@ -10,8 +10,8 @@ const SchemaData = { group_id: { type: ['number', 'string'] }, content: { type: 'string' }, image: { type: 'string' }, - pinned: { type: 'number' }, - confirmRequired: { type: 'number' }, + pinned: { type: ['number', 'string'] }, + confirmRequired: { type: ['number', 'string'] }, }, required: ['group_id', 'content'], } as const satisfies JSONSchema; @@ -49,14 +49,8 @@ export class SendGroupNotice extends BaseAction { } UploadImage = ImageUploadResult.picInfo; } - let Notice_Pinned = 0; - let Notice_confirmRequired = 0; - if (!payload.pinned) { - Notice_Pinned = 0; - } - if (!payload.confirmRequired) { - Notice_confirmRequired = 0; - } + let Notice_Pinned = +(payload.pinned ?? 0); + let Notice_confirmRequired = +(payload.confirmRequired ?? 0); const PublishGroupBulletinResult = await NTQQGroupApi.publishGroupBulletin(payload.group_id.toString(), payload.content, UploadImage, Notice_Pinned, Notice_confirmRequired); if (PublishGroupBulletinResult.result != 0) { diff --git a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts index 7828a28c..c329906b 100644 --- a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts +++ b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts @@ -3,8 +3,6 @@ import { ActionName, BaseCheckResult } from '../types'; import * as fs from 'node:fs'; import { checkFileReceived, uri2local } from '@/common/utils/file'; -// import { log } from "../../../common/utils"; - interface Payload { file: string, group_id: number @@ -42,7 +40,6 @@ export default class SetGroupPortrait extends BaseAction { if (!ret) { throw `头像${payload.file}设置失败,api无返回`; } - // log(`头像设置返回:${JSON.stringify(ret)}`) if (ret['result'] == 1004022) { throw `头像${payload.file}设置失败,文件可能不是图片格式或权限不足`; } else if (ret['result'] != 0) { diff --git a/src/onebot/action/group/GetGroupEssence.ts b/src/onebot/action/group/GetGroupEssence.ts index a54575f6..74c52aa6 100644 --- a/src/onebot/action/group/GetGroupEssence.ts +++ b/src/onebot/action/group/GetGroupEssence.ts @@ -7,7 +7,7 @@ const SchemaData = { type: 'object', properties: { group_id: { type: ['number', 'string'] }, - pages: { type: 'number' }, + pages: { type: ['number', 'string'] }, }, required: ['group_id'], } as const satisfies JSONSchema; @@ -20,7 +20,7 @@ export class GetGroupEssence extends BaseAction { async _handle(payload: Payload) { const NTQQWebApi = this.core.apis.WebApi; - const ret = await NTQQWebApi.getGroupEssenceMsg(payload.group_id.toString(), (payload.pages || "0").toString()); + const ret = await NTQQWebApi.getGroupEssenceMsg(payload.group_id.toString(), (+(payload.pages ?? 0)).toString()); if (!ret) { throw new Error('获取失败'); } diff --git a/src/onebot/action/group/GetGroupNotice.ts b/src/onebot/action/group/GetGroupNotice.ts index af764d91..214920f0 100644 --- a/src/onebot/action/group/GetGroupNotice.ts +++ b/src/onebot/action/group/GetGroupNotice.ts @@ -45,7 +45,6 @@ export class GetGroupNotice extends BaseAction { for (const key in ret.feeds) { const retApiNotice: WebApiGroupNoticeFeed = ret.feeds[key]; const retNotice: GroupNotice = { - //...ret.feeds[key], notice_id: retApiNotice.fid, sender_id: retApiNotice.u, publish_time: retApiNotice.pubt,