From 4f57b195a888ee21dc2521308e9dfed72b0ae79e Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 2 Dec 2024 09:11:25 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=B8=8E=E7=A6=BB?= =?UTF-8?q?=E8=81=8C=E8=B4=A6=E5=8F=B7=E8=81=8A=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/User.php | 6 +++++- app/Models/WebSocketDialog.php | 1 + .../assets/js/pages/manage/components/DialogWrapper.vue | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/Models/User.php b/app/Models/User.php index a8b9b9b23..04b4a5499 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -222,10 +222,14 @@ class User extends AbstractModel /** * 返回是否禁用帐号(离职) + * @param bool $incAt 是否包含禁用时间 * @return bool */ - public function isDisable() + public function isDisable($incAt = false) { + if ($incAt) { + return in_array('disable', $this->identity) || $this->disable_at; + } return in_array('disable', $this->identity); } diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index b930e8251..b7fca77d0 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -291,6 +291,7 @@ class WebSocketDialog extends AbstractModel $data['email'] = $basic->email; $data['userimg'] = $basic->userimg; $data['bot'] = $basic->getBotOwner(); + $data['is_disable'] = $basic->isDisable(true); $data['quick_msgs'] = UserBot::quickMsgs($basic->email); } else { $data['name'] = 'non-existent'; diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index ec89e4031..435347aae 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -260,6 +260,9 @@
{{$L('禁言发言')}}
+
+ {{$L('此账号已停用')}} +
0) { return this.msgId