diff --git a/src/common/file.ts b/src/common/file.ts index 1d1f5a67..bf644122 100644 --- a/src/common/file.ts +++ b/src/common/file.ts @@ -191,7 +191,7 @@ export async function checkUriType(Uri: string) { if (LocalFileRet) return LocalFileRet; const OtherFileRet = await solveProblem((uri: string) => { // 再判断是否是Http - if (uri.startsWith('http://') || uri.startsWith('https://')) { + if (uri.startsWith('http:') || uri.startsWith('https:')) { return { Uri: uri, Type: FileUriType.Remote }; } // 再判断是否是Base64 @@ -199,7 +199,7 @@ export async function checkUriType(Uri: string) { return { Uri: uri, Type: FileUriType.Base64 }; } if (uri.startsWith('file:')) { - let filePath: string = uri.slice(7); + const filePath: string = uri.slice(7); // file://C:\1.jpg // file:///test/1.jpg return { Uri: filePath, Type: FileUriType.Local }; diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index f5e9f52c..d8857371 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -41,7 +41,7 @@ export class NTQQFileApi { this.rkeyManager = new RkeyManager([ 'https://rkey.napneko.icu/rkeys' ], - this.context.logger + this.context.logger ); } @@ -307,18 +307,18 @@ export class NTQQFileApi { element.elementType === ElementType.FILE ) { switch (element.elementType) { - case ElementType.PIC: + case ElementType.PIC: element.picElement!.sourcePath = elementResults[elementIndex]; - break; - case ElementType.VIDEO: + break; + case ElementType.VIDEO: element.videoElement!.filePath = elementResults[elementIndex]; - break; - case ElementType.PTT: + break; + case ElementType.PTT: element.pttElement!.filePath = elementResults[elementIndex]; - break; - case ElementType.FILE: + break; + case ElementType.FILE: element.fileElement!.filePath = elementResults[elementIndex]; - break; + break; } elementIndex++; } diff --git a/src/core/packet/transformer/proto/message/message.ts b/src/core/packet/transformer/proto/message/message.ts index 1cb6ecfe..5453749f 100644 --- a/src/core/packet/transformer/proto/message/message.ts +++ b/src/core/packet/transformer/proto/message/message.ts @@ -62,7 +62,7 @@ export const GroupChange = { operatorUid: ProtoField(5, ScalarType.STRING, true), increaseType: ProtoField(6, ScalarType.UINT32), field7: ProtoField(7, ScalarType.BYTES, true), -} +}; export const PushMsgBody = { responseHead: ProtoField(1, () => ResponseHead), diff --git a/src/onebot/api/group.ts b/src/onebot/api/group.ts index faa8ee02..cf30726e 100644 --- a/src/onebot/api/group.ts +++ b/src/onebot/api/group.ts @@ -315,7 +315,7 @@ export class OneBotGroupApi { } else if (grayTipElement.jsonGrayTipElement.busiId == JsonGrayBusiId.AIO_GROUP_ESSENCE_MSG_TIP) { return await this.parseEssenceMsg(msg, grayTipElement.jsonGrayTipElement.jsonStr); } else { - return await this.parseOtherJsonEvent(msg, grayTipElement.jsonGrayTipElement.jsonStr, this.core.context) + return await this.parseOtherJsonEvent(msg, grayTipElement.jsonGrayTipElement.jsonStr, this.core.context); } } return undefined; diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index 8036d33d..b286348b 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -673,7 +673,7 @@ export class OneBotMsgApi { if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) { if (grayTipElement.jsonGrayTipElement.busiId == 1061) { const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(grayTipElement); - if (PokeEvent) { return PokeEvent }; + if (PokeEvent) { return PokeEvent; }; } else if (grayTipElement.jsonGrayTipElement.busiId == 19324 && msg.peerUid !== '') { return new OB11FriendAddNoticeEvent(this.core, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid))); } @@ -841,14 +841,14 @@ export class OneBotMsgApi { } private async convertArrayToStringMessage(originMsg: OB11Message): Promise { - let msg = structuredClone(originMsg); + const msg = structuredClone(originMsg); msg.message_format = 'string'; msg.message = msg.raw_message; return msg; } async importArrayTostringMsg(originMsg: OB11Message) { - let msg = structuredClone(originMsg); + const msg = structuredClone(originMsg); msg.message_format = 'string'; msg.message = msg.raw_message; return msg; @@ -924,7 +924,7 @@ export class OneBotMsgApi { fsPromise.unlink(file).then().catch(e => this.core.context.logger.logError.bind(this.core.context.logger)('发送消息删除文件失败', e)); } } catch (error) { - this.core.context.logger.logError.bind(this.core.context.logger)('发送消息删除文件失败', (error as Error).message) + this.core.context.logger.logError.bind(this.core.context.logger)('发送消息删除文件失败', (error as Error).message); } }); }, 60000); @@ -959,20 +959,20 @@ export class OneBotMsgApi { } groupChangDecreseType2String(type: number): GroupDecreaseSubType { switch (type) { - case 130: - return 'kick'; - case 131: - return 'leave'; - case 3: - return 'kick_me'; - default: - return 'kick'; + case 130: + return 'kick'; + case 131: + return 'leave'; + case 3: + return 'kick_me'; + default: + return 'kick'; } } async parseSysMessage(msg: number[]) { // Todo Refactor - let SysMessage = new NapProtoMsg(PushMsgBody).decode(Uint8Array.from(msg)); + const SysMessage = new NapProtoMsg(PushMsgBody).decode(Uint8Array.from(msg)); if (SysMessage.contentHead.type == 33 && SysMessage.body?.msgContent) { const groupChange = new NapProtoMsg(GroupChange).decode(SysMessage.body.msgContent); console.log(JSON.stringify(groupChange)); diff --git a/src/onebot/index.ts b/src/onebot/index.ts index 856e7821..9ffe9b07 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -298,10 +298,10 @@ export class NapCatOneBot11Adapter { peerUid: uid, guildId: '' }; - let msg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeq(peer, msgSeq)).msgList.find(e => e.msgType == NTMsgType.KMSGTYPEGRAYTIPS); - let element = msg?.elements[0]; + const msg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeq(peer, msgSeq)).msgList.find(e => e.msgType == NTMsgType.KMSGTYPEGRAYTIPS); + const element = msg?.elements[0]; if (msg && element) { - let recallEvent = await this.emitRecallMsg(msg, element); + const recallEvent = await this.emitRecallMsg(msg, element); try { if (recallEvent) { await this.networkManager.emitEvent(recallEvent); @@ -310,7 +310,7 @@ export class NapCatOneBot11Adapter { this.context.logger.logError('处理消息撤回失败', e); } } - } + }; msgListener.onKickedOffLine = async (kick) => { const event = new BotOfflineEvent(this.core, kick.tipsTitle, kick.tipsDesc); this.networkManager @@ -664,7 +664,7 @@ export class NapCatOneBot11Adapter { private async emitRecallMsg(message: RawMessage, element: MessageElement) { const peer: Peer = { chatType: message.chatType, peerUid: message.peerUid, guildId: '' }; - let oriMessageId = MessageUnique.getShortIdByMsgId(message.msgId) ?? MessageUnique.createUniqueMsgId(peer, message.msgId); + const oriMessageId = MessageUnique.getShortIdByMsgId(message.msgId) ?? MessageUnique.createUniqueMsgId(peer, message.msgId); if (message.chatType == ChatType.KCHATTYPEC2C) { return await this.emitFriendRecallMsg(message, oriMessageId, element); } else if (message.chatType == ChatType.KCHATTYPEGROUP) { @@ -684,7 +684,7 @@ export class NapCatOneBot11Adapter { private async emitGroupRecallMsg(message: RawMessage, oriMessageId: number, element: MessageElement) { const operatorUid = element.grayTipElement?.revokeElement.operatorUid; if (!operatorUid) return undefined; - let operatorId = message.senderUin ?? await this.core.apis.UserApi.getUinByUidV2(operatorUid); + const operatorId = message.senderUin ?? await this.core.apis.UserApi.getUinByUidV2(operatorUid); return new OB11GroupRecallNoticeEvent( this.core, +message.peerUin, diff --git a/src/onebot/network/passive-http.ts b/src/onebot/network/passive-http.ts index 80d862bd..4b18a1d3 100644 --- a/src/onebot/network/passive-http.ts +++ b/src/onebot/network/passive-http.ts @@ -102,7 +102,7 @@ export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter { if (req.path === '' || req.path === '/') { const hello = OB11Response.ok({}); hello.message = 'NapCat4 Ss Running'; - return res.json(hello) + return res.json(hello); } const actionName = req.path.split('/')[1]; const action = this.actions.get(actionName);