From 7143a46a6ec9739971e0eeb4bf6a1c5b8d11a081 Mon Sep 17 00:00:00 2001
From: Abron <AbronTeam>
Date: Thu, 6 Mar 2025 13:18:06 +0330
Subject: [PATCH] conversation list

---
 .../messaging/bars/MessageOverlayBar.tsx      | 16 ++++++++-----
 .../navigation/items/ButtonItem.tsx           | 24 +++++++++++++++----
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/components/common/messaging/bars/MessageOverlayBar.tsx b/src/components/common/messaging/bars/MessageOverlayBar.tsx
index 29735102..492e283b 100644
--- a/src/components/common/messaging/bars/MessageOverlayBar.tsx
+++ b/src/components/common/messaging/bars/MessageOverlayBar.tsx
@@ -88,8 +88,12 @@ const Divider = styled.div`
 
 export const MessageOverlayBar = observer(
     ({ reactionsOpen, setReactionsOpen, message, queued }: Props) => {
+        if (!message) {
+            return null;
+        }
+
         const client = message.client;
-        const isAuthor = message.author_id === client.user!._id;
+        const isAuthor = message.author_id === client.user?._id;
 
         const [copied, setCopied] = useState<"link" | "id">(null!);
         const [extraActions, setExtra] = useState(shiftKeyPressed);
@@ -147,17 +151,17 @@ export const MessageOverlayBar = observer(
                     </Tooltip>
                 )}
                 {isAuthor ||
-                (message.channel &&
-                    message.channel.havePermission("ManageMessages")) ? (
+                    (message.channel &&
+                        message.channel.havePermission("ManageMessages")) ? (
                     <Tooltip content="Delete">
                         <Entry
                             onClick={(e) =>
                                 e.shiftKey
                                     ? message.delete()
                                     : modalController.push({
-                                          type: "delete_message",
-                                          target: message,
-                                      })
+                                        type: "delete_message",
+                                        target: message,
+                                    })
                             }>
                             <Trash size={18} color={"var(--error)"} />
                         </Entry>
diff --git a/src/components/navigation/items/ButtonItem.tsx b/src/components/navigation/items/ButtonItem.tsx
index 77d7e68f..b98b421f 100644
--- a/src/components/navigation/items/ButtonItem.tsx
+++ b/src/components/navigation/items/ButtonItem.tsx
@@ -19,6 +19,7 @@ import Tooltip from "../../common/Tooltip";
 import UserIcon from "../../common/user/UserIcon";
 import { Username } from "../../common/user/UserShort";
 import UserStatus from "../../common/user/UserStatus";
+import { useClient } from "../../../controllers/client/ClientController";
 
 type CommonProps = Omit<
     JSX.HTMLAttributes<HTMLDivElement>,
@@ -37,6 +38,15 @@ type UserProps = CommonProps & {
     channel?: Channel;
 };
 
+// Helper function to convert mentions to usernames
+function convertMentionsToUsernames(content: string, client: any): string {
+    const mentionRegex = /<@([A-z0-9]{26})>/g;
+    return content.replace(mentionRegex, (match, userId) => {
+        const user = client.users.get(userId);
+        return user ? `@${user.username}` : match;
+    });
+}
+
 // TODO: Gray out blocked names.
 export const UserButton = observer((props: UserProps) => {
     const {
@@ -50,6 +60,8 @@ export const UserButton = observer((props: UserProps) => {
         ...divProps
     } = props;
 
+    const client = useClient();
+
     return (
         <div
             {...divProps}
@@ -81,8 +93,8 @@ export const UserButton = observer((props: UserProps) => {
                 {
                     <div className={styles.subText}>
                         {typeof channel?.last_message?.content === "string" &&
-                        alert ? (
-                            channel.last_message.content.slice(0, 32)
+                            alert ? (
+                            convertMentionsToUsernames(channel.last_message.content, client).slice(0, 32)
                         ) : (
                             <UserStatus user={user} tooltip />
                         )}
@@ -140,6 +152,8 @@ export const ChannelButton = observer((props: ChannelProps) => {
         ...divProps
     } = props;
 
+    const client = useClient();
+
     if (channel.channel_type === "SavedMessages") throw "Invalid channel type.";
     if (channel.channel_type === "DirectMessage") {
         if (typeof user === "undefined") throw "No user provided.";
@@ -170,9 +184,9 @@ export const ChannelButton = observer((props: ChannelProps) => {
                 {channel.channel_type === "Group" && (
                     <div className={styles.subText}>
                         {typeof channel.last_message?.content === "string" &&
-                        alert &&
-                        !muted ? (
-                            channel.last_message.content.slice(0, 32)
+                            alert &&
+                            !muted ? (
+                            convertMentionsToUsernames(channel.last_message.content, client).slice(0, 32)
                         ) : (
                             <Text
                                 id="quantities.members"