From 9f2d2f8bccaca5a0406e0029a8d97278081e1754 Mon Sep 17 00:00:00 2001
From: NarayanBavisetti <narayan3119@gmail.com>
Date: Mon, 23 Dec 2024 15:09:52 +0530
Subject: [PATCH 1/2] chore: remove bot users in mention

---
 apiserver/plane/app/views/search/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apiserver/plane/app/views/search/base.py b/apiserver/plane/app/views/search/base.py
index c0ef59aa743..3736d8f81af 100644
--- a/apiserver/plane/app/views/search/base.py
+++ b/apiserver/plane/app/views/search/base.py
@@ -274,7 +274,7 @@ def get(self, request, slug, project_id):
                         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(

From a4f56bd858e172f2cc509bc9ecdd63370bac0cff Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Date: Mon, 23 Dec 2024 15:11:43 +0530
Subject: [PATCH 2/2] fix: user highlight color

---
 space/core/components/editor/embeds/mentions/user.tsx | 9 ++++++---
 web/core/components/editor/embeds/mentions/user.tsx   | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/space/core/components/editor/embeds/mentions/user.tsx b/space/core/components/editor/embeds/mentions/user.tsx
index 418623f98cf..5a178396b83 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 8952e44d577..20cfeb2baa5 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,
         }
       )}
     >