Skip to content

adapt help XP leaderboard API #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 27, 2023
Merged

adapt help XP leaderboard API #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions ...g/javabot/api/routes/leaderboard/help_experience/HelpExperienceLeaderboardController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.discordjug.javabot.api.routes.CaffeineCache;
import net.discordjug.javabot.api.routes.leaderboard.help_experience.model.ExperienceUserData;
import net.discordjug.javabot.systems.help.HelpExperienceService;
import net.discordjug.javabot.systems.help.model.HelpAccount;
import net.discordjug.javabot.util.Pair;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.Guild;
Expand All @@ -18,6 +19,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;

Expand All @@ -26,7 +28,7 @@
*/
@RestController
public class HelpExperienceLeaderboardController extends CaffeineCache<Pair<Long, Integer>, List<ExperienceUserData>> {
private static final int PAGE_AMOUNT = 8;
private static final int PAGE_AMOUNT = 10;
private final JDA jda;
private final HelpExperienceService helpExperienceService;

Expand Down Expand Up @@ -65,9 +67,13 @@ public ResponseEntity<List<ExperienceUserData>> getHelpExperienceLeaderboard(
}
List<ExperienceUserData> members = getCache().getIfPresent(new Pair<>(guild.getIdLong(), page));
if (members == null || members.isEmpty()) {
members = helpExperienceService.getTopAccounts(PAGE_AMOUNT, page).stream()
.map(p -> ExperienceUserData.of(p, jda.retrieveUserById(p.getUserId()).complete()))
.toList();
List<HelpAccount> topAccounts = helpExperienceService.getTopAccounts(PAGE_AMOUNT, page);
members = new ArrayList<>(topAccounts.size());
for (int i = 0; i < topAccounts.size(); i++) {
HelpAccount acc = topAccounts.get(i);
int rank = (page - 1) * PAGE_AMOUNT + 1 + i;
members.add(ExperienceUserData.of(acc, jda.retrieveUserById(acc.getUserId()).complete(), rank));
}
getCache().put(new Pair<>(guild.getIdLong(), page), members);
}
return new ResponseEntity<>(members, HttpStatus.OK);
Expand Down
5 changes: 4 additions & 1 deletion ...t/discordjug/javabot/api/routes/leaderboard/help_experience/model/ExperienceUserData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@
@EqualsAndHashCode(callSuper = false)
public class ExperienceUserData extends UserData {
private HelpAccount account;
private int rank;

/**
* Creates a new {@link ExperienceUserData} instance.
*
* @param account The {@link HelpAccount} to use.
* @param user A nullable {@link User}.
* @param rank The position of the user in the help leaderboard.
* @return The {@link ExperienceUserData}.
*/
public static @NotNull ExperienceUserData of(@NotNull HelpAccount account, @Nullable User user) {
public static @NotNull ExperienceUserData of(@NotNull HelpAccount account, @Nullable User user, int rank) {
ExperienceUserData data = new ExperienceUserData();
data.setUserId(account.getUserId());
if (user != null) {
Expand All @@ -34,6 +36,7 @@ public class ExperienceUserData extends UserData {
data.setEffectiveAvatarUrl(user.getEffectiveAvatarUrl());
}
data.setAccount(account);
data.setRank(rank);
return data;
}
}