Merge branch 'main' into test

This commit is contained in:
Alen 2024-09-15 15:29:50 +08:00
commit e3fcd91b2d
4 changed files with 33 additions and 24 deletions

View File

@ -8,17 +8,15 @@ jobs:
Build-LiteLoader: Build-LiteLoader:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Clone Main Repository - name: Clone Main Repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
repository: 'NapNeko/NapCatQQ'
submodules: true
ref: main
token: ${{ secrets.NAPCAT_BUILD }}
- name: Use Node.js 20.X - name: Use Node.js 20.X
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20.x node-version: 20.x
- name: Build NuCat Framework - name: Build NuCat Framework
run: | run: |
npm i npm i
@ -27,25 +25,25 @@ jobs:
npm i --omit=dev npm i --omit=dev
rm package-lock.json rm package-lock.json
cd .. cd ..
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: NapCat.Framework name: NapCat.Framework
path: dist path: dist
Build-Shell: Build-Shell:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Clone Main Repository - name: Clone Main Repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
repository: 'NapNeko/NapCatQQ'
submodules: true
ref: main
token: ${{ secrets.NAPCAT_BUILD }}
- name: Use Node.js 20.X - name: Use Node.js 20.X
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20.x node-version: 20.x
- name: Build NuCat LiteLoader - name: Build NuCat LiteLoader
run: | run: |
npm i npm i
@ -54,6 +52,7 @@ jobs:
npm i --omit=dev npm i --omit=dev
rm package-lock.json rm package-lock.json
cd .. cd ..
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:

View File

@ -10,5 +10,9 @@
"6.9.53-27597": { "6.9.53-27597": {
"appid": 537243538, "appid": 537243538,
"qua": "V1_MAC_NQ_6.9.53_27597_GW_B" "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"
} }
} }

View File

@ -46,6 +46,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
}); });
if (isPrivilege) { if (isPrivilege) {
try {
const webGroupMembers = await this.core.apis.WebApi.getGroupMembers(payload.group_id.toString()); const webGroupMembers = await this.core.apis.WebApi.getGroupMembers(payload.group_id.toString());
for (let i = 0, len = webGroupMembers.length; i < len; i++) { for (let i = 0, len = webGroupMembers.length; i < len; i++) {
if (!webGroupMembers[i]?.uin) { if (!webGroupMembers[i]?.uin) {
@ -60,6 +61,11 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
MemberMap.set(webGroupMembers[i]?.uin, MemberData); 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()); _groupMembers = Array.from(MemberMap.values());

View File

@ -16,8 +16,8 @@ export interface InvalidCheckResult {
export enum ActionName { export enum ActionName {
// 以下为扩展napcat扩展 // 以下为扩展napcat扩展
Unknown = 'unknown', Unknown = 'unknown',
SharePeer = 'ArkShareGroup', SharePeer = 'ArkSharePeer',
ShareGroupEx = 'ArkSharePeer', ShareGroupEx = 'ArkShareGroup',
RebootNormal = 'reboot_normal',//无快速登录重新启动 RebootNormal = 'reboot_normal',//无快速登录重新启动
GetRobotUinRange = 'get_robot_uin_range', GetRobotUinRange = 'get_robot_uin_range',
SetOnlineStatus = 'set_online_status', SetOnlineStatus = 'set_online_status',