mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2024-11-16 04:45:46 +00:00
feat: 全面迁移V2
This commit is contained in:
parent
964014fc5c
commit
a2ecf10d19
@ -24,7 +24,7 @@ export class NTQQGroupApi {
|
|||||||
constructor(context: InstanceContext, core: NapCatCore) {
|
constructor(context: InstanceContext, core: NapCatCore) {
|
||||||
this.context = context;
|
this.context = context;
|
||||||
this.core = core;
|
this.core = core;
|
||||||
this.initCache().then().catch(context.logger.logError);
|
this.initCache().then().catch(context.logger.logError.bind(context.logger));
|
||||||
}
|
}
|
||||||
|
|
||||||
async initCache() {
|
async initCache() {
|
||||||
|
@ -159,7 +159,7 @@ export class NTQQUserApi {
|
|||||||
if (uid) return uid;
|
if (uid) return uid;
|
||||||
uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
|
uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
|
||||||
if (uid) return uid;
|
if (uid) return uid;
|
||||||
const unverifiedUid = (await this.getUserDetailInfoByUinV2(Uin)).detail.uid;//从QQ Native 特殊转换
|
const unverifiedUid = (await this.getUserDetailInfoByUin(Uin)).detail.uid;//从QQ Native 特殊转换
|
||||||
if (unverifiedUid.indexOf('*') == -1) uid = unverifiedUid;
|
if (unverifiedUid.indexOf('*') == -1) uid = unverifiedUid;
|
||||||
//if (uid) return uid;
|
//if (uid) return uid;
|
||||||
return uid;
|
return uid;
|
||||||
@ -195,7 +195,7 @@ export class NTQQUserApi {
|
|||||||
return await this.context.session.getRecentContactService().getRecentContactList();
|
return await this.context.session.getRecentContactService().getRecentContactList();
|
||||||
}
|
}
|
||||||
|
|
||||||
async getUserDetailInfoByUinV2(Uin: string) {
|
async getUserDetailInfoByUin(Uin: string) {
|
||||||
return await this.core.eventWrapper.callNoListenerEvent(
|
return await this.core.eventWrapper.callNoListenerEvent(
|
||||||
'NodeIKernelProfileService/getUserDetailInfoByUin',
|
'NodeIKernelProfileService/getUserDetailInfoByUin',
|
||||||
Uin
|
Uin
|
||||||
|
@ -297,7 +297,7 @@ export enum BizKey {
|
|||||||
KPHOTOWALL
|
KPHOTOWALL
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UserDetailInfoByUinV2 {
|
export interface UserDetailInfoByUin {
|
||||||
result: number,
|
result: number,
|
||||||
errMsg: string,
|
errMsg: string,
|
||||||
detail: {
|
detail: {
|
||||||
@ -308,65 +308,6 @@ export interface UserDetailInfoByUinV2 {
|
|||||||
photoWall: null
|
photoWall: null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UserDetailInfoByUin {
|
|
||||||
result: number,
|
|
||||||
errMsg: string,
|
|
||||||
info: {
|
|
||||||
uid: string,//这个没办法用
|
|
||||||
qid: string,
|
|
||||||
uin: string,
|
|
||||||
nick: string,
|
|
||||||
remark: string,
|
|
||||||
longNick: string,
|
|
||||||
avatarUrl: string,
|
|
||||||
birthday_year: number,
|
|
||||||
birthday_month: number,
|
|
||||||
birthday_day: number,
|
|
||||||
sex: number,//0
|
|
||||||
topTime: string,
|
|
||||||
constellation: number,
|
|
||||||
shengXiao: number,
|
|
||||||
kBloodType: number,
|
|
||||||
homeTown: string,
|
|
||||||
makeFriendCareer: number,
|
|
||||||
pos: string,
|
|
||||||
eMail: string,
|
|
||||||
phoneNum: string,
|
|
||||||
college: string,
|
|
||||||
country: string,
|
|
||||||
province: string,
|
|
||||||
city: string,
|
|
||||||
postCode: string,
|
|
||||||
address: string,
|
|
||||||
isBlock: boolean,
|
|
||||||
isSpecialCareOpen: boolean,
|
|
||||||
isSpecialCareZone: boolean,
|
|
||||||
ringId: string,
|
|
||||||
regTime: number,
|
|
||||||
interest: string,
|
|
||||||
termType: number,
|
|
||||||
labels: any[],
|
|
||||||
qqLevel: { crownNum: number, sunNum: number, moonNum: number, starNum: number },
|
|
||||||
isHideQQLevel: number,
|
|
||||||
privilegeIcon: { jumpUrl: string, openIconList: any[], closeIconList: any[] },
|
|
||||||
isHidePrivilegeIcon: number,
|
|
||||||
photoWall: { picList: any[] },
|
|
||||||
vipFlag: boolean,
|
|
||||||
yearVipFlag: boolean,
|
|
||||||
svipFlag: boolean,
|
|
||||||
vipLevel: number,
|
|
||||||
status: number,
|
|
||||||
qidianMasterFlag: number,
|
|
||||||
qidianCrewFlag: number,
|
|
||||||
qidianCrewFlag2: number,
|
|
||||||
extStatus: number,
|
|
||||||
recommendImgFlag: number,
|
|
||||||
disableEmojiShortCuts: number,
|
|
||||||
pendantId: string,
|
|
||||||
vipNameColorId: string
|
|
||||||
}
|
|
||||||
}
|
|
||||||
export enum UserDetailSource {
|
export enum UserDetailSource {
|
||||||
KDB,
|
KDB,
|
||||||
KSERVER
|
KSERVER
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { AnyCnameRecord } from 'node:dns';
|
import { AnyCnameRecord } from 'node:dns';
|
||||||
import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, ProfileBizType, SimpleInfo, UserDetailInfoByUinV2, UserDetailSource } from '@/core';
|
import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, ProfileBizType, SimpleInfo, UserDetailInfoByUin, UserDetailSource } from '@/core';
|
||||||
import { GeneralCallResult } from '@/core/services/common';
|
import { GeneralCallResult } from '@/core/services/common';
|
||||||
|
|
||||||
export interface NodeIKernelProfileService {
|
export interface NodeIKernelProfileService {
|
||||||
@ -55,7 +55,7 @@ export interface NodeIKernelProfileService {
|
|||||||
|
|
||||||
getUserDetailInfoWithBizInfo(uid: string, Biz: BizKey[]): Promise<GeneralCallResult>;
|
getUserDetailInfoWithBizInfo(uid: string, Biz: BizKey[]): Promise<GeneralCallResult>;
|
||||||
|
|
||||||
getUserDetailInfoByUin(uin: string): Promise<UserDetailInfoByUinV2>;
|
getUserDetailInfoByUin(uin: string): Promise<UserDetailInfoByUin>;
|
||||||
|
|
||||||
getZplanAvatarInfos(args: string[]): Promise<unknown>;
|
getZplanAvatarInfos(args: string[]): Promise<unknown>;
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11Use
|
|||||||
|
|
||||||
async _handle(payload: Payload): Promise<OB11User> {
|
async _handle(payload: Payload): Promise<OB11User> {
|
||||||
const user_id = payload.user_id.toString();
|
const user_id = payload.user_id.toString();
|
||||||
const extendData = await this.core.apis.UserApi.getUserDetailInfoByUinV2(user_id);
|
const extendData = await this.core.apis.UserApi.getUserDetailInfoByUin(user_id);
|
||||||
const uid = (await this.core.apis.UserApi.getUidByUinV2(user_id))!;
|
const uid = (await this.core.apis.UserApi.getUidByUinV2(user_id))!;
|
||||||
if (!uid || uid.indexOf('*') != -1) {
|
if (!uid || uid.indexOf('*') != -1) {
|
||||||
return {
|
return {
|
||||||
|
Loading…
Reference in New Issue
Block a user