From bb53f245cfc1842e270d5b727e53e85c618b3d78 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, 5 Dec 2024 14:50:27 +0800 Subject: [PATCH] style: lint check --- src/common/file.ts | 37 +++++++++-------- src/common/log.ts | 2 +- src/core/apis/file.ts | 20 +++++----- src/core/apis/user.ts | 4 +- .../transformer/proto/message/groupAdmin.ts | 6 +-- src/onebot/action/group/SetGroupAddRequest.ts | 2 +- src/onebot/action/group/SetGroupBan.ts | 2 +- src/onebot/action/user/SetFriendAddRequest.ts | 2 +- src/onebot/api/msg.ts | 40 +++++++++---------- src/onebot/index.ts | 17 ++++++-- 10 files changed, 72 insertions(+), 60 deletions(-) diff --git a/src/common/file.ts b/src/common/file.ts index aa1a019e..6dac529b 100644 --- a/src/common/file.ts +++ b/src/common/file.ts @@ -182,25 +182,28 @@ export async function uriToLocalFile(dir: string, uri: string): Promise e?.ext ?? '').catch(e => ''); + const extOrEmpty = await fileTypeFromFile(filePath).then(e => e?.ext ?? '').catch(e => ''); const ext = extOrEmpty ? `.${extOrEmpty}` : ''; let fileName = `${path.basename(filePath)}`; if (fileName.indexOf('.') === -1) { @@ -305,18 +305,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/apis/user.ts b/src/core/apis/user.ts index f2b9bb0a..010318d1 100644 --- a/src/core/apis/user.ts +++ b/src/core/apis/user.ts @@ -176,7 +176,7 @@ export class NTQQUserApi { const services = [ () => this.context.session.getUixConvertService().getUid([Uin]).then((data) => data.uidInfo.get(Uin)).catch(() => undefined), () => promisify> - (this.context.session.getProfileService().getUidByUin)('FriendsServiceImpl', [Uin]).then((data) => data.get(Uin)).catch(() => undefined), + (this.context.session.getProfileService().getUidByUin)('FriendsServiceImpl', [Uin]).then((data) => data.get(Uin)).catch(() => undefined), () => this.context.session.getGroupService().getUidByUins([Uin]).then((data) => data.uids.get(Uin)).catch(() => undefined), () => this.getUserDetailInfoByUin(Uin).then((data) => data.detail.uid).catch(() => undefined), ]; @@ -198,7 +198,7 @@ export class NTQQUserApi { () => this.context.session.getUixConvertService().getUin([Uid]).then((data) => data.uinInfo.get(Uid)).catch(() => undefined), () => this.context.session.getGroupService().getUinByUids([Uid]).then((data) => data.uins.get(Uid)).catch(() => undefined), () => promisify> - (this.context.session.getProfileService().getUinByUid)('FriendsServiceImpl', [Uid]).then((data) => data.get(Uid)).catch(() => undefined), + (this.context.session.getProfileService().getUinByUid)('FriendsServiceImpl', [Uid]).then((data) => data.get(Uid)).catch(() => undefined), () => this.core.apis.FriendApi.getBuddyIdMap(true).then((data) => data.getKey(Uid)).catch(() => undefined), () => this.getUserDetailInfo(Uid).then((data) => data.uin).catch(() => undefined), ]; diff --git a/src/core/packet/transformer/proto/message/groupAdmin.ts b/src/core/packet/transformer/proto/message/groupAdmin.ts index 0aa130b9..42030063 100644 --- a/src/core/packet/transformer/proto/message/groupAdmin.ts +++ b/src/core/packet/transformer/proto/message/groupAdmin.ts @@ -3,16 +3,16 @@ import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; export const GroupAdminExtra = { adminUid: ProtoField(1, ScalarType.STRING), isPromote: ProtoField(2, ScalarType.BOOL), -} +}; export const GroupAdminBody = { extraDisable: ProtoField(1, () => GroupAdminExtra), extraEnable: ProtoField(2, () => GroupAdminExtra), -} +}; export const GroupAdmin = { groupUin: ProtoField(1, ScalarType.UINT32), flag: ProtoField(2, ScalarType.UINT32), isPromote: ProtoField(3, ScalarType.BOOL), body: ProtoField(4, () => GroupAdminBody), -} \ No newline at end of file +}; \ No newline at end of file diff --git a/src/onebot/action/group/SetGroupAddRequest.ts b/src/onebot/action/group/SetGroupAddRequest.ts index f9f54cf7..97a2540b 100644 --- a/src/onebot/action/group/SetGroupAddRequest.ts +++ b/src/onebot/action/group/SetGroupAddRequest.ts @@ -20,7 +20,7 @@ export default class SetGroupAddRequest extends OneBotAction { const approve = payload.approve?.toString() !== 'false'; const reason = payload.reason ?? ' '; - let notify = await this.findNotify(flag); + const notify = await this.findNotify(flag); if (!notify) { throw new Error('No such request'); } diff --git a/src/onebot/action/group/SetGroupBan.ts b/src/onebot/action/group/SetGroupBan.ts index 1a02dcc7..7b73a007 100644 --- a/src/onebot/action/group/SetGroupBan.ts +++ b/src/onebot/action/group/SetGroupBan.ts @@ -18,7 +18,7 @@ export default class SetGroupBan extends OneBotAction { const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString()); if (!uid) throw new Error('uid error'); await this.core.apis.GroupApi.banMember(payload.group_id.toString(), - [{ uid: uid, timeStamp: +payload.duration}]); + [{ uid: uid, timeStamp: +payload.duration }]); return null; } } diff --git a/src/onebot/action/user/SetFriendAddRequest.ts b/src/onebot/action/user/SetFriendAddRequest.ts index aaa739c7..dfe29e6c 100644 --- a/src/onebot/action/user/SetFriendAddRequest.ts +++ b/src/onebot/action/user/SetFriendAddRequest.ts @@ -16,7 +16,7 @@ export default class SetFriendAddRequest extends OneBotAction { async _handle(payload: Payload): Promise { const approve = payload.approve?.toString() !== 'false'; - let notify = (await this.core.apis.FriendApi.getBuddyReq()).buddyReqs.find(e => e.reqTime == payload.flag.toString()); + const notify = (await this.core.apis.FriendApi.getBuddyReq()).buddyReqs.find(e => e.reqTime == payload.flag.toString()); if (!notify) { throw new Error('No such request'); } diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index ef0dde6e..09564992 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -160,7 +160,7 @@ export class OneBotMsgApi { type: element?.pokeType?.toString() ?? '0', id: faceIndex.toString(), } - } + }; } @@ -461,7 +461,7 @@ export class OneBotMsgApi { }, [OB11MessageDataType.face]: async ({ data: { id } }) => { - let parsedFaceId = +id; + const parsedFaceId = +id; // 从face_config.json中获取表情名称 const sysFaces = faceConfig.sysface; const face: any = sysFaces.find((systemFace) => systemFace.QSid === parsedFaceId.toString()); @@ -895,16 +895,16 @@ export class OneBotMsgApi { const calculateTotalSize = async (elements: SendMessageElement[]): Promise => { const sizePromises = elements.map(async element => { switch (element.elementType) { - case ElementType.PTT: - return (await fsPromise.stat(element.pttElement.filePath)).size; - case ElementType.FILE: - return (await fsPromise.stat(element.fileElement.filePath)).size; - case ElementType.VIDEO: - return (await fsPromise.stat(element.videoElement.filePath)).size; - case ElementType.PIC: - return (await fsPromise.stat(element.picElement.sourcePath)).size; - default: - return 0; + case ElementType.PTT: + return (await fsPromise.stat(element.pttElement.filePath)).size; + case ElementType.FILE: + return (await fsPromise.stat(element.fileElement.filePath)).size; + case ElementType.VIDEO: + return (await fsPromise.stat(element.videoElement.filePath)).size; + case ElementType.PIC: + return (await fsPromise.stat(element.picElement.sourcePath)).size; + default: + return 0; } }); const sizes = await Promise.all(sizePromises); @@ -970,14 +970,14 @@ export class OneBotMsgApi { } groupChangDecreseType2String(type: number): GroupDecreaseSubType { switch (type) { - case 130: - return 'leave'; - case 131: - return 'kick'; - case 3: - return 'kick_me'; - default: - return 'kick'; + case 130: + return 'leave'; + case 131: + return 'kick'; + case 3: + return 'kick_me'; + default: + return 'kick'; } } diff --git a/src/onebot/index.ts b/src/onebot/index.ts index 29fc73f7..95035243 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -521,21 +521,27 @@ export class NapCatOneBot11Adapter { // 群名片修改事件解析 任何都该判断 if (message.senderUin && message.senderUin !== '0') { const cardChangedEvent = await this.apis.GroupApi.parseCardChangedEvent(message); - cardChangedEvent && await this.networkManager.emitEvent(cardChangedEvent); + if (cardChangedEvent) { + await this.networkManager.emitEvent(cardChangedEvent); + } } if (message.msgType === NTMsgType.KMSGTYPEFILE) { // 文件为单元素消息 const elementWrapper = message.elements.find(e => !!e.fileElement); if (elementWrapper?.fileElement) { const uploadGroupFileEvent = await this.apis.GroupApi.parseGroupUploadFileEvene(message, elementWrapper.fileElement, elementWrapper); - uploadGroupFileEvent && await this.networkManager.emitEvent(uploadGroupFileEvent); + if (uploadGroupFileEvent) { + await this.networkManager.emitEvent(uploadGroupFileEvent); + } } } else if (message.msgType === NTMsgType.KMSGTYPEGRAYTIPS) { // 灰条为单元素消息 const grayTipElement = message.elements[0].grayTipElement; if (grayTipElement) { const event = await this.apis.GroupApi.parseGrayTipElement(message, grayTipElement); - event && await this.networkManager.emitEvent(event); + if (event) { + await this.networkManager.emitEvent(event); + } } } } catch (e) { @@ -550,7 +556,10 @@ export class NapCatOneBot11Adapter { const grayTipElement = message.elements[0].grayTipElement; if (grayTipElement) { const event = await this.apis.MsgApi.parsePrivateMsgEvent(message, grayTipElement); - event && await this.networkManager.emitEvent(event); + if (event) { + await this.networkManager.emitEvent(event); + } + } } } catch (e) {