removed blocking .complete() call

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/systems/help/commands/subcommands/ExperienceLeaderboardSubcommand.java

@@ -4,6 +4,7 @@
 import net.dv8tion.jda.api.entities.Emoji;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
@@ -53,7 +54,7 @@ public static void handleButtons(ButtonInteractionEvent event, String[] id) {
 				case "left" -> page--;
 				case "right" -> page++;
 			}
-			int maxPage = dao.getTotalRankedAccounts() / PAGE_SIZE;
+			int maxPage = dao.getTotalAccounts() / PAGE_SIZE;
 			if (page <= 0) page = maxPage;
 			if (page > maxPage) page = 1;
 			event.getHook().editOriginalEmbeds(buildExperienceLeaderboard(event.getGuild(), dao, page))
@@ -63,17 +64,18 @@ public static void handleButtons(ButtonInteractionEvent event, String[] id) {
 	}
 
 	private static MessageEmbed buildExperienceLeaderboard(Guild guild, HelpAccountRepository dao, int page) throws SQLException {
-		int maxPage = dao.getTotalRankedAccounts() / PAGE_SIZE;
-		List<HelpAccount> accounts = dao.getAccountsWithRank(Math.min(page, maxPage), PAGE_SIZE);
+		int maxPage = dao.getTotalAccounts() / PAGE_SIZE;
+		List<HelpAccount> accounts = dao.getAccounts(Math.min(page, maxPage), PAGE_SIZE);
 		EmbedBuilder builder = new EmbedBuilder()
 				.setTitle("Experience Leaderboard")
 				.setColor(Bot.config.get(guild).getSlashCommand().getDefaultColor())
 				.setFooter(String.format("Page %s/%s", Math.min(page, maxPage), maxPage));
 		accounts.forEach(account -> {
 			Map.Entry<Long, Double> currentRole = account.getCurrentExperienceGoal(guild);
+			System.out.println(guild.getJDA().getUserCache().toString());
+			User user = guild.getJDA().getUserById(account.getUserId());
 			builder.addField(
-					// TODO: implement without using blocking complete calls
-					String.format("**%s.** %s", (accounts.indexOf(account) + 1) + (page - 1) * PAGE_SIZE, guild.getJDA().retrieveUserById(account.getUserId()).complete().getAsTag()),
+					String.format("**%s.** %s", (accounts.indexOf(account) + 1) + (page - 1) * PAGE_SIZE, user == null ? account.getUserId() : user.getAsTag()),
 					String.format("<@&%s>: `%.0f XP`\n", currentRole.getKey(), account.getExperience()),
 					false);
 		});

src/main/java/net/javadiscord/javabot/systems/help/dao/HelpAccountRepository.java

@@ -2,9 +2,6 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import net.dv8tion.jda.api.entities.Guild;
-import net.javadiscord.javabot.Bot;
-import net.javadiscord.javabot.data.config.guild.HelpConfig;
 import net.javadiscord.javabot.systems.help.model.HelpAccount;
 
 import java.sql.Connection;
@@ -79,7 +76,7 @@ public Optional<HelpAccount> getByUserId(long userId) throws SQLException {
 	 * @return A {@link List} containing the specified amount of {@link HelpAccount}s.
 	 * @throws SQLException If an error occurs.
 	 */
-	public List<HelpAccount> getAccountsWithRank(int page, int size) throws SQLException {
+	public List<HelpAccount> getAccounts(int page, int size) throws SQLException {
 		String sql = "SELECT * FROM help_account WHERE experience > 0 ORDER BY experience DESC LIMIT %d OFFSET %d";
 		PreparedStatement stmt = con.prepareStatement(String.format(sql, size, (page * size) - size));
 		ResultSet rs = stmt.executeQuery();
@@ -97,7 +94,7 @@ public List<HelpAccount> getAccountsWithRank(int page, int size) throws SQLExcep
 	 * @return The amount, as an {@link Integer}.
 	 * @throws SQLException If an error occurs.
 	 */
-	public int getTotalRankedAccounts() throws SQLException {
+	public int getTotalAccounts() throws SQLException {
 		try (PreparedStatement s = con.prepareStatement("SELECT COUNT(*) FROM help_account WHERE experience > 0")) {
 			ResultSet rs = s.executeQuery();
 			if (rs.next()) return rs.getInt(1);