From b3c93644fdb02e08ec6770733f90a9e0b26c4cda 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, 4 May 2024 22:32:22 +0800 Subject: [PATCH] fix --- .../action/group/GetGroupMemberInfo.ts | 21 ++++++++---------- .../action/group/GetGroupMemberList.ts | 22 +++++++++---------- src/onebot11/server/ws/ReverseWebsocket.ts | 4 +--- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/onebot11/action/group/GetGroupMemberInfo.ts b/src/onebot11/action/group/GetGroupMemberInfo.ts index be70dc1f..9e013e7b 100644 --- a/src/onebot11/action/group/GetGroupMemberInfo.ts +++ b/src/onebot11/action/group/GetGroupMemberInfo.ts @@ -6,13 +6,12 @@ import { ActionName } from '../types'; import { NTQQUserApi } from '@/core/apis/user'; import { log, logDebug } from '@/common/utils/log'; import { isNull } from '../../../common/utils/helper'; -import { WebApi, WebApiGroupMember } from '@/core/apis/webapi'; +import { WebApi } from '@/core/apis/webapi'; export interface PayloadType { group_id: number; user_id: number; - no_cache?: boolean | string; } class GetGroupMemberInfo extends BaseAction { @@ -23,10 +22,7 @@ class GetGroupMemberInfo extends BaseAction { if (!group) { throw (`群(${payload.group_id})不存在`); } - const webGroupMembers: WebApiGroupMember[] = []; - if (payload.no_cache === true || payload.no_cache === 'true') { - // webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString()); - } + const WebGroupMember = await WebApi.getGroupMembers(payload.group_id.toString()); const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString()); // log(member); if (member) { @@ -39,13 +35,14 @@ class GetGroupMemberInfo extends BaseAction { logDebug('获取群成员详细信息失败, 只能返回基础信息', e); } const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member); - for (let i = 0, len = webGroupMembers.length; i < len; i++) { - if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) { - retMember.join_time = webGroupMembers[i]?.join_time; - retMember.last_sent_time = webGroupMembers[i]?.last_speak_time; - retMember.qage = webGroupMembers[i]?.qage; - retMember.level = webGroupMembers[i]?.lv.level; + for (let i = 0, len = WebGroupMember.length; i < len; i++) { + if (WebGroupMember[i]?.uin && WebGroupMember[i].uin === retMember.user_id) { + retMember.join_time = WebGroupMember[i]?.join_time; + retMember.last_sent_time = WebGroupMember[i]?.last_speak_time; + retMember.qage = WebGroupMember[i]?.qage; + retMember.level = WebGroupMember[i]?.lv.level; } + } return retMember; } else { diff --git a/src/onebot11/action/group/GetGroupMemberList.ts b/src/onebot11/action/group/GetGroupMemberList.ts index a9254f3d..a1bf0cc8 100644 --- a/src/onebot11/action/group/GetGroupMemberList.ts +++ b/src/onebot11/action/group/GetGroupMemberList.ts @@ -3,7 +3,7 @@ import { OB11GroupMember } from '../../types'; import { OB11Constructor } from '../../constructor'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; -import { napCatCore, NTQQGroupApi, WebApiGroupMember } from '@/core'; +import { napCatCore, NTQQGroupApi } from '@/core'; import { WebApi } from '@/core/apis/webapi'; import { logDebug } from '@/common/utils/log'; @@ -18,13 +18,13 @@ class GetGroupMemberList extends BaseAction { protected async _handle(payload: PayloadType) { const MemberMap: Map = new Map(); - const webGroupMembers: WebApiGroupMember[] = []; + const WebGroupMember = await WebApi.getGroupMembers(payload.group_id.toString()); // await NTQQGroupApi.getGroupMembers(payload.group_id.toString()); const group = await getGroup(payload.group_id.toString()); if (!group) { throw (`群${payload.group_id}不存在`); } - if (payload.no_cache === true || payload.no_cache === 'true') { + if (payload.no_cache || payload.no_cache === 'true') { // webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString()); const _groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString()); groupMembers.set(group.groupCode, _groupMembers); @@ -36,17 +36,17 @@ class GetGroupMemberList extends BaseAction { MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]); } // 合并数据 - for (let i = 0, len = webGroupMembers.length; i < len; i++) { - if (!webGroupMembers[i]?.uin) { + for (let i = 0, len = WebGroupMember.length; i < len; i++) { + if (!WebGroupMember[i]?.uin) { continue; } - const MemberData = MemberMap.get(webGroupMembers[i]?.uin); + const MemberData = MemberMap.get(WebGroupMember[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; - MemberMap.set(webGroupMembers[i]?.uin, MemberData); + MemberData.join_time = WebGroupMember[i]?.join_time; + MemberData.last_sent_time = WebGroupMember[i]?.last_speak_time; + MemberData.qage = WebGroupMember[i]?.qage; + MemberData.level = WebGroupMember[i]?.lv.level; + MemberMap.set(WebGroupMember[i]?.uin, MemberData); } } // 还原Map到Array diff --git a/src/onebot11/server/ws/ReverseWebsocket.ts b/src/onebot11/server/ws/ReverseWebsocket.ts index 9c8762fd..1fa0dedc 100644 --- a/src/onebot11/server/ws/ReverseWebsocket.ts +++ b/src/onebot11/server/ws/ReverseWebsocket.ts @@ -101,9 +101,7 @@ export class ReverseWebsocket { await this.onmessage(data.toString()); }); - this.websocket.on('error', (err) => { - logError('websocket error', err.toString()); - }); + this.websocket.on('error', log); const wsClientInterval = setInterval(() => { postWsEvent(new OB11HeartbeatEvent(!!selfInfo.online, true, heartInterval));