GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-07-19 12:03:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: 178发言时间与加入时间完全兜底

Browse Source
This commit is contained in:
手瓜一十雪
2024-08-05 13:45:07 +08:00
parent 28030c2d13
commit bc936a0ca7
4 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/src/core.ts
View File

@@ -322,6 +322,7 @@ export class NapCatCore {
if (groupMembers.has(groupCode)) { if (groupMembers.has(groupCode)) {
const existMembers = groupMembers.get(groupCode)!; const existMembers = groupMembers.get(groupCode)!;
arg.infos.forEach((member, uid) => { arg.infos.forEach((member, uid) => {
//console.log('onMemberListChange', member);
const existMember = existMembers.get(uid); const existMember = existMembers.get(uid);
if (existMember) { if (existMember) {
Object.assign(existMember, member); Object.assign(existMember, member);

4
src/core/src/entities/group.ts
View File

@@ -7,7 +7,7 @@ export enum GroupListUpdateType {
} }
export interface Group { export interface Group {
groupCode: string, groupCode: string,
createTime?:string,//高版本才有 createTime?: string,//高版本才有
maxMember: number, maxMember: number,
memberCount: number, memberCount: number,
groupName: string, groupName: string,
@@ -59,4 +59,6 @@ export interface GroupMember {
sex?: Sex sex?: Sex
qqLevel?: QQLevel qqLevel?: QQLevel
isChangeRole: boolean; isChangeRole: boolean;
joinTime: string;
lastSpeakTime: string;
} }

51
src/onebot11/action/group/GetGroupMemberInfo.ts
View File

@@ -7,7 +7,8 @@ import { logDebug } from '@/common/utils/log';
import { WebApi } from '@/core/apis/webapi'; import { WebApi } from '@/core/apis/webapi';
import { NTQQGroupApi } from '@/core'; import { NTQQGroupApi } from '@/core';
import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { FromSchema, JSONSchema } from 'json-schema-to-ts';
import { selfInfo } from '@/core/data'; import { getGroupMember, selfInfo } from '@/core/data';
import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
const SchemaData = { const SchemaData = {
type: 'object', type: 'object',
properties: { properties: {
@@ -40,31 +41,37 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
} catch (e) { } catch (e) {
logDebug('获取群成员详细信息失败, 只能返回基础信息', e); logDebug('获取群成员详细信息失败, 只能返回基础信息', e);
} }
const date = Math.round(Date.now() / 1000);
const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member); const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
let SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache); if (!requireMinNTQQBuild('26702')) {
let isPrivilege = false; let SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache);
if (SelfInfoInGroup) { let isPrivilege = false;
isPrivilege = SelfInfoInGroup.role === 3 || SelfInfoInGroup.role === 4; if (SelfInfoInGroup) {
} isPrivilege = SelfInfoInGroup.role === 3 || SelfInfoInGroup.role === 4;
if (isPrivilege) { }
const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString()); if (isPrivilege) {
for (let i = 0, len = webGroupMembers.length; i < len; i++) { const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) { for (let i = 0, len = webGroupMembers.length; i < len; i++) {
retMember.join_time = webGroupMembers[i]?.join_time; if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) {
retMember.last_sent_time = webGroupMembers[i]?.last_speak_time; retMember.join_time = webGroupMembers[i]?.join_time;
retMember.qage = webGroupMembers[i]?.qage; retMember.last_sent_time = webGroupMembers[i]?.last_speak_time;
retMember.level = webGroupMembers[i]?.lv.level.toString(); retMember.qage = webGroupMembers[i]?.qage;
retMember.level = webGroupMembers[i]?.lv.level.toString();
}
}
} else {
const LastestMsgList = await NTQQGroupApi.getLastestMsg(payload.group_id.toString(), [payload.user_id.toString()]);
if (LastestMsgList?.msgList?.length && LastestMsgList?.msgList?.length > 0) {
const last_send_time = LastestMsgList.msgList[0].msgTime;
if (last_send_time && last_send_time != '0' && last_send_time != '') {
retMember.last_sent_time = parseInt(last_send_time);
retMember.join_time = Math.round(Date.now() / 1000);//兜底数据 防止群管乱杀
}
} }
} }
} else { } else {
const LastestMsgList = await NTQQGroupApi.getLastestMsg(payload.group_id.toString(), [payload.user_id.toString()]); retMember.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString());
if (LastestMsgList?.msgList?.length && LastestMsgList?.msgList?.length > 0) { retMember.join_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString());
const last_send_time = LastestMsgList.msgList[0].msgTime;
if (last_send_time && last_send_time != '0' && last_send_time != '') {
retMember.last_sent_time = parseInt(last_send_time);
retMember.join_time = Math.round(Date.now() / 1000);//兜底数据 防止群管乱杀
}
}
} }
return retMember; return retMember;
} }

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

@@ -1,4 +1,4 @@
import { selfInfo } from '@/core/data'; import { getGroup, getGroupMember, selfInfo } from '@/core/data';
import { OB11GroupMember } from '../../types'; import { OB11GroupMember } from '../../types';
import { OB11Constructor } from '../../constructor'; import { OB11Constructor } from '../../constructor';
import BaseAction from '../BaseAction'; import BaseAction from '../BaseAction';
@@ -6,6 +6,7 @@ import { ActionName } from '../types';
import { NTQQGroupApi } from '@/core'; import { NTQQGroupApi } from '@/core';
import { WebApi } from '@/core/apis/webapi'; import { WebApi } from '@/core/apis/webapi';
import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { FromSchema, JSONSchema } from 'json-schema-to-ts';
import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
const SchemaData = { const SchemaData = {
type: 'object', type: 'object',
@@ -43,40 +44,47 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]); MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]);
} }
const selfRole = groupMembers.get(selfInfo.uid)?.role; if (!requireMinNTQQBuild('26702')) {
const isPrivilege = selfRole === 3 || selfRole === 4; const selfRole = groupMembers.get(selfInfo.uid)?.role;
const isPrivilege = selfRole === 3 || selfRole === 4;
if (isPrivilege) { if (isPrivilege) {
const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString()); const webGroupMembers = await 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) {
continue; continue;
} }
const MemberData = MemberMap.get(webGroupMembers[i]?.uin); 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);
}
}
} else {
if (isNocache) {
const DateMap = await NTQQGroupApi.getGroupMemberLastestSendTimeCache(payload.group_id.toString());//开始从本地拉取
for (const DateUin of DateMap.keys()) {
const MemberData = MemberMap.get(parseInt(DateUin));
if (MemberData) { if (MemberData) {
MemberData.last_sent_time = parseInt(DateMap.get(DateUin)!); MemberData.join_time = webGroupMembers[i]?.join_time;
//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);
} }
} }
} else { } else {
_groupMembers.forEach(item => { if (isNocache) {
item.last_sent_time = date; const DateMap = await NTQQGroupApi.getGroupMemberLastestSendTimeCache(payload.group_id.toString());//开始从本地拉取
item.join_time = date; for (const DateUin of DateMap.keys()) {
}); const MemberData = MemberMap.get(parseInt(DateUin));
if (MemberData) {
MemberData.last_sent_time = parseInt(DateMap.get(DateUin)!);
//join_time 有基础数据兜底
}
}
} else {
_groupMembers.forEach(item => {
item.last_sent_time = date;
item.join_time = date;
});
}
} }
} else {
_groupMembers.forEach(async item => {
item.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.lastSpeakTime || date.toString());
item.join_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.joinTime || date.toString());
});
} }
// 还原索引到Array 一同返回 // 还原索引到Array 一同返回