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

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

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);

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;
} }

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,7 +41,9 @@ 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);
if (!requireMinNTQQBuild('26702')) {
let SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache); let SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache);
let isPrivilege = false; let isPrivilege = false;
if (SelfInfoInGroup) { if (SelfInfoInGroup) {
@@ -66,6 +69,10 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
} }
} }
} }
} else {
retMember.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString());
retMember.join_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString());
}
return retMember; return retMember;
} }
} }

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,6 +44,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]); MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]);
} }
if (!requireMinNTQQBuild('26702')) {
const selfRole = groupMembers.get(selfInfo.uid)?.role; const selfRole = groupMembers.get(selfInfo.uid)?.role;
const isPrivilege = selfRole === 3 || selfRole === 4; const isPrivilege = selfRole === 3 || selfRole === 4;
@@ -78,6 +80,12 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
}); });
} }
} }
} 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 一同返回
// let retData: any[] = []; // let retData: any[] = [];