Skip to content

Ping moderators when /modmail and /report commands are used. #699

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

Merged
merged 7 commits into from
Nov 28, 2022
Merged

Ping moderators when /modmail and /report commands are used. #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d55e017
Ping moderators when /modmail command is used.
isvora Nov 24, 2022
818344a
Rename moderator group string to match the style
isvora Nov 24, 2022
98253f8
Ping moderators when /report command is used.
isvora Nov 24, 2022
4b3b433
Extra space
isvora Nov 24, 2022
91f2e01
Refactor
isvora Nov 27, 2022
2e2c3c3
Fix CR comments
isvora Nov 28, 2022
6a963fb
Fix CR comments
isvora Nov 28, 2022
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
23 changes: 20 additions & 3 deletions application/src/main/java/org/togetherjava/tjbot/commands/moderation/ReportCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
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.channel.concrete.TextChannel;
import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
Expand Down Expand Up @@ -52,6 +53,7 @@ public final class ReportCommand extends BotCommandAdapter implements MessageCon
private static final Color AMBIENT_COLOR = Color.BLACK;
private final Cache<Long, Instant> authorToLastReportInvocation = createCooldownCache();
private final Predicate<String> modMailChannelNamePredicate;
private final Predicate<String> configModGroupPattern;
private final String configModMailChannelPattern;

/**
Expand All @@ -66,6 +68,9 @@ public ReportCommand(Config config) {
Pattern.compile(config.getModMailChannelPattern()).asMatchPredicate();

configModMailChannelPattern = config.getModMailChannelPattern();

configModGroupPattern =
Pattern.compile(config.getHeavyModerationRolePattern()).asMatchPredicate();
}

private Cache<Long, Instant> createCooldownCache() {
Expand Down Expand Up @@ -177,9 +182,21 @@ private MessageCreateAction createModMessage(String reportReason,
.setDescription(reportReason)
.setColor(AMBIENT_COLOR)
.build();
return modMailAuditLog.sendMessageEmbeds(reportedMessageEmbed, reportReasonEmbed)
.addActionRow(DiscordClientAction.Channels.GUILD_CHANNEL_MESSAGE.asLinkButton(
"Go to Message", guild.getId(), reportedMessage.channelID, reportedMessage.id));

MessageCreateAction message =
modMailAuditLog.sendMessageEmbeds(reportedMessageEmbed, reportReasonEmbed)
.addActionRow(DiscordClientAction.Channels.GUILD_CHANNEL_MESSAGE.asLinkButton(
"Go to Message", guild.getId(), reportedMessage.channelID,
reportedMessage.id));

Optional<Role> moderatorRole = guild.getRoles()
.stream()
.filter(role -> configModGroupPattern.test(role.getName()))
.findFirst();

moderatorRole.ifPresent(role -> message.setContent(role.getAsMention()));

return message;
}

private void sendModMessage(ModalInteractionEvent event, List<String> args,
Expand Down
14 changes: 14 additions & 0 deletions ...tion/src/main/java/org/togetherjava/tjbot/commands/moderation/modmail/ModMailCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
Expand Down Expand Up @@ -50,6 +51,7 @@ public final class ModMailCommand extends SlashCommandAdapter {
private static final Color AMBIENT_COLOR = Color.BLACK;
private final Cache<Long, Instant> authorToLastModMailInvocation = createCooldownCache();
private final Predicate<String> modMailChannelNamePredicate;
private final Predicate<String> configModGroupPattern;
private final String configModMailChannelPattern;


Expand Down Expand Up @@ -83,6 +85,9 @@ public ModMailCommand(JDA jda, Config config) {
Pattern.compile(config.getModMailChannelPattern()).asMatchPredicate();

configModMailChannelPattern = config.getModMailChannelPattern();

configModGroupPattern =
Pattern.compile(config.getHeavyModerationRolePattern()).asMatchPredicate();
}

private Cache<Long, Instant> createCooldownCache() {
Expand Down Expand Up @@ -148,6 +153,15 @@ private MessageCreateAction createModMessage(SlashCommandInteractionEvent event,
message.addActionRow(DiscordClientAction.General.USER.asLinkButton("Author Profile",
String.valueOf(userId)));
}

Optional<Role> moderatorRole = event.getGuild()
.getRoles()
.stream()
.filter(role -> configModGroupPattern.test(role.getName()))
.findFirst();

moderatorRole.ifPresent(role -> message.setContent(role.getAsMention()));

return message;
}

Expand Down