X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fhelpers%2FUser.js;h=0705bed2d35013f25bcd14154a2361a861d8f56f;hb=cce28e8619fe87d4be33f82df9a5ec16b2ad9cf6;hp=b94b777091601790abdaf2440027206b8f5c7ea4;hpb=d2d1231d5cea49224df581aed9d9e77f9deb832b;p=alttp.git

diff --git a/resources/js/helpers/User.js b/resources/js/helpers/User.js
index b94b777..0705bed 100644
--- a/resources/js/helpers/User.js
+++ b/resources/js/helpers/User.js
@@ -46,11 +46,18 @@ export const findResult = (user, round) => {
 	return round.results.find(result => result.user_id == user.id);
 };
 
-export const getAvatarUrl = user => user && user.avatar
-	? `//cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`
-	: '/default-avatar.png';
+export const getAvatarUrl = user => {
+	if (user && user.avatar) {
+		if (user.avatar_cached) {
+			return `/media/avatar/${user.id}/${user.avatar}.png`;
+		}
+		return `//cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`;
+	}
+	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);