X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fhelpers%2FUser.js;h=f13e11977f652529284872d447c9454b2a7e53c8;hb=7e8555cfc96dcd364ca4fe9895e51af1bb04b546;hp=c6a99c9dfe4d60e5918ef93a345615111ecc6316;hpb=33cc4da565ffb07ee4f8d9cbafb248629b85e65a;p=alttp.git

diff --git a/resources/js/helpers/User.js b/resources/js/helpers/User.js
index c6a99c9..f13e119 100644
--- a/resources/js/helpers/User.js
+++ b/resources/js/helpers/User.js
@@ -4,10 +4,12 @@ export const findResult = (user, round) => {
 	return round.results.find(result => result.user_id == user.id);
 };
 
-export const getAvatarUrl = user => user.avatar
+export const getAvatarUrl = user => user && user.avatar
 	? `//cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`
 	: '/default-avatar.png';
 
+export const getUserName = user => (user && (user.nickname || user.username)) || '';
+
 export const hasFinishedRound = (user, round) => {
 	const result = findResult(user, round);
 	return result && result.has_finished;
@@ -16,5 +18,6 @@ export const hasFinishedRound = (user, round) => {
 export default {
 	findResult,
 	getAvatarUrl,
+	getUserName,
 	hasFinishedRound,
 };