fix: macos arm64 28971

.github/workflows/release.yml

@@ -127,10 +127,6 @@ jobs:
         zip -q -r NapCat.Framework.Windows.Once.zip *
         cd ..
         mv ./NapCat.Framework.Windows.Once/NapCat.Framework.Windows.Once.zip ./
-        mv ./external/packet/napcat.packet.arm64 ./
-        mv ./external/packet/napcat.packet.exe ./
-        mv ./external/packet/napcat.packet.linux ./
-        mv ./external/packet/napcat.packet.production.py ./
     - name: Extract version from tag
       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       
@@ -147,8 +143,4 @@ jobs:
           NapCat.Framework.zip
           NapCat.Shell.zip
           NapCat.Framework.Windows.Once.zip
-          napcat.packet.arm64
-          napcat.packet.exe
-          napcat.packet.linux
-          napcat.packet.production.py
         draft: true

README.md

@@ -30,6 +30,8 @@ NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现
 
 [Cloudflare.Pages](https://napneko.pages.dev/)
 
+[Server.Other](https://napcat.cyou/)
+
 [Github.IO](https://napneko.github.io/)
 ## 回家旅途
 [QQ Group](https://qm.qq.com/q/VfjAq5HIMS)

manifest.json

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

package.json

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

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.6.6';
+export const napCatVersion = '3.6.10';

src/core/apis/group.ts

@@ -375,8 +375,10 @@ export class NTQQGroupApi {
         };
     }
 
-    async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
+    async getGroupMembersV2(groupQQ: string, num = 3000, no_cache: boolean = false): Promise<Map<string, GroupMember>> {
-        //console.log('getGroupMembers -->', groupQQ);
+        if (no_cache) {
+            return (await this.getGroupMemberAll(groupQQ, true)).result.infos;
+        }
         let res = await this.GetGroupMembersV3(groupQQ, num);
         let ret = res.infos;
         if (res.infos.size === 0 && !res.listenerMode) {
@@ -386,14 +388,13 @@ export class NTQQGroupApi {
         if (res.infos.size === 0) {
             ret = (await this.getGroupMemberAll(groupQQ)).result.infos;
         }
-        //console.log("<---------------")
         return ret;
     }
 
     async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
         const groupService = this.context.session.getGroupService();
         const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
-        const result = await groupService.getNextMemberList(sceneId!, undefined, num);
+        const result = await groupService.getNextMemberList(sceneId, undefined, num);
         if (result.errCode !== 0) {
             throw new Error('获取群成员列表出错,' + result.errMsg);
         }
@@ -401,8 +402,8 @@ export class NTQQGroupApi {
         return result.result.infos;
     }
 
-    async getGroupFileCount(Gids: Array<string>) {
+    async getGroupFileCount(group_ids: Array<string>) {
-        return this.context.session.getRichMediaService().batchGetGroupFileCount(Gids);
+        return this.context.session.getRichMediaService().batchGetGroupFileCount(group_ids);
     }
 
     async getArkJsonGroupShare(GroupCode: string) {

src/core/external/offset.json

@@ -1,8 +1,4 @@
 {
-    "6.9.56-28418-arm64": {
-        "send": "4471360",
-        "recv": "4473BCC"
-    },
     "3.2.12-28418-x64": {
         "recv": "A0723E0",
         "send": "A06EAE0"
@@ -40,8 +36,8 @@
         "recv": "6E94B50"
     },
     "6.9.58-28971-arm64": {
-        "send": "449ACA0",
+        "send": "3FE0DB0",
-        "recv": "449D50C"
+        "recv": "3FE35C8"
     },
     "9.9.16-29271-x64": {
         "send": "3833510",

src/onebot/action/go-cqhttp/UploadGroupFile.ts

@@ -42,7 +42,7 @@ export default class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
             deleteAfterSentFiles: []
         };
         const sendFileEle = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name, payload.folder ?? payload.folder_id);
-        await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, [sendFileEle], [], true);
+        await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, [sendFileEle], msgContext.deleteAfterSentFiles, true);
         return null;
     }
 }

src/onebot/action/go-cqhttp/UploadPrivateFile.ts

@@ -53,7 +53,7 @@ export default class GoCQHTTPUploadPrivateFile extends BaseAction<Payload, null>
             deleteAfterSentFiles: []
         };
         const sendFileEle: SendFileElement = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name);
-        await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(await this.getPeer(payload), [sendFileEle], [], true);
+        await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(await this.getPeer(payload), [sendFileEle], msgContext.deleteAfterSentFiles, true);
         return null;
     }
 }

src/onebot/action/group/GetGroupMemberList.ts

@@ -24,12 +24,11 @@ export class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
         const noCache = payload.no_cache ? this.stringToBoolean(payload.no_cache) : false;
         const memberCache = this.core.apis.GroupApi.groupMemberCache;
         let groupMembers;
-        if (noCache) {
+        try {
-            groupMembers = await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr);
+            groupMembers = await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr, 3000, noCache);
-        } else {
+        } catch (error) {
             groupMembers = memberCache.get(groupIdStr) ?? await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr);
         }
-
         const memberPromises = Array.from(groupMembers.values()).map(item =>
             OB11Entities.groupMember(groupIdStr, item)
         );

static/assets/renderer.js

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