diff --git a/app/Policies/ConversationPolicy.php b/app/Policies/ConversationPolicy.php index 7bef60740..b87fd3bc3 100644 --- a/app/Policies/ConversationPolicy.php +++ b/app/Policies/ConversationPolicy.php @@ -26,7 +26,7 @@ public function view(User $user, Conversation $conversation) } else { if ($conversation->mailbox->users->contains($user)) { // Maybe user can see only assigned conversations. - if ($conversation->user_id != $user->id + if (!\Eventy::filter('conversation.is_user_assignee', $conversation->user_id == $user->id, $conversation, $user->id) && $user->hasManageMailboxPermission($conversation->mailbox_id, Mailbox::ACCESS_PERM_ASSIGNED) ) { return false; @@ -53,7 +53,7 @@ public function viewCached(User $user, Conversation $conversation) } else { if ($conversation->mailbox->users_cached->contains($user)) { // Maybe user can see only assigned conversations. - if ($conversation->user_id != $user->id + if (!\Eventy::filter('conversation.is_user_assignee', $conversation->user_id == $user->id, $conversation, $user->id) && $user->hasManageMailboxPermission($conversation->mailbox_id, Mailbox::ACCESS_PERM_ASSIGNED) ) { return false;