From cf9c71fcc1826f1561cd56a537ac58e58451abaa 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: Sat, 14 Sep 2024 17:24:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E5=87=86=E5=A4=87=E9=80=82?= =?UTF-8?q?=E9=85=8D9.9.15-28606?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/external/appid.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/external/appid.json b/src/core/external/appid.json index 3f05c08b..47190e43 100644 --- a/src/core/external/appid.json +++ b/src/core/external/appid.json @@ -10,5 +10,9 @@ "6.9.53-27597": { "appid": 537243538, "qua": "V1_MAC_NQ_6.9.53_27597_GW_B" + }, + "9.9.15-28606":{ + "appid": 537246092, + "qua": "V1_WIN_NQ_9.9.15_28606_GW_B" } } From fe92a449ba393588e0539a5e9c6b2ee145e954fb 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: Sat, 14 Sep 2024 17:24:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E5=87=86=E5=A4=87=E9=80=82?= =?UTF-8?q?=E9=85=8D9.9.15-28060=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/external/appid.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/external/appid.json b/src/core/external/appid.json index 3f05c08b..47190e43 100644 --- a/src/core/external/appid.json +++ b/src/core/external/appid.json @@ -10,5 +10,9 @@ "6.9.53-27597": { "appid": 537243538, "qua": "V1_MAC_NQ_6.9.53_27597_GW_B" + }, + "9.9.15-28606":{ + "appid": 537246092, + "qua": "V1_WIN_NQ_9.9.15_28606_GW_B" } } From afcdd01c0d49979a18d7280404959d0d1b6f6089 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: Sat, 14 Sep 2024 19:22:36 +0800 Subject: [PATCH 3/6] fix: typo 9.9.15-28060 --- src/core/external/appid.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/external/appid.json b/src/core/external/appid.json index 47190e43..50d410db 100644 --- a/src/core/external/appid.json +++ b/src/core/external/appid.json @@ -11,8 +11,8 @@ "appid": 537243538, "qua": "V1_MAC_NQ_6.9.53_27597_GW_B" }, - "9.9.15-28606":{ + "9.9.15-28060":{ "appid": 537246092, - "qua": "V1_WIN_NQ_9.9.15_28606_GW_B" + "qua": "V1_WIN_NQ_9.9.15_28060_GW_B" } } From 3dc529edf4a7b8670cb7c922234d4b4aa4698e1a 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: Sun, 15 Sep 2024 09:39:17 +0800 Subject: [PATCH 4/6] fix: #369 --- src/onebot/action/group/GetGroupMemberList.ts | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/onebot/action/group/GetGroupMemberList.ts b/src/onebot/action/group/GetGroupMemberList.ts index 852ed188..76ef944c 100644 --- a/src/onebot/action/group/GetGroupMemberList.ts +++ b/src/onebot/action/group/GetGroupMemberList.ts @@ -46,20 +46,26 @@ class GetGroupMemberList extends BaseAction { }); if (isPrivilege) { - const webGroupMembers = await this.core.apis.WebApi.getGroupMembers(payload.group_id.toString()); - for (let i = 0, len = webGroupMembers.length; i < len; i++) { - if (!webGroupMembers[i]?.uin) { - continue; - } - const MemberData = MemberMap.get(webGroupMembers[i]?.uin); - if (MemberData) { - MemberData.join_time = webGroupMembers[i]?.join_time; - MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time; - MemberData.qage = webGroupMembers[i]?.qage; - MemberData.level = webGroupMembers[i]?.lv.level.toString(); - MemberMap.set(webGroupMembers[i]?.uin, MemberData); + try { + const webGroupMembers = await this.core.apis.WebApi.getGroupMembers(payload.group_id.toString()); + for (let i = 0, len = webGroupMembers.length; i < len; i++) { + if (!webGroupMembers[i]?.uin) { + continue; + } + const MemberData = MemberMap.get(webGroupMembers[i]?.uin); + if (MemberData) { + MemberData.join_time = webGroupMembers[i]?.join_time; + MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time; + MemberData.qage = webGroupMembers[i]?.qage; + MemberData.level = webGroupMembers[i]?.lv.level.toString(); + MemberMap.set(webGroupMembers[i]?.uin, MemberData); + } } + } catch (e) { + const logger = this.core.context.logger; + logger.logError.bind(logger)('GetGroupMemberList', e); } + } _groupMembers = Array.from(MemberMap.values()); From f0e376d06bbc65adc198c4c94f29c5710026eec9 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: Sun, 15 Sep 2024 14:55:18 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/onebot/action/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/onebot/action/types.ts b/src/onebot/action/types.ts index e93eb90f..54d8cd68 100644 --- a/src/onebot/action/types.ts +++ b/src/onebot/action/types.ts @@ -16,8 +16,8 @@ export interface InvalidCheckResult { export enum ActionName { // 以下为扩展napcat扩展 Unknown = 'unknown', - SharePeer = 'ArkShareGroup', - ShareGroupEx = 'ArkSharePeer', + SharePeer = 'ArkSharePeer', + ShareGroupEx = 'ArkShareGroup', RebootNormal = 'reboot_normal',//无快速登录重新启动 GetRobotUinRange = 'get_robot_uin_range', SetOnlineStatus = 'set_online_status', From 58cd38c4a824cc7d28efe2037055efd549e21bed 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: Sun, 15 Sep 2024 15:20:44 +0800 Subject: [PATCH 6/6] chore: workflow --- .github/workflows/build.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bedb58ed..3e2a2096 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,17 +8,15 @@ jobs: Build-LiteLoader: runs-on: ubuntu-latest steps: + - name: Clone Main Repository uses: actions/checkout@v4 - with: - repository: 'NapNeko/NapCatQQ' - submodules: true - ref: main - token: ${{ secrets.NAPCAT_BUILD }} + - name: Use Node.js 20.X uses: actions/setup-node@v4 with: node-version: 20.x + - name: Build NuCat Framework run: | npm i @@ -27,25 +25,25 @@ jobs: npm i --omit=dev rm package-lock.json cd .. + - name: Upload Artifact uses: actions/upload-artifact@v4 with: name: NapCat.Framework path: dist + Build-Shell: runs-on: ubuntu-latest steps: + - name: Clone Main Repository uses: actions/checkout@v4 - with: - repository: 'NapNeko/NapCatQQ' - submodules: true - ref: main - token: ${{ secrets.NAPCAT_BUILD }} + - name: Use Node.js 20.X uses: actions/setup-node@v4 with: node-version: 20.x + - name: Build NuCat LiteLoader run: | npm i @@ -54,6 +52,7 @@ jobs: npm i --omit=dev rm package-lock.json cd .. + - name: Upload Artifact uses: actions/upload-artifact@v4 with: