sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
SebClem 2020-11-23 14:41:19 +01:00
commit 266801bc5d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java
View File

@ -194,8 +194,8 @@ public class UserStatsUtils {
List<UserStats> allStats = userStatsRepository.findByGuildId(guildId); List<UserStats> allStats = userStatsRepository.findByGuildId(guildId);
List<GuildStats> ranked = new ArrayList<>(); List<GuildStats> ranked = new ArrayList<>();
for (UserStats stats : allStats) { for (UserStats stats : allStats) {
if (MainBot.jda.getUserById(stats.getUser().getJdaId()) != null) { if (CacheTools.getJdaUser(stats.getUser()) != null) {
String avatar = MainBot.jda.getUserById(stats.getUser().getJdaId()).getEffectiveAvatarUrl(); String avatar = CacheTools.getJdaUser(stats.getUser()).getEffectiveAvatarUrl();
GuildStats temp = new GuildStats(stats.getUser().getName(), 0, avatar, stats.getVocalTime(), stats.getMessageCount(), stats.getApiCommandCount()); GuildStats temp = new GuildStats(stats.getUser().getName(), 0, avatar, stats.getVocalTime(), stats.getMessageCount(), stats.getApiCommandCount());
if (stats.getUser().getId().equals(userEntity.getId())) { if (stats.getUser().getId().equals(userEntity.getId())) {

2
src/main/java/net/Broken/webView/GeneralWebView.java
View File

@ -168,7 +168,7 @@ public class GeneralWebView {
model.addAttribute("stack", stack); model.addAttribute("stack", stack);
try { try {
UserEntity userE = userUtils.getUserWithApiToken(userRepository, token); UserEntity userE = userUtils.getUserWithApiToken(userRepository, token);
User user = MainBot.jda.getUserById(userE.getJdaId()); User user = CacheTools.getJdaUser(userE);
addGuildAndRedirect(model, token, cookieGuildId, user); addGuildAndRedirect(model, token, cookieGuildId, user);
} catch (UnknownTokenException e) { } catch (UnknownTokenException e) {
throw new ForbiddenException(); throw new ForbiddenException();