GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: friend uid 异常

Browse Source
This commit is contained in:
手瓜一十雪 2024-07-10 21:11:28 +08:00
parent 29904f3cb7
commit 22faac7e36
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/src/apis/user.ts
View File

@ -1,7 +1,7 @@
import { ModifyProfileParams, SelfInfo, User, UserDetailInfoByUin } from '@/core/entities'; import { ModifyProfileParams, SelfInfo, User, UserDetailInfoByUin } from '@/core/entities';
import { selfInfo } from '@/core/data'; import { friends, selfInfo } from '@/core/data';
import { CacheClassFuncAsync } from '@/common/utils/helper'; import { CacheClassFuncAsync } from '@/common/utils/helper';
import { GeneralCallResult, napCatCore } from '@/core'; import { GeneralCallResult, napCatCore, NTQQFriendApi } from '@/core';
import { ProfileListener } from '@/core/listeners'; import { ProfileListener } from '@/core/listeners';
import { rejects } from 'assert'; import { rejects } from 'assert';
import { randomUUID } from 'crypto'; import { randomUUID } from 'crypto';
@ -170,7 +170,18 @@ export class NTQQUserApi {
5000, 5000,
[Uin] [Uin]
); );
return ret.uidInfo.get(Uin); let uid = ret.uidInfo.get(Uin);
//let t = await NTQQUserApi.getUserDetailInfoByUin(Uin);
if (!uid) {
uid = (await NTQQFriendApi.getFriends(true)).find((t) => { t.uin == Uin })?.uid;
}
if (!uid) {
uid = Array.from(friends.values()).find((t) => { t.uin == Uin })?.uid;
}
if (!uid) {
//uid获取失败
}
return uid;
} }
static async getUinByUid(Uid: string | undefined) { static async getUinByUid(Uid: string | undefined) {
if (!Uid) { if (!Uid) {

1
src/onebot11/action/msg/SendMsg/index.ts
View File

@ -102,6 +102,7 @@ async function createContext(payload: OB11PostSendMsg, contextMode: ContextMode)
if ((contextMode === ContextMode.Private || contextMode === ContextMode.Normal) && payload.user_id) { if ((contextMode === ContextMode.Private || contextMode === ContextMode.Normal) && payload.user_id) {
const Uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); const Uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
const isBuddy = await NTQQFriendApi.isBuddy(Uid!); const isBuddy = await NTQQFriendApi.isBuddy(Uid!);
//console.log("[调试代码] UIN:", payload.user_id, " UID:", Uid, " IsBuddy:", isBuddy);
return { return {
peer: { peer: {
chatType: isBuddy ? ChatType.friend : ChatType.temp, chatType: isBuddy ? ChatType.friend : ChatType.temp,