From 13299c463196ad006818bf8cb6d9f36255c4004f Mon Sep 17 00:00:00 2001 From: idranme Date: Sat, 21 Sep 2024 09:04:05 +0800 Subject: [PATCH] chore: improve code quality --- src/common/utils/file.ts | 8 - src/ntqqapi/api/friend.ts | 83 +-- src/ntqqapi/api/msg.ts | 4 +- src/ntqqapi/api/webapi.ts | 1 - src/ntqqapi/ntcall.ts | 4 +- src/ntqqapi/services/NodeIKernelMsgService.ts | 678 +----------------- .../services/NodeIKernelProfileLikeService.ts | 10 +- .../services/NodeIKernelProfileService.ts | 81 +-- .../services/NodeIKernelRichMediaService.ts | 245 +------ .../services/NodeIKernelSearchService.ts | 128 ---- .../services/NodeIKernelTipOffService.ts | 18 +- src/ntqqapi/services/index.ts | 1 - src/ntqqapi/types/msg.ts | 44 -- src/ntqqapi/wrapper.ts | 4 +- src/onebot11/entities.ts | 15 +- src/onebot11/types.ts | 2 +- 16 files changed, 93 insertions(+), 1233 deletions(-) delete mode 100644 src/ntqqapi/services/NodeIKernelSearchService.ts diff --git a/src/common/utils/file.ts b/src/common/utils/file.ts index 8c995e1..8dfc40b 100644 --- a/src/common/utils/file.ts +++ b/src/common/utils/file.ts @@ -6,14 +6,6 @@ import { randomUUID, createHash } from 'node:crypto' import { fileURLToPath } from 'node:url' import { fileTypeFromFile } from 'file-type' -export function isGIF(path: string) { - const buffer = Buffer.alloc(4) - const fd = fs.openSync(path, 'r') - fs.readSync(fd, buffer, 0, 4, 0) - fs.closeSync(fd) - return buffer.toString() === 'GIF8' -} - // 定义一个异步函数来检查文件是否存在 export function checkFileReceived(path: string, timeout: number = 3000): Promise { return new Promise((resolve, reject) => { diff --git a/src/ntqqapi/api/friend.ts b/src/ntqqapi/api/friend.ts index b05edce..dbbb361 100644 --- a/src/ntqqapi/api/friend.ts +++ b/src/ntqqapi/api/friend.ts @@ -62,67 +62,42 @@ export class NTQQFriendApi extends Service { } async getBuddyV2(refresh = false): Promise { - const session = getSession() - if (session) { - const uids: string[] = [] - const buddyService = session.getBuddyService() - const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) - uids.push(...buddyListV2.data.flatMap(item => item.buddyUids)) - const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids) - return Array.from(data.values()) - } else { - const data = await invoke<{ - buddyCategory: CategoryFriend[] - userSimpleInfos: Record - }>( - 'getBuddyList', - [refresh], - { - className: NTClass.NODE_STORE_API, - cbCmd: ReceiveCmdS.FRIENDS, - afterFirstCmd: false, - } - ) - const uids = data.buddyCategory.flatMap(item => item.buddyUids) - return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!)) - } + const data = await invoke<{ + buddyCategory: CategoryFriend[] + userSimpleInfos: Record + }>( + 'getBuddyList', + [refresh], + { + className: NTClass.NODE_STORE_API, + cbCmd: ReceiveCmdS.FRIENDS, + afterFirstCmd: false, + } + ) + const uids = data.buddyCategory.flatMap(item => item.buddyUids) + return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!)) } /** uid => uin */ async getBuddyIdMap(refresh = false): Promise> { const retMap: Map = new Map() - const session = getSession() - if (session) { - const uids: string[] = [] - const buddyService = session.getBuddyService() - const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) - uids.push(...buddyListV2.data.flatMap(item => item.buddyUids)) - const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids) - for (const [, item] of data) { - if (retMap.size > 5000) { - break - } - retMap.set(item.uid!, item.uin!) + const data = await invoke<{ + buddyCategory: CategoryFriend[] + userSimpleInfos: Record + }>( + 'getBuddyList', + [refresh], + { + className: NTClass.NODE_STORE_API, + cbCmd: ReceiveCmdS.FRIENDS, + afterFirstCmd: false, } - } else { - const data = await invoke<{ - buddyCategory: CategoryFriend[] - userSimpleInfos: Record - }>( - 'getBuddyList', - [refresh], - { - className: NTClass.NODE_STORE_API, - cbCmd: ReceiveCmdS.FRIENDS, - afterFirstCmd: false, - } - ) - for (const item of Object.values(data.userSimpleInfos)) { - if (retMap.size > 5000) { - break - } - retMap.set(item.uid!, item.uin!) + ) + for (const item of Object.values(data.userSimpleInfos)) { + if (retMap.size > 5000) { + break } + retMap.set(item.uid!, item.uin!) } return retMap } diff --git a/src/ntqqapi/api/msg.ts b/src/ntqqapi/api/msg.ts index 4c3f205..4ab6270 100644 --- a/src/ntqqapi/api/msg.ts +++ b/src/ntqqapi/api/msg.ts @@ -1,6 +1,6 @@ import { invoke, NTMethod } from '../ntcall' import { GeneralCallResult } from '../services' -import { RawMessage, SendMessageElement, Peer, ChatType2 } from '../types' +import { RawMessage, SendMessageElement, Peer, ChatType } from '../types' import { getSession } from '@/ntqqapi/wrapper' import { Service, Context } from 'cordis' import { selfInfo } from '@/common/globalVars' @@ -18,7 +18,7 @@ export class NTQQMsgApi extends Service { super(ctx, 'ntMsgApi', true) } - async getTempChatInfo(chatType: ChatType2, peerUid: string) { + async getTempChatInfo(chatType: ChatType, peerUid: string) { const session = getSession() if (session) { return session.getMsgService().getTempChatInfo(chatType, peerUid) diff --git a/src/ntqqapi/api/webapi.ts b/src/ntqqapi/api/webapi.ts index 1d3bd74..130e1e3 100644 --- a/src/ntqqapi/api/webapi.ts +++ b/src/ntqqapi/api/webapi.ts @@ -108,7 +108,6 @@ export class NTQQWebApi extends Service { return (hash & 0x7FFFFFFF).toString() } - //实现未缓存 考虑2h缓存 async getGroupHonorInfo(groupCode: string, getType: string) { const getDataInternal = async (groupCode: string, type: number) => { const url = 'https://qun.qq.com/interactive/honorlist?gc=' + groupCode + '&type=' + type diff --git a/src/ntqqapi/ntcall.ts b/src/ntqqapi/ntcall.ts index 687f208..1b25cad 100644 --- a/src/ntqqapi/ntcall.ts +++ b/src/ntqqapi/ntcall.ts @@ -13,8 +13,7 @@ import { NodeIKernelUixConvertService, NodeIKernelRichMediaService, NodeIKernelTicketService, - NodeIKernelTipOffService, - NodeIKernelSearchService, + NodeIKernelTipOffService } from './services' export enum NTClass { @@ -94,7 +93,6 @@ interface NTService { nodeIKernelRichMediaService: NodeIKernelRichMediaService nodeIKernelTicketService: NodeIKernelTicketService nodeIKernelTipOffService: NodeIKernelTipOffService - nodeIKernelSearchService: NodeIKernelSearchService } interface InvokeOptions { diff --git a/src/ntqqapi/services/NodeIKernelMsgService.ts b/src/ntqqapi/services/NodeIKernelMsgService.ts index 52c92e8..8188229 100644 --- a/src/ntqqapi/services/NodeIKernelMsgService.ts +++ b/src/ntqqapi/services/NodeIKernelMsgService.ts @@ -1,15 +1,14 @@ import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/ntqqapi/types' import { GeneralCallResult } from './common' -import { Dict } from 'cosmokit' export interface QueryMsgsParams { - chatInfo: Peer, - filterMsgType: [], - filterSendersUid: string[], - filterMsgFromTime: string, - filterMsgToTime: string, - pageLimit: number, - isReverseOrder: boolean, + chatInfo: Peer + filterMsgType: [] + filterSendersUid: string[] + filterMsgFromTime: string + filterMsgToTime: string + pageLimit: number + isReverseOrder: boolean isIncludeCurrent: boolean } @@ -31,444 +30,73 @@ export interface TmpChatInfo { export interface NodeIKernelMsgService { generateMsgUniqueId(chatType: number, time: string): string - addKernelMsgListener(nodeIKernelMsgListener: unknown): number - sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map): Promise recallMsg(peer: Peer, msgIds: string[]): Promise - addKernelMsgImportToolListener(arg: Dict): unknown - - removeKernelMsgListener(args: unknown): unknown - - addKernelTempChatSigListener(...args: unknown[]): unknown - - removeKernelTempChatSigListener(...args: unknown[]): unknown - - setAutoReplyTextList(AutoReplyText: Array, i2: number): unknown - - getAutoReplyTextList(...args: unknown[]): unknown - - getOnLineDev(): void - - kickOffLine(DevInfo: Dict): unknown - setStatus(args: { status: number, extStatus: number, batteryStatus: number }): Promise - fetchStatusMgrInfo(): unknown - - fetchStatusUnitedConfigInfo(): unknown - - getOnlineStatusSmallIconBasePath(): unknown - - getOnlineStatusSmallIconFileNameByUrl(Url: string): unknown - - downloadOnlineStatusSmallIconByUrl(arg0: number, arg1: string): unknown - - getOnlineStatusBigIconBasePath(): unknown - - downloadOnlineStatusBigIconByUrl(arg0: number, arg1: string): unknown - - getOnlineStatusCommonPath(arg: string): unknown - - getOnlineStatusCommonFileNameByUrl(Url: string): unknown - - downloadOnlineStatusCommonByUrl(arg0: string, arg1: string): unknown - - // this.tokenType = i2 - // this.apnsToken = bArr - // this.voipToken = bArr2 - // this.profileId = str - - setToken(arg: Dict): unknown - - switchForeGround(): unknown - - switchBackGround(arg: Dict): unknown - - //hex - setTokenForMqq(token: string): unknown - - switchForeGroundForMqq(...args: unknown[]): unknown - - switchBackGroundForMqq(...args: unknown[]): unknown - - getMsgSetting(...args: unknown[]): unknown - - setMsgSetting(...args: unknown[]): unknown - - addSendMsg(...args: unknown[]): unknown - - cancelSendMsg(...args: unknown[]): unknown - - switchToOfflineSendMsg(peer: Peer, MsgId: string): unknown - - reqToOfflineSendMsg(...args: unknown[]): unknown - - refuseReceiveOnlineFileMsg(peer: Peer, MsgId: string): unknown - - resendMsg(...args: unknown[]): unknown - - reeditRecallMsg(...args: unknown[]): unknown - - //调用请检查除开commentElements其余参数不能为null forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise forwardMsgWithComment(...args: unknown[]): Promise - forwardSubMsgWithComment(...args: unknown[]): unknown - - forwardRichMsgInVist(...args: unknown[]): unknown - - forwardFile(...args: unknown[]): unknown - //Array, Peer from, Peer to - multiForwardMsg(...args: unknown[]): unknown - multiForwardMsgWithComment(...args: unknown[]): unknown - deleteRecallMsg(...args: unknown[]): unknown + getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise - deleteRecallMsgForLocal(...args: unknown[]): unknown - - addLocalGrayTipMsg(...args: unknown[]): unknown - - addLocalJsonGrayTipMsg(...args: unknown[]): unknown - - addLocalJsonGrayTipMsgExt(...args: unknown[]): unknown - - IsLocalJsonTipValid(...args: unknown[]): unknown - - addLocalAVRecordMsg(...args: unknown[]): unknown - - addLocalTofuRecordMsg(...args: unknown[]): unknown - - addLocalRecordMsg(Peer: Peer, msgId: string, ele: MessageElement, attr: Array | number, front: boolean): Promise - - deleteMsg(Peer: Peer, msgIds: Array): Promise - - updateElementExtBufForUI(...args: unknown[]): unknown - - updateMsgRecordExtPbBufForUI(...args: unknown[]): unknown - - startMsgSync(...args: unknown[]): unknown - - startGuildMsgSync(...args: unknown[]): unknown - - isGuildChannelSync(...args: unknown[]): unknown - - getMsgUniqueId(UniqueId: string): string - - isMsgMatched(...args: unknown[]): unknown - - getOnlineFileMsgs(...args: unknown[]): unknown - - getAllOnlineFileMsgs(...args: unknown[]): unknown - - getLatestDbMsgs(peer: Peer, cnt: number): Promise - - getLastMessageList(peer: Peer[]): Promise - - getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise - - getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise - - getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise - - // this.$peer = contact - // this.$msgTime = j2 - // this.$clientSeq = j3 - // this.$cnt = i2 - - getMsgsWithMsgTimeAndClientSeqForC2C(...args: unknown[]): Promise - - getMsgsWithStatus(params: { - peer: Peer - msgId: string - msgTime: unknown - cnt: unknown - queryOrder: boolean - isIncludeSelf: boolean - appid: unknown - }): Promise - - getMsgsBySeqRange(peer: Peer, startSeq: string, endSeq: string): Promise + getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise getMsgsByMsgId(peer: Peer, ids: string[]): Promise - getRecallMsgsByMsgId(peer: Peer, MsgId: string[]): Promise - getMsgsBySeqList(peer: Peer, seqList: string[]): Promise - getSingleMsg(Peer: Peer, msgSeq: string): Promise + getSingleMsg(peer: Peer, msgSeq: string): Promise - getSourceOfReplyMsg(peer: Peer, MsgId: string, SourceSeq: string): unknown - - getSourceOfReplyMsgV2(peer: Peer, RootMsgId: string, ReplyMsgId: string): unknown - - getMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown - - getSourceOfReplyMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown - - getMsgsByTypeFilter(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilter: { type: number, subtype: Array }): unknown - - getMsgsByTypeFilters(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilters: Array<{ type: number, subtype: Array }>): unknown - - getMsgWithAbstractByFilterParam(...args: unknown[]): unknown - - queryMsgsWithFilter(...args: unknown[]): unknown - - // this.chatType = i2 - // this.peerUid = str - // this.chatInfo = new ChatInfo() - // this.filterMsgType = new ArrayList<>() - // this.filterSendersUid = new ArrayList<>() - // this.chatInfo = chatInfo - // this.filterMsgType = arrayList - // this.filterSendersUid = arrayList2 - // this.filterMsgFromTime = j2 - // this.filterMsgToTime = j3 - // this.pageLimit = i2 - // this.isReverseOrder = z - // this.isIncludeCurrent = z2 - //queryMsgsWithFilterEx(0L, 0L, 0L, new QueryMsgsParams(new ChatInfo(2, str), new ArrayList(), new ArrayList(), 0L, 0L, 250, false, true)) queryMsgsWithFilterEx(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise - //queryMsgsWithFilterEx(this.$msgId, this.$msgTime, this.$msgSeq, this.$param) - queryFileMsgsDesktop(...args: unknown[]): unknown - - setMsgRichInfoFlag(...args: unknown[]): unknown - - queryPicOrVideoMsgs(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise - - queryPicOrVideoMsgsDesktop(...args: unknown[]): unknown - - queryEmoticonMsgs(msgId: string, msgTime: string, msgSeq: string, Params: QueryMsgsParams): Promise - - queryTroopEmoticonMsgs(msgId: string, msgTime: string, msgSeq: string, Params: QueryMsgsParams): Promise - - queryMsgsAndAbstractsWithFilter(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): unknown - - setFocusOnGuild(...args: unknown[]): unknown - - setFocusSession(...args: unknown[]): unknown - - enableFilterUnreadInfoNotify(...args: unknown[]): unknown - - enableFilterMsgAbstractNotify(...args: unknown[]): unknown - - onScenesChangeForSilenceMode(...args: unknown[]): unknown - - getContactUnreadCnt(...args: unknown[]): unknown - - getUnreadCntInfo(...args: unknown[]): unknown - - getGuildUnreadCntInfo(...args: unknown[]): unknown - - getGuildUnreadCntTabInfo(...args: unknown[]): unknown - - getAllGuildUnreadCntInfo(...args: unknown[]): unknown - - getAllJoinGuildCnt(...args: unknown[]): unknown - - getAllDirectSessionUnreadCntInfo(...args: unknown[]): unknown - - getCategoryUnreadCntInfo(...args: unknown[]): unknown - - getGuildFeedsUnreadCntInfo(...args: unknown[]): unknown - - setUnVisibleChannelCntInfo(...args: unknown[]): unknown - - setUnVisibleChannelTypeCntInfo(...args: unknown[]): unknown - - setVisibleGuildCntInfo(...args: unknown[]): unknown setMsgRead(peer: Peer): Promise - setAllC2CAndGroupMsgRead(): Promise - - setGuildMsgRead(...args: unknown[]): unknown - - setAllGuildMsgRead(...args: unknown[]): unknown - - setMsgReadAndReport(...args: unknown[]): unknown - - setSpecificMsgReadAndReport(...args: unknown[]): unknown - - setLocalMsgRead(...args: unknown[]): unknown - - setGroupGuildMsgRead(...args: unknown[]): unknown - - getGuildGroupTransData(...args: unknown[]): unknown - - setGroupGuildBubbleRead(...args: unknown[]): unknown - - getGuildGroupBubble(...args: unknown[]): unknown - - fetchGroupGuildUnread(...args: unknown[]): unknown - - setGroupGuildFlag(...args: unknown[]): unknown - - setGuildUDCFlag(...args: unknown[]): unknown - - setGuildTabUserFlag(...args: unknown[]): unknown - - setBuildMode(flag: number/*0 1 3*/): unknown - - setConfigurationServiceData(...args: unknown[]): unknown - - setMarkUnreadFlag(...args: unknown[]): unknown - - getChannelEventFlow(...args: unknown[]): unknown - - getMsgEventFlow(...args: unknown[]): unknown - - getRichMediaFilePathForMobileQQSend(...args: unknown[]): unknown - getRichMediaFilePathForGuild(arg: { - md5HexStr: string, - fileName: string, - elementType: ElementType, - elementSubType: number, - thumbSize: 0, - needCreate: true, - downloadType: 1, + md5HexStr: string + fileName: string + elementType: ElementType + elementSubType: number + thumbSize: 0 + needCreate: true + downloadType: 1 file_uuid: '' }): string - assembleMobileQQRichMediaFilePath(...args: unknown[]): unknown - - getFileThumbSavePathForSend(...args: unknown[]): unknown - - getFileThumbSavePath(...args: unknown[]): unknown - - //猜测居多 - translatePtt2Text(MsgId: string, Peer: Dict, MsgElement: Dict): unknown - - setPttPlayedState(...args: unknown[]): unknown - // NodeIQQNTWrapperSession fetchFavEmojiList [ - // "", - // 48, - // true, - // true - // ] fetchFavEmojiList(str: string, num: number, uk1: boolean, uk2: boolean): Promise + }[] }> - addFavEmoji(...args: unknown[]): unknown - - fetchMarketEmoticonList(...args: unknown[]): unknown - - fetchMarketEmoticonShowImage(...args: unknown[]): unknown - - fetchMarketEmoticonAioImage(...args: unknown[]): unknown - - fetchMarketEmotionJsonFile(...args: unknown[]): unknown - - getMarketEmoticonPath(...args: unknown[]): unknown - - getMarketEmoticonPathBySync(...args: unknown[]): unknown - - fetchMarketEmoticonFaceImages(...args: unknown[]): unknown - - fetchMarketEmoticonAuthDetail(...args: unknown[]): unknown - - getFavMarketEmoticonInfo(...args: unknown[]): unknown - - addRecentUsedFace(...args: unknown[]): unknown - - getRecentUsedFaceList(...args: unknown[]): unknown - - getMarketEmoticonEncryptKeys(...args: unknown[]): unknown - - downloadEmojiPic(...args: unknown[]): unknown - - deleteFavEmoji(...args: unknown[]): unknown - - modifyFavEmojiDesc(...args: unknown[]): unknown - - queryFavEmojiByDesc(...args: unknown[]): unknown - - getHotPicInfoListSearchString(...args: unknown[]): unknown - - getHotPicSearchResult(...args: unknown[]): unknown - - getHotPicHotWords(...args: unknown[]): unknown - - getHotPicJumpInfo(...args: unknown[]): unknown - - getEmojiResourcePath(...args: unknown[]): unknown - - JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: unknown): unknown - - getMsgAbstracts(...args: unknown[]): unknown - - getMsgAbstract(...args: unknown[]): unknown - - getMsgAbstractList(...args: unknown[]): unknown - - getMsgAbstractListBySeqRange(...args: unknown[]): unknown - - refreshMsgAbstracts(...args: unknown[]): unknown - - refreshMsgAbstractsByGuildIds(...args: unknown[]): unknown - - getRichMediaElement(...args: unknown[]): unknown - - cancelGetRichMediaElement(...args: unknown[]): unknown - - refuseGetRichMediaElement(...args: unknown[]): unknown - - switchToOfflineGetRichMediaElement(...args: unknown[]): unknown - downloadRichMedia(...args: unknown[]): unknown - getFirstUnreadMsgSeq(args: { - peerUid: string - guildId: string - }): unknown - - getFirstUnreadCommonMsg(...args: unknown[]): unknown - - getFirstUnreadAtmeMsg(...args: unknown[]): unknown - - getFirstUnreadAtallMsg(...args: unknown[]): unknown - - getNavigateInfo(...args: unknown[]): unknown - - getChannelFreqLimitInfo(...args: unknown[]): unknown - - getRecentUseEmojiList(...args: unknown[]): unknown - - getRecentEmojiList(...args: unknown[]): unknown - setMsgEmojiLikes(...args: unknown[]): unknown getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, cookie: string, bForward: boolean, number: number): Promise<{ @@ -484,235 +112,7 @@ export interface NodeIKernelMsgService { isFirstPage: boolean }> - setMsgEmojiLikesForRole(...args: unknown[]): unknown - - clickInlineKeyboardButton(...args: unknown[]): unknown - - setCurOnScreenMsg(...args: unknown[]): unknown - - setCurOnScreenMsgForMsgEvent(...args: unknown[]): unknown - - getMiscData(key: string): unknown - - setMiscData(key: string, value: string): unknown - - getBookmarkData(...args: unknown[]): unknown - - setBookmarkData(...args: unknown[]): unknown - - sendShowInputStatusReq(ChatType: number, EventType: number, toUid: string): Promise - - queryCalendar(...args: unknown[]): unknown - - queryFirstMsgSeq(peer: Peer, ...args: unknown[]): unknown - - queryRoamCalendar(...args: unknown[]): unknown - - queryFirstRoamMsg(...args: unknown[]): unknown - - fetchLongMsg(peer: Peer, msgId: string): unknown - - fetchLongMsgWithCb(...args: unknown[]): unknown - - setIsStopKernelFetchLongMsg(...args: unknown[]): unknown - - insertGameResultAsMsgToDb(...args: unknown[]): unknown - - getMultiMsg(...args: unknown[]): Promise - - setDraft(...args: unknown[]): unknown - - getDraft(...args: unknown[]): unknown - - deleteDraft(...args: unknown[]): unknown - - getRecentHiddenSesionList(...args: unknown[]): unknown - - setRecentHiddenSession(...args: unknown[]): unknown - - delRecentHiddenSession(...args: unknown[]): unknown - - getCurHiddenSession(...args: unknown[]): unknown - - setCurHiddenSession(...args: unknown[]): unknown - - setReplyDraft(...args: unknown[]): unknown - - getReplyDraft(...args: unknown[]): unknown - - deleteReplyDraft(...args: unknown[]): unknown - - getFirstUnreadAtMsg(peer: Peer): unknown - - clearMsgRecords(...args: unknown[]): unknown//设置已读后调用我觉得比较好 清理记录 现在别了 - - IsExistOldDb(...args: unknown[]): unknown - - canImportOldDbMsg(...args: unknown[]): unknown - - setPowerStatus(z: boolean): unknown - - canProcessDataMigration(...args: unknown[]): unknown - - importOldDbMsg(...args: unknown[]): unknown - - stopImportOldDbMsgAndroid(...args: unknown[]): unknown - - isMqqDataImportFinished(...args: unknown[]): unknown - - getMqqDataImportTableNames(...args: unknown[]): unknown - - getCurChatImportStatusByUin(...args: unknown[]): unknown - - getDataImportUserLevel(): unknown - - getMsgQRCode(...args: unknown[]): unknown - - getGuestMsgAbstracts(...args: unknown[]): unknown - - getGuestMsgByRange(...args: unknown[]): unknown - - getGuestMsgAbstractByRange(...args: unknown[]): unknown - - registerSysMsgNotification(...args: unknown[]): unknown - - unregisterSysMsgNotification(...args: unknown[]): unknown - - enterOrExitAio(...args: unknown[]): unknown - - // this.peerUid = "" - // this.peerNickname = "" - // this.fromGroupCode = "" - // this.sig = new byte[0] - // this.selfUid = "" - // this.selfPhone = "" - // this.chatType = i2 - // this.peerUid = str - // this.peerNickname = str2 - // this.fromGroupCode = str3 - // this.sig = bArr - // this.selfUid = str4 - // this.selfPhone = str5 - // this.gameSession = tempChatGameSession - prepareTempChat(args: unknown): unknown//主动临时消息 不做 - - sendSsoCmdReqByContend(cmd: string, param: string): Promise - - getTempChatInfo(ChatType: number, Uid: string): Promise - - setContactLocalTop(...args: unknown[]): unknown - - switchAnonymousChat(...args: unknown[]): unknown - - renameAnonyChatNick(...args: unknown[]): unknown - - getAnonymousInfo(...args: unknown[]): unknown - - updateAnonymousInfo(...args: unknown[]): unknown - - sendSummonMsg(peer: Peer, MsgElement: unknown, MsgAttributeInfo: unknown): Promise//频道的东西 - - outputGuildUnreadInfo(...args: unknown[]): unknown - - checkMsgWithUrl(...args: unknown[]): unknown - - checkTabListStatus(...args: unknown[]): unknown - - getABatchOfContactMsgBoxInfo(...args: unknown[]): unknown - - insertMsgToMsgBox(peer: Peer, msgId: string, arg: 2006): unknown - - isHitEmojiKeyword(...args: unknown[]): unknown - - getKeyWordRelatedEmoji(...args: unknown[]): unknown - - recordEmoji(...args: unknown[]): unknown - - fetchGetHitEmotionsByWord(args: Dict): Promise//表情推荐？ - - deleteAllRoamMsgs(...args: unknown[]): unknown//漫游消息？ - - packRedBag(...args: unknown[]): unknown - - grabRedBag(...args: unknown[]): unknown - - pullDetail(...args: unknown[]): unknown - - selectPasswordRedBag(...args: unknown[]): unknown - - pullRedBagPasswordList(...args: unknown[]): unknown - - requestTianshuAdv(...args: unknown[]): unknown - - tianshuReport(...args: unknown[]): unknown - - tianshuMultiReport(...args: unknown[]): unknown - - GetMsgSubType(a0: number, a1: number): unknown - - setIKernelPublicAccountAdapter(...args: unknown[]): unknown - //tempChatGameSession有关 - createUidFromTinyId(fromTinyId: string, toTinyId: string): unknown - - dataMigrationGetDataAvaiableContactList(...args: unknown[]): unknown - - dataMigrationGetMsgList(...args: unknown[]): unknown - - dataMigrationStopOperation(...args: unknown[]): unknown - - dataMigrationImportMsgPbRecord(DataMigrationMsgInfo: Array<{ - extensionData: string //"Hex" - extraData: string //"" - chatType: number - chatUin: string - msgType: number - msgTime: string - msgSeq: string - msgRandom: string - }>, DataMigrationResourceInfo: { - extraData: string - filePath: string - fileSize: string - msgRandom: string - msgSeq: string - msgSubType: number - msgType: number - }): unknown - - dataMigrationGetResourceLocalDestinyPath(...args: unknown[]): unknown - - dataMigrationSetIOSPathPrefix(...args: unknown[]): unknown - - getServiceAssistantSwitch(...args: unknown[]): unknown - - setServiceAssistantSwitch(...args: unknown[]): unknown - - setSubscribeFolderUsingSmallRedPoint(...args: unknown[]): unknown - - clearGuildNoticeRedPoint(...args: unknown[]): unknown - - clearFeedNoticeRedPoint(...args: unknown[]): unknown - - clearFeedSquareRead(...args: unknown[]): unknown - - IsC2CStyleChatType(...args: unknown[]): unknown - - IsTempChatType(uin: number): unknown//猜的 - - getGuildInteractiveNotification(...args: unknown[]): unknown - - getGuildNotificationAbstract(...args: unknown[]): unknown - - setFocusOnBase(...args: unknown[]): unknown - - queryArkInfo(...args: unknown[]): unknown - - queryUserSecQuality(...args: unknown[]): unknown - - getGuildMsgAbFlag(...args: unknown[]): unknown - - getGroupMsgStorageTime(): unknown//这是嘛啊 + getMultiMsg(...args: unknown[]): Promise + getTempChatInfo(chatType: number, uid: string): Promise } diff --git a/src/ntqqapi/services/NodeIKernelProfileLikeService.ts b/src/ntqqapi/services/NodeIKernelProfileLikeService.ts index da29f2c..5d98f8e 100644 --- a/src/ntqqapi/services/NodeIKernelProfileLikeService.ts +++ b/src/ntqqapi/services/NodeIKernelProfileLikeService.ts @@ -3,10 +3,6 @@ import { GeneralCallResult } from './common' import { Dict } from 'cosmokit' export interface NodeIKernelProfileLikeService { - addKernelProfileLikeListener(listener: NodeIKernelProfileLikeService): void - - removeKernelProfileLikeListener(listener: unknown): void - setBuddyProfileLike(...args: unknown[]): { result: number, errMsg: string, succCounts: number } getBuddyProfileLike(req: BuddyProfileLikeReq): Promise - - getProfileLikeScidResourceInfo(...args: unknown[]): void - - isNull(): boolean -} \ No newline at end of file +} diff --git a/src/ntqqapi/services/NodeIKernelProfileService.ts b/src/ntqqapi/services/NodeIKernelProfileService.ts index f1003ed..5ccec1c 100644 --- a/src/ntqqapi/services/NodeIKernelProfileService.ts +++ b/src/ntqqapi/services/NodeIKernelProfileService.ts @@ -1,4 +1,3 @@ -import { AnyCnameRecord } from 'node:dns' import { SimpleInfo } from '../types' import { GeneralCallResult } from './common' @@ -16,91 +15,17 @@ export enum ProfileBizType { } export interface NodeIKernelProfileService { - getUidByUin(callfrom: string, uin: Array): Promise>//uin->uid + getUidByUin(callfrom: string, uin: Array): Promise> getUinByUid(callfrom: string, uid: Array): Promise> - // { - // coreInfo: CoreInfo, - // baseInfo: BaseInfo, - // status: null, - // vasInfo: null, - // relationFlags: null, - // otherFlags: null, - // intimate: null - // } getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise> fetchUserDetailInfo(trace: string, uids: string[], arg2: number, arg3: number[]): Promise - addKernelProfileListener(listener: unknown): number - - removeKernelProfileListener(listenerId: number): void - - prepareRegionConfig(...args: unknown[]): unknown - - getLocalStrangerRemark(): Promise - - enumCountryOptions(): Array - - enumProvinceOptions(Country: string): Array - - enumCityOptions(Country: string, Province: string): unknown - - enumAreaOptions(...args: unknown[]): unknown - - //SimpleInfo - // this.uid = "" - // this.uid = str - // this.uin = j2 - // this.isBuddy = z - // this.coreInfo = coreInfo - // this.baseInfo = baseInfo - // this.status = statusInfo - // this.vasInfo = vasInfo - // this.relationFlags = relationFlag - // this.otherFlags = otherFlag - // this.intimate = intimate - - modifySelfProfile(...args: unknown[]): Promise - - modifyDesktopMiniProfile(param: unknown): Promise - - setNickName(NickName: string): Promise - - setLongNick(longNick: string): Promise - - setBirthday(...args: unknown[]): Promise - - setGander(...args: unknown[]): Promise - setHeader(arg: string): Promise - setRecommendImgFlag(...args: unknown[]): Promise - - getUserSimpleInfo(force: boolean, uids: string[],): Promise - - getUserDetailInfo(uid: string): Promise - - getUserDetailInfoWithBizInfo(uid: string, Biz: unknown[]): Promise + getUserDetailInfoWithBizInfo(uid: string, biz: unknown[]): Promise getUserDetailInfoByUin(uin: string): Promise - - getZplanAvatarInfos(args: string[]): Promise - - getStatus(uid: string): Promise - - startStatusPolling(isForceReset: boolean): Promise - - getSelfStatus(): Promise - - setdisableEmojiShortCuts(...args: unknown[]): unknown - - getProfileQzonePicInfo(uid: string, type: number, force: boolean): Promise - - //profileService.getCoreInfo("UserRemarkServiceImpl::getStrangerRemarkByUid", arrayList) - getCoreInfo(name: string, arg: unknown[]): unknown - - //m429253e12.getOtherFlag("FriendListInfoCache_getKernelDataAndPutCache", new ArrayList<>()) - isNull(): boolean -} \ No newline at end of file +} diff --git a/src/ntqqapi/services/NodeIKernelRichMediaService.ts b/src/ntqqapi/services/NodeIKernelRichMediaService.ts index b16ab18..e11a4a6 100644 --- a/src/ntqqapi/services/NodeIKernelRichMediaService.ts +++ b/src/ntqqapi/services/NodeIKernelRichMediaService.ts @@ -1,191 +1,23 @@ -import { GetFileListParam, MessageElement, Peer } from '../types' +import { GetFileListParam, Peer } from '../types' import { GeneralCallResult } from './common' -export enum UrlFileDownloadType { - KUNKNOWN, - KURLFILEDOWNLOADPRIVILEGEICON, - KURLFILEDOWNLOADPHOTOWALL, - KURLFILEDOWNLOADQZONE, - KURLFILEDOWNLOADCOMMON, - KURLFILEDOWNLOADINSTALLAPP -} - -export enum RMBizTypeEnum { - KUNKNOWN, - KC2CFILE, - KGROUPFILE, - KC2CPIC, - KGROUPPIC, - KDISCPIC, - KC2CVIDEO, - KGROUPVIDEO, - KC2CPTT, - KGROUPPTT, - KFEEDCOMMENTPIC, - KGUILDFILE, - KGUILDPIC, - KGUILDPTT, - KGUILDVIDEO -} - -export interface CommonFileInfo { - bizType: number - chatType: number - elemId: string - favId: string - fileModelId: string - fileName: string - fileSize: string - md5: string - md510m: string - msgId: string - msgTime: string - parent: string - peerUid: string - picThumbPath: Array - sha: string - sha3: string - subId: string - uuid: string -} - export interface NodeIKernelRichMediaService { - //getVideoPlayUrl(peer, msgId, elemId, videoCodecFormat, VideoRequestWay.KHAND, cb) - // public enum VideoCodecFormatType { - // KCODECFORMATH264, - // KCODECFORMATH265, - // KCODECFORMATH266, - // KCODECFORMATAV1 - // } - // public enum VideoRequestWay { - // KUNKNOW, - // KHAND, - // KAUTO - // } - getVideoPlayUrl(peer: Peer, msgId: string, elemId: string, videoCodecFormat: number, VideoRequestWay: number): Promise - - //exParams (RMReqExParams) - // this.downSourceType = i2 - // this.triggerType = i3 - //peer, msgId, elemId, videoCodecFormat, exParams - // 1 0 频道在用 - // 1 1 - // 0 2 - - // public static final int KCOMMONREDENVELOPEMSGTYPEINMSGBOX = 1007 - // public static final int KDOWNSOURCETYPEAIOINNER = 1 - // public static final int KDOWNSOURCETYPEBIGSCREEN = 2 - // public static final int KDOWNSOURCETYPEHISTORY = 3 - // public static final int KDOWNSOURCETYPEUNKNOWN = 0 - - // public static final int KTRIGGERTYPEAUTO = 1 - // public static final int KTRIGGERTYPEMANUAL = 0 - getVideoPlayUrlV2(peer: Peer, msgId: string, elemId: string, videoCodecFormat: number, exParams: { downSourceType: number, triggerType: number }): Promise, + }[] videoCodecFormat: number } }> - getRichMediaFileDir(elementType: number, downType: number, isTemp: boolean): unknown + deleteGroupFolder(groupCode: string, folderId: string): Promise - // this.senderUid = "" - // this.peerUid = "" - // this.guildId = "" - // this.elem = new MsgElement() - // this.downloadType = i2 - // this.thumbSize = i3 - // this.msgId = j2 - // this.msgRandom = j3 - // this.msgSeq = j4 - // this.msgTime = j5 - // this.chatType = i4 - // this.senderUid = str - // this.peerUid = str2 - // this.guildId = str3 - // this.elem = msgElement - // this.useHttps = num - - getVideoPlayUrlInVisit(arg: { - downloadType: number, - thumbSize: number, - msgId: string, - msgRandom: string, - msgSeq: string, - msgTime: string, - chatType: number, - senderUid: string, - peerUid: string, - guildId: string, - ele: MessageElement, - useHttps: boolean - }): Promise - - //arg双端number - isFileExpired(arg: number): unknown - - deleteGroupFolder(GroupCode: string, FolderId: string): Promise - - //参数与getVideoPlayUrlInVisit一样 - downloadRichMediaInVisit(arg: { - downloadType: number, - thumbSize: number, - msgId: string, - msgRandom: string, - msgSeq: string, - msgTime: string, - chatType: number, - senderUid: string, - peerUid: string, - guildId: string, - ele: MessageElement, - useHttps: boolean - }): unknown - //arg3为“” - downloadFileForModelId(peer: Peer, ModelId: string[], arg3: string): unknown - //第三个参数 Array - // this.fileId = "" - // this.fileName = "" - // this.fileId = str - // this.fileName = str2 - // this.fileSize = j2 - // this.fileModelId = j3 - - downloadFileForFileUuid(peer: Peer, uuid: string, arg3: { - fileId: string, - fileName: string, - fileSize: string, - fileModelId: string - }[]): Promise - - downloadFileByUrlList(fileDownloadTyp: UrlFileDownloadType, urlList: Array): unknown - - downloadFileForFileInfo(fileInfo: CommonFileInfo[], savePath: string): unknown - - createGroupFolder(GroupCode: string, FolderName: string): Promise } }> - - downloadFile(commonFile: CommonFileInfo, arg2: unknown, arg3: unknown, savePath: string): unknown - - downloadGroupFolder(arg1: unknown, arg2: unknown, arg3: unknown): unknown - - renameGroupFolder(arg1: unknown, arg2: unknown, arg3: unknown): unknown - - deleteTransferInfo(arg1: unknown, arg2: unknown): unknown - - cancelTransferTask(arg1: unknown, arg2: unknown, arg3: unknown): unknown - - cancelUrlDownload(arg: unknown): unknown - - updateOnlineVideoElemStatus(arg: unknown): unknown - - getGroupSpace(arg: unknown): unknown + createGroupFolder(groupCode: string, folderName: string): Promise getGroupFileList(groupCode: string, params: GetFileListParam): Promise - getGroupFileInfo(arg1: unknown, arg2: unknown): unknown - - getGroupTransferList(arg1: unknown, arg2: unknown): unknown - - renameGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown - moveGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown - transGroupFile(arg1: unknown, arg2: unknown): unknown - - searchGroupFile( - keywords: Array, - param: { - groupIds: Array, - fileType: number, - context: string, - count: number, - sortType: number, - groupNames: Array - }): Promise - searchGroupFileByWord(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown - - deleteGroupFile(GroupCode: string, params: Array, Files: Array): Promise, files: Array): Promise failFileIdList: Array } }> +} - translateEnWordToZn(words: string[]): Promise - - getScreenOCR(path: string): Promise - - batchGetGroupFileCount(Gids: Array): Promise, groupFileCounts: Array }> - - queryPicDownloadSize(arg: unknown): unknown - - searchGroupFile(arg1: unknown, arg2: unknown): unknown - - searchMoreGroupFile(arg: unknown): unknown - - cancelSearcheGroupFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown - - onlyDownloadFile(peer: Peer, arg2: unknown, arg3: Array<{ - fileId: string, - fileName: string, - fileSize: string, - fileModelId: string - } - >): unknown - - onlyUploadFile(arg1: unknown, arg2: unknown): unknown - - isExtraLargePic(arg1: unknown, arg2: unknown, arg3: unknown): unknown - - uploadRMFileWithoutMsg(arg: { - bizType: RMBizTypeEnum, - filePath: string, - peerUid: string, - transferId: string - useNTV2: string - }): Promise - - isNull(): boolean -} \ No newline at end of file diff --git a/src/ntqqapi/services/NodeIKernelSearchService.ts b/src/ntqqapi/services/NodeIKernelSearchService.ts deleted file mode 100644 index 3c4b7f1..0000000 --- a/src/ntqqapi/services/NodeIKernelSearchService.ts +++ /dev/null @@ -1,128 +0,0 @@ -import { ChatType } from '../types' - -export interface NodeIKernelSearchService { - addKernelSearchListener(...args: unknown[]): unknown// needs 1 arguments - - removeKernelSearchListener(...args: unknown[]): unknown// needs 1 arguments - - searchStranger(...args: unknown[]): unknown// needs 3 arguments - - searchGroup(...args: unknown[]): unknown// needs 1 arguments - - searchLocalInfo(keywords: string, unknown: number/*4*/): unknown - - cancelSearchLocalInfo(...args: unknown[]): unknown// needs 3 arguments - - searchBuddyChatInfo(...args: unknown[]): unknown// needs 2 arguments - - searchMoreBuddyChatInfo(...args: unknown[]): unknown// needs 1 arguments - - cancelSearchBuddyChatInfo(...args: unknown[]): unknown// needs 3 arguments - - searchContact(...args: unknown[]): unknown// needs 2 arguments - - searchMoreContact(...args: unknown[]): unknown// needs 1 arguments - - cancelSearchContact(...args: unknown[]): unknown// needs 3 arguments - - searchGroupChatInfo(...args: unknown[]): unknown// needs 3 arguments - - resetSearchGroupChatInfoSortType(...args: unknown[]): unknown// needs 3 arguments - - resetSearchGroupChatInfoFilterMembers(...args: unknown[]): unknown// needs 3 arguments - - searchMoreGroupChatInfo(...args: unknown[]): unknown// needs 1 arguments - - cancelSearchGroupChatInfo(...args: unknown[]): unknown// needs 3 arguments - - searchChatsWithKeywords(...args: unknown[]): unknown// needs 3 arguments - - searchMoreChatsWithKeywords(...args: unknown[]): unknown// needs 1 arguments - - cancelSearchChatsWithKeywords(...args: unknown[]): unknown// needs 3 arguments - - searchChatMsgs(...args: unknown[]): unknown// needs 2 arguments - - searchMoreChatMsgs(...args: unknown[]): unknown// needs 1 arguments - - cancelSearchChatMsgs(...args: unknown[]): unknown// needs 3 arguments - - searchMsgWithKeywords(...args: unknown[]): unknown// needs 2 arguments - - searchMoreMsgWithKeywords(...args: unknown[]): unknown// needs 1 arguments - - cancelSearchMsgWithKeywords(...args: unknown[]): unknown// needs 3 arguments - - searchFileWithKeywords(keywords: string[], source: number): Promise// needs 2 arguments - - searchMoreFileWithKeywords(...args: unknown[]): unknown// needs 1 arguments - - cancelSearchFileWithKeywords(...args: unknown[]): unknown// needs 3 arguments - - searchAtMeChats(...args: unknown[]): unknown// needs 3 arguments - - searchMoreAtMeChats(...args: unknown[]): unknown// needs 1 arguments - - cancelSearchAtMeChats(...args: unknown[]): unknown// needs 3 arguments - - searchChatAtMeMsgs(...args: unknown[]): unknown// needs 1 arguments - - searchMoreChatAtMeMsgs(...args: unknown[]): unknown// needs 1 arguments - - cancelSearchChatAtMeMsgs(...args: unknown[]): unknown// needs 3 arguments - - addSearchHistory(param: { - type: number,//4 - contactList: [], - id: number,//-1 - groupInfos: [], - msgs: [], - fileInfos: [ - { - chatType: ChatType, - buddyChatInfo: Array<{ category_name: string, peerUid: string, peerUin: string, remark: string }>, - discussChatInfo: [], - groupChatInfo: Array< - { - groupCode: string, - isConf: boolean, - hasModifyConfGroupFace: boolean, - hasModifyConfGroupName: boolean, - groupName: string, - remark: string - }>, - dataLineChatInfo: [], - tmpChatInfo: [], - msgId: string, - msgSeq: string, - msgTime: string, - senderUid: string, - senderNick: string, - senderRemark: string, - senderCard: string, - elemId: string, - elemType: string,//3 - fileSize: string, - filePath: string, - fileName: string, - hits: Array< - { - start: 12, - end: 14 - } - > - } - ] - - }): Promise<{ - result: number, - errMsg: string, - id?: number - }> - - removeSearchHistory(...args: unknown[]): unknown// needs 1 arguments - - searchCache(...args: unknown[]): unknown// needs 3 arguments - - clearSearchCache(...args: unknown[]): unknown// needs 1 arguments -} \ No newline at end of file diff --git a/src/ntqqapi/services/NodeIKernelTipOffService.ts b/src/ntqqapi/services/NodeIKernelTipOffService.ts index e63ba90..c5fe80d 100644 --- a/src/ntqqapi/services/NodeIKernelTipOffService.ts +++ b/src/ntqqapi/services/NodeIKernelTipOffService.ts @@ -1,19 +1,5 @@ import { GeneralCallResult } from './common' export interface NodeIKernelTipOffService { - addKernelTipOffListener(listener: unknown): void - - removeKernelTipOffListener(listenerId: unknown): void - - tipOffSendJsData(args: unknown[]): Promise //2 - - getPskey(domainList: string[], nocache: boolean): Promise }> //2 - - tipOffSendJsData(args: unknown[]): Promise //2 - - tipOffMsgs(args: unknown[]): Promise //1 - - encodeUinAesInfo(args: unknown[]): Promise //2 - - isNull(): boolean -} \ No newline at end of file + getPskey(domainList: string[], nocache: boolean): Promise }> +} diff --git a/src/ntqqapi/services/index.ts b/src/ntqqapi/services/index.ts index 22f46ab..2ce5f5a 100644 --- a/src/ntqqapi/services/index.ts +++ b/src/ntqqapi/services/index.ts @@ -9,4 +9,3 @@ export * from './NodeIKernelUixConvertService' export * from './NodeIKernelRichMediaService' export * from './NodeIKernelTicketService' export * from './NodeIKernelTipOffService' -export * from './NodeIKernelSearchService' \ No newline at end of file diff --git a/src/ntqqapi/types/msg.ts b/src/ntqqapi/types/msg.ts index f84f1f2..81390ab 100644 --- a/src/ntqqapi/types/msg.ts +++ b/src/ntqqapi/types/msg.ts @@ -197,50 +197,6 @@ export enum ChatType { temp = 100, } -// 来自Android分析 -export enum ChatType2 { - KCHATTYPEADELIE = 42, - KCHATTYPEBUDDYNOTIFY = 5, - KCHATTYPEC2C = 1, - KCHATTYPECIRCLE = 113, - KCHATTYPEDATALINE = 8, - KCHATTYPEDATALINEMQQ = 134, - KCHATTYPEDISC = 3, - KCHATTYPEFAV = 41, - KCHATTYPEGAMEMESSAGE = 105, - KCHATTYPEGAMEMESSAGEFOLDER = 116, - KCHATTYPEGROUP = 2, - KCHATTYPEGROUPBLESS = 133, - KCHATTYPEGROUPGUILD = 9, - KCHATTYPEGROUPHELPER = 7, - KCHATTYPEGROUPNOTIFY = 6, - KCHATTYPEGUILD = 4, - KCHATTYPEGUILDMETA = 16, - KCHATTYPEMATCHFRIEND = 104, - KCHATTYPEMATCHFRIENDFOLDER = 109, - KCHATTYPENEARBY = 106, - KCHATTYPENEARBYASSISTANT = 107, - KCHATTYPENEARBYFOLDER = 110, - KCHATTYPENEARBYHELLOFOLDER = 112, - KCHATTYPENEARBYINTERACT = 108, - KCHATTYPEQQNOTIFY = 132, - KCHATTYPERELATEACCOUNT = 131, - KCHATTYPESERVICEASSISTANT = 118, - KCHATTYPESERVICEASSISTANTSUB = 201, - KCHATTYPESQUAREPUBLIC = 115, - KCHATTYPESUBSCRIBEFOLDER = 30, - KCHATTYPETEMPADDRESSBOOK = 111, - KCHATTYPETEMPBUSSINESSCRM = 102, - KCHATTYPETEMPC2CFROMGROUP = 100, - KCHATTYPETEMPC2CFROMUNKNOWN = 99, - KCHATTYPETEMPFRIENDVERIFY = 101, - KCHATTYPETEMPNEARBYPRO = 119, - KCHATTYPETEMPPUBLICACCOUNT = 103, - KCHATTYPETEMPWPA = 117, - KCHATTYPEUNKNOWN = 0, - KCHATTYPEWEIYUN = 40, -} - export interface PttElement { canConvert2Text: boolean duration: number // 秒数 diff --git a/src/ntqqapi/wrapper.ts b/src/ntqqapi/wrapper.ts index 80fc730..f101f1a 100644 --- a/src/ntqqapi/wrapper.ts +++ b/src/ntqqapi/wrapper.ts @@ -8,8 +8,7 @@ import { NodeIKernelUixConvertService, NodeIKernelRichMediaService, NodeIKernelTicketService, - NodeIKernelTipOffService, - NodeIKernelSearchService + NodeIKernelTipOffService } from './services' import { constants } from 'node:os' import { Dict } from 'cosmokit' @@ -26,7 +25,6 @@ export interface NodeIQQNTWrapperSession { getRichMediaService(): NodeIKernelRichMediaService getTicketService(): NodeIKernelTicketService getTipOffService(): NodeIKernelTipOffService - getSearchService(): NodeIKernelSearchService } export interface WrapperApi { diff --git a/src/onebot11/entities.ts b/src/onebot11/entities.ts index dce07bd..40a14d9 100644 --- a/src/onebot11/entities.ts +++ b/src/onebot11/entities.ts @@ -20,8 +20,7 @@ import { Sex, TipGroupElementType, User, - FriendV2, - ChatType2 + FriendV2 } from '../ntqqapi/types' import { EventType } from './event/OB11BaseEvent' import { encodeCQCode } from './cqcode' @@ -91,11 +90,11 @@ export namespace OB11Entities { resMsg.sub_type = 'friend' resMsg.sender.nickname = (await ctx.ntUserApi.getUserDetailInfo(msg.senderUid)).nick } - else if (msg.chatType as unknown as ChatType2 === ChatType2.KCHATTYPETEMPC2CFROMGROUP) { + else if (msg.chatType === ChatType.temp) { resMsg.sub_type = 'group' resMsg.temp_source = 0 //群聊 resMsg.sender.nickname = (await ctx.ntUserApi.getUserDetailInfo(msg.senderUid)).nick - const ret = await ctx.ntMsgApi.getTempChatInfo(ChatType2.KCHATTYPETEMPC2CFROMGROUP, msg.senderUid) + const ret = await ctx.ntMsgApi.getTempChatInfo(ChatType.temp, msg.senderUid) if (ret?.result === 0) { resMsg.sender.group_id = Number(ret.tmpChatInfo?.groupCode) } else { @@ -503,14 +502,6 @@ export namespace OB11Entities { const xmlElement = grayTipElement.xmlElement if (xmlElement?.templId === '10382') { - // 表情回应消息 - // "content": - // " - // - // - // - // - // ", const emojiLikeData = new XMLParser({ ignoreAttributes: false, attributeNamePrefix: '', diff --git a/src/onebot11/types.ts b/src/onebot11/types.ts index cb63d99..0fd169b 100644 --- a/src/onebot11/types.ts +++ b/src/onebot11/types.ts @@ -289,7 +289,7 @@ export interface OB11MessageContact { export interface OB11MessageShake { type: OB11MessageDataType.shake - data: {} + data: Record } export type OB11MessageData =