X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fhelpers%2FUser.js;fp=resources%2Fjs%2Fhelpers%2FUser.js;h=9a554449cdfb0dd437c10c13ab6e344273c3d70e;hb=35dca1d496a5298daad2fc5f926a9fe400f68dce;hp=b94b777091601790abdaf2440027206b8f5c7ea4;hpb=9bbd52a3b52020f57124e29c22982c6f2d5b1571;p=alttp.git

diff --git a/resources/js/helpers/User.js b/resources/js/helpers/User.js
index b94b777..9a55444 100644
--- a/resources/js/helpers/User.js
+++ b/resources/js/helpers/User.js
@@ -1,3 +1,5 @@
+import moment from 'moment';
+
 export const compareFinished = round => (a, b) => {
 	const a_result = findResult(a, round);
 	const b_result = findResult(b, round);
@@ -46,9 +48,15 @@ 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)) || '';