diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index 7e796e14..aa9948d3 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -117,31 +117,31 @@ export class NTQQFileApi { filePath: string }) => Promise, (fileTransNotifyInfo: OnRichMediaDownloadCompleteParams) => void - >( - 'NodeIKernelMsgService/downloadRichMedia', - 'NodeIKernelMsgListener/onRichMediaDownloadComplete', - 1, - timeout, - (arg: OnRichMediaDownloadCompleteParams) => { - if (arg.msgId === msgId) { - return true; - } - return false; - }, - { - fileModelId: '0', - downloadSourceType: 0, - triggerType: 1, - msgId: msgId, - chatType: chatType, - peerUid: peerUid, - elementId: elementId, - thumbSize: 0, - downloadType: 1, - filePath: thumbPath, - }, - ); - let msg = await this.core.apis.MsgApi.getMsgsByMsgId({ + >( + 'NodeIKernelMsgService/downloadRichMedia', + 'NodeIKernelMsgListener/onRichMediaDownloadComplete', + 1, + timeout, + (arg: OnRichMediaDownloadCompleteParams) => { + if (arg.msgId === msgId) { + return true; + } + return false; + }, + { + fileModelId: '0', + downloadSourceType: 0, + triggerType: 1, + msgId: msgId, + chatType: chatType, + peerUid: peerUid, + elementId: elementId, + thumbSize: 0, + downloadType: 1, + filePath: thumbPath, + }, + ); + const msg = await this.core.apis.MsgApi.getMsgsByMsgId({ guildId: '', chatType: chatType, peerUid: peerUid, @@ -150,13 +150,13 @@ export class NTQQFileApi { return data[1].filePath; } //获取原始消息 - let FileElements = msg?.msgList[0]?.elements?.find(e => e.elementId === elementId); + const FileElements = msg?.msgList[0]?.elements?.find(e => e.elementId === elementId); if (!FileElements) { //失败则就乱来 Todo return data[1].filePath; } //从原始消息获取文件路径 - let filePath = + const filePath = FileElements?.fileElement?.filePath || FileElements?.pttElement?.filePath || FileElements?.videoElement?.filePath || @@ -280,10 +280,10 @@ export class NTQQFileApi { let id = ''; const Listener = this.core.eventWrapper.RegisterListen<(params: OnListener) => void> ( - 'NodeIKernelSearchListener/onSearchFileKeywordsResult', - 1, - 20000, - (params) => id !== '' && params.searchId == id, + 'NodeIKernelSearchListener/onSearchFileKeywordsResult', + 1, + 20000, + (params) => id !== '' && params.searchId == id, ); id = await Event!(keys, 12); const [ret] = (await Listener); diff --git a/src/core/apis/friend.ts b/src/core/apis/friend.ts index 20574d7d..45a15161 100644 --- a/src/core/apis/friend.ts +++ b/src/core/apis/friend.ts @@ -83,12 +83,12 @@ export class NTQQFriendApi { async getFriends(forced = false): Promise { const [_retData, _BuddyArg] = await this.core.eventWrapper.CallNormalEvent<(force: boolean) => Promise, (arg: OnBuddyChangeParams) => void> ( - 'NodeIKernelBuddyService/getBuddyList', - 'NodeIKernelBuddyListener/onBuddyListChange', - 1, - 5000, - () => true, - forced, + 'NodeIKernelBuddyService/getBuddyList', + 'NodeIKernelBuddyListener/onBuddyListChange', + 1, + 5000, + () => true, + forced, ); const friends: User[] = []; for (const categoryItem of _BuddyArg) { diff --git a/src/core/apis/msg.ts b/src/core/apis/msg.ts index 0ceeecfc..a0059d66 100644 --- a/src/core/apis/msg.ts +++ b/src/core/apis/msg.ts @@ -103,18 +103,18 @@ export class NTQQMsgApi { const data = await this.core.eventWrapper.CallNormalEvent< (GroupCode: string, params: GetFileListParam) => Promise, (groupFileListResult: onGroupFileInfoUpdateParamType) => void - >( - 'NodeIKernelRichMediaService/getGroupFileList', - 'NodeIKernelMsgListener/onGroupFileInfoUpdate', - 1, - 5000, - (groupFileListResult: onGroupFileInfoUpdateParamType) => { + >( + 'NodeIKernelRichMediaService/getGroupFileList', + 'NodeIKernelMsgListener/onGroupFileInfoUpdate', + 1, + 5000, + (groupFileListResult: onGroupFileInfoUpdateParamType) => { //Developer Mlikiowa Todo: 此处有问题 无法判断是否成功 - return true; - }, - GroupCode, - params, - ); + return true; + }, + GroupCode, + params, + ); return data[1].item; } @@ -155,24 +155,24 @@ export class NTQQMsgApi { const data = await this.core.eventWrapper.CallNormalEvent< (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map) => Promise, (msgList: RawMessage[]) => void - >( - 'NodeIKernelMsgService/sendMsg', - 'NodeIKernelMsgListener/onMsgInfoListUpdate', - 1, - timeout, - (msgRecords: RawMessage[]) => { - for (const msgRecord of msgRecords) { - if (msgRecord.msgId === msgId && msgRecord.sendStatus === 2) { - return true; + >( + 'NodeIKernelMsgService/sendMsg', + 'NodeIKernelMsgListener/onMsgInfoListUpdate', + 1, + timeout, + (msgRecords: RawMessage[]) => { + for (const msgRecord of msgRecords) { + if (msgRecord.msgId === msgId && msgRecord.sendStatus === 2) { + return true; + } } - } - return false; - }, - msgId, - peer, - msgElements, - new Map(), - ); + return false; + }, + msgId, + peer, + msgElements, + new Map(), + ); const retMsg = data[1].find(msgRecord => { if (msgRecord.msgId === msgId) { return true; @@ -186,7 +186,7 @@ export class NTQQMsgApi { } async PrepareTempChat(toUserUid: string, GroupCode: string, nickname: string) { //By Jadx/Ida Mlikiowa - let TempGameSession = { + const TempGameSession = { nickname: "", gameAppId: "", selfTinyId: "", @@ -210,7 +210,7 @@ export class NTQQMsgApi { async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) { //唉？ ！我有个想法 if (peer.chatType === ChatType.temp && peer.guildId && peer.guildId !== '') { - let member = await this.core.apis.GroupApi.getGroupMember(peer.guildId, peer.peerUid!); + const member = await this.core.apis.GroupApi.getGroupMember(peer.guildId, peer.peerUid!); if (member) { await this.PrepareTempChat(peer.peerUid, peer.guildId, member.nick); } @@ -220,24 +220,24 @@ export class NTQQMsgApi { const data = await this.core.eventWrapper.CallNormalEvent< (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map) => Promise, (msgList: RawMessage[]) => void - >( - 'NodeIKernelMsgService/sendMsg', - 'NodeIKernelMsgListener/onMsgInfoListUpdate', - 1, - timeout, - (msgRecords: RawMessage[]) => { - for (const msgRecord of msgRecords) { - if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) { - return true; + >( + 'NodeIKernelMsgService/sendMsg', + 'NodeIKernelMsgListener/onMsgInfoListUpdate', + 1, + timeout, + (msgRecords: RawMessage[]) => { + for (const msgRecord of msgRecords) { + if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) { + return true; + } } - } - return false; - }, - '0', - peer, - msgElements, - new Map(), - ); + return false; + }, + '0', + peer, + msgElements, + new Map(), + ); const retMsg = data[1].find(msgRecord => { if (msgRecord.guildId === msgId) { return true; @@ -272,25 +272,25 @@ export class NTQQMsgApi { const data = await this.core.eventWrapper.CallNormalEvent< (msgInfo: typeof msgInfos, srcPeer: Peer, destPeer: Peer, comment: Array, attr: Map) => Promise, (msgList: RawMessage[]) => void - >( - 'NodeIKernelMsgService/multiForwardMsgWithComment', - 'NodeIKernelMsgListener/onMsgInfoListUpdate', - 1, - 5000, - (msgRecords: RawMessage[]) => { - for (const msgRecord of msgRecords) { - if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == this.core.selfInfo.uid) { - return true; + >( + 'NodeIKernelMsgService/multiForwardMsgWithComment', + 'NodeIKernelMsgListener/onMsgInfoListUpdate', + 1, + 5000, + (msgRecords: RawMessage[]) => { + for (const msgRecord of msgRecords) { + if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == this.core.selfInfo.uid) { + return true; + } } - } - return false; - }, - msgInfos, - srcPeer, - destPeer, - [], - new Map(), - ); + return false; + }, + msgInfos, + srcPeer, + destPeer, + [], + new Map(), + ); for (const msg of data[1]) { const arkElement = msg.elements.find(ele => ele.arkElement); if (!arkElement) { diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts index 98676254..d8f79449 100644 --- a/src/core/apis/user.ts +++ b/src/core/apis/user.ts @@ -156,8 +156,8 @@ export class NTQQUserApi { async getCookies(domain: string) { const ClientKeyData = await this.forceFetchClientKey(); const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + this.core.selfInfo.uin + - '&clientkey=' + ClientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + this.core.selfInfo.uin + '%2Finfocenter&keyindex=19%27' - let cookies: { [key: string]: string; } = await RequestUtil.HttpsGetCookies(requestUrl); + '&clientkey=' + ClientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + this.core.selfInfo.uin + '%2Finfocenter&keyindex=19%27'; + const cookies: { [key: string]: string; } = await RequestUtil.HttpsGetCookies(requestUrl); return cookies; } diff --git a/src/framework/napcat.ts b/src/framework/napcat.ts index f6a60fad..a7ad890c 100644 --- a/src/framework/napcat.ts +++ b/src/framework/napcat.ts @@ -13,7 +13,7 @@ import { NapCatOneBot11Adapter } from '@/onebot'; //Framework ES入口文件 export async function getWebUiUrl() { - let WebUiConfigData = (await WebUiConfig.GetWebUIConfig()); + const WebUiConfigData = (await WebUiConfig.GetWebUIConfig()); return "http://127.0.0.1:" + WebUiConfigData.port + '/webui/?token=' + WebUiConfigData.token; } export async function NCoreInitFramework( diff --git a/src/framework/renderer.js b/src/framework/renderer.js index 114622ba..b6393a6b 100644 --- a/src/framework/renderer.js +++ b/src/framework/renderer.js @@ -13,7 +13,7 @@ export const onSettingWindowCreated = async (view) => { // //iframe.scrolling = "no"; // //有滚动条何尝不是一种美 // view.appendChild(iframe); - let webui = await window.napcat.getWebUiUrl() + let webui = await window.napcat.getWebUiUrl(); let panel = ` diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index 346fde95..a0114686 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -286,13 +286,13 @@ export class OB11Constructor { chatType: msg.chatType, guildId: '', }, - msg.msgId, - msg.msgSeq, - msg.senderUid, - element.elementId, - element.elementType.toString(), - element.pttElement.fileSize || '0', - element.pttElement.fileUuid || '', + msg.msgId, + msg.msgSeq, + msg.senderUid, + element.elementId, + element.elementType.toString(), + element.pttElement.fileSize || '0', + element.pttElement.fileUuid || '', ); //以uuid作为文件名 } else if (element.arkElement) { diff --git a/src/onebot/network/passive-websocket.ts b/src/onebot/network/passive-websocket.ts index 1317f440..134da9a5 100644 --- a/src/onebot/network/passive-websocket.ts +++ b/src/onebot/network/passive-websocket.ts @@ -37,7 +37,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter { this.heartbeatInterval = heartbeatInterval; this.wsServer = new WebSocketServer({ port: port, host: ip }); - let core = coreContext; + const core = coreContext; this.wsServer.on('connection', async (wsClient, wsReq) => { if (!this.isOpen) { wsClient.close(); diff --git a/src/webui/index.ts b/src/webui/index.ts index d9f73b74..a15988f1 100644 --- a/src/webui/index.ts +++ b/src/webui/index.ts @@ -19,7 +19,7 @@ export let webUiPathWrapper: NapCatPathWrapper; export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapper) { webUiPathWrapper = pathWrapper; WebUiConfig = new WebUiConfigWrapper(); - let log = logger.log.bind(logger); + const log = logger.log.bind(logger); const config = await WebUiConfig.GetWebUIConfig(); if (config.port == 0) { log('[NapCat] [WebUi] Current WebUi is not run.'); diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index 7d8e7c8e..771f50dc 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -180,12 +180,12 @@ async function onSettingWindowCreated(view: Element) { 'Telegram 群', 'https://t.me/+nLZEnpne-pQ1OWFl', SettingButton('进去逛逛', 'open-telegram') - ), - SettingItem( + ), + SettingItem( 'QQ 群', '518662028', SettingButton('我要进去', 'open-qq-group') - ), + ), '', ].join(''), 'text/html',