release: 2.5.2

This reverts commit 7e74578312.

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/helper.ts

@@ -163,8 +163,17 @@ export function isEqual(obj1: any, obj2: any) {
 export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
     if (os.platform() === 'linux') {
         return {
-            baseVersion: '3.2.12-27597',
+            baseVersion: '3.2.12.27254',
-            curVersion: '3.2.12-27597',
+            curVersion: '3.2.12.27254',
+            prevVersion: '',
+            onErrorVersions: [],
+            buildId: '27254',
+        };
+    }
+    if (os.platform() === 'darwin') {
+        return {
+            baseVersion: '6.9.53.27597',
+            curVersion: '6.9.53.27597',
             prevVersion: '',
             onErrorVersions: [],
             buildId: '27597',

src/common/qq-basic-info.ts

@@ -53,23 +53,23 @@ export class QQBasicInfoWrapper {
     //此方法不要直接使用
     getQUAInternal() {
         switch (systemPlatform) {
-        case 'linux':
+            case 'linux':
-            return `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+                return `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-        case 'darwin':
+            case 'darwin':
-            return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;                
+                return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-        default:
+            default:
-            return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+                return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
         }
     }
 
     getAppidInternal() {
         switch (systemPlatform) {
-        case 'linux':
+            case 'linux':
-            return '537243600';
+                return '537240795';
-        case 'darwin':
+            case 'darwin':
-            return '537243441';
+                return '537243538';
-        default:
+            default:
-            return '537243538';
+                return '537243441';
         }
     }
 

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.5.1';
+export const napCatVersion = '2.5.2';

src/core/external/appid.json

@@ -1,4 +1,14 @@
 {
+
+    "3.2.12-27254":{
+        "appid": 537240795,
+        "qua": "V1_LNX_NQ_3.2.12_27254_GW_B"
+    },
+    "9.9.15-27254":{
+        "appid": 537240709,
+        "qua": "V1_WIN_NQ_9.9.15_27254_GW_B"
+    },
+
     "3.2.12-27597": {
         "appid": 537243600,
         "qua": "V1_LNX_NQ_3.2.12_27597_GW_B"
@@ -11,6 +21,7 @@
         "appid": 537243538,
         "qua": "V1_MAC_NQ_6.9.53_27597_GW_B" 
     },
+
     "9.9.15-28060":{
         "appid": 537246092,
         "qua": "V1_WIN_NQ_9.9.15_28060_GW_B"

src/onebot/api/msg.ts

@@ -629,7 +629,7 @@ export class OneBotMsgApi {
                 if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
                     //好友添加成功事件
                     if (element.grayTipElement.xmlElement.templId === '10229' && msg.peerUin !== '') {
-                        return new OB11FriendAddNoticeEvent(this.core, parseInt(msg.peerUin));
+                        return new OB11FriendAddNoticeEvent(this.core, parseInt(msg.peerUin) || Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
                     }
                 }
             }

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.5.1', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.5.2', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V2.5.1", "napcat-update-button", "secondary")
+          SettingButton("V2.5.2", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([