diff --git a/src/core/packet/utils/crypto/hash.ts b/src/core/packet/utils/crypto/hash.ts index 39a3b925..6f2eae88 100644 --- a/src/core/packet/utils/crypto/hash.ts +++ b/src/core/packet/utils/crypto/hash.ts @@ -5,17 +5,17 @@ import * as fs from 'fs'; import { CalculateStreamBytesTransform } from "@/core/packet/utils/crypto/sha1StreamBytesTransform"; function sha1Stream(readable: stream.Readable) { - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { readable.on('error', reject); readable.pipe(crypto.createHash('sha1').on('error', reject).on('data', resolve)); - }) as Promise; + }); } function md5Stream(readable: stream.Readable) { - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { readable.on('error', reject); readable.pipe(crypto.createHash('md5').on('error', reject).on('data', resolve)); - }) as Promise; + }); } export function calculateSha1(filePath: string): Promise { diff --git a/src/onebot/action/BaseAction.ts b/src/onebot/action/BaseAction.ts index 92e46f8a..f374d02a 100644 --- a/src/onebot/action/BaseAction.ts +++ b/src/onebot/action/BaseAction.ts @@ -29,7 +29,7 @@ abstract class BaseAction { }); return { valid: false, - message: errorMessages.join('\n') as string || '未知错误', + message: errorMessages.join('\n') ?? '未知错误', }; } return { diff --git a/src/onebot/action/extends/GetMiniAppArk.ts b/src/onebot/action/extends/GetMiniAppArk.ts index 26870a5b..83f24dc8 100644 --- a/src/onebot/action/extends/GetMiniAppArk.ts +++ b/src/onebot/action/extends/GetMiniAppArk.ts @@ -60,7 +60,7 @@ export class GetMiniAppArk extends GetPacketStatusDepends; + const { appId, scene, iconUrl, templateType, businessType, verType, shareType, versionId, withShareTicket } = payload; reqParam = MiniAppInfoHelper.generateReq( customParams, { diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index 6bf4360a..668305d9 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/src/onebot/action/msg/SendMsg.ts @@ -133,7 +133,7 @@ export class SendMsg extends BaseAction { guildId: '', peerUid: peer.peerUid, chatType: peer.chatType, - }, (returnMsgAndResId.message)!.msgId); + }, (returnMsgAndResId.message).msgId); return { message_id: msgShortId!, res_id: returnMsgAndResId.res_id }; } else if (returnMsgAndResId.res_id && !returnMsgAndResId.message) { throw Error(`发送转发消息（res_id：${returnMsgAndResId.res_id} 失败`); @@ -150,7 +150,7 @@ export class SendMsg extends BaseAction { const { sendElements, deleteAfterSentFiles } = await this.obContext.apis.MsgApi .createSendElements(messages, peer); const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, sendElements, deleteAfterSentFiles); - return { message_id: returnMsg!.id! }; + return { message_id: returnMsg.id! }; } private async uploadForwardedNodesPacket(msgPeer: Peer, messageNodes: OB11MessageNode[], source?: string, news?: { diff --git a/src/onebot/api/group.ts b/src/onebot/api/group.ts index f0ca749a..fc6576e6 100644 --- a/src/onebot/api/group.ts +++ b/src/onebot/api/group.ts @@ -165,10 +165,10 @@ export class OneBotGroupApi { async parseGroupBanEvent(GroupCode: string, grayTipElement: GrayTipElement) { const groupElement = grayTipElement?.groupElement; if (!groupElement?.shutUp) return undefined; - const memberUid = groupElement.shutUp!.member.uid; - const adminUid = groupElement.shutUp!.admin.uid; + const memberUid = groupElement.shutUp.member.uid; + const adminUid = groupElement.shutUp.admin.uid; let memberUin: string; - let duration = parseInt(groupElement.shutUp!.duration); + let duration = parseInt(groupElement.shutUp.duration); const subType: 'ban' | 'lift_ban' = duration > 0 ? 'ban' : 'lift_ban'; if (memberUid) { memberUin = (await this.core.apis.GroupApi.getGroupMember(GroupCode, memberUid))?.uin ?? ''; diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index dfef692c..6058f508 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -700,7 +700,7 @@ export class OneBotMsgApi { //跳过空消息 const resMsg: OB11Message = { self_id: parseInt(this.core.selfInfo.uin), - user_id: parseInt(msg.senderUin!), + user_id: parseInt(msg.senderUin), time: parseInt(msg.msgTime) || Date.now(), message_id: msg.id!, message_seq: msg.id!, diff --git a/src/onebot/entities.ts b/src/onebot/entities.ts index debbd30c..7d4cf5cd 100644 --- a/src/onebot/entities.ts +++ b/src/onebot/entities.ts @@ -25,7 +25,7 @@ export class OB11Entities { user_id: parseInt(rawFriend.coreInfo.uin), nickname: rawFriend.coreInfo.nick, remark: rawFriend.coreInfo.remark ?? rawFriend.coreInfo.nick, - sex: this.sex(rawFriend.baseInfo.sex!), + sex: this.sex(rawFriend.baseInfo.sex), level: 0, })); } diff --git a/src/onebot/event/notice/OB11InputStatusEvent.ts b/src/onebot/event/notice/OB11InputStatusEvent.ts index 7ae538e2..42293205 100644 --- a/src/onebot/event/notice/OB11InputStatusEvent.ts +++ b/src/onebot/event/notice/OB11InputStatusEvent.ts @@ -1,7 +1,7 @@ import { OB11BaseNoticeEvent } from './OB11BaseNoticeEvent'; import { NapCatCore } from '@/core'; -//输入状态事件 初步完成 Mlikio wa Todo 需要做一些过滤 +//work: 输入状态事件 初步完成 Mlikiowa 需要做一些过滤 export class OB11InputStatusEvent extends OB11BaseNoticeEvent { notice_type = 'notify'; sub_type = 'input_status'; diff --git a/src/onebot/index.ts b/src/onebot/index.ts index 402a03f1..c34f5e21 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -327,7 +327,7 @@ export class NapCatOneBot11Adapter { const requesterUin = await this.core.apis.UserApi.getUinByUidV2(req.friendUid); await this.networkManager.emitEvent(new OB11FriendRequestEvent( this.core, - parseInt(requesterUin!), + +requesterUin, req.extWords, req.friendUid + '|' + req.reqTime, )); @@ -391,7 +391,7 @@ export class NapCatOneBot11Adapter { } } else if (notify.type == GroupNotifyMsgType.MEMBER_LEAVE_NOTIFY_ADMIN || notify.type == GroupNotifyMsgType.KICK_MEMBER_NOTIFY_ADMIN) { this.context.logger.logDebug('有成员退出通知', notify); - const member1Uin = (await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid))!; + const member1Uin = (await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid)); let operatorId = member1Uin; let subType: GroupDecreaseSubType = 'leave'; if (notify.user2.uid) { @@ -417,7 +417,7 @@ export class NapCatOneBot11Adapter { ].includes(notify.type) && notify.status == GroupNotifyMsgStatus.KUNHANDLE) { this.context.logger.logDebug('有加群请求'); try { - let requestUin = (await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid))!; + let requestUin = (await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid)); if (isNaN(parseInt(requestUin))) { requestUin = (await this.core.apis.UserApi.getUserDetailInfo(notify.user1.uid)).uin; }