Compare commits

...

5 Commits

Author SHA1 Message Date
手瓜一十雪
1823a17bf9 fix 2025-03-27 12:12:12 +08:00
手瓜一十雪
111ec4c18e fix 2025-03-26 23:03:55 +08:00
手瓜一十雪
4faddb9e38 refactor 2025-03-26 22:50:37 +08:00
手瓜一十雪
41199ec88e fix 2025-03-26 22:40:33 +08:00
手瓜一十雪
c141975804 fix 2025-03-26 22:40:14 +08:00
16 changed files with 203 additions and 136 deletions

View File

@@ -44,13 +44,22 @@ export class NTQQGroupApi {
} }
async initApi() { async initApi() {
this.initCache().then().catch(e => this.context.logger.logError(e)); await this.initCache().then().catch(e => this.context.logger.logError(e));
} }
async initCache() { async initCache() {
let promises: Promise<void>[] = [];
for (const group of await this.getGroups(true)) { for (const group of await this.getGroups(true)) {
this.refreshGroupMemberCache(group.groupCode, false).then().catch(e => this.context.logger.logError(e)); let user = await this.refreshGroupMemberCache(group.groupCode, false).then().catch(e => this.context.logger.logError(e));
if (user) {
for (const member of user) {
let promise = this.core.apis.UserApi.fetchUserDetailInfoV3(member[1].uid).then(_ => void 0).catch(e => this.context.logger.logError(e));
promises.push(promise);
}
}
} }
await Promise.all(promises);
this.context.logger.logDebug('[NapCat] [Mark] 群成员缓存初始化完成');
} }
async fetchGroupEssenceList(groupCode: string) { async fetchGroupEssenceList(groupCode: string) {

View File

@@ -1,4 +1,4 @@
import { ModifyProfileParams, User, UserDetailSource } from '@/core/types'; import { ModifyProfileParams, UserDetailSource } from '@/core/types';
import { RequestUtil } from '@/common/request'; import { RequestUtil } from '@/common/request';
import { InstanceContext, NapCatCore, ProfileBizType } from '..'; import { InstanceContext, NapCatCore, ProfileBizType } from '..';
import { solveAsyncProblem } from '@/common/helper'; import { solveAsyncProblem } from '@/common/helper';
@@ -77,7 +77,7 @@ export class NTQQUserApi {
return this.context.session.getGroupService().setHeader(gc, filePath); return this.context.session.getGroupService().setHeader(gc, filePath);
} }
async fetchUserDetailInfo(uid: string, mode: UserDetailSource = UserDetailSource.KDB) { async fetchUserDetailInfoV2(uid: string, mode: UserDetailSource = UserDetailSource.KDB) {
const [, profile] = await this.core.eventWrapper.callNormalEventV2( const [, profile] = await this.core.eventWrapper.callNormalEventV2(
'NodeIKernelProfileService/fetchUserDetailInfo', 'NodeIKernelProfileService/fetchUserDetailInfo',
'NodeIKernelProfileListener/onUserDetailInfoChanged', 'NodeIKernelProfileListener/onUserDetailInfoChanged',
@@ -90,46 +90,31 @@ export class NTQQUserApi {
() => true, () => true,
(profile) => profile.uid === uid, (profile) => profile.uid === uid,
); );
const RetUser: User = { return profile;
...profile.simpleInfo.status,
...profile.simpleInfo.vasInfo,
...profile.commonExt,
...profile.simpleInfo.baseInfo,
...profile.simpleInfo.coreInfo,
qqLevel: profile.commonExt?.qqLevel,
age: profile.simpleInfo.baseInfo.age,
pendantId: '',
nick: profile.simpleInfo.coreInfo.nick || '',
};
return RetUser;
} }
async getUserDetailInfo(uid: string): Promise<User> { async fetchUserDetailInfoV3(uid: string) {
let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid); let cache = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KDB);
if (!cache.commonExt) {
cache = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KSERVER);
}
return cache;
}
async getUserDetailInfoV2(uid: string) {
let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfoV2(uid, UserDetailSource.KDB), uid);
if (retUser && retUser.uin !== '0') { if (retUser && retUser.uin !== '0') {
return retUser; return retUser;
} }
this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.'); this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
retUser = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER); retUser = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KSERVER);
if (retUser && retUser.uin === '0') { if (retUser && retUser.uin === '0') {
retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0'; retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
} }
return retUser; return retUser;
} }
async getUserDetailInfoV2(uid: string): Promise<User> {
const fallback = new Fallback<User>((user) => FallbackUtil.boolchecker(user, user !== undefined && user.uin !== '0'))
.add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KDB))
.add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER));
const retUser = await fallback.run().then(async (user) => {
if (user && user.uin === '0') {
user.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
}
return user;
});
return retUser;
}
async modifySelfProfile(param: ModifyProfileParams) { async modifySelfProfile(param: ModifyProfileParams) {
return this.context.session.getProfileService().modifyDesktopMiniProfile(param); return this.context.session.getProfileService().modifyDesktopMiniProfile(param);
} }
@@ -216,7 +201,7 @@ export class NTQQUserApi {
.add(() => this.context.session.getUixConvertService().getUin([uid]).then((data) => data.uinInfo.get(uid))) .add(() => this.context.session.getUixConvertService().getUin([uid]).then((data) => data.uinInfo.get(uid)))
.add(() => this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [uid]).get(uid)) .add(() => this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [uid]).get(uid))
.add(() => this.context.session.getGroupService().getUinByUids([uid]).then((data) => data.uins.get(uid))) .add(() => this.context.session.getGroupService().getUinByUids([uid]).then((data) => data.uins.get(uid)))
.add(() => this.getUserDetailInfo(uid).then((data) => data.uin)); .add(() => this.fetchUserDetailInfoV2(uid).then((data) => data.uin));
const uin = await fallback.run().catch(() => '0'); const uin = await fallback.run().catch(() => '0');
return uin ?? '0'; return uin ?? '0';

