From 11308829a662e778f2746d4f70b762fc407465c6 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 13 Jun 2022 15:53:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=91=98=E5=B7=A5=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=90=8E=E5=AF=B9=E8=AF=9D=E8=BF=98=E5=AD=98=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/WebSocketDialog.php                | 22 ++++++++++++++++---
 .../assets/js/pages/manage/messenger.vue      |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php
index 1dff5fc5c..4eb2e5029 100644
--- a/app/Models/WebSocketDialog.php
+++ b/app/Models/WebSocketDialog.php
@@ -84,16 +84,32 @@ class WebSocketDialog extends AbstractModel
                 if ($dialog_user->userid === 0) {
                     $dialog_user->userid = $userid;
                 }
-                $this->name = User::userid2nickname($dialog_user->userid);
+                $basic = User::userid2basic($dialog_user->userid);
+                if ($basic) {
+                    $this->name = $basic->nickname;
+                } else {
+                    $this->name = 'non-existent';
+                    $this->dialog_delete = 1;
+                }
                 $this->dialog_user = $dialog_user;
                 break;
             case "group":
                 if ($this->group_type === 'project') {
                     $this->group_info = Project::withTrashed()->select(['id', 'name', 'archived_at', 'deleted_at'])->whereDialogId($this->id)->first()?->cancelAppend()->cancelHidden();
-                    $this->name = $this->group_info ? $this->group_info->name : '';
+                    if ($this->group_info) {
+                        $this->name = $this->group_info->name;
+                    } else {
+                        $this->name = '[Delete]';
+                        $this->dialog_delete = 1;
+                    }
                 } elseif ($this->group_type === 'task') {
                     $this->group_info = ProjectTask::withTrashed()->select(['id', 'name', 'complete_at', 'archived_at', 'deleted_at'])->whereDialogId($this->id)->first()?->cancelAppend()->cancelHidden();
-                    $this->name = $this->group_info ? $this->group_info->name : '';
+                    if ($this->group_info) {
+                        $this->name = $this->group_info->name;
+                    } else {
+                        $this->name = '[Delete]';
+                        $this->dialog_delete = 1;
+                    }
                 }
                 break;
         }
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index 866732e18..07c48ad08 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -414,7 +414,7 @@ export default {
             if ($A.getDialogUnread(dialog) > 0 || dialog.id == this.dialogId || dialog.top_at) {
                 return true
             }
-            if (dialog.name === undefined) {
+            if (dialog.name === undefined || dialog.dialog_delete === 1) {
                 return false;
             }
             if (!dialog.last_at) {