From 5c6fb7b7c8c1c0192d4b1752aa6029255f3dfa0a Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 14 Dec 2022 15:39:20 +0800
Subject: [PATCH] Better username lookup

---
 src/components/status.jsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/status.jsx b/src/components/status.jsx
index fddcd47..a8980da 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -695,9 +695,14 @@ function Status({
               ) {
                 e.preventDefault();
                 e.stopPropagation();
-                const username = target.querySelector('span');
+                const username = (
+                  target.querySelector('span') || target
+                ).innerText
+                  .trim()
+                  .replace(/^@/, '');
                 const mention = mentions.find(
-                  (mention) => mention.username === username?.innerText.trim(),
+                  (mention) =>
+                    mention.username === username || mention.acct === username,
                 );
                 if (mention) {
                   states.showAccount = mention.acct;