From abfda0dd583e6f8defe41380ab4f56296db5ef96 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, 14 Nov 2024 13:00:25 +0800 Subject: [PATCH] fix: || -> ?? --- src/onebot/action/user/SendLike.ts | 4 +-- src/onebot/api/group.ts | 4 +-- src/onebot/api/msg.ts | 4 +-- src/onebot/entities.ts | 2 +- src/onebot/index.ts | 52 ++++++++++++++---------------- 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/src/onebot/action/user/SendLike.ts b/src/onebot/action/user/SendLike.ts index a81b74c7..e63409b4 100644 --- a/src/onebot/action/user/SendLike.ts +++ b/src/onebot/action/user/SendLike.ts @@ -19,10 +19,10 @@ export default class SendLike extends BaseAction { async _handle(payload: Payload): Promise { const qq = payload.user_id.toString(); - const uid: string = await this.core.apis.UserApi.getUidByUinV2(qq) || ''; + const uid: string = await this.core.apis.UserApi.getUidByUinV2(qq) ?? ''; const result = await this.core.apis.UserApi.like(uid, parseInt(payload.times?.toString()) || 1); if (result.result !== 0) { - throw new Error( `点赞失败 ${result.errMsg}`); + throw new Error(`点赞失败 ${result.errMsg}`); } return null; } diff --git a/src/onebot/api/group.ts b/src/onebot/api/group.ts index a22b42fc..f0ca749a 100644 --- a/src/onebot/api/group.ts +++ b/src/onebot/api/group.ts @@ -40,7 +40,7 @@ export class OneBotGroupApi { if (msg.senderUin && msg.senderUin !== '0') { const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin); if (member && member.cardName !== msg.sendMemberName) { - const newCardName = msg.sendMemberName || ''; + const newCardName = msg.sendMemberName ?? ''; const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName); member.cardName = newCardName; return event; @@ -83,7 +83,7 @@ export class OneBotGroupApi { url: pathToFileURL(element.fileElement.filePath).href, name: element.fileElement.fileName, size: parseInt(element.fileElement.fileSize), - busid: element.fileElement.fileBizId || 0, + busid: element.fileElement.fileBizId ?? 0, }, ); } diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index 83892810..2c1afece 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -706,9 +706,9 @@ export class OneBotMsgApi { real_id: msg.id!, message_type: msg.chatType == ChatType.KCHATTYPEGROUP ? 'group' : 'private', sender: { - user_id: parseInt(msg.senderUin || '0'), + user_id: +(msg.senderUin ?? 0), nickname: msg.sendNickName, - card: msg.sendMemberName || '', + card: msg.sendMemberName ?? '', }, raw_message: '', font: 14, diff --git a/src/onebot/entities.ts b/src/onebot/entities.ts index efaf249f..debbd30c 100644 --- a/src/onebot/entities.ts +++ b/src/onebot/entities.ts @@ -76,7 +76,7 @@ export class OB11Entities { is_robot: member.isRobot, shut_up_timestamp: member.shutUpTime, role: OB11Entities.groupMemberRole(member.role), - title: member.memberSpecialTitle || '', + title: member.memberSpecialTitle ?? '', }; } diff --git a/src/onebot/index.ts b/src/onebot/index.ts index ed36aee0..402a03f1 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -174,20 +174,19 @@ export class NapCatOneBot11Adapter { } else { await this.networkManager.closeAdapterByPredicate(adapter => adapter instanceof OB11ActiveHttpAdapter); } - } else { - if (now.http.enablePost) { - const { added, removed } = this.findDifference(prev.http.postUrls, now.http.postUrls); - await this.networkManager.closeAdapterByPredicate( - adapter => adapter instanceof OB11ActiveHttpAdapter && removed.includes(adapter.url), - ); - for (const url of added) { - await this.networkManager.registerAdapterAndOpen(new OB11ActiveHttpAdapter( - url, now.http.secret, this.core, this, - )); - } + } else if (now.http.enablePost) { + const { added, removed } = this.findDifference(prev.http.postUrls, now.http.postUrls); + await this.networkManager.closeAdapterByPredicate( + adapter => adapter instanceof OB11ActiveHttpAdapter && removed.includes(adapter.url), + ); + for (const url of added) { + await this.networkManager.registerAdapterAndOpen(new OB11ActiveHttpAdapter( + url, now.http.secret, this.core, this, + )); } } + // check difference in passive websocket (Ws) if (prev.ws.enable !== now.ws.enable) { if (now.ws.enable) { @@ -214,19 +213,18 @@ export class NapCatOneBot11Adapter { adapter => adapter instanceof OB11ActiveWebSocketAdapter, ); } - } else { - if (now.reverseWs.enable) { - const { added, removed } = this.findDifference(prev.reverseWs.urls, now.reverseWs.urls); - await this.networkManager.closeAdapterByPredicate( - adapter => adapter instanceof OB11ActiveWebSocketAdapter && removed.includes(adapter.url), - ); - for (const url of added) { - await this.networkManager.registerAdapterAndOpen(new OB11ActiveWebSocketAdapter( - url, 5000, now.heartInterval, now.token, this.core, this.actions, - )); - } + } else if (now.reverseWs.enable) { + const { added, removed } = this.findDifference(prev.reverseWs.urls, now.reverseWs.urls); + await this.networkManager.closeAdapterByPredicate( + adapter => adapter instanceof OB11ActiveWebSocketAdapter && removed.includes(adapter.url), + ); + for (const url of added) { + await this.networkManager.registerAdapterAndOpen(new OB11ActiveWebSocketAdapter( + url, 5000, now.heartInterval, now.token, this.core, this.actions, + )); } } + } private findDifference(prev: T[], now: T[]): { added: T[], removed: T[] } { @@ -573,7 +571,7 @@ export class NapCatOneBot11Adapter { if (message.chatType == ChatType.KCHATTYPEC2C) { const friendRecallEvent = new OB11FriendRecallNoticeEvent( this.core, - parseInt(message!.senderUin), + +message.senderUin, oriMessageId, ); this.networkManager.emitEvent(friendRecallEvent) @@ -584,13 +582,13 @@ export class NapCatOneBot11Adapter { const operatorUid = element.grayTipElement?.revokeElement.operatorUid; if (!operatorUid) return; const operator = await this.core.apis.GroupApi.getGroupMember(message.peerUin, operatorUid); - operatorId = operator?.uin || message.senderUin; + operatorId = operator?.uin ?? message.senderUin; } const groupRecallEvent = new OB11GroupRecallNoticeEvent( this.core, - parseInt(message.peerUin), - parseInt(message.senderUin), - parseInt(operatorId), + +message.peerUin, + +message.senderUin, + +operatorId, oriMessageId ); this.networkManager.emitEvent(groupRecallEvent)