View File

@@ -1,71 +1,71 @@
import { User, UserDetailInfoListenerArg } from '@/core/types'; import { User, UserDetailInfoListenerArg } from '@/core/types';
export class NodeIKernelProfileListener { export class NodeIKernelProfileListener {
onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void { onUserDetailInfoChanged(_arg: UserDetailInfoListenerArg): void {
} }
onProfileSimpleChanged(...args: unknown[]): any { onProfileSimpleChanged(..._args: unknown[]): any {
} }
onProfileDetailInfoChanged(profile: User): any { onProfileDetailInfoChanged(_profile: User): any {
} }
onStatusUpdate(...args: unknown[]): any { onStatusUpdate(..._args: unknown[]): any {
} }
onSelfStatusChanged(...args: unknown[]): any { onSelfStatusChanged(..._args: unknown[]): any {
} }
onStrangerRemarkChanged(...args: unknown[]): any { onStrangerRemarkChanged(..._args: unknown[]): any {
} }
onMemberListChange(...args: unknown[]): any { onMemberListChange(..._args: unknown[]): any {
} }
onMemberInfoChange(...args: unknown[]): any { onMemberInfoChange(..._args: unknown[]): any {
} }
onGroupListUpdate(...args: unknown[]): any { onGroupListUpdate(..._args: unknown[]): any {
} }
onGroupAllInfoChange(...args: unknown[]): any { onGroupAllInfoChange(..._args: unknown[]): any {
} }
onGroupDetailInfoChange(...args: unknown[]): any { onGroupDetailInfoChange(..._args: unknown[]): any {
} }
onGroupConfMemberChange(...args: unknown[]): any { onGroupConfMemberChange(..._args: unknown[]): any {
} }
onGroupExtListUpdate(...args: unknown[]): any { onGroupExtListUpdate(..._args: unknown[]): any {
} }
onGroupNotifiesUpdated(...args: unknown[]): any { onGroupNotifiesUpdated(..._args: unknown[]): any {
} }
onGroupNotifiesUnreadCountUpdated(...args: unknown[]): any { onGroupNotifiesUnreadCountUpdated(..._args: unknown[]): any {
} }
onGroupMemberLevelInfoChange(...args: unknown[]): any { onGroupMemberLevelInfoChange(..._args: unknown[]): any {
} }
onGroupBulletinChange(...args: unknown[]): any { onGroupBulletinChange(..._args: unknown[]): any {
} }
} }

View File

