From 756dea71fc4d913ba50144fe08c90645f90a59a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Thu, 14 Nov 2024 12:44:21 +0800 Subject: [PATCH] remove: todo -> work --- src/core/helper/adaptDecoder.ts | 2 +- src/core/helper/adaptSysMessageDecoder.ts | 2 +- src/core/index.ts | 2 +- src/core/packet/client/wsClient.ts | 3 +-- src/core/packet/highway/highwayContext.ts | 8 ++++---- src/core/packet/message/builder.ts | 2 +- src/core/packet/message/converter.ts | 4 ++-- src/core/packet/message/element.ts | 10 +++++----- .../packet/transformer/highway/DownloadOfflineFile.ts | 2 +- src/core/packet/transformer/highway/FetchSessionKey.ts | 2 +- .../packet/transformer/highway/UploadGroupImage.ts | 2 +- .../packet/transformer/highway/UploadPrivateImage.ts | 2 +- src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts | 2 +- src/onebot/action/packet/GetPacketStatus.ts | 2 +- src/onebot/event/notice/OB11GroupDecreaseEvent.ts | 2 +- src/onebot/index.ts | 2 +- 16 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/core/helper/adaptDecoder.ts b/src/core/helper/adaptDecoder.ts index f3910363..ce8db26c 100644 --- a/src/core/helper/adaptDecoder.ts +++ b/src/core/helper/adaptDecoder.ts @@ -1,4 +1,4 @@ -// TODO: further refactor in NapCat.Packet v2 +// work:further refactor in NapCat.Packet v2 import { NapProtoMsg, ProtoField, ScalarType } from "@napneko/nap-proto-core"; const LikeDetail = { diff --git a/src/core/helper/adaptSysMessageDecoder.ts b/src/core/helper/adaptSysMessageDecoder.ts index 6bd9122a..cf6f15a9 100644 --- a/src/core/helper/adaptSysMessageDecoder.ts +++ b/src/core/helper/adaptSysMessageDecoder.ts @@ -1,4 +1,4 @@ -// TODO: further refactor in NapCat.Packet v2 +// work:further refactor in NapCat.Packet v2 import { NapProtoMsg, ProtoField, ScalarType } from "@napneko/nap-proto-core"; const BodyInner = { diff --git a/src/core/index.ts b/src/core/index.ts index 8dffa4d6..e2b0c1c3 100644 --- a/src/core/index.ts +++ b/src/core/index.ts @@ -210,7 +210,7 @@ export class NapCatCore { }); }; groupListener.onMemberListChange = (arg) => { - // todo: 应该加一个内部自己维护的成员变动callback，用于判断成员变化通知 + // work:应该加一个内部自己维护的成员变动callback，用于判断成员变化通知 const groupCode = arg.sceneId.split('_')[0]; if (this.apis.GroupApi.groupMemberCache.has(groupCode)) { const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode)!; diff --git a/src/core/packet/client/wsClient.ts b/src/core/packet/client/wsClient.ts index 54625cfc..8d195e9a 100644 --- a/src/core/packet/client/wsClient.ts +++ b/src/core/packet/client/wsClient.ts @@ -1,8 +1,7 @@ -import { Data, WebSocket } from "ws"; +import { Data, WebSocket, ErrorEvent } from "ws"; import { IPacketClient, RecvPacket } from "@/core/packet/client/baseClient"; import { PacketContext } from "@/core/packet/context/packetContext"; import { LogStack } from "@/core/packet/context/clientContext"; -import { ErrorEvent } from "ws"; export class WsPacketClient extends IPacketClient { private websocket: WebSocket | null = null; diff --git a/src/core/packet/highway/highwayContext.ts b/src/core/packet/highway/highwayContext.ts index ed95f6ee..f02e375c 100644 --- a/src/core/packet/highway/highwayContext.ts +++ b/src/core/packet/highway/highwayContext.ts @@ -228,7 +228,7 @@ export class PacketHighwayContext { }); await this.hwClient.upload( 1005, - fs.createReadStream(video.filePath!, { highWaterMark: BlockSize }), + fs.createReadStream(video.filePath, { highWaterMark: BlockSize }), +video.fileSize!, md5, extend @@ -256,7 +256,7 @@ export class PacketHighwayContext { }); await this.hwClient.upload( 1006, - fs.createReadStream(video.thumbPath!, { highWaterMark: BlockSize }), + fs.createReadStream(video.thumbPath, { highWaterMark: BlockSize }), +video.thumbSize!, md5, extend @@ -293,7 +293,7 @@ export class PacketHighwayContext { }); await this.hwClient.upload( 1001, - fs.createReadStream(video.filePath!, { highWaterMark: BlockSize }), + fs.createReadStream(video.filePath, { highWaterMark: BlockSize }), +video.fileSize!, md5, extend @@ -321,7 +321,7 @@ export class PacketHighwayContext { }); await this.hwClient.upload( 1002, - fs.createReadStream(video.thumbPath!, { highWaterMark: BlockSize }), + fs.createReadStream(video.thumbPath, { highWaterMark: BlockSize }), +video.thumbSize!, md5, extend diff --git a/src/core/packet/message/builder.ts b/src/core/packet/message/builder.ts index ddbe3825..addb8771 100644 --- a/src/core/packet/message/builder.ts +++ b/src/core/packet/message/builder.ts @@ -16,7 +16,7 @@ export class PacketMsgBuilder { return element.map((node): NapProtoEncodeStructType => { const avatar = `https://q.qlogo.cn/headimg_dl?dst_uin=${node.senderUin}&spec=640&img_type=jpg`; const msgContent = node.msg.reduceRight((acc: undefined | Uint8Array, msg: IPacketMsgElement) => { - return acc !== undefined ? acc : msg.buildContent(); + return acc ?? msg.buildContent(); }, undefined); const msgElement = node.msg.flatMap(msg => msg.buildElement() ?? []); if (!msgContent && !msgElement.length) { diff --git a/src/core/packet/message/converter.ts b/src/core/packet/message/converter.ts index 749c855e..af564425 100644 --- a/src/core/packet/message/converter.ts +++ b/src/core/packet/message/converter.ts @@ -76,7 +76,7 @@ export type rawMsgWithSendMsg = { msg: PacketSendMsgElement[] } -// TODO: make it become adapter? +// work:make it become adapter? export class PacketMsgConverter { private isValidElementType(type: ElementType): type is keyof ElementToPacketMsgConverters { return SupportedElementTypes.includes(type); @@ -116,7 +116,7 @@ export class PacketMsgConverter { [ElementType.MARKDOWN]: (element) => { return new PacketMsgMarkDownElement(element as SendMarkdownElement); }, - // TODO: check this logic, move it in arkElement? + // work:check this logic, move it in arkElement? [ElementType.STRUCTLONGMSG]: (element) => { return new PacketMultiMsgElement(element as SendStructLongMsgElement); } diff --git a/src/core/packet/message/element.ts b/src/core/packet/message/element.ts index 8142f1cb..1b2b51db 100644 --- a/src/core/packet/message/element.ts +++ b/src/core/packet/message/element.ts @@ -32,7 +32,7 @@ import { ForwardMsgBuilder } from "@/common/forward-msg-builder"; import { PacketMsg, PacketSendMsgElement } from "@/core/packet/message/message"; // raw <-> packet -// TODO: SendStructLongMsgElement +// work:SendStructLongMsgElement export abstract class IPacketMsgElement { protected constructor(rawElement: T) { } @@ -118,7 +118,7 @@ export class PacketMsgReplyElement extends IPacketMsgElement { this.targetUin = +(element.replyElement.senderUin ?? 0); this.targetUid = element.replyElement.senderUidStr ?? ''; this.time = +(element.replyElement.replyMsgTime ?? 0); - this.elems = []; // TODO: in replyElement.sourceMsgTextElems + this.elems = []; // work:in replyElement.sourceMsgTextElems } get isGroupReply(): boolean { @@ -131,7 +131,7 @@ export class PacketMsgReplyElement extends IPacketMsgElement { origSeqs: [this.isGroupReply ? this.messageClientSeq : this.messageSeq], senderUin: BigInt(this.targetUin), time: this.time, - elems: [], // TODO: in replyElement.sourceMsgTextElems + elems: [], // work:in replyElement.sourceMsgTextElems pbReserve: { messageId: this.messageId, }, @@ -346,9 +346,9 @@ export class PacketMsgPttElement extends IPacketMsgElement { constructor(element: SendPttElement) { super(element); this.filePath = element.pttElement.filePath; - this.fileSize = +element.pttElement.fileSize; // TODO: cc + this.fileSize = +element.pttElement.fileSize; // work:cc this.fileMd5 = element.pttElement.md5HexStr; - this.fileDuration = Math.round(element.pttElement.duration); // TODO: cc + this.fileDuration = Math.round(element.pttElement.duration); // work:cc } get valid(): boolean { diff --git a/src/core/packet/transformer/highway/DownloadOfflineFile.ts b/src/core/packet/transformer/highway/DownloadOfflineFile.ts index e9ee00b5..8848f02f 100644 --- a/src/core/packet/transformer/highway/DownloadOfflineFile.ts +++ b/src/core/packet/transformer/highway/DownloadOfflineFile.ts @@ -25,7 +25,7 @@ class DownloadOfflineFile extends PacketTransformer fileName: img.name, type: { type: 1, - picFormat: img.picType, //TODO: extend NapCat imgType /cc @MliKiowa + picFormat: img.picType, //work:extend NapCat imgType /cc @MliKiowa videoFormat: 0, voiceFormat: 0, }, diff --git a/src/core/packet/transformer/highway/UploadPrivateImage.ts b/src/core/packet/transformer/highway/UploadPrivateImage.ts index 9b9b708c..c7c90f78 100644 --- a/src/core/packet/transformer/highway/UploadPrivateImage.ts +++ b/src/core/packet/transformer/highway/UploadPrivateImage.ts @@ -40,7 +40,7 @@ class UploadPrivateImage extends PacketTransformer; export class GetGroupFileSystemInfo extends BaseAction { actionName = ActionName.GoCQHTTP_GetGroupFileSystemInfo; diff --git a/src/onebot/action/packet/GetPacketStatus.ts b/src/onebot/action/packet/GetPacketStatus.ts index 3e013245..8f8be1a6 100644 --- a/src/onebot/action/packet/GetPacketStatus.ts +++ b/src/onebot/action/packet/GetPacketStatus.ts @@ -7,7 +7,7 @@ export abstract class GetPacketStatusDepends extends BaseAction protected async check(payload: PT): Promise{ if (!this.core.apis.PacketApi.available) { - // TODO: add error stack? + // work:add error stack? return { valid: false, message: "packetBackend不可用，请参照文档 https://napneko.github.io/config/advanced 和启动日志检查packetBackend状态或进行配置！" + diff --git a/src/onebot/event/notice/OB11GroupDecreaseEvent.ts b/src/onebot/event/notice/OB11GroupDecreaseEvent.ts index f914d23e..bcbd7a51 100644 --- a/src/onebot/event/notice/OB11GroupDecreaseEvent.ts +++ b/src/onebot/event/notice/OB11GroupDecreaseEvent.ts @@ -5,7 +5,7 @@ export type GroupDecreaseSubType = 'leave' | 'kick' | 'kick_me'; export class OB11GroupDecreaseEvent extends OB11GroupNoticeEvent { notice_type = 'group_decrease'; - sub_type: GroupDecreaseSubType = 'leave'; // TODO: 实现其他几种子类型的识别 ("leave" | "kick" | "kick_me") + sub_type: GroupDecreaseSubType = 'leave'; // work:实现其他几种子类型的识别 ("leave" | "kick" | "kick_me") operator_id: number; constructor(core: NapCatCore, groupId: number, userId: number, operatorId: number, subType: GroupDecreaseSubType = 'leave') { diff --git a/src/onebot/index.ts b/src/onebot/index.ts index 90c33bcb..ed36aee0 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -563,7 +563,7 @@ export class NapCatOneBot11Adapter { for (const message of msgList) { // log("message update", message.sendStatus, message.msgId, message.msgSeq) const peer: Peer = { chatType: message.chatType, peerUid: message.peerUid, guildId: '' }; - if (message.recallTime != '0' && !cache.get(message.msgId)) { //todo: 这个判断方法不太好，应该使用灰色消息元素来判断? + if (message.recallTime != '0' && !cache.get(message.msgId)) { //work:这个判断方法不太好，应该使用灰色消息元素来判断? cache.put(message.msgId, true); // 撤回消息上报 let oriMessageId = MessageUnique.getShortIdByMsgId(message.msgId);