diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts index 7c7897cb..fe8d48f5 100644 --- a/src/core/apis/user.ts +++ b/src/core/apis/user.ts @@ -1,7 +1,6 @@ -import type { ModifyProfileParams, User } from '@/core/entities'; +import { ModifyProfileParams, User, UserDetailSource } from '@/core/entities'; import { RequestUtil } from '@/common/request'; -import { ProfileBizType, UserDetailSource } from '@/core/services'; -import { InstanceContext, NapCatCore } from '..'; +import { InstanceContext, NapCatCore, ProfileBizType } from '..'; import { solveAsyncProblem } from '@/common/helper'; export class NTQQUserApi { diff --git a/src/core/entities/contact.ts b/src/core/entities/contact.ts new file mode 100644 index 00000000..ab13af92 --- /dev/null +++ b/src/core/entities/contact.ts @@ -0,0 +1,12 @@ + +export interface FSABRecentContactParams { + anchorPointContact: { + contactId: string; + sortField: string; + pos: number; + }; + relativeMoveCount: number; + listType: number; + count: number; + fetchOld: boolean; +} diff --git a/src/core/entities/user.ts b/src/core/entities/user.ts index 70197a49..2323705b 100644 --- a/src/core/entities/user.ts +++ b/src/core/entities/user.ts @@ -375,4 +375,8 @@ export enum ProfileBizType { KVAS, KQZONE, KOTHER +}export enum BuddyListReqType { + KNOMAL, + KLETTER } + diff --git a/src/core/services/NodeIKernelAlbumService.ts b/src/core/services/NodeIKernelAlbumService.ts index b8224e0f..1d1ca68c 100644 --- a/src/core/services/NodeIKernelAlbumService.ts +++ b/src/core/services/NodeIKernelAlbumService.ts @@ -1,4 +1,5 @@ export interface NodeIKernelAlbumService { + setAlbumServiceInfo(...args: any[]): unknown;// needs 3 arguments getMainPage(...args: any[]): unknown;// needs 2 arguments diff --git a/src/core/services/NodeIKernelAvatarService.ts b/src/core/services/NodeIKernelAvatarService.ts index 1dcc4453..176c0aba 100644 --- a/src/core/services/NodeIKernelAvatarService.ts +++ b/src/core/services/NodeIKernelAvatarService.ts @@ -1,7 +1,7 @@ export interface NodeIKernelAvatarService { - addAvatarListener(arg: unknown): unknown; + addAvatarListener(listener: unknown): void; - removeAvatarListener(arg: unknown): unknown; + removeAvatarListener(listenerId: number): void; getAvatarPath(arg1: unknown, arg2: unknown): unknown; diff --git a/src/core/services/NodeIKernelBuddyService.ts b/src/core/services/NodeIKernelBuddyService.ts index b940ed8c..c42a772c 100644 --- a/src/core/services/NodeIKernelBuddyService.ts +++ b/src/core/services/NodeIKernelBuddyService.ts @@ -1,13 +1,8 @@ import { GeneralCallResult } from '@/core/services/common'; import { NodeIKernelBuddyListener } from '@/core/listeners'; - -export enum BuddyListReqType { - KNOMAL, - KLETTER -} +import { BuddyListReqType } from '../entities/user'; export interface NodeIKernelBuddyService { - // 26702 以上 getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise }>; - //26702 以上 getBuddyListFromCache(callFrom: string): Promise//Uids }>>; - - // 以下为原生方法 + addKernelBuddyListener(listener: NodeIKernelBuddyListener): number; getAllBuddyCount(): number; - removeKernelBuddyListener(listener: unknown): void; + removeKernelBuddyListener(listenerId: number): void; - /** - * @deprecated - * @param nocache 使用缓存 - */ - getBuddyList(nocache: boolean): Promise; + //getBuddyList(nocache: boolean): Promise; getBuddyNick(uid: number): string; diff --git a/src/core/services/NodeIKernelCollectionService.ts b/src/core/services/NodeIKernelCollectionService.ts index c745a93a..2bbdd459 100644 --- a/src/core/services/NodeIKernelCollectionService.ts +++ b/src/core/services/NodeIKernelCollectionService.ts @@ -1,9 +1,9 @@ import { GeneralCallResult } from './common'; export interface NodeIKernelCollectionService { - addKernelCollectionListener(...args: any[]): unknown;//needs 1 arguments + addKernelCollectionListener(...args: any[]): void;//needs 1 arguments - removeKernelCollectionListener(...args: any[]): unknown;//needs 1 arguments + removeKernelCollectionListener(listenerId: number): void; getCollectionItemList(param: { category: number, @@ -14,46 +14,46 @@ export interface NodeIKernelCollectionService { count: number, searchDown: boolean }): Promise, - hasMore: boolean, - bottomTimeStamp: string - } + numId: string, + strId: string, + groupId: string, + groupName: string, + uid: string + }, + bid: number, + category: number, + createTime: string, + collectTime: string, + modifyTime: string, + sequence: string, + shareUrl: string, + customGroupId: number, + securityBeat: boolean, + summary: { + textSummary: unknown, + linkSummary: unknown, + gallerySummary: unknown, + audioSummary: unknown, + videoSummary: unknown, + fileSummary: unknown, + locationSummary: unknown, + richMediaSummary: unknown, + } + }>, + hasMore: boolean, + bottomTimeStamp: string } - >;//needs 1 arguments + } + >; getCollectionContent(...args: any[]): unknown;//needs 5 arguments diff --git a/src/core/services/NodeIKernelDbToolsService.ts b/src/core/services/NodeIKernelDbToolsService.ts index ab110b05..8dd9bd4e 100644 --- a/src/core/services/NodeIKernelDbToolsService.ts +++ b/src/core/services/NodeIKernelDbToolsService.ts @@ -1,7 +1,9 @@ export interface NodeIKernelDbToolsService { + depositDatabase(...args: unknown[]): unknown; backupDatabase(...args: unknown[]): unknown; retrieveDatabase(...args: unknown[]): unknown; + } diff --git a/src/core/services/NodeIKernelECDHService.ts b/src/core/services/NodeIKernelECDHService.ts index e6e83613..fd8231a3 100644 --- a/src/core/services/NodeIKernelECDHService.ts +++ b/src/core/services/NodeIKernelECDHService.ts @@ -1,3 +1,2 @@ export interface NodeIKernelECDHService { - } diff --git a/src/core/services/NodeIKernelGroupService.ts b/src/core/services/NodeIKernelGroupService.ts index 7d54c099..2ecad978 100644 --- a/src/core/services/NodeIKernelGroupService.ts +++ b/src/core/services/NodeIKernelGroupService.ts @@ -11,8 +11,6 @@ import { } from '@/core/entities'; import { GeneralCallResult } from '@/core/services/common'; -//高版本的接口不应该随意使用 使用应该严格进行pr审核 同时部分ipc中未出现的接口不要过于依赖 应该做好数据兜底 - export interface NodeIKernelGroupService { getGroupExt0xEF0Info(enableGroupCodes: string[], bannedGroupCodes: string[], filter: GroupExt0xEF0InfoFilter, forceFetch: boolean): Promise } }>; @@ -82,11 +80,11 @@ export interface NodeIKernelGroupService { }): Promise; - isEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise; + isEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise; - queryCachedEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise; + queryCachedEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise; - fetchGroupEssenceList(Req: { + fetchGroupEssenceList(req: { groupCode: string, pageStart: number, pageLimit: number @@ -110,13 +108,12 @@ export interface NodeIKernelGroupService { addKernelGroupListener(listener: NodeIKernelGroupListener): number; - removeKernelGroupListener(listenerId: unknown): void; + removeKernelGroupListener(listenerId: number): void; createMemberListScene(groupCode: string, scene: string): string; destroyMemberListScene(SceneId: string): void; - //About Arg (a) name: lastId 根据手Q来看为object {index:?(number),uid:string} getNextMemberList(sceneId: string, a: undefined, num: number): Promise<{ errCode: number, errMsg: string, result: { ids: string[], infos: Map, finish: boolean, hasRobot: boolean } diff --git a/src/core/services/NodeIKernelMsgBackupService.ts b/src/core/services/NodeIKernelMsgBackupService.ts index e48bea13..395edd04 100644 --- a/src/core/services/NodeIKernelMsgBackupService.ts +++ b/src/core/services/NodeIKernelMsgBackupService.ts @@ -1,7 +1,7 @@ export interface NodeIKernelMsgBackupService { - addKernelMsgBackupListener(...args: any[]): unknown;// needs 1 arguments + addKernelMsgBackupListener(listener: unknown): number; - removeKernelMsgBackupListener(...args: any[]): unknown;// needs 1 arguments + removeKernelMsgBackupListener(listenerId: number): void; getMsgBackupLocation(...args: any[]): unknown;// needs 0 arguments diff --git a/src/core/services/NodeIKernelOnlineStatusService.ts b/src/core/services/NodeIKernelOnlineStatusService.ts index c3c97062..4cb372a7 100644 --- a/src/core/services/NodeIKernelOnlineStatusService.ts +++ b/src/core/services/NodeIKernelOnlineStatusService.ts @@ -1,8 +1,8 @@ export interface NodeIKernelOnlineStatusService { - addKernelOnlineStatusListener(listener: unknown): void; + addKernelOnlineStatusListener(listener: unknown): number; - removeKernelOnlineStatusListener(listenerId: unknown): void; + removeKernelOnlineStatusListener(listenerId: number): void; getShouldShowAIOStatusAnimation(arg: unknown): unknown; diff --git a/src/core/services/NodeIKernelProfileLikeService.ts b/src/core/services/NodeIKernelProfileLikeService.ts index a1f385e3..b4682a31 100644 --- a/src/core/services/NodeIKernelProfileLikeService.ts +++ b/src/core/services/NodeIKernelProfileLikeService.ts @@ -1,17 +1,17 @@ import { BuddyProfileLikeReq, GeneralCallResult } from '@/core'; export interface NodeIKernelProfileLikeService { - addKernelProfileLikeListener(listener: NodeIKernelProfileLikeService): void; + addKernelProfileLikeListener(listener: unknown): number; - removeKernelProfileLikeListener(listener: unknown): void; + removeKernelProfileLikeListener(listenerId: unknown): void; setBuddyProfileLike(...args: unknown[]): { result: number, errMsg: string, succCounts: number }; getBuddyProfileLike(req: BuddyProfileLikeReq): Promise, - 'friendMaxVotes': number, - 'start': number + info: { + userLikeInfos: Array, + friendMaxVotes: number, + start: number } }>; diff --git a/src/core/services/NodeIKernelProfileService.ts b/src/core/services/NodeIKernelProfileService.ts index c16ad740..17cdf791 100644 --- a/src/core/services/NodeIKernelProfileService.ts +++ b/src/core/services/NodeIKernelProfileService.ts @@ -1,5 +1,5 @@ import { AnyCnameRecord } from 'node:dns'; -import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, SimpleInfo, UserDetailInfoByUinV2 } from '@/core'; +import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, ProfileBizType, SimpleInfo, UserDetailInfoByUinV2, UserDetailSource } from '@/core'; import { GeneralCallResult } from '@/core/services/common'; export interface NodeIKernelProfileService { @@ -10,7 +10,7 @@ export interface NodeIKernelProfileService { getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise>; - fetchUserDetailInfo(trace: string, uids: string[], arg2: number, arg3: number[]): Promise; + fetchUserDetailInfo(trace: string, uids: string[], source: UserDetailSource, bizType: ProfileBizType[]): Promise; addKernelProfileListener(listener: NodeIKernelProfileListener): number; @@ -22,9 +22,9 @@ export interface NodeIKernelProfileService { enumCountryOptions(): Array; - enumProvinceOptions(Country: string): Array; + enumProvinceOptions(country: string): Array; - enumCityOptions(Country: string, Province: string): unknown; + enumCityOptions(country: string, province: string): unknown; enumAreaOptions(...args: unknown[]): unknown; diff --git a/src/core/services/NodeIKernelRecentContactService.ts b/src/core/services/NodeIKernelRecentContactService.ts index 556b3281..2573e413 100644 --- a/src/core/services/NodeIKernelRecentContactService.ts +++ b/src/core/services/NodeIKernelRecentContactService.ts @@ -1,30 +1,8 @@ import { ChatType, Peer } from '../entities'; import { NodeIKernelRecentContactListener } from '../listeners/NodeIKernelRecentContactListener'; import { GeneralCallResult } from './common'; +import { FSABRecentContactParams } from '../entities/contact'; -export interface FSABRecentContactParams { - anchorPointContact: { - contactId: string; - sortField: string; - pos: number; - }, - relativeMoveCount: number; - listType: number; - count: number; - fetchOld: boolean; -} - -// { -// "anchorPointContact": { -// "contactId": "", -// "sortField": "", -// "pos": 0 -// }, -// "relativeMoveCount": 0, -// "listType": 1, -// "count": 200, -// "fetchOld": true -// } export interface NodeIKernelRecentContactService { setGuildDisplayStatus(...args: unknown[]): unknown; // 2 arguments @@ -36,7 +14,6 @@ export interface NodeIKernelRecentContactService { enterOrExitMsgList(...args: unknown[]): unknown; // 1 arguments - /*!---!*/ getRecentContactListSnapShot(count: number): Promise; searchGroup(...args: any[]): unknown;// needs 1 arguments @@ -125,4 +126,5 @@ export interface NodeIKernelSearchService { searchCache(...args: any[]): unknown;// needs 3 arguments clearSearchCache(...args: any[]): unknown;// needs 1 arguments + } diff --git a/src/core/services/NodeIKernelStorageCleanService.ts b/src/core/services/NodeIKernelStorageCleanService.ts index ed7aa2e4..28a9d546 100644 --- a/src/core/services/NodeIKernelStorageCleanService.ts +++ b/src/core/services/NodeIKernelStorageCleanService.ts @@ -3,9 +3,9 @@ import { GeneralCallResult } from './common'; export interface NodeIKernelStorageCleanService { - addKernelStorageCleanListener(Listener: NodeIKernelStorageCleanListener): number; + addKernelStorageCleanListener(listener: NodeIKernelStorageCleanListener): number; - removeKernelStorageCleanListener(ListenerId: number): void; + removeKernelStorageCleanListener(listenerId: number): void; addCacheScanedPaths(arg: unknown): unknown; diff --git a/src/core/services/NodeIKernelTianShuService.ts b/src/core/services/NodeIKernelTianShuService.ts index caf408aa..3cb883b3 100644 --- a/src/core/services/NodeIKernelTianShuService.ts +++ b/src/core/services/NodeIKernelTianShuService.ts @@ -1,9 +1,7 @@ export interface NodeIKernelTianShuService { - addKernelTianShuListener(...args: any[]): unknown;// needs 1 arguments + addKernelTianShuListener(listener:unknown): number; - removeKernelTianShuListener(...args: any[]): unknown;// needs 1 arguments - - requesTianShuNumeralRe(...args: any[]): unknown;//d needs 1 arguments + removeKernelTianShuListener(listenerId:number): void; reportTianShuNumeralRed(...args: any[]): unknown;// needs 1 arguments diff --git a/src/core/services/NodeIKernelTicketService.ts b/src/core/services/NodeIKernelTicketService.ts index 70132f9b..57f802ba 100644 --- a/src/core/services/NodeIKernelTicketService.ts +++ b/src/core/services/NodeIKernelTicketService.ts @@ -2,9 +2,9 @@ import { ForceFetchClientKeyRetType } from './common'; export interface NodeIKernelTicketService { - addKernelTicketListener(listener: unknown): void; + addKernelTicketListener(listener: unknown): number; - removeKernelTicketListener(listenerId: unknown): void; + removeKernelTicketListener(listenerId: number): void; forceFetchClientKey(arg: string): Promise; diff --git a/src/core/services/NodeIKernelTipOffService.ts b/src/core/services/NodeIKernelTipOffService.ts index 756eaa8b..ae4617cd 100644 --- a/src/core/services/NodeIKernelTipOffService.ts +++ b/src/core/services/NodeIKernelTipOffService.ts @@ -2,7 +2,7 @@ import { GeneralCallResult } from './common'; export interface NodeIKernelTipOffService { - addKernelTipOffListener(listener: unknown): void; + addKernelTipOffListener(listener: unknown): number; removeKernelTipOffListener(listenerId: unknown): void; @@ -10,7 +10,7 @@ export interface NodeIKernelTipOffService { getPskey(domainList: string[], nocache: boolean): Promise - }>;//2 + }>; tipOffSendJsData(args: unknown[]): Promise;//2 diff --git a/src/core/services/NodeIKernelUnitedConfigService.ts b/src/core/services/NodeIKernelUnitedConfigService.ts index 6c02b27b..6a287a16 100644 --- a/src/core/services/NodeIKernelUnitedConfigService.ts +++ b/src/core/services/NodeIKernelUnitedConfigService.ts @@ -1,7 +1,8 @@ export interface NodeIKernelUnitedConfigService { - addKernelUnitedConfigListener(...args: any[]): unknown;// needs 1 arguments - removeKernelUnitedConfigListener(...args: any[]): unknown;// needs 1 arguments + addKernelUnitedConfigListener(listener:unknown): number; + + removeKernelUnitedConfigListener(listenerId:number): void; fetchUnitedCommendConfig(...args: any[]): unknown;// needs 1 arguments @@ -12,4 +13,5 @@ export interface NodeIKernelUnitedConfigService { isUnitedConfigSwitchOn(...args: any[]): unknown;// needs 1 arguments registerUnitedConfigPushGroupList(...args: any[]): unknown;// needs 1 arguments + } diff --git a/src/core/services/NodeIYellowFaceService.ts b/src/core/services/NodeIYellowFaceService.ts index 31ef0ff6..973cc91a 100644 --- a/src/core/services/NodeIYellowFaceService.ts +++ b/src/core/services/NodeIYellowFaceService.ts @@ -1,5 +1,5 @@ -// public interface IYellowFaceForManagerService extends QRouteApi { -// void download(@NotNull String resourceConfigJson, @NotNull String resourceDir, @NotNull String cacheDir, boolean force, @NotNull IKernelYellowFaceDownloadCallback callback); +export interface NodeIYellowFaceService { + download(resourceConfigJson: string, resourceDir: string, cacheDir: string, force: boolean): void; -// void setHistory(@NotNull String fullMd5, @NotNull IOperateCallback callback); -// } \ No newline at end of file + setHistory(fullMd5: string): void; +} diff --git a/src/core/services/NodeIkernelTestPerformanceService.ts b/src/core/services/NodeIkernelTestPerformanceService.ts index 427aaa0c..ba6f4e66 100644 --- a/src/core/services/NodeIkernelTestPerformanceService.ts +++ b/src/core/services/NodeIkernelTestPerformanceService.ts @@ -1,6 +1,7 @@ import { MessageElement, Peer } from '../entities'; export interface NodeIkernelTestPerformanceService { + insertMsg(MsgParam: { peer: Peer msgTime: string diff --git a/src/core/services/common.ts b/src/core/services/common.ts index 8f087fbb..1843db4e 100644 --- a/src/core/services/common.ts +++ b/src/core/services/common.ts @@ -1,6 +1,5 @@ export enum GeneralCallResultStatus { - OK = 0, - // ERROR = 1, + OK = 0 } export interface GeneralCallResult {