From ef712c62a9c0307e9e97be1c490a629afea96521 Mon Sep 17 00:00:00 2001 From: Lim Chee Aun Date: Mon, 27 May 2024 19:02:19 +0800 Subject: [PATCH] =?UTF-8?q?Add=20one=20more=20username=20=E2=89=88=20displ?= =?UTF-8?q?ay=20name=20logic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/name-text.jsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/name-text.jsx b/src/components/name-text.jsx index c60f619c..48c6a743 100644 --- a/src/components/name-text.jsx +++ b/src/components/name-text.jsx @@ -31,16 +31,17 @@ function NameText({ .replace(/(\:(\w|\+|\-)+\:)(?=|[\!\.\?]|$)/g, '') // Remove shortcodes, regex from https://regex101.com/r/iE9uV0/1 .replace(/\s+/g, ''); // E.g. "My name" === "myname" const shortenedAlphaNumericDisplayName = shortenedDisplayName.replace( - /[^a-z0-9]/gi, + /[^a-z0-9@\.]/gi, '', ); // Remove non-alphanumeric characters if ( - !short && - (trimmedUsername === trimmedDisplayName || - trimmedUsername === shortenedDisplayName || - trimmedUsername === shortenedAlphaNumericDisplayName || - nameCollator.compare(trimmedUsername, shortenedDisplayName) === 0) + (!short && + (trimmedUsername === trimmedDisplayName || + trimmedUsername === shortenedDisplayName || + trimmedUsername === shortenedAlphaNumericDisplayName || + nameCollator.compare(trimmedUsername, shortenedDisplayName) === 0)) || + shortenedAlphaNumericDisplayName === acct.toLowerCase() ) { username = null; }