@@ -1,5 +1,3 @@
import { QQLevel, NTSex } from './user';
export interface KickMemberInfo { export interface KickMemberInfo {
optFlag: number; optFlag: number;
optOperate: number; optOperate: number;
@@ -274,24 +272,42 @@ export enum NTGroupMemberRole {
KOWNER = 4 KOWNER = 4
} }
export interface GroupMember { export interface GroupMember {
memberRealLevel: number | undefined;
memberSpecialTitle?: string;
avatarPath: string;
cardName: string;
cardType: number;
isDelete: boolean;
nick: string;
qid: string;
remark: string;
role: NTGroupMemberRole;
shutUpTime: number; // 禁言时间(S)
uid: string; uid: string;
qid: string;
uin: string; uin: string;
nick: string;
remark: string;
cardType: number;
cardName: string;
role: NTGroupMemberRole;
avatarPath: string;
shutUpTime: number;
isDelete: boolean;
isSpecialConcerned: boolean;
isSpecialShield: boolean;
isRobot: boolean; isRobot: boolean;
sex?: NTSex; groupHonor: Uint8Array;
age?: number; memberRealLevel: number;
qqLevel?: QQLevel; memberLevel: number;
isChangeRole: boolean; globalGroupLevel: number;
joinTime: string; globalGroupPoint: number;
lastSpeakTime: string; memberTitleId: number;
memberSpecialTitle: string;
specialTitleExpireTime: string;
userShowFlag: number;
userShowFlagNew: number;
richFlag: number;
mssVipType: number;
bigClubLevel: number;
bigClubFlag: number;
autoRemark: string;
creditLevel: number;
joinTime: number;
lastSpeakTime: number;
memberFlag: number;
memberFlagExt: number;
memberMobileFlag: number;
memberFlagExt2: number;
isSpecialShielded: boolean;
cardNameId: number;
} }

View File

@@ -207,8 +207,8 @@ interface PhotoWall {
// 简单信息 // 简单信息
export interface SimpleInfo { export interface SimpleInfo {
uid?: string; uid: string;
uin?: string; uin: string;
coreInfo: CoreInfo; coreInfo: CoreInfo;
baseInfo: BaseInfo; baseInfo: BaseInfo;
status: UserStatus | null; status: UserStatus | null;
@@ -233,13 +233,15 @@ export interface SelfStatusInfo {
setTime: string; setTime: string;
} }
export type UserV2 = UserDetailInfoListenerArg;
// 用户详细信息监听参数 // 用户详细信息监听参数
export interface UserDetailInfoListenerArg { export interface UserDetailInfoListenerArg {
uid: string; uid: string;
uin: string; uin: string;
simpleInfo: SimpleInfo; simpleInfo?: SimpleInfo;
commonExt: CommonExt; commonExt?: CommonExt;
photoWall: PhotoWall; photoWall?: PhotoWall;
} }
// 修改个人资料参数 // 修改个人资料参数
@@ -332,13 +334,12 @@ export interface User {
} }
// 自身信息 // 自身信息
export interface SelfInfo extends User { export interface SelfInfo extends Partial<UserV2> {
online?: boolean; uid: string;
uin: string;
online: boolean;
} }
// 好友类型
export type Friend = User;
// 业务键枚举 // 业务键枚举
export enum BizKey { export enum BizKey {
KPRIVILEGEICON = 0, KPRIVILEGEICON = 0,

View File

@@ -46,7 +46,6 @@ export async function NCoreInitFramework(
resolveSelfInfo({ resolveSelfInfo({
uid: loginResult.uid, uid: loginResult.uid,
uin: loginResult.uin, uin: loginResult.uin,
nick: '', // 获取不到
online: true, online: true,
}); });
}; };

View File

@@ -19,7 +19,7 @@ export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11U
const extendData = await this.core.apis.UserApi.getUserDetailInfoByUin(user_id); const extendData = await this.core.apis.UserApi.getUserDetailInfoByUin(user_id);
let uid = (await this.core.apis.UserApi.getUidByUinV2(user_id)); let uid = (await this.core.apis.UserApi.getUidByUinV2(user_id));
if (!uid) uid = extendData.detail.uid; if (!uid) uid = extendData.detail.uid;
const info = (await this.core.apis.UserApi.getUserDetailInfo(uid)); const info = (await this.core.apis.UserApi.fetchUserDetailInfoV2(uid));
return { return {
...extendData.detail.simpleInfo.coreInfo, ...extendData.detail.simpleInfo.coreInfo,
...extendData.detail.commonExt ?? {}, ...extendData.detail.commonExt ?? {},
@@ -29,17 +29,17 @@ export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11U
user_id: parseInt(extendData.detail.uin) ?? 0, user_id: parseInt(extendData.detail.uin) ?? 0,
uid: info.uid ?? uid, uid: info.uid ?? uid,
nickname: extendData.detail.simpleInfo.coreInfo.nick ?? '', nickname: extendData.detail.simpleInfo.coreInfo.nick ?? '',
age: extendData.detail.simpleInfo.baseInfo.age ?? info.age, age: extendData.detail.simpleInfo.baseInfo.age ?? info.simpleInfo?.baseInfo.age,
qid: extendData.detail.simpleInfo.baseInfo.qid, qid: extendData.detail.simpleInfo.baseInfo.qid,
qqLevel: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? info.qqLevel), qqLevel: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? info.commonExt?.qqLevel),
sex: OB11Construct.sex(extendData.detail.simpleInfo.baseInfo.sex) ?? OB11UserSex.unknown, sex: OB11Construct.sex(extendData.detail.simpleInfo.baseInfo.sex) ?? OB11UserSex.unknown,
long_nick: extendData.detail.simpleInfo.baseInfo.longNick ?? info.longNick, long_nick: extendData.detail.simpleInfo.baseInfo.longNick ?? info.simpleInfo?.baseInfo.longNick,
reg_time: extendData.detail.commonExt?.regTime ?? info.regTime, reg_time: extendData.detail.commonExt?.regTime ?? info.commonExt?.regTime,
is_vip: extendData.detail.simpleInfo.vasInfo?.svipFlag, is_vip: extendData.detail.simpleInfo.vasInfo?.svipFlag,
is_years_vip: extendData.detail.simpleInfo.vasInfo?.yearVipFlag, is_years_vip: extendData.detail.simpleInfo.vasInfo?.yearVipFlag,
vip_level: extendData.detail.simpleInfo.vasInfo?.vipLevel, vip_level: extendData.detail.simpleInfo.vasInfo?.vipLevel,
remark: extendData.detail.simpleInfo.coreInfo.remark ?? info.remark, remark: extendData.detail.simpleInfo.coreInfo.remark ?? info.simpleInfo?.coreInfo.remark,
status: extendData.detail.simpleInfo.status?.status ?? info.status, status: extendData.detail.simpleInfo.status?.status ?? info.simpleInfo?.status?.status,
login_days: 0,//失效 login_days: 0,//失效
}; };
} }

