Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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
Expand Up @@ -10,6 +10,7 @@
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;
Expand All @@ -25,6 +26,7 @@
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;
Expand All @@ -36,6 +38,7 @@
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
* Implements the /report command, which allows users to report a selected offensive message from
Expand All @@ -53,15 +56,19 @@ 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 required information of the reported user
Comment thread
modwodmm marked this conversation as resolved.
Outdated
*/
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 +189,12 @@ private MessageCreateAction createModMessage(String reportReason,
.setColor(AMBIENT_COLOR)
.build();

String historyButtonId = generateComponentId(Lifespan.PERMANENT, reportedMessage.authorID);
Comment thread
modwodmm marked this conversation as resolved.
Outdated

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, "View user history"));
Comment thread
modwodmm marked this conversation as resolved.
Outdated

Optional<Role> moderatorRole = guild.getRoles()
.stream()
Expand Down Expand Up @@ -222,7 +232,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) {
Comment thread
modwodmm marked this conversation as resolved.
Outdated
static ReportedMessage ofArgs(List<String> args) {
String content = args.getFirst();
String id = args.get(1);
Expand All @@ -231,8 +241,47 @@ 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) {
if (args.isEmpty()) {
event.reply("Error: Target user context lost").setEphemeral(true).queue();
return;
}
Comment thread
modwodmm marked this conversation as resolved.
Outdated

long guildId = Objects.requireNonNull(event.getGuild()).getIdLong();
Comment thread
modwodmm marked this conversation as resolved.
Outdated
long targetUserId = Long.parseLong(args.getFirst());
Comment thread
modwodmm marked this conversation as resolved.
Outdated

List<ActionRecord> actions =
Comment thread
modwodmm marked this conversation as resolved.
Outdated
moderationActionsStore.getActionsByTargetAscending(guildId, targetUserId);

EmbedBuilder embedBuilder = new EmbedBuilder()
.setTitle("Moderation History for User (ID: " + targetUserId + ")")
.setColor(Color.ORANGE)
.setTimestamp(Instant.now());
Comment thread
modwodmm marked this conversation as resolved.
Outdated

if (actions.isEmpty()) {
embedBuilder.setDescription("No mutes, warnings, or punishments found.");
Comment thread
modwodmm marked this conversation as resolved.
Outdated
} else {
String historyContent = actions.stream()
.map(action -> String.format(
"• **%s** (Case #%d) - Reason: *%s* (Issued: <t:%d:R>)",
action.actionType(), action.caseId(),
MessageUtils.abbreviate(action.reason(), 100),
action.issuedAt().getEpochSecond()))
.collect(Collectors.joining("\n"));

embedBuilder.setDescription(
MessageUtils.abbreviate(historyContent, MessageEmbed.DESCRIPTION_MAX_LENGTH));
}
Comment thread
modwodmm marked this conversation as resolved.
Outdated

event.replyEmbeds(embedBuilder.build()).setEphemeral(true).queue();
Comment thread
Zabuzard marked this conversation as resolved.
Outdated

}

}
Loading