Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
features.add(new GitHubCommand(githubReference));
features.add(new ModMailCommand(jda, config));
features.add(new HelpThreadCommand(config, helpSystemHelper, metrics));
features.add(new ReportCommand(config));
features.add(new ReportCommand(config, actionsStore));
features.add(new BookmarksCommand(bookmarksSystem));

features.add(new ChatGptCommand(chatGptService, helpSystemHelper,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.togetherjava.tjbot.features.moderation;

import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.IPermissionHolder;
Expand All @@ -12,6 +13,7 @@
import net.dv8tion.jda.api.requests.RestAction;
import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
import net.dv8tion.jda.api.utils.Result;
import net.dv8tion.jda.api.utils.TimeUtil;
import net.dv8tion.jda.internal.requests.CompletedRestAction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -25,11 +27,17 @@

import java.awt.Color;
import java.time.Instant;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalUnit;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
* Utility class offering helpers revolving around user moderation, such as banning or kicking.
Expand All @@ -45,6 +53,10 @@ private ModerationUtils() {
* {@link AuditableRestAction#reason(String)}.
*/
private static final int REASON_MAX_LENGTH = 512;
/**
* The maximum amount of moderation actions displayed on a single audit log page
*/
private static final int MAX_AUDIT_PAGE_LENGTH = 10;
/**
* Human-readable text representing the duration of a permanent action, will be shown to the
* user as option for selection.
Expand Down Expand Up @@ -273,7 +285,7 @@ static boolean handleHasAuthorPermissions(String actionVerb, Permission permissi
* Creates a message to be displayed as response to a moderation action.
* <p>
* Essentially, it informs others about the action, such as "John banned Bob for playing with
* the fire.".
* the fire".
*
* @param author the author executing the action
* @param action the action that is executed
Expand Down Expand Up @@ -442,4 +454,86 @@ static RestAction<Boolean> sendModActionDm(RestAction<EmbedBuilder> embedBuilder
*/
record TemporaryData(Instant expiresAt, String duration) {
}

/**
* Splits a list of moderation records into discrete pages capped at 10 items each.
*
* @param moderationActions the list of chronological actions against a target
* @return a list of sub-lists where each sub-list contains a maximum of 10 items
*/
public static List<List<ActionRecord>> groupActionsByPages(
List<ActionRecord> moderationActions) {
List<List<ActionRecord>> groupedModerationActions = new ArrayList<>();

for (int i = 0; i < moderationActions.size(); i++) {
if (i % MAX_AUDIT_PAGE_LENGTH == 0) {
groupedModerationActions.add(new ArrayList<>(MAX_AUDIT_PAGE_LENGTH));
}
groupedModerationActions.getLast().add(moderationActions.get(i));
}

return groupedModerationActions;
}

/**
* Generates a structural text overview outlining the count total of each action type.
*
* @param moderationActions a collection of history records
* @return a formatted markdown description summary
*/
public static String createSummaryMessageDescription(
Collection<ActionRecord> moderationActions) {
int moderationActionAmount = moderationActions.size();

String shortSummary = "There are **%s actions** against the user."
.formatted(moderationActionAmount == 0 ? "no" : moderationActionAmount);

if (moderationActionAmount == 0) {
return shortSummary;
}

Map<ModerationAction, Long> moderationActionTypeToCount = moderationActions.stream()
.collect(Collectors.groupingBy(ActionRecord::actionType, Collectors.counting()));

String typeCountSummary = moderationActionTypeToCount.entrySet()
.stream()
.filter(typeAndCount -> typeAndCount.getValue() > 0)
.sorted(Map.Entry.<ModerationAction, Long>comparingByValue().reversed())
.map(typeAndCount -> "- **%s**: %d".formatted(typeAndCount.getKey(),
typeAndCount.getValue()))
.collect(Collectors.joining("\n"));

return shortSummary + "\n" + typeCountSummary;
}

/**
* Converts an action record item asynchronously into a formatted embed data field.
*
* @param moderationActionRecord the moderation action history record to convert
* @param jda the active JDA instance used to resolve the moderator's handle
* @return a rest action that resolves to the embed field representing the moderation action
*/
public static RestAction<MessageEmbed.Field> moderationActionToEmbedField(
ActionRecord moderationActionRecord, JDA jda) {
return jda.retrieveUserById(moderationActionRecord.authorId())
.map(author -> author == null ? "(unknown user)" : author.getName())
.map(authorText -> {
String expiresAtFormatted = moderationActionRecord.actionExpiresAt() == null ? ""
: "\nTemporary action, expires at: " + TimeUtil.getDateTimeString(
moderationActionRecord.actionExpiresAt().atOffset(ZoneOffset.UTC));

String embedFieldName = "%s by %s"
.formatted(moderationActionRecord.actionType().name(), authorText);
String embedFieldDescription = """
%s
Issued at: %s%s
""".formatted(moderationActionRecord.reason(),
TimeUtil.getDateTimeString(
moderationActionRecord.issuedAt().atOffset(ZoneOffset.UTC)),
expiresAtFormatted);

return new MessageEmbed.Field(embedFieldName, embedFieldDescription, false);
});
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
import net.dv8tion.jda.api.interactions.InteractionHook;
import net.dv8tion.jda.api.interactions.commands.build.Commands;
import net.dv8tion.jda.api.interactions.components.buttons.Button;
import net.dv8tion.jda.api.interactions.components.text.TextInput;
import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
import net.dv8tion.jda.api.interactions.modals.Modal;
import net.dv8tion.jda.api.requests.RestAction;
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
import net.dv8tion.jda.api.utils.Result;
import org.slf4j.Logger;
Expand All @@ -25,14 +24,13 @@
import org.togetherjava.tjbot.features.BotCommandAdapter;
import org.togetherjava.tjbot.features.CommandVisibility;
import org.togetherjava.tjbot.features.MessageContextCommand;
import org.togetherjava.tjbot.features.componentids.Lifespan;
import org.togetherjava.tjbot.features.utils.MessageUtils;

import java.awt.Color;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.regex.Pattern;
Expand All @@ -53,15 +51,20 @@ public final class ReportCommand extends BotCommandAdapter implements MessageCon
private final Predicate<String> modMailChannelNamePredicate;
private final Predicate<String> configModGroupPattern;
private final String configModMailChannelPattern;
private final ModerationActionsStore moderationActionsStore;

/**
* Creates a new instance.
*
* @param config to get the channel to forward reports to
* @param moderationActionsStore to get the history of moderation actions against the reported
* user
*/
public ReportCommand(Config config) {
public ReportCommand(Config config, ModerationActionsStore moderationActionsStore) {
super(Commands.message(COMMAND_NAME), CommandVisibility.GUILD);

this.moderationActionsStore = Objects.requireNonNull(moderationActionsStore);

modMailChannelNamePredicate =
Pattern.compile(config.getModMailChannelPattern()).asMatchPredicate();

Expand Down Expand Up @@ -182,9 +185,13 @@ private MessageCreateAction createModMessage(String reportReason,
.setColor(AMBIENT_COLOR)
.build();

String historyButtonId =
generateComponentId(Lifespan.REGULAR, reportedMessage.authorId, "0");

MessageCreateAction message =
modMailAuditLog.sendMessageEmbeds(reportedMessageEmbed, reportReasonEmbed)
.addActionRow(Button.link(reportedMessage.jumpUrl, "Go to message"));
.addActionRow(Button.link(reportedMessage.jumpUrl, "Go to message"),
Button.primary(historyButtonId, "Audit"));

Optional<Role> moderatorRole = guild.getRoles()
.stream()
Expand Down Expand Up @@ -222,7 +229,7 @@ private static String createUserReply(Result<Message> result) {
}

private record ReportedMessage(String content, String id, String jumpUrl, String channelID,
Instant timestamp, String authorName, String authorAvatarUrl) {
Instant timestamp, String authorName, String authorAvatarUrl, String authorId) {
static ReportedMessage ofArgs(List<String> args) {
String content = args.getFirst();
String id = args.get(1);
Expand All @@ -231,8 +238,92 @@ static ReportedMessage ofArgs(List<String> args) {
Instant timestamp = Instant.parse(args.get(4));
String authorName = args.get(5);
String authorAvatarUrl = args.get(6);
String authorId = args.get(7);
return new ReportedMessage(content, id, jumpUrl, channelID, timestamp, authorName,
authorAvatarUrl);
authorAvatarUrl, authorId);
}
}

@Override
public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
event.deferReply(true).queue();

Guild guild =
Objects.requireNonNull(event.getGuild(), "Guild cannot be null for this command.");
long guildId = guild.getIdLong();

long reportedUserId = Long.parseLong(args.get(0));
int targetPage = Integer.parseInt(args.get(1));

List<ActionRecord> actions = new ArrayList<>(
moderationActionsStore.getActionsByTargetAscending(guildId, reportedUserId));
Collections.reverse(actions);
List<List<ActionRecord>> pages = ModerationUtils.groupActionsByPages(actions);

event.getJDA()
.retrieveUserById(reportedUserId)
.flatMap(user -> prepareAuditEmbedTasks(event, user, actions, pages, targetPage))
.onErrorFlatMap(_ -> event.getHook()
.sendMessage("Could not load audit data for this user.")
.map(msg -> null))
Comment on lines +266 to +268

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you sure that works and doesnt crash when its happening?

.queue();
}

private RestAction<List<MessageEmbed.Field>> prepareAuditEmbedTasks(
ButtonInteractionEvent event, User user, List<ActionRecord> actions,
List<List<ActionRecord>> pages, int targetPage) {

EmbedBuilder auditEmbed =
new EmbedBuilder().setTitle("Audit log of **%s**".formatted(user.getName()))
.setAuthor(user.getName(), null, user.getEffectiveAvatarUrl())
.setColor(Color.BLACK)
.setDescription(ModerationUtils.createSummaryMessageDescription(actions));

if (pages.isEmpty()) {
return event.getHook()
.editOriginalEmbeds(auditEmbed.build())
.setComponents(List.of())
.map(_ -> List.of());
}

int currentPageIndex = Math.clamp(targetPage, 0, pages.size() - 1);

List<RestAction<MessageEmbed.Field>> fetchFieldActions = pages.get(currentPageIndex)
.stream()
.map(actionRecord -> ModerationUtils.moderationActionToEmbedField(actionRecord,
event.getJDA()))
.toList();

return RestAction.allOf(fetchFieldActions).map(embedFields -> {
finalizeAndSendEmbed(event, auditEmbed, embedFields, user.getIdLong(), currentPageIndex,
pages.size());
return embedFields;
});
Comment thread
Zabuzard marked this conversation as resolved.
}

private void finalizeAndSendEmbed(ButtonInteractionEvent event, EmbedBuilder auditEmbed,
List<MessageEmbed.Field> embedFields, long reportedUserId, int currentPageIndex,
int totalPages) {
auditEmbed.clearFields();
embedFields.forEach(auditEmbed::addField);

auditEmbed.setFooter(
"Page %d/%d (Most recent first)".formatted(currentPageIndex + 1, totalPages));

String prevButtonId = generateComponentId(Lifespan.REGULAR, String.valueOf(reportedUserId),
String.valueOf(currentPageIndex - 1));
String nextButtonId = generateComponentId(Lifespan.REGULAR, String.valueOf(reportedUserId),
String.valueOf(currentPageIndex + 1));

Button prevButton =
Button.primary(prevButtonId, "◀ Previous").withDisabled(currentPageIndex == 0);
Button nextButton = Button.primary(nextButtonId, "Next ▶")
.withDisabled(currentPageIndex == totalPages - 1);

event.getHook()
.editOriginalEmbeds(auditEmbed.build())
.setActionRow(prevButton, nextButton)
.queue();
}

}
Loading
Loading