View File

@@ -16,15 +16,15 @@ export class SetQQProfile extends OneBotAction<Payload, Awaited<ReturnType<NTQQU
async _handle(payload: Payload) { async _handle(payload: Payload) {
const self = this.core.selfInfo; const self = this.core.selfInfo;
const OldProfile = await this.core.apis.UserApi.getUserDetailInfo(self.uid); const OldProfile = await this.core.apis.UserApi.fetchUserDetailInfoV2(self.uid);
return await this.core.apis.UserApi.modifySelfProfile({ return await this.core.apis.UserApi.modifySelfProfile({
nick: payload.nickname, nick: payload.nickname,
longNick: (payload?.personal_note ?? OldProfile?.longNick) || '', longNick: (payload?.personal_note ?? OldProfile?.simpleInfo!.baseInfo.longNick) || '',
sex: parseInt(payload?.sex ? payload?.sex.toString() : OldProfile?.sex!.toString()), sex: parseInt(payload?.sex ? payload?.sex.toString() : OldProfile?.simpleInfo!.baseInfo.sex!.toString()),
birthday: { birthday: {
birthday_year: OldProfile?.birthday_year!.toString(), birthday_year: OldProfile?.simpleInfo!.baseInfo.birthday_year!.toString(),
birthday_month: OldProfile?.birthday_month!.toString(), birthday_month: OldProfile?.simpleInfo!.baseInfo.birthday_month!.toString(),
birthday_day: OldProfile?.birthday_day!.toString(), birthday_day: OldProfile?.simpleInfo!.baseInfo.birthday_day!.toString(),
}, },
location: undefined, location: undefined,
}); });

View File

@@ -32,24 +32,20 @@ class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
const [member, info] = await Promise.all([ const [member, info] = await Promise.all([
this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, isNocache), this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, isNocache),
this.core.apis.UserApi.getUserDetailInfo(uid), this.core.apis.UserApi.fetchUserDetailInfoV2(uid),
]); ]);
if (!member || !groupMember) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`); if (!member || !groupMember) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);
return info ? { ...groupMember, ...member, ...info } : member; return { member, info, groupMember };
} }
async _handle(payload: Payload) { async _handle(payload: Payload) {
const isNocache = this.parseBoolean(payload.no_cache ?? true); const isNocache = this.parseBoolean(payload.no_cache ?? true);
const uid = await this.getUid(payload.user_id); const uid = await this.getUid(payload.user_id);
const member = await this.getGroupMemberInfo(payload, uid, isNocache); const { member, info } = await this.getGroupMemberInfo(payload, uid, isNocache);
console.log('member', JSON.stringify(member, null, 2), 'info', JSON.stringify(info, null, 2));
if (!member) { return OB11Construct.groupMember(payload.group_id.toString(), member, info);
this.core.context.logger.logDebug('获取群成员详细信息失败, 只能返回基础信息');
}
return OB11Construct.groupMember(payload.group_id.toString(), member);
} }
} }

View File

@@ -16,16 +16,35 @@ export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]>
override actionName = ActionName.GetGroupMemberList; override actionName = ActionName.GetGroupMemberList;
override payloadSchema = SchemaData; override payloadSchema = SchemaData;
/**
* 处理获取群成员列表请求
*/
async _handle(payload: Payload) { async _handle(payload: Payload) {
const groupIdStr = payload.group_id.toString(); const groupIdStr = payload.group_id.toString();
const noCache = this.parseBoolean(payload.no_cache ?? false); const noCache = this.parseBoolean(payload.no_cache ?? false);
// 获取群成员基本信息
const groupMembers = await this.getGroupMembers(groupIdStr, noCache); const groupMembers = await this.getGroupMembers(groupIdStr, noCache);
const _groupMembers = await Promise.all( const memberArray = Array.from(groupMembers.values());
Array.from(groupMembers.values()).map(item =>
OB11Construct.groupMember(groupIdStr, item) // 批量并行获取用户详情
) const userDetailsPromises = memberArray.map(member =>
this.core.apis.UserApi.fetchUserDetailInfoV2(member.uid)
.catch(_ => {
return { uin: member.uin, uid: member.uid };
})
); );
return Array.from(new Map(_groupMembers.map(member => [member.user_id, member])).values()); const userDetails = await Promise.all(userDetailsPromises);
// 并行构建 OneBot 格式的群成员数据
const groupMembersList = memberArray.map((member, index) => {
// 确保用户详情不会是undefined
const userDetail = userDetails[index] || { uin: member.uin, uid: member.uid };
return OB11Construct.groupMember(groupIdStr, member, userDetail);
});
// 直接返回处理后的成员列表,不进行去重
return groupMembersList;
} }
private parseBoolean(value: boolean | string): boolean { private parseBoolean(value: boolean | string): boolean {
@@ -37,13 +56,18 @@ export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]>
let groupMembers = memberCache.get(groupIdStr); let groupMembers = memberCache.get(groupIdStr);
if (noCache || !groupMembers) { if (noCache || !groupMembers) {
const data = this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr, true).then().catch(); try {
groupMembers = memberCache.get(groupIdStr) || (await data); const refreshPromise = this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr, true);
if (!groupMembers) {
throw new Error(`Failed to get group member list for group ${groupIdStr}`); groupMembers = memberCache.get(groupIdStr) || (await refreshPromise);
if (!groupMembers) {
throw new Error(`无法获取群 ${groupIdStr} 的成员列表`);
}
} catch (error) {
throw new Error(`获取群 ${groupIdStr} 成员列表失败: ${error instanceof Error ? error.message : String(error)}`);
} }
} }
return groupMembers; return groupMembers;
} }
} }

View File

@@ -15,7 +15,24 @@ export default class GetFriendList extends OneBotAction<Payload, OB11User[]> {
override payloadSchema = SchemaData; override payloadSchema = SchemaData;
async _handle(_payload: Payload) { async _handle(_payload: Payload) {
//全新逻辑 // 获取好友列表
return OB11Construct.friends(await this.core.apis.FriendApi.getBuddy()); let buddyList = await this.core.apis.FriendApi.getBuddyV2SimpleInfoMap();
const buddyArray = Array.from(buddyList.values());
// 批量并行获取用户详情
const userDetailsPromises = buddyArray.map(member =>
this.core.apis.UserApi.fetchUserDetailInfoV2(member.uid)
.catch(_ => {
return { uin: member.uin, uid: member.uid };
})
);
const userDetails = await Promise.all(userDetailsPromises);
const friendList = buddyArray.map((friend, index) => {
const userDetail = userDetails[index] || { uin: friend.uin, uid: friend.uid };
return OB11Construct.friend(friend, userDetail);
});
return friendList;
} }
} }

View File

@@ -444,8 +444,8 @@ export class OneBotMsgApi {
} }
const uid = await this.core.apis.UserApi.getUidByUinV2(`${atQQ}`); const uid = await this.core.apis.UserApi.getUidByUinV2(`${atQQ}`);
if (!uid) throw new Error('Get Uid Error'); if (!uid) throw new Error('Get Uid Error');
const info = await this.core.apis.UserApi.getUserDetailInfo(uid); const info = await this.core.apis.UserApi.fetchUserDetailInfoV2(uid);
return at(atQQ, uid, NTMsgAtType.ATTYPEONE, info.nick || ''); return at(atQQ, uid, NTMsgAtType.ATTYPEONE, info.simpleInfo?.coreInfo.nick || '');
}, },
[OB11MessageDataType.reply]: async ({ data: { id } }) => { [OB11MessageDataType.reply]: async ({ data: { id } }) => {
@@ -845,7 +845,7 @@ export class OneBotMsgApi {
return; return;
} }
} }
resMsg.sender.nickname = (await this.core.apis.UserApi.getUserDetailInfo(msg.senderUid)).nick; resMsg.sender.nickname = (await this.core.apis.UserApi.fetchUserDetailInfoV2(msg.senderUid)).simpleInfo?.coreInfo.nick || '';
} }
private async handleTempGroupMessage(resMsg: OB11Message, msg: RawMessage) { private async handleTempGroupMessage(resMsg: OB11Message, msg: RawMessage) {

View File

@@ -1,6 +1,6 @@
import { calcQQLevel } from '@/common/helper'; import { calcQQLevel } from '@/common/helper';
import { FileNapCatOneBotUUID } from '@/common/file-uuid'; import { FileNapCatOneBotUUID } from '@/common/file-uuid';
import { FriendV2, Group, GroupFileInfoUpdateParamType, GroupMember, SelfInfo, NTSex } from '@/core'; import { FriendV2, Group, GroupFileInfoUpdateParamType, GroupMember, SelfInfo, NTSex, UserV2 } from '@/core';
import { import {
OB11Group, OB11Group,
OB11GroupFile, OB11GroupFile,
@@ -14,7 +14,7 @@ export class OB11Construct {
static selfInfo(selfInfo: SelfInfo): OB11User { static selfInfo(selfInfo: SelfInfo): OB11User {
return { return {
user_id: +selfInfo.uin, user_id: +selfInfo.uin,
nickname: selfInfo.nick, nickname: selfInfo.simpleInfo?.coreInfo.nick ?? '',
}; };
} }
@@ -34,7 +34,23 @@ export class OB11Construct {
level: 0, level: 0,
})); }));
} }
static friend(friends: FriendV2,info:UserV2): OB11User {
return {
birthday_year: friends.baseInfo.birthday_year,
birthday_month: friends.baseInfo.birthday_month,
birthday_day: friends.baseInfo.birthday_day,
user_id: parseInt(friends.coreInfo.uin),
age: friends.baseInfo.age,
phone_num: friends.baseInfo.phoneNum,
email: friends.baseInfo.eMail,
category_id: friends.baseInfo.categoryId,
nickname: friends.coreInfo.nick ?? '',
remark: friends.coreInfo.remark ?? friends.coreInfo.nick,
sex: this.sex(friends.baseInfo.sex),
level: calcQQLevel(info?.commonExt?.qqLevel) || 0,
qid: friends.baseInfo.qid,
};
}
static groupMemberRole(role: number): OB11GroupMemberRole | undefined { static groupMemberRole(role: number): OB11GroupMemberRole | undefined {
return { return {
4: OB11GroupMemberRole.owner, 4: OB11GroupMemberRole.owner,
@@ -53,20 +69,20 @@ export class OB11Construct {
}[sex] || OB11UserSex.unknown; }[sex] || OB11UserSex.unknown;
} }
static groupMember(group_id: string, member: GroupMember): OB11GroupMember { static groupMember(group_id: string, member: GroupMember, info: UserV2): OB11GroupMember {
return { return {
group_id: +group_id, group_id: +group_id,
user_id: +member.uin, user_id: +member.uin,
nickname: member.nick, nickname: member.nick,
card: member.cardName, card: member.cardName,
sex: this.sex(member.sex), sex: this.sex(info?.simpleInfo?.baseInfo.sex),
age: member.age ?? 0, age: info?.simpleInfo?.baseInfo.age ?? 0,
area: '', area: info?.commonExt?.address,
level: member.memberRealLevel?.toString() ?? '0', level: member.memberRealLevel?.toString() ?? '0',
qq_level: member.qqLevel && calcQQLevel(member.qqLevel) || 0, qq_level: info?.commonExt?.qqLevel && calcQQLevel(info.commonExt.qqLevel) || 0,
join_time: +member.joinTime, join_time: +member.joinTime,
last_sent_time: +member.lastSpeakTime, last_sent_time: +member.lastSpeakTime,
title_expire_time: 0, title_expire_time: +member.specialTitleExpireTime,
unfriendly: false, unfriendly: false,
card_changeable: true, card_changeable: true,
is_robot: member.isRobot, is_robot: member.isRobot,

View File

@@ -97,13 +97,13 @@ export class NapCatOneBot11Adapter {
return log; return log;
} }
async InitOneBot() { async InitOneBot() {
const selfInfo = this.core.selfInfo;
const ob11Config = this.configLoader.configData; const ob11Config = this.configLoader.configData;
this.core.apis.UserApi.getUserDetailInfo(selfInfo.uid) this.core.apis.UserApi.fetchUserDetailInfoV2(this.core.selfInfo.uid)
.then((user) => { .then((user) => {
selfInfo.nick = user.nick; this.core.selfInfo = { ...user, online: this.core.selfInfo.online };
this.context.logger.setLogSelfInfo(selfInfo); this.context.logger.setLogSelfInfo({ nick: this.core.selfInfo.simpleInfo?.coreInfo.nick ?? '', uid: this.core.selfInfo.uid });
}) })
.catch(e => this.context.logger.logError(e)); .catch(e => this.context.logger.logError(e));
@@ -170,7 +170,7 @@ export class NapCatOneBot11Adapter {
this.initGroupListener(); this.initGroupListener();
WebUiDataRuntime.setQQVersion(this.core.context.basicInfoWrapper.getFullQQVesion()); WebUiDataRuntime.setQQVersion(this.core.context.basicInfoWrapper.getFullQQVesion());
WebUiDataRuntime.setQQLoginInfo(selfInfo); WebUiDataRuntime.setQQLoginInfo(this.core.selfInfo);
WebUiDataRuntime.setQQLoginStatus(true); WebUiDataRuntime.setQQLoginStatus(true);
WebUiDataRuntime.setOnOB11ConfigChanged(async (newConfig) => { WebUiDataRuntime.setOnOB11ConfigChanged(async (newConfig) => {
const prev = this.configLoader.configData; const prev = this.configLoader.configData;

View File

@@ -1,4 +1,10 @@
export interface OB11User { export interface OB11User {
birthday_year?: number;
birthday_month?: number;
birthday_day?: number;
phone_num?: string; // 手机号
email?: string; // 邮箱
category_id?: number; // 分组ID
user_id: number; // 用户ID user_id: number; // 用户ID
nickname: string; // 昵称 nickname: string; // 昵称
remark?: string; // 备注 remark?: string; // 备注

View File

@@ -131,7 +131,6 @@ async function handleLogin(
inner_resolve({ inner_resolve({
uid: loginResult.uid, uid: loginResult.uid,
uin: loginResult.uin, uin: loginResult.uin,
nick: '',
online: true, online: true,
}); });
@@ -346,8 +345,8 @@ export async function NCoreInitShell() {
guid, guid,
basicInfoWrapper.QQVersionAppid, basicInfoWrapper.QQVersionAppid,
basicInfoWrapper.getFullQQVesion(), basicInfoWrapper.getFullQQVesion(),
selfInfo.uin, selfInfo.uin ?? '',
selfInfo.uid, selfInfo.uid ?? '',
dataPath, dataPath,
); );
@@ -380,7 +379,6 @@ export async function NCoreInitShell() {
export class NapCatShell { export class NapCatShell {
readonly core: NapCatCore; readonly core: NapCatCore;
readonly context: InstanceContext; readonly context: InstanceContext;
constructor( constructor(
wrapper: WrapperNodeApi, wrapper: WrapperNodeApi,
session: NodeIQQNTWrapperSession, session: NodeIQQNTWrapperSession,