X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fusers%2FBox.js;h=c0d011bc106d4060dcbfd222865b62ed3d1e2fad;hb=cf210ddda8ff5336feee10f733b022a72d906238;hp=bc4673ee9e12d818c209ced29906346bd3ff8f22;hpb=82b95e7542824bcdf4f1b245559cb1c93f4eafdd;p=alttp.git

diff --git a/resources/js/components/users/Box.js b/resources/js/components/users/Box.js
index bc4673e..c0d011b 100644
--- a/resources/js/components/users/Box.js
+++ b/resources/js/components/users/Box.js
@@ -4,34 +4,43 @@ import { Button } from 'react-bootstrap';
 import { withTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 
-import { getAvatarUrl } from '../../helpers/User';
+import { getAvatarUrl, getUserName } from '../../helpers/User';
 import i18n from '../../i18n';
 
-const Box = ({ discriminator, user }) => {
+const Box = ({ discriminator, noLink, user }) => {
 	const navigate = useNavigate();
 
 	if (!user) {
 		return <span>{i18n.t('general.anonymous')}</span>;
 	}
 
-	return <Button
-		className="user-box"
-		onClick={() => navigate(`/users/${user.id}`)}
-		variant="link"
-	>
+	const content = <>
 		<img alt="" src={getAvatarUrl(user)} />
-		<span>{discriminator || !user.nickname ? user.username : user.nickname}</span>
-		{discriminator ?
+		<span>{discriminator ? user.username : getUserName(user)}</span>
+		{discriminator && user.discriminator && user.discriminator !== '0' ?
 			<span className="text-muted">
 				{'#'}
 				{user.discriminator}
 			</span>
 		: null}
+	</>;
+
+	if (noLink) {
+		return <span className="user-box">{content}</span>;
+	}
+
+	return <Button
+		className="user-box"
+		onClick={() => navigate(`/users/${user.id}`)}
+		variant="link"
+	>
+		{content}
 	</Button>;
 };
 
 Box.propTypes = {
 	discriminator: PropTypes.bool,
+	noLink: PropTypes.bool,
 	user: PropTypes.shape({
 		discriminator: PropTypes.string,
 		id: PropTypes.string,