From d54c1bae0388ae76e7449bf345a1dfb6239a23df Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 23 Dec 2024 15:25:40 +0530
Subject: [PATCH] [PE-93] regression: mention users highlight color, reomve bot
 users from search list (#6258)

* chore: remove bot users in mention

* fix: user highlight color

---------

Co-authored-by: NarayanBavisetti <narayan3119@gmail.com>
---
 apiserver/plane/app/views/search/base.py              | 2 +-
 space/core/components/editor/embeds/mentions/user.tsx | 9 ++++++---
 web/core/components/editor/embeds/mentions/user.tsx   | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apiserver/plane/app/views/search/base.py b/apiserver/plane/app/views/search/base.py
index c0ef59aa74..3736d8f81a 100644
--- a/apiserver/plane/app/views/search/base.py
+++ b/apiserver/plane/app/views/search/base.py
@@ -274,7 +274,7 @@ class SearchEndpoint(BaseAPIView):
                         q |= Q(**{f"{field}__icontains": query})
                 users = (
                     ProjectMember.objects.filter(
-                        q, is_active=True, project_id=project_id, workspace__slug=slug
+                        q, is_active=True, project_id=project_id, workspace__slug=slug, member__is_bot=False
                     )
                     .annotate(
                         member__avatar_url=Case(
diff --git a/space/core/components/editor/embeds/mentions/user.tsx b/space/core/components/editor/embeds/mentions/user.tsx
index 418623f98c..5a178396b8 100644
--- a/space/core/components/editor/embeds/mentions/user.tsx
+++ b/space/core/components/editor/embeds/mentions/user.tsx
@@ -26,9 +26,12 @@ export const EditorUserMention: React.FC<Props> = observer((props) => {
 
   return (
     <div
-      className={cn("not-prose inline px-1 py-0.5 rounded bg-yellow-500/20 text-yellow-500 no-underline", {
-        "bg-custom-primary-100/20 text-custom-primary-100": id === currentUser?.id,
-      })}
+      className={cn(
+        "not-prose inline px-1 py-0.5 rounded bg-custom-primary-100/20 text-custom-primary-100 no-underline",
+        {
+          "bg-yellow-500/20 text-yellow-500": id === currentUser?.id,
+        }
+      )}
     >
       @{userDetails?.member__display_name}
     </div>
diff --git a/web/core/components/editor/embeds/mentions/user.tsx b/web/core/components/editor/embeds/mentions/user.tsx
index 8952e44d57..20cfeb2baa 100644
--- a/web/core/components/editor/embeds/mentions/user.tsx
+++ b/web/core/components/editor/embeds/mentions/user.tsx
@@ -58,9 +58,9 @@ export const EditorUserMention: React.FC<Props> = observer((props) => {
   return (
     <div
       className={cn(
-        "not-prose group/user-mention inline px-1 py-0.5 rounded bg-yellow-500/20 text-yellow-500 no-underline",
+        "not-prose group/user-mention inline px-1 py-0.5 rounded bg-custom-primary-100/20 text-custom-primary-100 no-underline",
         {
-          "bg-custom-primary-100/20 text-custom-primary-100": id === currentUser?.id,
+          "bg-yellow-500/20 text-yellow-500": id === currentUser?.id,
         }
       )}
     >