From 91b794d66d659a72fdbcf99e68adb0780f68fd1c 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, 19 Sep 2024 20:45:09 +0800 Subject: [PATCH 1/2] release: 2.6.10 --- manifest.json | 2 +- package.json | 4 ++-- src/common/version.ts | 2 +- src/core/services/NodeIKernelLoginService.ts | 4 +++- src/core/services/NodeIKernelNodeMiscService.ts | 1 + .../services/NodeIKernelUnitedConfigService.ts | 8 ++++---- src/shell/napcat.ts | 14 +++++++++++++- src/webui/ui/NapCat.ts | 2 +- static/assets/renderer.js | 2 +- 9 files changed, 27 insertions(+), 12 deletions(-) diff --git a/manifest.json b/manifest.json index 6784d036..0e6897c8 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCatQQ", "slug": "NapCat.Framework", "description": "高性能的 OneBot 11 协议实现", - "version": "2.6.9", + "version": "2.6.10", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index fe796710..0169d007 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "2.6.9", + "version": "2.6.10", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", @@ -52,4 +52,4 @@ "strtok3": "8.0.1", "ws": "^8.18.0" } -} +} \ No newline at end of file diff --git a/src/common/version.ts b/src/common/version.ts index 2f26eaa4..57bc8a0c 100644 --- a/src/common/version.ts +++ b/src/common/version.ts @@ -1 +1 @@ -export const napCatVersion = '2.6.9'; +export const napCatVersion = '2.6.10'; diff --git a/src/core/services/NodeIKernelLoginService.ts b/src/core/services/NodeIKernelLoginService.ts index 895ea2aa..c3294606 100644 --- a/src/core/services/NodeIKernelLoginService.ts +++ b/src/core/services/NodeIKernelLoginService.ts @@ -1,4 +1,5 @@ import { NodeIKernelLoginListener } from '@/core/listeners/NodeIKernelLoginListener'; +import { GeneralCallResult } from './common'; export interface LoginInitConfig { machineId: ''; @@ -59,6 +60,7 @@ export interface QuickLoginResult { } export interface NodeIKernelLoginService { + setLoginMiscData(arg0: string, value: string): unknown; getMachineGuid(): string; get(): NodeIKernelLoginService; @@ -71,7 +73,7 @@ export interface NodeIKernelLoginService { initConfig(config: LoginInitConfig): void; - getLoginMiscData(cb: (r: unknown) => void): void; + getLoginMiscData(data: string): Promise; getLoginList(): Promise<{ result: number, // 0是ok diff --git a/src/core/services/NodeIKernelNodeMiscService.ts b/src/core/services/NodeIKernelNodeMiscService.ts index 21b75d06..715ecd4d 100644 --- a/src/core/services/NodeIKernelNodeMiscService.ts +++ b/src/core/services/NodeIKernelNodeMiscService.ts @@ -1,6 +1,7 @@ import { GeneralCallResult } from './common'; export interface NodeIKernelNodeMiscService { + writeVersionToRegistry: any; getMiniAppPath(): unknown; setMiniAppVersion(version: string): unknown; diff --git a/src/core/services/NodeIKernelUnitedConfigService.ts b/src/core/services/NodeIKernelUnitedConfigService.ts index 6a287a16..d3481cfc 100644 --- a/src/core/services/NodeIKernelUnitedConfigService.ts +++ b/src/core/services/NodeIKernelUnitedConfigService.ts @@ -4,14 +4,14 @@ export interface NodeIKernelUnitedConfigService { removeKernelUnitedConfigListener(listenerId:number): void; - fetchUnitedCommendConfig(...args: any[]): unknown;// needs 1 arguments - fetchUnitedSwitchConfig(...args: any[]): unknown;// needs 1 arguments - loadUnitedConfig(...args: any[]): unknown;// needs 1 arguments - isUnitedConfigSwitchOn(...args: any[]): unknown;// needs 1 arguments registerUnitedConfigPushGroupList(...args: any[]): unknown;// needs 1 arguments + fetchUnitedCommendConfig(ids: `${string}`[]): void + + loadUnitedConfig(id: string): Promise + } diff --git a/src/shell/napcat.ts b/src/shell/napcat.ts index 0d354935..480e6cd4 100644 --- a/src/shell/napcat.ts +++ b/src/shell/napcat.ts @@ -186,7 +186,14 @@ export async function NCoreInitShell() { // 遍历 res.LocalLoginInfoList[x].isQuickLogin是否可以 res.LocalLoginInfoList[x].uin 转为string 加入string[] 最后遍历完成调用WebUiDataRuntime.setQQQuickLoginList WebUiDataRuntime.setQQQuickLoginList(res.LocalLoginInfoList.filter((item) => item.isQuickLogin).map((item) => item.uin.toString())); }); - + if (basicInfoWrapper.QQVersionConfig?.curVersion) { + loginService.getLoginMiscData('hotUpdateSign').then((res) => { + if (res.result === 0) { + loginService.setLoginMiscData('hotUpdateSign', res.value); + } + }); + session.getNodeMiscService().writeVersionToRegistry(basicInfoWrapper.QQVersionConfig?.curVersion); + } WebUiDataRuntime.setQuickLoginCall(async (uin: string) => { return await new Promise((resolve) => { if (uin) { @@ -244,6 +251,11 @@ export async function NCoreInitShell() { let guid = loginService.getMachineGuid(); guid = guid.slice(0, 8) + '-' + guid.slice(8, 12) + '-' + guid.slice(12, 16) + '-' + guid.slice(16, 20) + '-' + guid.slice(20); //console.log('guid:', guid); + //NodeIO3MiscService/reportAmgomWeather login a6 [ '1726748166943', '184', '329' ] + o3Service.reportAmgomWeather('login', 'a6', [dataTimestape, '184', '329']); + // if(session.getUnitedConfigService()){ + // session.getUnitedConfigService().fetchUnitedCommendConfig([]); + // } // from initSession await new Promise(async (resolve, reject) => { const sessionConfig = await genSessionConfig( diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index 6b423647..3e1f7332 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.6.9', 'napcat-update-button', 'secondary'), + SettingButton('V2.6.10', 'napcat-update-button', 'secondary'), ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 33b44f9d..0ab5c44d 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.6.9", "napcat-update-button", "secondary") + SettingButton("V2.6.10", "napcat-update-button", "secondary") ) ]), SettingList([ From 0dbfe8ca55b8a0780c0c7c17c73f7773d6b239cd 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, 19 Sep 2024 20:49:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=8B=A6=E6=88=AA=E4=B8=8D?= =?UTF-8?q?=E5=90=88=E6=B3=95=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/onebot/api/msg.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index d37b4654..07e6e28d 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -421,6 +421,10 @@ export class OneBotMsgApi { // 从face_config.json中获取表情名称 const sysFaces = faceConfig.sysface; const face: any = sysFaces.find((systemFace) => systemFace.QSid === parsedFaceId.toString()); + if (!face) { + this.core.context.logger.logError('不支持的ID', id); + return undefined; + } parsedFaceId = parseInt(parsedFaceId.toString()); let faceType = 1; if (parsedFaceId >= 222) {