Skip to content

add modal support to /modmail command #800

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 3 commits into from
Mar 11, 2023
Merged

add modal support to /modmail command #800

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19386c6
add modal support to /modmail command
hamzanaciri99 Mar 9, 2023
4941f09
Merge branch 'Together-Java:develop' into hamzanaciri99/issue645
hamzanaciri99 Mar 9, 2023
2e8ea98
/modmail modal support
hamzanaciri99 Mar 10, 2023
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ logviewer/webpack.generated.js
.DS_Store

# VisualStudioCode
.vscode
.vscode/*
!.vscode/settings.json
!.vscode/extensions.json
Expand Down
58 changes: 45 additions & 13 deletions ...tion/src/main/java/org/togetherjava/tjbot/features/moderation/modmail/ModMailCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@
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.ModalInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.interactions.InteractionHook;
import net.dv8tion.jda.api.interactions.commands.Command;
import net.dv8tion.jda.api.interactions.commands.OptionType;
import net.dv8tion.jda.api.interactions.commands.build.OptionData;
import net.dv8tion.jda.api.interactions.components.Modal;
import net.dv8tion.jda.api.interactions.components.text.TextInput;
import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
Expand Down Expand Up @@ -45,10 +49,12 @@ public final class ModMailCommand extends SlashCommandAdapter {
private static final String OPTION_MESSAGE = "message";
private static final String OPTION_STAY_ANONYMOUS = "stay-anonymous";
private static final String OPTION_GUILD = "server";
private static final int COOLDOWN_DURATION_VALUE = 30;
private static final int COOLDOWN_DURATION_VALUE = 0; // 30
private static final ChronoUnit COOLDOWN_DURATION_UNIT = ChronoUnit.MINUTES;
private static final Color AMBIENT_COLOR = Color.BLACK;
private final Cache<Long, Instant> authorToLastModMailInvocation = createCooldownCache();
private final Cache<Long, SlashCommandInteractionEvent> userToSlashCommandEvent =
createSlashCommandCache();
private final Predicate<String> modMailChannelNamePredicate;
private final Predicate<String> configModGroupPattern;
private final String configModMailChannelPattern;
Expand All @@ -64,8 +70,6 @@ public ModMailCommand(JDA jda, Config config) {
super(COMMAND_NAME, "Contact the moderators of the selected guild",
CommandVisibility.GLOBAL);

OptionData messageOption = new OptionData(OptionType.STRING, OPTION_MESSAGE,
"What do you want to tell them?", true);
OptionData guildOption = new OptionData(OptionType.STRING, OPTION_GUILD,
"The server to contact mods from", true);
OptionData anonymousOption = new OptionData(OptionType.BOOLEAN, OPTION_STAY_ANONYMOUS,
Expand All @@ -78,7 +82,7 @@ public ModMailCommand(JDA jda, Config config) {

guildOption.addChoices(choices);

getData().addOptions(messageOption, guildOption, anonymousOption);
getData().addOptions(/* messageOption, */ guildOption, anonymousOption);

modMailChannelNamePredicate =
Pattern.compile(config.getModMailChannelPattern()).asMatchPredicate();
Expand All @@ -96,6 +100,10 @@ private Cache<Long, Instant> createCooldownCache() {
.build();
}

private Cache<Long, SlashCommandInteractionEvent> createSlashCommandCache() {
return Caffeine.newBuilder().maximumSize(1_000).build();
}

@Override
public void onSlashCommand(SlashCommandInteractionEvent event) {
long userId = event.getUser().getIdLong();
Expand All @@ -104,22 +112,47 @@ public void onSlashCommand(SlashCommandInteractionEvent event) {
return;
}
authorToLastModMailInvocation.put(userId, Instant.now());
event.deferReply().setEphemeral(true).queue();

long userGuildId = event.getOption(OPTION_GUILD).getAsLong();
Optional<TextChannel> modMailAuditLog = getModMailChannel(event.getJDA(), userGuildId);
userToSlashCommandEvent.put(userId, event);
createMessageModal(event);
}

private void createMessageModal(SlashCommandInteractionEvent event) {
TextInput message =
TextInput.create(OPTION_MESSAGE, "Your message", TextInputStyle.PARAGRAPH)
.setPlaceholder("What do you want to tell them?")
.setMinLength(10)
.build();

Modal modal = Modal.create(generateComponentId(), "Send message to moderators")
.addActionRow(message)
.build();

event.replyModal(modal).queue();
}

@Override
public void onModalSubmitted(ModalInteractionEvent event, List<String> args) {
String userMessage = event.getValue(OPTION_MESSAGE).getAsString();
long userId = event.getUser().getIdLong();

SlashCommandInteractionEvent slashCommandEvent =
userToSlashCommandEvent.getIfPresent(userId);
long userGuildId = slashCommandEvent.getOption(OPTION_GUILD).getAsLong();
Optional<TextChannel> modMailAuditLog =
getModMailChannel(slashCommandEvent.getJDA(), userGuildId);
if (modMailAuditLog.isEmpty()) {
logger.warn(
"Cannot find the designated modmail channel in server by id {} with the pattern {}",
userGuildId, configModMailChannelPattern);
return;
}

MessageCreateAction message =
createModMessage(event, userId, modMailAuditLog.orElseThrow());
event.deferReply().setEphemeral(true).queue();
MessageCreateAction message = createModMessage(slashCommandEvent, userId, userMessage,
modMailAuditLog.orElseThrow());

sendMessage(event, message);

}

private boolean handleIsOnCooldown(long userId, SlashCommandInteractionEvent event) {
Expand All @@ -141,8 +174,7 @@ private Optional<TextChannel> getModMailChannel(JDA jda, long guildId) {
}

private MessageCreateAction createModMessage(SlashCommandInteractionEvent event, long userId,
TextChannel modMailAuditLog) {
String userMessage = event.getOption(OPTION_MESSAGE).getAsString();
String userMessage, TextChannel modMailAuditLog) {
boolean wantsToStayAnonymous = event.getOption(OPTION_STAY_ANONYMOUS).getAsBoolean();

User user = wantsToStayAnonymous ? null : event.getUser();
Expand All @@ -164,7 +196,7 @@ private MessageCreateAction createModMessage(SlashCommandInteractionEvent event,
return message;
}

private void sendMessage(SlashCommandInteractionEvent event, MessageCreateAction message) {
private void sendMessage(ModalInteractionEvent event, MessageCreateAction message) {
InteractionHook hook = event.getHook();
message.mapToResult().map(result -> {
if (result.isSuccess()) {
Expand Down