Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aceece7e90 | ||
|
|
52efb4f9ef | ||
|
|
6b0d96fe8d | ||
|
|
ad052821b0 |
No files matched your search
+1
-1
@@ -4,7 +4,7 @@
|
||||
"name": "NapCatQQ",
|
||||
"slug": "NapCat.Framework",
|
||||
"description": "高性能的 OneBot 11 协议实现",
|
||||
"version": "4.2.13",
|
||||
"version": "4.2.15",
|
||||
"icon": "./logo.png",
|
||||
"authors": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "napcat",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"version": "4.2.13",
|
||||
"version": "4.2.15",
|
||||
"scripts": {
|
||||
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
|
||||
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
|
||||
|
||||
@@ -1 +1 @@
|
||||
export const napCatVersion = '4.2.13';
|
||||
export const napCatVersion = '4.2.15';
|
||||
+24
-21
@@ -146,31 +146,34 @@ export class NTQQGroupApi {
|
||||
async refreshGroupMemberCache(groupCode: string) {
|
||||
try {
|
||||
const members = await this.getGroupMemberAll(groupCode, true);
|
||||
// 首先填入基础信息
|
||||
const existingMembers = this.groupMemberCache.get(groupCode) ?? new Map<string, GroupMember>();
|
||||
members.result.infos.forEach((value, key) => {
|
||||
let existingMembers = this.groupMemberCache.get(groupCode);
|
||||
if (!existingMembers) {
|
||||
existingMembers = new Map<string, GroupMember>();
|
||||
this.groupMemberCache.set(groupCode, existingMembers);
|
||||
}
|
||||
members.result.infos.forEach((value) => {
|
||||
existingMembers.set(value.uid, { ...value, ...existingMembers.get(value.uid) });
|
||||
});
|
||||
// 后台补全复杂信息
|
||||
let event = (async () => {
|
||||
let data = (await Promise.allSettled(members.result.ids.map(e => this.core.apis.UserApi.getUserDetailInfo(e.uid)))).filter(e => e.status === 'fulfilled').map(e => e.value);
|
||||
data.forEach(e => {
|
||||
const existingMember = members.result.infos.get(e.uid);
|
||||
if (existingMember) {
|
||||
members.result.infos.set(e.uid, { ...existingMember, ...e });
|
||||
}
|
||||
});
|
||||
this.groupMemberCache.set(groupCode, members.result.infos);
|
||||
})().then().catch(e => this.context.logger.logError(e));
|
||||
// 处理首次空缺
|
||||
if (!this.groupMemberCache.get(groupCode)) {
|
||||
await event;
|
||||
}
|
||||
} catch (e) {
|
||||
this.context.logger.logError(`刷新群成员缓存失败, ${e}`);
|
||||
this.context.logger.logError(`刷新群成员缓存失败, 群号: ${groupCode}, 错误: ${e}`);
|
||||
}
|
||||
return this.groupMemberCache;
|
||||
}
|
||||
|
||||
// 后台补全复杂信息
|
||||
// let event = (async () => {
|
||||
// let data = (await Promise.allSettled(members.result.ids.map(e => this.core.apis.UserApi.getUserDetailInfo(e.uid)))).filter(e => e.status === 'fulfilled').map(e => e.value);
|
||||
// data.forEach(e => {
|
||||
// const existingMember = members.result.infos.get(e.uid);
|
||||
// if (existingMember) {
|
||||
// members.result.infos.set(e.uid, { ...existingMember, ...e });
|
||||
// }
|
||||
// });
|
||||
// this.groupMemberCache.set(groupCode, members.result.infos);
|
||||
// })().then().catch(e => this.context.logger.logError(e));
|
||||
// 处理首次空缺
|
||||
// if (!this.groupMemberCache.get(groupCode)) {
|
||||
// await event;
|
||||
// }
|
||||
async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
|
||||
const groupCodeStr = groupCode.toString();
|
||||
const memberUinOrUidStr = memberUinOrUid.toString();
|
||||
@@ -178,7 +181,7 @@ export class NTQQGroupApi {
|
||||
// 检查群缓存
|
||||
let members = this.groupMemberCache.get(groupCodeStr);
|
||||
if (!members) {
|
||||
await this.refreshGroupMemberCache(groupCodeStr);
|
||||
members = (await this.refreshGroupMemberCache(groupCodeStr)).get(groupCodeStr);
|
||||
}
|
||||
|
||||
function getMember() {
|
||||
|
||||
Reference in new issue
Block a user