From 4bafcb33f402eb41bb2fe499dd1d8436f472275e Mon Sep 17 00:00:00 2001 From: SebClem Date: Mon, 23 Nov 2020 14:41:02 +0100 Subject: [PATCH] :ambulance: Fix userstats for cache --- .../net/Broken/Tools/UserManager/Stats/UserStatsUtils.java | 4 ++-- src/main/java/net/Broken/webView/GeneralWebView.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java b/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java index c59a98f..7763db2 100644 --- a/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java +++ b/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java @@ -194,8 +194,8 @@ public class UserStatsUtils { List allStats = userStatsRepository.findByGuildId(guildId); List ranked = new ArrayList<>(); for (UserStats stats : allStats) { - if (MainBot.jda.getUserById(stats.getUser().getJdaId()) != null) { - String avatar = MainBot.jda.getUserById(stats.getUser().getJdaId()).getEffectiveAvatarUrl(); + if (CacheTools.getJdaUser(stats.getUser()) != null) { + String avatar = CacheTools.getJdaUser(stats.getUser()).getEffectiveAvatarUrl(); GuildStats temp = new GuildStats(stats.getUser().getName(), 0, avatar, stats.getVocalTime(), stats.getMessageCount(), stats.getApiCommandCount()); if (stats.getUser().getId().equals(userEntity.getId())) { diff --git a/src/main/java/net/Broken/webView/GeneralWebView.java b/src/main/java/net/Broken/webView/GeneralWebView.java index 6d92a82..ff8f812 100644 --- a/src/main/java/net/Broken/webView/GeneralWebView.java +++ b/src/main/java/net/Broken/webView/GeneralWebView.java @@ -168,7 +168,7 @@ public class GeneralWebView { model.addAttribute("stack", stack); try { UserEntity userE = userUtils.getUserWithApiToken(userRepository, token); - User user = MainBot.jda.getUserById(userE.getJdaId()); + User user = CacheTools.getJdaUser(userE); addGuildAndRedirect(model, token, cookieGuildId, user); } catch (UnknownTokenException e) { throw new ForbiddenException();