From 8e14b399691baefc74c19bba74b439e786f5388b 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 00:38:04 +0800 Subject: [PATCH] release: 2.0.16 --- manifest.json | 2 +- package.json | 2 +- src/common/framework/napcat.ts | 2 +- src/core/apis/user.ts | 14 ++++---------- src/onebot/action/group/GetGroupEssence.ts | 4 ++-- src/onebot/action/group/GetGroupMemberInfo.ts | 2 +- src/onebot/action/group/GetGroupMemberList.ts | 2 +- .../action/msg/SendMsg/create-send-elements.ts | 4 ++-- src/onebot/helper/data.ts | 2 +- src/webui/ui/NapCat.ts | 2 +- static/assets/renderer.js | 2 +- 11 files changed, 16 insertions(+), 22 deletions(-) diff --git a/manifest.json b/manifest.json index 33e7d65c..4c64366d 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCat", "slug": "NapCat", "description": "现代化的 OneBot 11 协议实现", - "version": "2.0.15", + "version": "2.0.16", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index 667c6f3c..c9560bac 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "2.0.15", + "version": "2.0.16", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", diff --git a/src/common/framework/napcat.ts b/src/common/framework/napcat.ts index f1c104da..8a67a412 100644 --- a/src/common/framework/napcat.ts +++ b/src/common/framework/napcat.ts @@ -2,7 +2,7 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import fs from 'fs'; -export const napcat_version = '2.0.15'; +export const napcat_version = '2.0.16'; export class NapCatPathWrapper { binaryPath: string; diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts index 71e1f423..98676254 100644 --- a/src/core/apis/user.ts +++ b/src/core/apis/user.ts @@ -155,16 +155,10 @@ export class NTQQUserApi { //需要异常处理 async getCookies(domain: string) { const ClientKeyData = await this.forceFetchClientKey(); - const requestUrl = `https://ssl.ptlogin2.qq.com/jump?${ - new URLSearchParams({ - ptlang: '1033', - clientuin: this.core.selfInfo.uin, - clientkey: ClientKeyData.clientKey, - u1: `https://user.qzone.qq.com/${this.core.selfInfo.uin}/infocenter`, - keyindex: '19', - }) - }`; - return await RequestUtil.HttpsGetCookies(requestUrl); + const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + this.core.selfInfo.uin + + '&clientkey=' + ClientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + this.core.selfInfo.uin + '%2Finfocenter&keyindex=19%27' + let cookies: { [key: string]: string; } = await RequestUtil.HttpsGetCookies(requestUrl); + return cookies; } async getPSkey(domainList: string[]) { diff --git a/src/onebot/action/group/GetGroupEssence.ts b/src/onebot/action/group/GetGroupEssence.ts index 135d5425..c17db16a 100644 --- a/src/onebot/action/group/GetGroupEssence.ts +++ b/src/onebot/action/group/GetGroupEssence.ts @@ -9,7 +9,7 @@ const SchemaData = { group_id: { type: ['number', 'string'] }, pages: { type: 'number' }, }, - required: ['group_id', 'pages'], + required: ['group_id'], } as const satisfies JSONSchema; type Payload = FromSchema; @@ -20,7 +20,7 @@ export class GetGroupEssence extends BaseAction { async _handle(payload: Payload) { const NTQQWebApi = this.CoreContext.apis.WebApi; - const ret = await NTQQWebApi.getGroupEssenceMsg(payload.group_id.toString(), payload.pages.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/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index 78c93208..6d65192c 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -69,7 +69,7 @@ class GetGroupMemberInfo extends BaseAction { } } } else { - // Mlikiowa V2.0.15 Refactor Todo + // Mlikiowa V2.0.16 Refactor Todo // retMember.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString()); // retMember.join_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString()); } diff --git a/src/onebot/action/group/GetGroupMemberList.ts b/src/onebot/action/group/GetGroupMemberList.ts index 66f2a703..7287afdb 100644 --- a/src/onebot/action/group/GetGroupMemberList.ts +++ b/src/onebot/action/group/GetGroupMemberList.ts @@ -83,7 +83,7 @@ class GetGroupMemberList extends BaseAction { } } } else { - // Mlikiowa V2.0.15 Refactor Todo + // Mlikiowa V2.0.16 Refactor Todo // _groupMembers.forEach(async item => { // item.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.lastSpeakTime || date.toString()); // item.join_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.joinTime || date.toString()); diff --git a/src/onebot/action/msg/SendMsg/create-send-elements.ts b/src/onebot/action/msg/SendMsg/create-send-elements.ts index 871e8160..3a02efb5 100644 --- a/src/onebot/action/msg/SendMsg/create-send-elements.ts +++ b/src/onebot/action/msg/SendMsg/create-send-elements.ts @@ -56,7 +56,7 @@ const _handlers: { if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员'); // then the qq is a group member - // Mlikiowa V2.0.15 Refactor Todo + // Mlikiowa V2.0.16 Refactor Todo const uid = await coreContext.apis.UserApi.getUidByUinV2(atQQ); if (!uid) throw new Error('Get Uid Error'); return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, ''); @@ -161,7 +161,7 @@ const _handlers: { } else { postData = data; } - // Mlikiowa V2.0.15 Refactor Todo + // Mlikiowa V2.0.16 Refactor Todo const signUrl = obContext.configLoader.configData.musicSignUrl; if (!signUrl) { if (data.type === 'qq') { diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index d2e6573b..346fde95 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -417,7 +417,7 @@ export class OB11Constructor { return; } //log("group msg", msg); - // Mlikiowa V2.0.15 Refactor Todo + // Mlikiowa V2.0.16 Refactor Todo // if (msg.senderUin && msg.senderUin !== '0') { // const member = await getGroupMember(msg.peerUid, msg.senderUin); // if (member && member.cardName !== msg.sendMemberName) { diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index d11d191a..7d8e7c8e 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) { SettingItem( 'Napcat', undefined, - SettingButton('V2.0.15', 'napcat-update-button', 'secondary'), + SettingButton('V2.0.16', 'napcat-update-button', 'secondary'), ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 97f8aa78..40512148 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V2.0.15", "napcat-update-button", "secondary") + SettingButton("V2.0.16", "napcat-update-button", "secondary") ) ]), SettingList([