diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index 2d1e7f05..d1b8260a 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -339,12 +339,12 @@ export class NTQQFileApi { if (!element) { return ''; } - const url: string = element.originImageUrl!; // 没有域名 + const url: string = element.originImageUrl ?? ''; const md5HexStr = element.md5HexStr; const fileMd5 = element.md5HexStr; if (url) { - const parsedUrl = new URL(IMAGE_HTTP_HOST + url);//临时解析拼接 + const parsedUrl = new URL(IMAGE_HTTP_HOST + url); const imageAppid = parsedUrl.searchParams.get('appid'); const isNTFlavoredPic = imageAppid && ['1406', '1407'].includes(imageAppid); if (isNTFlavoredPic) { diff --git a/src/core/apis/friend.ts b/src/core/apis/friend.ts index fdaff939..66733cbc 100644 --- a/src/core/apis/friend.ts +++ b/src/core/apis/friend.ts @@ -6,14 +6,9 @@ export class NTQQFriendApi { context: InstanceContext; core: NapCatCore; - // friends: Map = new Map(); - constructor(context: InstanceContext, core: NapCatCore) { this.context = context; this.core = core; - // if (!this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) { - // this.getFriends(true); - // } } async getBuddyV2SimpleInfoMap(refresh = false) { diff --git a/src/core/apis/group.ts b/src/core/apis/group.ts index 363483a4..a0276f8e 100644 --- a/src/core/apis/group.ts +++ b/src/core/apis/group.ts @@ -44,8 +44,8 @@ export class NTQQGroupApi { }, pskey); } - async clearGroupNotifiesUnreadCount(unk: boolean) { - return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(unk); + async clearGroupNotifiesUnreadCount(uk: boolean) { + return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(uk); } async setGroupAvatar(gc: string, filePath: string) { @@ -61,9 +61,9 @@ export class NTQQGroupApi { return groupList; } - async getGroupExtFE0Info(GroupCode: string[], forced = true) { + async getGroupExtFE0Info(groupCode: string[], forced = true) { return this.context.session.getGroupService().getGroupExt0xEF0Info( - GroupCode, + groupCode, [], { bindGuildId: 1, @@ -121,8 +121,8 @@ export class NTQQGroupApi { return group; } - async getGroupMemberAll(GroupCode: string, forced = false) { - return this.context.session.getGroupService().getAllMemberList(GroupCode, forced); + async getGroupMemberAll(groupCode: string, forced = false) { + return this.context.session.getGroupService().getAllMemberList(groupCode, forced); } async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) { @@ -157,8 +157,8 @@ export class NTQQGroupApi { } return member; } - async getGroupRecommendContactArkJson(GroupCode: string) { - return this.context.session.getGroupService().getGroupRecommendContactArkJson(GroupCode); + async getGroupRecommendContactArkJson(groupCode: string) { + return this.context.session.getGroupService().getGroupRecommendContactArkJson(groupCode); } async CreatGroupFileFolder(groupCode: string, folderName: string) { @@ -174,7 +174,6 @@ export class NTQQGroupApi { } async addGroupEssence(GroupCode: string, msgId: string) { - // 需要 ob11msgId -> msgId + (peer) -> msgSeq + msgRandom const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', @@ -185,7 +184,6 @@ export class NTQQGroupApi { msgRandom: parseInt(MsgData.msgList[0].msgRandom), msgSeq: parseInt(MsgData.msgList[0].msgSeq), }; - // GetMsgByShortID(shortID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数 return this.context.session.getGroupService().addGroupEssence(param); } @@ -203,7 +201,6 @@ export class NTQQGroupApi { groupCode: GroupCode, needDeleteLocalMsg: needDeleteLocalMsg, }; - //应该是直接返回不需要Listener的 未经测试 需测试再发布 return this.context.session.getGroupService().quitGroupV2(param); } @@ -325,8 +322,7 @@ export class NTQQGroupApi { if (result.errCode !== 0) { throw new Error('获取群成员列表出错,' + result.errMsg); } - - this.context.logger.logDebug(`获取群(${groupQQ})成员列表结果:`, `members: ${result.result.infos.size}`); //, Array.from(result.result.infos.values())); + this.context.logger.logDebug(`获取群(${groupQQ})成员列表结果:`, `members: ${result.result.infos.size}`); return result.result.infos; } @@ -357,12 +353,12 @@ export class NTQQGroupApi { return this.context.session.getGroupService().operateSysNotify( false, { - 'operateType': operateType, // 2 拒绝 - 'targetMsg': { - 'seq': seq, // 通知序列号 - 'type': type, - 'groupCode': groupCode, - 'postscript': reason ?? ' ', // 仅传空值可能导致处理失败,故默认给个空格 + operateType: operateType, // 2 拒绝 + targetMsg: { + seq: seq, // 通知序列号 + type: type, + groupCode: groupCode, + postscript: reason ?? ' ', // 仅传空值可能导致处理失败,故默认给个空格 }, }); } @@ -418,7 +414,6 @@ export class NTQQGroupApi { } async getMemberExtInfo(groupCode: string, uin: string) { - // 仅NTQQ 9.9.11 24568测试 容易炸开谨慎使用 return this.context.session.getGroupService().getMemberExtInfo( { groupCode: groupCode, diff --git a/src/core/apis/msg.ts b/src/core/apis/msg.ts index e0294492..0ad0358d 100644 --- a/src/core/apis/msg.ts +++ b/src/core/apis/msg.ts @@ -19,27 +19,16 @@ export class NTQQMsgApi { return this.context.session.getMsgService().getAioFirstViewLatestMsgs(peer, MsgCount); } - async getLatestDbMsgs(peer: Peer, MsgCount: number) { - return this.context.session.getMsgService().getLatestDbMsgs(peer, MsgCount); - } - - async FetchLongMsg(peer: Peer, msgId: string) { - return this.context.session.getMsgService().fetchLongMsg(peer, msgId); - } - async sendShowInputStatusReq(peer: Peer, eventType: number) { return this.context.session.getMsgService().sendShowInputStatusReq(peer.chatType, eventType, peer.peerUid); } async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number = 20) { - //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged M likiowa + //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged Mlikiowa return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, count); } async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set: boolean = true) { - // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览 - // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid - // 其实以官方文档为准是最好的,https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType emojiId = emojiId.toString(); return this.context.session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiId.length > 3 ? '2' : '1', set); } @@ -108,14 +97,6 @@ export class NTQQMsgApi { async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) { return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z); } - async getMsgBySeqList(peer: Peer, msgSeqList: string[]) { - //坏的 - return await this.context.session.getMsgService().getMsgsBySeqList(peer, msgSeqList); - } - async getMsgBySeqExFirstMsg(peer: Peer, rootMsgId: string, replyMsgId: string) { - const reply = await this.context.session.getMsgService().getSourceOfReplyMsgV2(peer, rootMsgId, replyMsgId); - console.log(reply); - } async getMsgExBySeq(peer: Peer, msgSeq: string) { const DateNow = Math.floor(Date.now() / 1000); const filterMsgFromTime = (DateNow - 300).toString(); @@ -200,7 +181,7 @@ export class NTQQMsgApi { await this.PrepareTempChat(peer.peerUid, peer.guildId, member.nick); } } - const msgId = await this.generateMsgUniqueId(peer.chatType, await this.getServerTime()); + const msgId = await this.generateMsgUniqueId(peer.chatType); peer.guildId = msgId; const [, msgList] = await this.core.eventWrapper.callNormalEventV2( 'NodeIKernelMsgService/sendMsg', @@ -226,12 +207,8 @@ export class NTQQMsgApi { return msgList.find(msgRecord => msgRecord.guildId === msgId); } - async generateMsgUniqueId(chatType: number, time: string) { - return this.context.session.getMsgService().generateMsgUniqueId(chatType, time); - } - - async getServerTime() { - return this.context.session.getMSFService().getServerTime(); + async generateMsgUniqueId(chatType: number) { + return this.context.session.getMsgService().generateMsgUniqueId(chatType, this.context.session.getMSFService().getServerTime()); } async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) { diff --git a/src/core/apis/sign.ts b/src/core/apis/sign.ts index 53f20289..9ac71d80 100644 --- a/src/core/apis/sign.ts +++ b/src/core/apis/sign.ts @@ -214,11 +214,6 @@ export class NTQQMusicSignApi { //console.log(MusicReal); return { ...MusicReal.data, mid: signedMid }; } - - async CreateMusicThirdWay1(id: string = '', mid: string = '') { - - } - //转换外域名为 https://qq.ugcimg.cn/v1/cpqcbu4b8870i61bde6k7cbmjgejq8mr3in82qir4qi7ielffv5slv8ck8g42novtmev26i233ujtuab6tvu2l2sjgtupfr389191v00s1j5oh5325j5eqi40774jv1i/khovifoh7jrqd6eahoiv7koh8o //https://cgi.connect.qq.com/qqconnectopen/openapi/change_image_url?url=https://th.bing.com/th?id=OSK.b8ed36f1fb1889de6dc84fd81c187773&w=46&h=46&c=11&rs=1&qlt=80&o=6&dpr=2&pid=SANGAM diff --git a/src/core/apis/system.ts b/src/core/apis/system.ts index af70cff5..f79b4b53 100644 --- a/src/core/apis/system.ts +++ b/src/core/apis/system.ts @@ -22,7 +22,7 @@ export class NTQQSystemApi { } async getOnlineDev() { - return this.context.session.getMsgService().getOnLineDev(); + this.context.session.getMsgService().getOnLineDev(); } async getArkJsonCollection(cid: string) { diff --git a/src/onebot/api/friend.ts b/src/onebot/api/friend.ts index 8a1136f3..d87ba1c3 100644 --- a/src/onebot/api/friend.ts +++ b/src/onebot/api/friend.ts @@ -18,7 +18,6 @@ export class OneBotFriendApi { let pokedetail: any[] = json.items; //筛选item带有uid的元素 pokedetail = pokedetail.filter(item => item.uid); - //console.log("[NapCat] 群拍一拍 群:", pokedetail, parseInt(msg.peerUid), " ", await NTQQUserApi.getUinByUid(pokedetail[0].uid), "拍了拍", await NTQQUserApi.getUinByUid(pokedetail[1].uid)); if (pokedetail.length == 2) { return new OB11FriendPokeEvent( this.core, diff --git a/src/onebot/types/quick.ts b/src/onebot/types/quick.ts index 748c8705..2c3fff65 100644 --- a/src/onebot/types/quick.ts +++ b/src/onebot/types/quick.ts @@ -17,7 +17,6 @@ export interface QuickActionGroupMessage extends QuickActionPrivateMessage { kick?: boolean; ban?: boolean; ban_duration?: number; - // } export interface QuickActionFriendRequest {