From dacfbabef923a2c3d47b45673c1de7f0e98891ca Mon Sep 17 00:00:00 2001 From: ningmengchongshui <916415899@qq.com> Date: Mon, 17 Jun 2024 11:10:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/plugins.loader.ts | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/core/plugins.loader.ts b/src/core/plugins.loader.ts index 3c1723a..8de0be5 100644 --- a/src/core/plugins.loader.ts +++ b/src/core/plugins.loader.ts @@ -589,18 +589,16 @@ class PluginsLoader { // 存在 if (e.sender) { - // nickname - e.sender.card = e.sender.nickname + e.sender.card = e.sender?.nickname } else { + e.sender = {} as any // 不存在 e.sender = { - // nickname card: e.friend?.nickname, - // nickname nickname: e.friend?.nickname } as any } - e.logText = `[私聊][${e.sender.nickname}(${e.user_id})]` + e.logText = `[私聊][${e.sender?.nickname}(${e.user_id})]` } /** @@ -612,22 +610,19 @@ class PluginsLoader { // 存在 if (e.sender) { - // nickname - e.sender.card = e.sender.card ?? e.sender.nickname + e.sender.card = e.sender.card ?? e.sender?.nickname } else if (e.member) { e.sender = { - // nickname - card: e.member.card ?? e.member.nickname, - nickname: e.member.card ?? e.member.nickname + card: e.member.card ?? e.member?.nickname, + nickname: e.member.card ?? e.member?.nickname } as any - } else if (e.nickname) { + } else if (e?.nickname) { e.sender = { - // nickname - card: e.nickname, - // nickname - nickname: e.nickname + card: e?.nickname, + nickname: e?.nickname } as any } else { + e.sender = {} as any e.sender = { card: e?.user_id ?? '', nickname: e?.user_id ?? '' @@ -653,8 +648,8 @@ class PluginsLoader { if (e?.group_id) { e.group_avatar = `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/640/` } - if (e.sender.nickname) { - e.user_name = e.sender.nickname + if (e.sender?.nickname) { + e.user_name = e.sender?.nickname } /**