discord discriminator stuff round 2

[alttp.git] / resources / js / helpers / User.js

diff --git a/resources/js/helpers/User.js b/resources/js/helpers/User.js
index 9a554449cdfb0dd437c10c13ab6e344273c3d70e..0705bed2d35013f25bcd14154a2361a861d8f56f 100644 (file)
--- a/resources/js/helpers/User.js
+++ b/resources/js/helpers/User.js
@@ -1,5 +1,3 @@
-import moment from 'moment';
-
 export const compareFinished = round => (a, b) => {
        const a_result = findResult(a, round);
        const b_result = findResult(b, round);
@@ -58,7 +56,8 @@ export const getAvatarUrl = user => {
        return '/default-avatar.png';
 };
 
-export const getUserName = user => (user && (user.nickname || user.username)) || '';
+export const getUserName = user => (user &&
+       (user.nickname || user.discord_nickname || user.username)) || '';
 
 export const hasFinishedRound = (user, round) => {
        const result = findResult(user, round);