mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2024-11-21 09:36:35 +00:00
fix
This commit is contained in:
parent
09405de26c
commit
0118dbd5fb
@ -16,14 +16,35 @@ class GetGroupMemberList extends BaseAction<PayloadType, OB11GroupMember[]> {
|
|||||||
actionName = ActionName.GetGroupMemberList;
|
actionName = ActionName.GetGroupMemberList;
|
||||||
|
|
||||||
protected async _handle(payload: PayloadType) {
|
protected async _handle(payload: PayloadType) {
|
||||||
// logDebug(await WebApi.getGroupMembers(payload.group_id.toString()));
|
let MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>();
|
||||||
|
let WebGroupMember = await WebApi.getGroupMembers(payload.group_id.toString());
|
||||||
// await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
|
// await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
|
||||||
const group = await getGroup(payload.group_id.toString());
|
const group = await getGroup(payload.group_id.toString());
|
||||||
if (group) {
|
if (!group) {
|
||||||
return OB11Constructor.groupMembers(group);
|
|
||||||
} else {
|
|
||||||
throw (`群${payload.group_id}不存在`);
|
throw (`群${payload.group_id}不存在`);
|
||||||
}
|
}
|
||||||
|
let GroupMember = OB11Constructor.groupMembers(group);
|
||||||
|
// 方便索引处理
|
||||||
|
for (let i = 0, len = GroupMember.length; i < len; i++) {
|
||||||
|
MemberMap.set(GroupMember[i].user_id, GroupMember[i]);
|
||||||
|
}
|
||||||
|
// 合并数据
|
||||||
|
for (let i = 0, len = WebGroupMember.length; i < len; i++) {
|
||||||
|
if (!WebGroupMember[i]?.uin) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let MemberData = MemberMap.get(WebGroupMember[i]?.uin);
|
||||||
|
if (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
|
||||||
|
let RetGroupMember: OB11GroupMember[] = Array.from(MemberMap.values());
|
||||||
|
return RetGroupMember;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,6 +45,7 @@ export interface OB11GroupMember {
|
|||||||
shut_up_timestamp?: number
|
shut_up_timestamp?: number
|
||||||
// 以下为扩展字段
|
// 以下为扩展字段
|
||||||
is_robot?: boolean
|
is_robot?: boolean
|
||||||
|
qage?: number
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface OB11Group {
|
export interface OB11Group {
|
||||||
@ -225,13 +226,13 @@ export interface OB11MessageJson {
|
|||||||
data: { config: { token: string } } & any
|
data: { config: { token: string } } & any
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface OB11MessageDice{
|
export interface OB11MessageDice {
|
||||||
type: OB11MessageDataType.dice,
|
type: OB11MessageDataType.dice,
|
||||||
data: {
|
data: {
|
||||||
result: number
|
result: number
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export interface OB11MessageRPS{
|
export interface OB11MessageRPS {
|
||||||
type: OB11MessageDataType.RPS,
|
type: OB11MessageDataType.RPS,
|
||||||
data: {
|
data: {
|
||||||
result: number
|
result: number
|
||||||
|
Loading…
x
Reference in New Issue
Block a user