Skip to content

/modmail anonymous UX improvements #1260

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 1 commit into from
Jun 26, 2025
Merged

/modmail anonymous UX improvements #1260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 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 @@ -47,7 +47,7 @@ public final class ModMailCommand extends SlashCommandAdapter {
private static final Logger logger = LoggerFactory.getLogger(ModMailCommand.class);
public static final String COMMAND_NAME = "modmail";
private static final String OPTION_MESSAGE = "message";
private static final String OPTION_STAY_ANONYMOUS = "stay-anonymous";
private static final String OPTION_REVEAL_NAME = "reveal-name";
private static final String OPTION_GUILD = "server";
private static final int COOLDOWN_DURATION_VALUE = 30;
private static final ChronoUnit COOLDOWN_DURATION_UNIT = ChronoUnit.MINUTES;
Expand All @@ -70,8 +70,9 @@ public ModMailCommand(JDA jda, Config config) {

OptionData guildOption = new OptionData(OptionType.STRING, OPTION_GUILD,
"The server to contact mods from", true);
OptionData anonymousOption = new OptionData(OptionType.BOOLEAN, OPTION_STAY_ANONYMOUS,
"If set, your name is hidden - note that mods then can not get back to you", true);
OptionData revealNameOption = new OptionData(OptionType.BOOLEAN, OPTION_REVEAL_NAME,
"If set, your name is shown to mods - false means mods can not get back to you",
true);

List<Command.Choice> choices = jda.getGuildCache()
.stream()
Expand All @@ -80,7 +81,7 @@ public ModMailCommand(JDA jda, Config config) {

guildOption.addChoices(choices);

getData().addOptions(guildOption, anonymousOption);
getData().addOptions(guildOption, revealNameOption);

modMailChannelNamePredicate =
Pattern.compile(config.getModMailChannelPattern()).asMatchPredicate();
Expand Down Expand Up @@ -112,16 +113,16 @@ public void onSlashCommand(SlashCommandInteractionEvent event) {

private void sendMessageModal(SlashCommandInteractionEvent event) {
long userGuildId = event.getOption(OPTION_GUILD).getAsLong();
boolean wantsToStayAnonymous = event.getOption(OPTION_STAY_ANONYMOUS).getAsBoolean();
boolean wantsToRevealName = event.getOption(OPTION_REVEAL_NAME).getAsBoolean();

TextInput message =
TextInput.create(OPTION_MESSAGE, "Your message", TextInputStyle.PARAGRAPH)
.setPlaceholder("What do you want to tell them?")
.setMinLength(3)
.build();

String componentId = generateComponentId(String.valueOf(userGuildId),
String.valueOf(wantsToStayAnonymous));
String componentId =
generateComponentId(String.valueOf(userGuildId), String.valueOf(wantsToRevealName));

Modal modal = Modal.create(componentId, "Send message to moderators")
.addActionRow(message)
Expand All @@ -136,7 +137,7 @@ public void onModalSubmitted(ModalInteractionEvent event, List<String> args) {
long userId = event.getUser().getIdLong();

long userGuildId = Long.parseLong(args.getFirst());
boolean wantsToStayAnonymous = Boolean.parseBoolean(args.get(1));
boolean wantsToRevealName = Boolean.parseBoolean(args.get(1));

Optional<TextChannel> modMailAuditLog = getModMailChannel(event.getJDA(), userGuildId);
if (modMailAuditLog.isEmpty()) {
Expand All @@ -148,7 +149,7 @@ public void onModalSubmitted(ModalInteractionEvent event, List<String> args) {

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

sendMessage(event, message);
}
Expand All @@ -172,11 +173,11 @@ private Optional<TextChannel> getModMailChannel(JDA jda, long guildId) {
}

private MessageCreateAction createModMessage(ModalInteractionEvent event, long userId,
String userMessage, boolean wantsToStayAnonymous, TextChannel modMailAuditLog) {
User user = wantsToStayAnonymous ? null : event.getUser();
String userMessage, boolean wantsToRevealName, TextChannel modMailAuditLog) {
User user = wantsToRevealName ? event.getUser() : null;
MessageCreateAction message =
modMailAuditLog.sendMessageEmbeds(createModMailMessage(user, userMessage));
if (!wantsToStayAnonymous) {
if (wantsToRevealName) {
message.addActionRow(DiscordClientAction.General.USER.asLinkButton("Author Profile",
String.valueOf(userId)));
}
Expand Down
Loading