Skip to content

starboard improvements #563

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

Open
danthe1st wants to merge 3 commits into
base: main
Choose a base branch
from
Open

starboard improvements #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae85828
starboard improvements
danthe1st Oct 17, 2026
75c7d27
reduce thresholds for different star emojis
danthe1st Oct 17, 2026
1c3937e
fix Javadoc
danthe1st Oct 17, 2026
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
3 changes: 3 additions & 0 deletions src/main/java/net/discordjug/javabot/data/config/guild/StarboardConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
import net.dv8tion.jda.api.entities.emoji.UnicodeEmoji;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

/**
* Configuration for the guild's starboard system.
Expand All @@ -19,6 +21,7 @@ public class StarboardConfig extends GuildConfigItem {
private long starboardChannelId;
private int reactionThreshold;
private List<String> emojiUnicodes = new ArrayList<>();
private Set<Long> disallowedChannelIds = new HashSet<>();

public TextChannel getStarboardChannel() {
return this.getGuild().getTextChannelById(this.starboardChannelId);
Expand Down
77 changes: 54 additions & 23 deletions src/main/java/net/discordjug/javabot/systems/starboard/StarboardManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import net.dv8tion.jda.api.entities.emoji.Emoji;
import net.dv8tion.jda.api.entities.emoji.UnicodeEmoji;
import net.dv8tion.jda.api.events.message.MessageDeleteEvent;
import net.dv8tion.jda.api.events.message.react.GenericMessageReactionEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
Expand All @@ -30,8 +31,10 @@
import org.jetbrains.annotations.NotNull;
import org.springframework.dao.DataAccessException;

import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;

Expand All @@ -47,34 +50,55 @@ public class StarboardManager extends ListenerAdapter {

@Override
public void onMessageReactionAdd(@NotNull MessageReactionAddEvent event) {
if (isInvalidUser(event.getUser())) return;
if (isInvalidChannel(event.getChannel())) return;
if (shouldSkip(event)) {
return;
}
if (isInvalidUser(event.getUser())) {
return;
}
if (event.getMessageAuthorIdLong() == event.getUserIdLong()) {
return;
}
handleReactionEvent(event.getGuild(), event.getEmoji(), event.getChannel(), event.getMessageIdLong());
}

@Override
public void onMessageReactionRemove(@NotNull MessageReactionRemoveEvent event) {
if (isInvalidUser(event.getUser())) return;
if (isInvalidChannel(event.getGuildChannel())) return;
if (shouldSkip(event)) {
return;
}
handleReactionEvent(event.getGuild(), event.getEmoji(), event.getChannel(), event.getMessageIdLong());
}


private boolean shouldSkip(GenericMessageReactionEvent event) {
if (isInvalidChannel(event.getChannel())) {
return true;
}
StarboardConfig config = botConfig.get(event.getGuild()).getStarboardConfig();
if (config.getDisallowedChannelIds().contains(event.getChannel().getIdLong())) {
return true;
}
if (config.getStarboardChannelId() == event.getChannel().getIdLong()) {
return true;
}
return false;
}

private void handleReactionEvent(Guild guild, Emoji emoji, MessageChannel channel, long messageId) {
asyncPool.submit(() -> {
StarboardConfig config = botConfig.get(guild).getStarboardConfig();
if (config.getStarboardChannel().equals(channel)) return;
Emoji starEmote = config.getEmojis().get(0);
if (!emoji.equals(starEmote)) return;
Set<Emoji> starEmojis = new HashSet<>(config.getEmojis());
if (!starEmojis.contains(emoji)) return;
channel.retrieveMessageById(messageId).queue(
message -> {
int stars = getReactionCountForEmote(starEmote, message);
asyncPool.execute(()->{
long stars = getReactionCountForEmotes(starEmojis, message);
try {
starboardRepository
.getEntryByMessageId(message.getIdLong())
.ifPresentOrElse(entry->{
updateStarboardMessage(message, stars, config);
}, ()->{
.ifPresentOrElse(_ ->
updateStarboardMessage(message, stars, config)
, ()->{
if (stars >= config.getReactionThreshold()) {
addMessageToStarboard(message, stars, config);
} else if (stars < 1 && !removeMessageFromStarboard(message.getIdLong(), channel, config)) {
Expand Down Expand Up @@ -122,21 +146,24 @@ private boolean isInvalidUser(User user) {
}

/**
* Attemps to get the amount of reactions for the given emote.
* Attemps to get the amount of reactions for the given emotes.
*
* @param emoji The emote.
* @param emojis The emotes that included in the count.
* @param message The message.
* @return The amount of reactions.
*/
private int getReactionCountForEmote(Emoji emoji, @NotNull Message message) {
private long getReactionCountForEmotes(Set<Emoji> emojis, @NotNull Message message) {
return message.getReactions().stream()
.filter(r -> r.getEmoji().equals(emoji))
.findFirst()
.map(MessageReaction::getCount)
.orElse(0);
.filter(r -> emojis.contains(r.getEmoji()))
.flatMap(reaction -> reaction.retrieveUsers().complete().stream())
.filter(user -> !isInvalidUser(user))
.mapToLong(User::getIdLong)
.filter(userId -> userId != message.getAuthor().getIdLong())
.distinct()
.count();
}

private void addMessageToStarboard(Message message, int stars, @NotNull StarboardConfig config) throws DataAccessException {
private void addMessageToStarboard(Message message, long stars, @NotNull StarboardConfig config) throws DataAccessException {
if (stars < config.getReactionThreshold()) return;
MessageEmbed embed = buildStarboardEmbed(message);
MessageCreateAction action = config.getStarboardChannel()
Expand Down Expand Up @@ -177,7 +204,7 @@ private void addMessageToStarboard(Message message, int stars, @NotNull Starboar
);
}

private void updateStarboardMessage(@NotNull Message message, int stars, @NotNull StarboardConfig config) throws DataAccessException {
private void updateStarboardMessage(@NotNull Message message, long stars, @NotNull StarboardConfig config) throws DataAccessException {
Optional<StarboardEntry> starboardEntry = starboardRepository.getEntryByMessageId(message.getIdLong());
starboardEntry.ifPresentOrElse(entry->{
long starboardId = entry.getStarboardMessageId();
Expand All @@ -197,8 +224,12 @@ private void updateStarboardMessage(@NotNull Message message, int stars, @NotNul
}
} else {
UnicodeEmoji starEmote = config.getEmojis().get(0);
if (stars > 10) starEmote = config.getEmojis().get(1);
if (stars > 25) starEmote = config.getEmojis().get(2);
if (stars > 5 && config.getEmojis().size() > 1) {
starEmote = config.getEmojis().get(1);
}
if (stars > 10 && config.getEmojis().size() > 2) {
starEmote = config.getEmojis().get(2);
}
starboardMessage.editMessage(
String.format("%s %s | %s", starEmote, stars, message.getChannel().getAsMention()))
.queue();
Expand Down
Loading