fix: || -> ??

This commit is contained in:
手瓜一十雪 2024-11-14 13:00:25 +08:00
parent f66d7b11a8
commit abfda0dd58
5 changed files with 32 additions and 34 deletions

View File

@ -19,10 +19,10 @@ export default class SendLike extends BaseAction<Payload, null> {
async _handle(payload: Payload): Promise<null> { async _handle(payload: Payload): Promise<null> {
const qq = payload.user_id.toString(); 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); const result = await this.core.apis.UserApi.like(uid, parseInt(payload.times?.toString()) || 1);
if (result.result !== 0) { if (result.result !== 0) {
throw new Error( `点赞失败 ${result.errMsg}`); throw new Error(`点赞失败 ${result.errMsg}`);
} }
return null; return null;
} }

View File

@ -40,7 +40,7 @@ export class OneBotGroupApi {
if (msg.senderUin && msg.senderUin !== '0') { if (msg.senderUin && msg.senderUin !== '0') {
const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin); const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin);
if (member && member.cardName !== msg.sendMemberName) { 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); const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
member.cardName = newCardName; member.cardName = newCardName;
return event; return event;
@ -83,7 +83,7 @@ export class OneBotGroupApi {
url: pathToFileURL(element.fileElement.filePath).href, url: pathToFileURL(element.fileElement.filePath).href,
name: element.fileElement.fileName, name: element.fileElement.fileName,
size: parseInt(element.fileElement.fileSize), size: parseInt(element.fileElement.fileSize),
busid: element.fileElement.fileBizId || 0, busid: element.fileElement.fileBizId ?? 0,
}, },
); );
} }

View File

@ -706,9 +706,9 @@ export class OneBotMsgApi {
real_id: msg.id!, real_id: msg.id!,
message_type: msg.chatType == ChatType.KCHATTYPEGROUP ? 'group' : 'private', message_type: msg.chatType == ChatType.KCHATTYPEGROUP ? 'group' : 'private',
sender: { sender: {
user_id: parseInt(msg.senderUin || '0'), user_id: +(msg.senderUin ?? 0),
nickname: msg.sendNickName, nickname: msg.sendNickName,
card: msg.sendMemberName || '', card: msg.sendMemberName ?? '',
}, },
raw_message: '', raw_message: '',
font: 14, font: 14,

View File

@ -76,7 +76,7 @@ export class OB11Entities {
is_robot: member.isRobot, is_robot: member.isRobot,
shut_up_timestamp: member.shutUpTime, shut_up_timestamp: member.shutUpTime,
role: OB11Entities.groupMemberRole(member.role), role: OB11Entities.groupMemberRole(member.role),
title: member.memberSpecialTitle || '', title: member.memberSpecialTitle ?? '',
}; };
} }

View File

@ -174,8 +174,7 @@ export class NapCatOneBot11Adapter {
} else { } else {
await this.networkManager.closeAdapterByPredicate(adapter => adapter instanceof OB11ActiveHttpAdapter); await this.networkManager.closeAdapterByPredicate(adapter => adapter instanceof OB11ActiveHttpAdapter);
} }
} else { } else if (now.http.enablePost) {
if (now.http.enablePost) {
const { added, removed } = this.findDifference<string>(prev.http.postUrls, now.http.postUrls); const { added, removed } = this.findDifference<string>(prev.http.postUrls, now.http.postUrls);
await this.networkManager.closeAdapterByPredicate( await this.networkManager.closeAdapterByPredicate(
adapter => adapter instanceof OB11ActiveHttpAdapter && removed.includes(adapter.url), adapter => adapter instanceof OB11ActiveHttpAdapter && removed.includes(adapter.url),
@ -186,7 +185,7 @@ export class NapCatOneBot11Adapter {
)); ));
} }
} }
}
// check difference in passive websocket (Ws) // check difference in passive websocket (Ws)
if (prev.ws.enable !== now.ws.enable) { if (prev.ws.enable !== now.ws.enable) {
@ -214,8 +213,7 @@ export class NapCatOneBot11Adapter {
adapter => adapter instanceof OB11ActiveWebSocketAdapter, adapter => adapter instanceof OB11ActiveWebSocketAdapter,
); );
} }
} else { } else if (now.reverseWs.enable) {
if (now.reverseWs.enable) {
const { added, removed } = this.findDifference<string>(prev.reverseWs.urls, now.reverseWs.urls); const { added, removed } = this.findDifference<string>(prev.reverseWs.urls, now.reverseWs.urls);
await this.networkManager.closeAdapterByPredicate( await this.networkManager.closeAdapterByPredicate(
adapter => adapter instanceof OB11ActiveWebSocketAdapter && removed.includes(adapter.url), adapter => adapter instanceof OB11ActiveWebSocketAdapter && removed.includes(adapter.url),
@ -226,7 +224,7 @@ export class NapCatOneBot11Adapter {
)); ));
} }
} }
}
} }
private findDifference<T>(prev: T[], now: T[]): { added: T[], removed: T[] } { private findDifference<T>(prev: T[], now: T[]): { added: T[], removed: T[] } {
@ -573,7 +571,7 @@ export class NapCatOneBot11Adapter {
if (message.chatType == ChatType.KCHATTYPEC2C) { if (message.chatType == ChatType.KCHATTYPEC2C) {
const friendRecallEvent = new OB11FriendRecallNoticeEvent( const friendRecallEvent = new OB11FriendRecallNoticeEvent(
this.core, this.core,
parseInt(message!.senderUin), +message.senderUin,
oriMessageId, oriMessageId,
); );
this.networkManager.emitEvent(friendRecallEvent) this.networkManager.emitEvent(friendRecallEvent)
@ -584,13 +582,13 @@ export class NapCatOneBot11Adapter {
const operatorUid = element.grayTipElement?.revokeElement.operatorUid; const operatorUid = element.grayTipElement?.revokeElement.operatorUid;
if (!operatorUid) return; if (!operatorUid) return;
const operator = await this.core.apis.GroupApi.getGroupMember(message.peerUin, operatorUid); 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( const groupRecallEvent = new OB11GroupRecallNoticeEvent(
this.core, this.core,
parseInt(message.peerUin), +message.peerUin,
parseInt(message.senderUin), +message.senderUin,
parseInt(operatorId), +operatorId,
oriMessageId oriMessageId
); );
this.networkManager.emitEvent(groupRecallEvent) this.networkManager.emitEvent(groupRecallEvent)