From 0b41f620d81771b399a38a1372245de19eaddd7d Mon Sep 17 00:00:00 2001
From: SrGooglo <srgooglo@ragestudio.net>
Date: Thu, 10 Apr 2025 18:23:09 +0000
Subject: [PATCH] Improve mention search functionality in PostCreator

---
 .../app/src/components/PostCreator/index.jsx  | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/components/PostCreator/index.jsx b/packages/app/src/components/PostCreator/index.jsx
index d0e7d30a..89ca7b61 100755
--- a/packages/app/src/components/PostCreator/index.jsx
+++ b/packages/app/src/components/PostCreator/index.jsx
@@ -335,10 +335,17 @@ export default class PostCreator extends React.Component {
 	}
 
 	handleOnMentionSearch = lodash.debounce(async (value) => {
-		const results = await SearchModel.userSearch(`username:${value}`)
+		if (value === "") {
+			return false
+		}
+
+		const results = await SearchModel.search(`${value}`, {
+			fields: "users",
+			limit: 5,
+		})
 
 		this.setState({
-			mentionsLoadedData: results,
+			mentionsLoadedData: results.users.items,
 		})
 	}, 300)
 
@@ -674,13 +681,20 @@ export default class PostCreator extends React.Component {
 						draggable={false}
 						prefix="@"
 						allowClear
+						onBlur={() => {
+							this.setState({ mentionsLoadedData: [] })
+						}}
 						options={this.state.mentionsLoadedData.map((item) => {
 							return {
 								key: item.id,
 								value: item.username,
 								label: (
 									<>
-										<antd.Avatar src={item.avatar} />
+										<antd.Avatar
+											size={24}
+											src={item.avatar}
+											shape="square"
+										/>
 										<span>{item.username}</span>
 									</>
 								),