Northern_Lights/NapCatQQ
0
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-03-01 08:10:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: MemberInfo-1

Browse Source
This commit is contained in:
手瓜一十雪
2024-05-28 20:08:40 +08:00
parent 75ad495b98
commit 07cee90c7a
8 changed files with 96 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/onebot11/action/group/GetGroupMemberList.ts
View File

@@ -1,4 +1,4 @@
import { getGroup, groupMembers } from '@/core/data';
import { getGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data';
import { OB11GroupMember } from '../../types';
import { OB11Constructor } from '../../constructor';
import BaseAction from '../BaseAction';
@@ -7,7 +7,8 @@ import { napCatCore, NTQQGroupApi, NTQQUserApi, SignMiniApp } from '@/core';
import { WebApi } from '@/core/apis/webapi';
import { logDebug } from '@/common/utils/log';
import { FromSchema, JSONSchema } from 'json-schema-to-ts';
import { getLastSentTimeAndJoinTime }from "./LastSendAndJoinRemberLRU"
import { getLastSentTimeAndJoinTime } from "../../../common/utils/LastSendAndJoinRemberLRU"
import { ob11Config } from '@/onebot11/config';
const SchemaData = {
type: 'object',
@@ -24,56 +25,56 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
actionName = ActionName.GetGroupMemberList;
PayloadSchema = SchemaData;
protected async _handle(payload: Payload) {
const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>();
const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
const role = (await getGroupMember(payload.group_id, selfInfo.uin))?.role;
const group = await getGroup(payload.group_id.toString());
if (!group) {
throw (`群${payload.group_id}不存在`);
}
// 从Data里面获取
let _groupMembers: OB11GroupMember[] = OB11Constructor.groupMembers(group);
if (payload.no_cache == true || 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);
}
const _groupMembers = OB11Constructor.groupMembers(group);
// 方便索引处理
const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>();
// 转为Map 方便索引
for (let i = 0, len = _groupMembers.length; i < len; i++) {
MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]);
}
// 合并数据
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;
MemberMap.set(webGroupMembers[i]?.uin, MemberData);
}
}
// 还原Map到Array
const RetGroupMember: OB11GroupMember[] = Array.from(MemberMap.values());
// 无管理员权限通过本地记录获取发言时间
const haveAdmin = RetGroupMember[0].last_sent_time !== 0;
if (!haveAdmin) {
//logDebug('没有管理员权限，使用本地记录');
const _sendAndJoinRember = await getLastSentTimeAndJoinTime(parseInt(group.groupCode));
_sendAndJoinRember.forEach((rember) => {
const member = RetGroupMember.find(member=>member.user_id == rember.user_id);
if(member){
member.last_sent_time = rember.last_sent_time;
member.join_time = rember.join_time;
const isPrivilege = role === 3 || role === 4;
if (isPrivilege) {
const webGroupMembers = await 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;
MemberMap.set(webGroupMembers[i]?.uin, MemberData);
}
}
} else if ((ob11Config.GroupLocalTimeRecord as Array<number>).includes(payload.group_id)) {
const _sendAndJoinRember = await getLastSentTimeAndJoinTime(payload.group_id);
_sendAndJoinRember.forEach((element) => {
let MemberData = MemberMap.get(element.user_id);
if (MemberData) {
MemberData.join_time = element.join_time;
MemberData.last_sent_time = element.last_sent_time;
}
});
}
return RetGroupMember;
// 还原索引到Array 一同返回
_groupMembers = Array.from(MemberMap.values());
return _groupMembers;
}
}