Feature/leaderboard command#1465
Open
barsh404error wants to merge 3 commits into
Open
Conversation
barsh404error
force-pushed
the
feature/leaderboard-command
branch
from
8a9840f to
ff6632d
Compare
barsh404error
force-pushed
the
feature/leaderboard-command
branch
from
ff6632d to
9bb9883
Compare
Zabuzard
requested changes
Jun 3, 2026
| private final Config config; | ||
|
|
||
| private final Map<Long, Map<Long, Integer>> winsByGuild = new ConcurrentHashMap<>(); | ||
| private final Map<Long, OffsetDateTime> lastFetchedPerGuild = new ConcurrentHashMap<>(); |
Comment on lines
+83
to
+118
| if (!winsByGuild.containsKey(guildId)) { | ||
| hallOfFame.getIterableHistory().takeAsync(HISTORY_LIMIT).thenAccept(messages -> { | ||
| Map<Long, Integer> wins = new HashMap<>(); | ||
| countWinsInto(messages, wins); | ||
| winsByGuild.put(guildId, new ConcurrentHashMap<>(wins)); | ||
|
|
||
| if (sorted.isEmpty()) { | ||
| event.getHook().editOriginal("No top helper data found.").queue(); | ||
| return; | ||
| } | ||
| if (!messages.isEmpty()) { | ||
| lastFetchedPerGuild.put(guildId, messages.getFirst().getTimeCreated()); | ||
| } | ||
|
|
||
| sendLeaderboard(guild, wins, hook); | ||
| }).exceptionally(error -> { | ||
| logger.error("Failed to read hall of fame channel", error); | ||
| hook.editOriginal("Failed to read the hall of fame channel.").queue(); | ||
| return null; | ||
| }); | ||
| } else { | ||
| OffsetDateTime lastFetched = lastFetchedPerGuild.get(guildId); | ||
| Map<Long, Integer> cachedWins = winsByGuild.get(guildId); | ||
|
|
||
| hallOfFame.getIterableHistory() | ||
| .takeWhileAsync(HISTORY_LIMIT, msg -> msg.getTimeCreated().isAfter(lastFetched)) | ||
| .thenAccept(newMessages -> { | ||
| if (!newMessages.isEmpty()) { | ||
| countWinsInto(newMessages, cachedWins); | ||
| lastFetchedPerGuild.put(guildId, newMessages.getFirst().getTimeCreated()); | ||
| } | ||
| sendLeaderboard(guild, cachedWins, hook); | ||
| }) | ||
| .exceptionally(error -> { | ||
| logger.error("Failed to read hall of fame channel", error); | ||
| hook.editOriginal("Failed to read the hall of fame channel.").queue(); | ||
| return null; | ||
| }); | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
refactor this to get rid of the duplication. 90% of the code in the if-else branches are identical
…essages to remove duplication
surajkumar
requested changes
Jun 5, 2026
| @Override | ||
| public void onSlashCommand(SlashCommandInteractionEvent event) { | ||
| Guild guild = event.getGuild(); | ||
| if (guild == null) { |
Contributor
There was a problem hiding this comment.
This branch can never occur because of CommandVisibility.GUILD , if you're getting a nullable warning then wrap it with Objects.requireNotNull as we have in other places.
| .orElse(null); | ||
|
|
||
| if (hallOfFame == null) { | ||
| event.getHook().editOriginal("Could not find the hall of fame channel.").queue(); |
Contributor
There was a problem hiding this comment.
Perhaps change this to something like "Could not find channel matching "
| Map<Long, Integer> wins = new HashMap<>(); | ||
| for (Message message : messages) { | ||
| String content = message.getContentRaw(); | ||
| if (!content.toLowerCase().contains("top helper")) { |
Contributor
There was a problem hiding this comment.
I just checked the channel and every message is has been a top helper message so tbh we could remove this if-block and accept any message in that channel.
TBC
| return; | ||
| } | ||
|
|
||
| hallOfFame.getIterableHistory().takeAsync(HISTORY_LIMIT).thenAccept(messages -> { |
Contributor
There was a problem hiding this comment.
Does this work? Has it been tested?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Adds a
/leaderboardcommand that displays the all-time top helpers. It reads the hall-of-fame channel history, finds messages that mention top helpers, counts how many times each user was awarded, and shows the top 10 ranked with medals.How
Reads the hall-of-fame channel history, filters messages containing "top helper", extracts mentioned users via
getMentions(), counts wins per user and shows the top 10 in an embed.Edge cases
sorted.isEmpty()catches it, then returns "No top helper data found."sorted.isEmpty()check covers it.NOTE: Channel not found and Messages exist but none contain "top helper" returns the same output "No top helper data found."