From 86da417c17566ac81b881b73a1128d8b6199ef20 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: Thu, 14 Nov 2024 20:44:14 +0800 Subject: [PATCH 1/4] feat: add SetMsgEmojiLike --- src/onebot/action/msg/SetMsgEmojiLike.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/onebot/action/msg/SetMsgEmojiLike.ts b/src/onebot/action/msg/SetMsgEmojiLike.ts index 8ceb32bc..065538f0 100644 --- a/src/onebot/action/msg/SetMsgEmojiLike.ts +++ b/src/onebot/action/msg/SetMsgEmojiLike.ts @@ -8,6 +8,7 @@ const SchemaData = { properties: { message_id: { type: ['string', 'number'] }, emoji_id: { type: ['string', 'number'] }, + set: { type: ['boolean', 'string'] } }, required: ['message_id', 'emoji_id'], } as const satisfies JSONSchema; @@ -26,10 +27,19 @@ export class SetMsgEmojiLike extends BaseAction { if (!payload.emoji_id) { throw new Error('emojiId not found'); } + if (!payload.set) { + payload.set = true; + } + const msgData = (await this.core.apis.MsgApi.getMsgsByMsgId(msg.Peer, [msg.MsgId])).msgList; if (!msgData || msgData.length == 0 || !msgData[0].msgSeq) { throw new Error('find msg by msgid error'); } - return await this.core.apis.MsgApi.setEmojiLike(msg.Peer, msgData[0].msgSeq, payload.emoji_id.toString(), true); + return await this.core.apis.MsgApi.setEmojiLike( + msg.Peer, + msgData[0].msgSeq, + payload.emoji_id.toString(), + typeof payload.set == 'string' ? payload.set === 'true' : !!payload + ); } } From aad5ed55d2ce57b0b87d983834dcd70838f2f491 Mon Sep 17 00:00:00 2001 From: Mlikiowa Date: Thu, 14 Nov 2024 12:45:02 +0000 Subject: [PATCH 2/4] release: v4.0.2 --- manifest.json | 2 +- package.json | 2 +- src/common/version.ts | 2 +- static/assets/renderer.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 01ca0f73..f249d21e 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCatQQ", "slug": "NapCat.Framework", "description": "高性能的 OneBot 11 协议实现", - "version": "4.0.1", + "version": "4.0.2", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index 059dbd0a..96f6d04a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "4.0.1", + "version": "4.0.2", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", diff --git a/src/common/version.ts b/src/common/version.ts index 403b1516..89645c54 100644 --- a/src/common/version.ts +++ b/src/common/version.ts @@ -1 +1 @@ -export const napCatVersion = '4.0.1'; +export const napCatVersion = '4.0.2'; diff --git a/static/assets/renderer.js b/static/assets/renderer.js index c9e4fa7e..8af58835 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V4.0.1", "napcat-update-button", "secondary") + SettingButton("V4.0.2", "napcat-update-button", "secondary") ) ]), SettingList([ From 89f78926812fbbb5b01c4b8e5d1bbe8aa810aa2b 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: Thu, 14 Nov 2024 23:30:52 +0800 Subject: [PATCH 3/4] fix: rkey --- src/core/apis/file.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index 192c1237..b0cd2309 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -472,7 +472,7 @@ export class NTQQFileApi { return IMAGE_HTTP_HOST_NT + urlRkey; } else if (isNTV2 && rkeyData.online_rkey) { const rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey; - return IMAGE_HTTP_HOST_NT + parsedUrl.pathname + `&rkey=${rkey}`; + return IMAGE_HTTP_HOST_NT + `/download?appid=${imageAppid}&fileid=${imageFileId}&rkey=${rkey}`; } else if (isNTV2 && imageFileId) { const rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey; return IMAGE_HTTP_HOST + `/download?appid=${imageAppid}&fileid=${imageFileId}&rkey=${rkey}`; From 74b4d9bf492916ec3b99014d43581623d120ba30 Mon Sep 17 00:00:00 2001 From: Mlikiowa Date: Thu, 14 Nov 2024 15:34:43 +0000 Subject: [PATCH 4/4] release: v4.0.3 --- manifest.json | 2 +- package.json | 2 +- src/common/version.ts | 2 +- static/assets/renderer.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index f249d21e..1e92fb89 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCatQQ", "slug": "NapCat.Framework", "description": "高性能的 OneBot 11 协议实现", - "version": "4.0.2", + "version": "4.0.3", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index 96f6d04a..fad84da5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "4.0.2", + "version": "4.0.3", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", diff --git a/src/common/version.ts b/src/common/version.ts index 89645c54..03e1c309 100644 --- a/src/common/version.ts +++ b/src/common/version.ts @@ -1 +1 @@ -export const napCatVersion = '4.0.2'; +export const napCatVersion = '4.0.3'; diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 8af58835..d662d353 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V4.0.2", "napcat-update-button", "secondary") + SettingButton("V4.0.3", "napcat-update-button", "secondary") ) ]), SettingList([