From bdf1c7fd5ff2c16158c8050ecdffbe85a2e11400 Mon Sep 17 00:00:00 2001 From: idranme Date: Sat, 7 Sep 2024 02:56:59 +0800 Subject: [PATCH] chore --- src/ntqqapi/api/friend.ts | 2 +- src/ntqqapi/api/group.ts | 2 +- src/ntqqapi/api/user.ts | 2 +- src/ntqqapi/entities.ts | 2 +- src/ntqqapi/wrapper.ts | 2 +- src/onebot11/action/go-cqhttp/UploadFile.ts | 4 ++-- src/onebot11/action/group/GetGroupList.ts | 4 ++-- src/onebot11/action/group/GetGroupMemberInfo.ts | 2 +- src/onebot11/action/msg/SendMsg.ts | 2 +- src/onebot11/action/system/CanSendRecord.ts | 2 +- src/onebot11/action/user/GetFriendList.ts | 2 +- src/onebot11/entities.ts | 6 +++--- src/onebot11/helper/createMessage.ts | 3 +-- src/onebot11/helper/quickOperation.ts | 2 +- src/renderer/index.ts | 2 +- 15 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/ntqqapi/api/friend.ts b/src/ntqqapi/api/friend.ts index d447f3e..ba68c49 100644 --- a/src/ntqqapi/api/friend.ts +++ b/src/ntqqapi/api/friend.ts @@ -19,7 +19,7 @@ export class NTQQFriendApi extends Service { } /** 大于或等于 26702 应使用 getBuddyV2 */ - async getFriends(_forced = false) { + async getFriends() { const data = await invoke<{ data: { categoryId: number diff --git a/src/ntqqapi/api/group.ts b/src/ntqqapi/api/group.ts index 949e171..93a78b7 100644 --- a/src/ntqqapi/api/group.ts +++ b/src/ntqqapi/api/group.ts @@ -24,7 +24,7 @@ export class NTQQGroupApi extends Service { super(ctx, 'ntGroupApi', true) } - async getGroups(forced = false): Promise { + async getGroups(): Promise { const result = await invoke<{ updateType: number groupList: Group[] diff --git a/src/ntqqapi/api/user.ts b/src/ntqqapi/api/user.ts index 52cb1f5..cb4791d 100644 --- a/src/ntqqapi/api/user.ts +++ b/src/ntqqapi/api/user.ts @@ -65,7 +65,7 @@ export class NTQQUserApi extends Service { return ret } - async getUserDetailInfo(uid: string, _getLevel = false) { + async getUserDetailInfo(uid: string) { if (getBuildVersion() >= 26702) { return this.fetchUserDetailInfo(uid) } diff --git a/src/ntqqapi/entities.ts b/src/ntqqapi/entities.ts index 5f02e5c..451a6f3 100644 --- a/src/ntqqapi/entities.ts +++ b/src/ntqqapi/entities.ts @@ -201,7 +201,7 @@ export namespace SendElementEntities { // log("生成缩略图", _thumbPath) thumbPath.set(0, _thumbPath) const thumbMd5 = await calculateFileMD5(_thumbPath) - let element: SendVideoElement = { + const element: SendVideoElement = { elementType: ElementType.VIDEO, elementId: '', videoElement: { diff --git a/src/ntqqapi/wrapper.ts b/src/ntqqapi/wrapper.ts index 9250c9b..6530797 100644 --- a/src/ntqqapi/wrapper.ts +++ b/src/ntqqapi/wrapper.ts @@ -34,7 +34,7 @@ export interface WrapperApi { } export interface WrapperConstructor { - [key: string]: any + [key: string]: unknown } const wrapperApi: WrapperApi = {} diff --git a/src/onebot11/action/go-cqhttp/UploadFile.ts b/src/onebot11/action/go-cqhttp/UploadFile.ts index 24428b9..3502d2f 100644 --- a/src/onebot11/action/go-cqhttp/UploadFile.ts +++ b/src/onebot11/action/go-cqhttp/UploadFile.ts @@ -28,7 +28,7 @@ export class UploadGroupFile extends BaseAction { } const sendFileEle = await SendElementEntities.file(this.ctx, downloadResult.path, payload.name, payload.folder_id) const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group) - await sendMsg(this.ctx, peer, [sendFileEle], [], true) + await sendMsg(this.ctx, peer, [sendFileEle], []) return null } } @@ -53,7 +53,7 @@ export class UploadPrivateFile extends BaseAction { actionName = ActionName.GetGroupList - protected async _handle(payload: Payload) { - const groupList = await this.ctx.ntGroupApi.getGroups(payload?.no_cache === true || payload?.no_cache === 'true') + protected async _handle() { + const groupList = await this.ctx.ntGroupApi.getGroups() return OB11Entities.groups(groupList) } } diff --git a/src/onebot11/action/group/GetGroupMemberInfo.ts b/src/onebot11/action/group/GetGroupMemberInfo.ts index e05ea91..b4d153d 100644 --- a/src/onebot11/action/group/GetGroupMemberInfo.ts +++ b/src/onebot11/action/group/GetGroupMemberInfo.ts @@ -18,7 +18,7 @@ class GetGroupMemberInfo extends BaseAction { if (member) { if (isNullable(member.sex)) { //log('获取群成员详细信息') - const info = await this.ctx.ntUserApi.getUserDetailInfo(member.uid, true) + const info = await this.ctx.ntUserApi.getUserDetailInfo(member.uid) //log('群成员详细信息结果', info) Object.assign(member, info) } diff --git a/src/onebot11/action/msg/SendMsg.ts b/src/onebot11/action/msg/SendMsg.ts index 35ced15..cf73588 100644 --- a/src/onebot11/action/msg/SendMsg.ts +++ b/src/onebot11/action/msg/SendMsg.ts @@ -214,7 +214,7 @@ export class SendMsg extends BaseAction { } // log("分割后的转发节点", sendElementsSplit) for (const eles of sendElementsSplit) { - const nodeMsg = await sendMsg(this.ctx, selfPeer, eles, [], true) + const nodeMsg = await sendMsg(this.ctx, selfPeer, eles, []) if (!nodeMsg) { this.ctx.logger.warn('转发节点生成失败', eles) continue diff --git a/src/onebot11/action/system/CanSendRecord.ts b/src/onebot11/action/system/CanSendRecord.ts index d75f35f..665d5fb 100644 --- a/src/onebot11/action/system/CanSendRecord.ts +++ b/src/onebot11/action/system/CanSendRecord.ts @@ -5,7 +5,7 @@ interface ReturnType { yes: boolean } -export default class CanSendRecord extends BaseAction { +export default class CanSendRecord extends BaseAction { actionName = ActionName.CanSendRecord protected async _handle() { diff --git a/src/onebot11/action/user/GetFriendList.ts b/src/onebot11/action/user/GetFriendList.ts index 7c6e632..7bbead3 100644 --- a/src/onebot11/action/user/GetFriendList.ts +++ b/src/onebot11/action/user/GetFriendList.ts @@ -16,7 +16,7 @@ export class GetFriendList extends BaseAction { if (getBuildVersion() >= 26702) { return OB11Entities.friendsV2(await this.ctx.ntFriendApi.getBuddyV2(refresh)) } - return OB11Entities.friends(await this.ctx.ntFriendApi.getFriends(refresh)) + return OB11Entities.friends(await this.ctx.ntFriendApi.getFriends()) } } diff --git a/src/onebot11/entities.ts b/src/onebot11/entities.ts index b319998..68b04a1 100644 --- a/src/onebot11/entities.ts +++ b/src/onebot11/entities.ts @@ -173,8 +173,8 @@ export namespace OB11Entities { id: MessageUnique.createMsg(peer, replyMsg ? replyMsg.msgId : records.msgId).toString() } } - } catch (e: any) { - ctx.logger.error('获取不到引用的消息', replyElement, e.stack) + } catch (e) { + ctx.logger.error('获取不到引用的消息', replyElement, (e as Error).stack) continue } } @@ -378,7 +378,7 @@ export namespace OB11Entities { if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) { //判断业务类型 //Poke事件 - const pokedetail: any[] = json.items + const pokedetail: Dict[] = json.items //筛选item带有uid的元素 const poke_uid = pokedetail.filter(item => item.uid) if (poke_uid.length == 2) { diff --git a/src/onebot11/helper/createMessage.ts b/src/onebot11/helper/createMessage.ts index 18ebd90..6ec850f 100644 --- a/src/onebot11/helper/createMessage.ts +++ b/src/onebot11/helper/createMessage.ts @@ -236,8 +236,7 @@ export async function sendMsg( ctx: Context, peer: Peer, sendElements: SendMessageElement[], - deleteAfterSentFiles: string[], - waitComplete = true, + deleteAfterSentFiles: string[] ) { if (!sendElements.length) { throw '消息体无法解析,请检查是否发送了不支持的消息类型' diff --git a/src/onebot11/helper/quickOperation.ts b/src/onebot11/helper/quickOperation.ts index c67d8f7..8127015 100644 --- a/src/onebot11/helper/quickOperation.ts +++ b/src/onebot11/helper/quickOperation.ts @@ -88,7 +88,7 @@ async function handleMsg(ctx: Context, msg: OB11Message, quickAction: QuickOpera } replyMessage = replyMessage.concat(convertMessage2List(reply, quickAction.auto_escape)) const { sendElements, deleteAfterSentFiles } = await createSendElements(ctx, replyMessage, peer) - sendMsg(ctx, peer, sendElements, deleteAfterSentFiles, false).catch(e => ctx.logger.error(e)) + sendMsg(ctx, peer, sendElements, deleteAfterSentFiles).catch(e => ctx.logger.error(e)) } if (msg.message_type === 'group') { const groupMsgQuickAction = quickAction as QuickOperationGroupMessage diff --git a/src/renderer/index.ts b/src/renderer/index.ts index 685b606..17d16ac 100644 --- a/src/renderer/index.ts +++ b/src/renderer/index.ts @@ -1,7 +1,7 @@ import { CheckVersion, Config } from '../common/types' import { SettingButton, SettingItem, SettingList, SettingSwitch, SettingSelect } from './components' import { version } from '../version' -// @ts-expect-error +// @ts-expect-error: Unreachable code error import StyleRaw from './style.css?raw' type HostsType = 'httpHosts' | 'wsHosts'