fix waterfall fairy chest IDs

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

diff --git a/resources/js/helpers/User.js b/resources/js/helpers/User.js
index b94b777091601790abdaf2440027206b8f5c7ea4..0705bed2d35013f25bcd14154a2361a861d8f56f 100644 (file)
--- 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);