From adfd1239702e271ba5b1fb465d842d85417207e5 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: Mon, 26 Aug 2024 00:29:52 +0800 Subject: [PATCH] style: lint --- src/common/framework/event.ts | 21 +++---- src/common/utils/system.ts | 2 +- src/core/apis/file.ts | 62 +++++++++---------- src/core/apis/group.ts | 7 +-- src/core/apis/msg.ts | 8 +-- src/core/entities/group.ts | 2 +- src/core/entities/msg.ts | 4 +- src/core/listeners/NodeIKernelMsgListener.ts | 6 +- src/core/services/NodeIKernelGroupService.ts | 6 +- src/onebot/action/group/SetGroupAddRequest.ts | 2 +- 10 files changed, 59 insertions(+), 61 deletions(-) diff --git a/src/common/framework/event.ts b/src/common/framework/event.ts index ff513c25..b9c68ef9 100644 --- a/src/common/framework/event.ts +++ b/src/common/framework/event.ts @@ -26,12 +26,11 @@ export class NTEventChannel extends EventEmitter { } createProxyDispatch(ListenerMainName: string) { - // eslint-disable-next-line @typescript-eslint/no-this-alias - const current = this; + const dispatcherListener = this.dispatcherListener.bind(this); return new Proxy({}, { get(_target: any, prop: any, _receiver: any) { return (...args: any[]) => { - current.dispatcherListener.apply(current, [ListenerMainName + '/' + prop, ...args]); + dispatcherListener(ListenerMainName + '/' + prop, ...args); }; }, }); @@ -59,14 +58,14 @@ export class NTEventChannel extends EventEmitter { } async createEventWithListener any, ListenerType extends (...args: any) => any> - ( - eventName: string, - listenerName: string, - waitTimes = 1, - timeout: number = 3000, - checker: (...args: Parameters) => boolean, - ...eventArg: Parameters - ) { + ( + eventName: string, + listenerName: string, + waitTimes = 1, + timeout: number = 3000, + checker: (...args: Parameters) => boolean, + ...eventArg: Parameters + ) { return new Promise<[EventRet: Awaited>, ...Parameters]>(async (resolve, reject) => { const ListenerNameList = listenerName.split('/'); const ListenerMainName = ListenerNameList[0]; diff --git a/src/common/utils/system.ts b/src/common/utils/system.ts index 5411bbb6..bb69edd0 100644 --- a/src/common/utils/system.ts +++ b/src/common/utils/system.ts @@ -30,7 +30,7 @@ export async function getMachineId(): Promise { if (!machineId) { machineId = (async () => { const id = await getMacMachineId(); - return id || randomUUID(); // fallback, generate a UUID + return id ?? randomUUID(); // fallback, generate a UUID })(); } diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index 0d32ad39..b6147ad2 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -319,30 +319,30 @@ 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, - }, - ); + >( + '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, @@ -359,9 +359,9 @@ export class NTQQFileApi { } //从原始消息获取文件路径 const filePath = - FileElements?.fileElement?.filePath || - FileElements?.pttElement?.filePath || - FileElements?.videoElement?.filePath || + FileElements?.fileElement?.filePath ?? + FileElements?.pttElement?.filePath ?? + FileElements?.videoElement?.filePath ?? FileElements?.picElement?.sourcePath; return filePath; } @@ -482,10 +482,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/group.ts b/src/core/apis/group.ts index 16ddba1b..0d9beb8d 100644 --- a/src/core/apis/group.ts +++ b/src/core/apis/group.ts @@ -7,8 +7,7 @@ import { GroupNotify, GroupRequestOperateTypes, InstanceContext, - KickMemberInfo, - kickMemberV2Req, + KickMemberV2Req, MemberExtSourceType, NapCatCore, NodeIKernelGroupListener, @@ -223,7 +222,7 @@ export class NTQQGroupApi { // GetMsgByShoretID(ShoretID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数 return this.context.session.getGroupService().addGroupEssence(param); } - async kickMemberV2Inner(param: kickMemberV2Req) { + async kickMemberV2Inner(param: KickMemberV2Req) { return this.context.session.getGroupService().kickMemberV2(param); } async deleteGroupBulletin(GroupCode: string, feedId: string) { @@ -358,7 +357,7 @@ export class NTQQGroupApi { 'seq': seq, // 通知序列号 'type': type, 'groupCode': groupCode, - 'postscript': reason || ' ', // 仅传空值可能导致处理失败，故默认给个空格 + 'postscript': reason ?? ' ', // 仅传空值可能导致处理失败，故默认给个空格 }, }); } diff --git a/src/core/apis/msg.ts b/src/core/apis/msg.ts index 67279708..b844068f 100644 --- a/src/core/apis/msg.ts +++ b/src/core/apis/msg.ts @@ -1,6 +1,6 @@ import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/entities'; import { InstanceContext, NapCatCore } from '@/core'; -import { onGroupFileInfoUpdateParamType } from '@/core/listeners'; +import { GroupFileInfoUpdateParamType } from '@/core/listeners'; import { GeneralCallResult } from '@/core/services/common'; export class NTQQMsgApi { @@ -119,13 +119,13 @@ export class NTQQMsgApi { async getGroupFileList(GroupCode: string, params: GetFileListParam) { const data = await this.core.eventWrapper.CallNormalEvent< (GroupCode: string, params: GetFileListParam) => Promise, - (groupFileListResult: onGroupFileInfoUpdateParamType) => void + (groupFileListResult: GroupFileInfoUpdateParamType) => void >( 'NodeIKernelRichMediaService/getGroupFileList', 'NodeIKernelMsgListener/onGroupFileInfoUpdate', 1, 5000, - (groupFileListResult: onGroupFileInfoUpdateParamType) => { + (groupFileListResult: GroupFileInfoUpdateParamType) => { //Developer Mlikiowa Todo: 此处有问题 无法判断是否成功 return true; }, @@ -251,7 +251,7 @@ export class NTQQMsgApi { if (!arkElement) { continue; } - const forwardData: any = JSON.parse(arkElement.arkElement?.bytesData || ""); + const forwardData: any = JSON.parse(arkElement.arkElement?.bytesData ?? ""); if (forwardData.app != 'com.tencent.multimsg') { continue; } diff --git a/src/core/entities/group.ts b/src/core/entities/group.ts index 8585cbff..1502c7fb 100644 --- a/src/core/entities/group.ts +++ b/src/core/entities/group.ts @@ -5,7 +5,7 @@ export interface KickMemberInfo { optMemberUid: string, optBytesMsg: string, } -export interface kickMemberV2Req{ +export interface KickMemberV2Req{ groupCode: string, kickFlag: number, kickList: Array, diff --git a/src/core/entities/msg.ts b/src/core/entities/msg.ts index cdfdd538..182ddb85 100644 --- a/src/core/entities/msg.ts +++ b/src/core/entities/msg.ts @@ -411,7 +411,7 @@ export interface ShareLocationElement { ext: string; } -export interface sendShareLocationElement { +export interface SendShareLocationElement { elementType: ElementType.SHARELOCATION; elementId: string; shareLocationElement?: ShareLocationElement; @@ -461,7 +461,7 @@ export interface SendMarkdownElement { export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement | - SendVideoElement | SendArkElement | SendMarkdownElement | sendShareLocationElement; + SendVideoElement | SendArkElement | SendMarkdownElement | SendShareLocationElement; export interface TextElement { content: string; diff --git a/src/core/listeners/NodeIKernelMsgListener.ts b/src/core/listeners/NodeIKernelMsgListener.ts index 14dc0ebe..4fd1066e 100644 --- a/src/core/listeners/NodeIKernelMsgListener.ts +++ b/src/core/listeners/NodeIKernelMsgListener.ts @@ -23,7 +23,7 @@ export interface OnRichMediaDownloadCompleteParams { userUsedSpacePerDay: unknown | null } -export interface onGroupFileInfoUpdateParamType { +export interface GroupFileInfoUpdateParamType { retCode: number; retMsg: string; clientWording: string; @@ -83,7 +83,7 @@ export interface IKernelMsgListener { onGroupFileInfoAdd(groupItem: unknown): void; - onGroupFileInfoUpdate(groupFileListResult: onGroupFileInfoUpdateParamType): void; + onGroupFileInfoUpdate(groupFileListResult: GroupFileInfoUpdateParamType): void; onGroupGuildUpdate(groupGuildNotifyInfo: unknown): void; @@ -305,7 +305,7 @@ export class MsgListener implements IKernelMsgListener { } - onGroupFileInfoUpdate(groupFileListResult: onGroupFileInfoUpdateParamType) { + onGroupFileInfoUpdate(groupFileListResult: GroupFileInfoUpdateParamType) { } diff --git a/src/core/services/NodeIKernelGroupService.ts b/src/core/services/NodeIKernelGroupService.ts index 9a90d9f0..5317eb3c 100644 --- a/src/core/services/NodeIKernelGroupService.ts +++ b/src/core/services/NodeIKernelGroupService.ts @@ -1,18 +1,18 @@ -import { IGroupListener, NodeIKernelGroupListener } from '@/core/listeners/NodeIKernelGroupListener'; +import { IGroupListener } from '@/core/listeners/NodeIKernelGroupListener'; import { GroupExtParam, GroupMember, GroupMemberRole, GroupNotifyMsgType, GroupRequestOperateTypes, - kickMemberV2Req, + KickMemberV2Req } from '@/core/entities'; import { GeneralCallResult } from '@/core/services/common'; //高版本的接口不应该随意使用 使用应该严格进行pr审核 同时部分ipc中未出现的接口不要过于依赖 应该做好数据兜底 export interface NodeIKernelGroupService { - kickMemberV2(param: kickMemberV2Req): Promise; + kickMemberV2(param: KickMemberV2Req): Promise; quitGroupV2(param: { groupCode: string; needDeleteLocalMsg: boolean; }): Promise; getMemberCommonInfo(Req: { diff --git a/src/onebot/action/group/SetGroupAddRequest.ts b/src/onebot/action/group/SetGroupAddRequest.ts index e03f4463..3c2e05d2 100644 --- a/src/onebot/action/group/SetGroupAddRequest.ts +++ b/src/onebot/action/group/SetGroupAddRequest.ts @@ -25,7 +25,7 @@ export default class SetGroupAddRequest extends BaseAction { const approve = payload.approve?.toString() !== 'false'; await NTQQGroupApi.handleGroupRequest(flag, approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject, - payload.reason || ' ', + payload.reason ?? ' ', ); return null; }