From 5770fc02a1bd6acf43d522e562374ade4fc598b9 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: Wed, 14 Aug 2024 23:56:45 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20extend=20get=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/onebot/action/extends/FetchCustomFace.ts | 4 ++-- src/onebot/action/extends/FetchEmojiLike.ts | 4 ++-- src/onebot/action/extends/GetCollectionList.ts | 6 +++--- src/onebot/action/extends/SetOnlineStatus.ts | 18 ++++++++---------- src/onebot/action/extends/SetSelfProfile.ts | 4 ++-- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/onebot/action/extends/FetchCustomFace.ts b/src/onebot/action/extends/FetchCustomFace.ts index 36984783..14bdf610 100644 --- a/src/onebot/action/extends/FetchCustomFace.ts +++ b/src/onebot/action/extends/FetchCustomFace.ts @@ -5,7 +5,7 @@ import { ActionName } from '../types'; const SchemaData = { type: 'object', properties: { - count: { type: 'number' }, + count: { type: ['number', 'string'] }, }, } as const satisfies JSONSchema; @@ -17,7 +17,7 @@ export class FetchCustomFace extends BaseAction { async _handle(payload: Payload) { //48 可能正好是QQ需要的一个页面的数量 Tagged Mlikiowa - const ret = await this.CoreContext.apis.MsgApi.fetchFavEmojiList(payload.count || 48); + const ret = await this.CoreContext.apis.MsgApi.fetchFavEmojiList(parseInt((payload.count || '0').toString()) || 48); return ret.emojiInfoList.map(e => e.url); } } diff --git a/src/onebot/action/extends/FetchEmojiLike.ts b/src/onebot/action/extends/FetchEmojiLike.ts index 05cc67ac..2d9a9ce6 100644 --- a/src/onebot/action/extends/FetchEmojiLike.ts +++ b/src/onebot/action/extends/FetchEmojiLike.ts @@ -12,7 +12,7 @@ const SchemaData = { emojiId: { type: 'string' }, emojiType: { type: 'string' }, message_id: { type: ['string', 'number'] }, - count: { type: 'number' }, + count: { type: ['string', 'number'] }, }, required: ['emojiId', 'emojiType', 'message_id'], } as const satisfies JSONSchema; @@ -27,6 +27,6 @@ export class FetchEmojiLike extends BaseAction { const msgIdPeer = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString())); if (!msgIdPeer) throw new Error('消息不存在'); const msg = (await NTQQMsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0]; - return await NTQQMsgApi.getMsgEmojiLikesList(msgIdPeer.Peer, msg.msgSeq, payload.emojiId, payload.emojiType, payload.count); + return await NTQQMsgApi.getMsgEmojiLikesList(msgIdPeer.Peer, msg.msgSeq, payload.emojiId, payload.emojiType, parseInt((payload.count || '0').toString()) || 20); } } diff --git a/src/onebot/action/extends/GetCollectionList.ts b/src/onebot/action/extends/GetCollectionList.ts index b4a4c43e..ebc82e2b 100644 --- a/src/onebot/action/extends/GetCollectionList.ts +++ b/src/onebot/action/extends/GetCollectionList.ts @@ -5,8 +5,8 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; const SchemaData = { type: 'object', properties: { - category: { type: 'number' }, - count: { type: 'number' }, + category: { type: ['number', 'string'] }, + count: { type: ['number', 'string'] }, }, required: ['category', 'count'], } as const satisfies JSONSchema; @@ -18,6 +18,6 @@ export class GetCollectionList extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { const NTQQCollectionApi = this.CoreContext.apis.CollectionApi; - return await NTQQCollectionApi.getAllCollection(payload.category, payload.count); + return await NTQQCollectionApi.getAllCollection(parseInt(payload.category.toString()), parseInt(payload.count.toString())); } } diff --git a/src/onebot/action/extends/SetOnlineStatus.ts b/src/onebot/action/extends/SetOnlineStatus.ts index c64ffaea..efbcc818 100644 --- a/src/onebot/action/extends/SetOnlineStatus.ts +++ b/src/onebot/action/extends/SetOnlineStatus.ts @@ -6,9 +6,9 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; const SchemaData = { type: 'object', properties: { - status: { type: 'number' }, - extStatus: { type: 'number' }, - batteryStatus: { type: 'number' }, + status: { type: ['number', 'string'] }, + extStatus: { type: ['number', 'string'] }, + batteryStatus: { type: ['number', 'string'] }, }, required: ['status', 'extStatus', 'batteryStatus'], } as const satisfies JSONSchema; @@ -20,14 +20,12 @@ export class SetOnlineStatus extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - // 可设置状态 - // { status: 10, extStatus: 1027, batteryStatus: 0 } - // { status: 30, extStatus: 0, batteryStatus: 0 } - // { status: 50, extStatus: 0, batteryStatus: 0 } - // { status: 60, extStatus: 0, batteryStatus: 0 } - // { status: 70, extStatus: 0, batteryStatus: 0 } const NTQQUserApi = this.CoreContext.apis.UserApi; - const ret = await NTQQUserApi.setSelfOnlineStatus(payload.status, payload.extStatus, payload.batteryStatus); + const ret = await NTQQUserApi.setSelfOnlineStatus( + parseInt(payload.status.toString()), + parseInt(payload.extStatus.toString()), + parseInt(payload.batteryStatus.toString()) + ); if (ret.result !== 0) { throw new Error('设置在线状态失败'); } diff --git a/src/onebot/action/extends/SetSelfProfile.ts b/src/onebot/action/extends/SetSelfProfile.ts index 84b64a92..4c60f0ea 100644 --- a/src/onebot/action/extends/SetSelfProfile.ts +++ b/src/onebot/action/extends/SetSelfProfile.ts @@ -7,7 +7,7 @@ const SchemaData = { properties: { nick: { type: 'string' }, longNick: { type: 'string' }, - sex: { type: 'number' },//传Sex值？建议传0 + sex: { type: ['number', 'string'] },//传Sex值？建议传0 }, required: ['nick', 'longNick', 'sex'], } as const satisfies JSONSchema; @@ -23,7 +23,7 @@ export class SetSelfProfile extends BaseAction { const ret = await NTQQUserApi.modifySelfProfile({ nick: payload.nick, longNick: payload.longNick, - sex: payload.sex, + sex: parseInt(payload.sex.toString()), birthday: { birthday_year: '', birthday_month: '', birthday_day: '' }, location: undefined, });