Skip to content

Added cancel feature to reminder command #737

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
Zabuzard merged 3 commits into from
Jan 27, 2023
Merged

Added cancel feature to reminder command #737

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea1bc83
added cancel feature to reminders
Taz03 Dec 29, 2022
6f5c7da
removed cancel all command
Taz03 Jan 22, 2023
7f994e1
code fixes
Taz03 Jan 23, 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
40 changes: 40 additions & 0 deletions application/src/main/java/org/togetherjava/tjbot/commands/reminder/ReminderCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.entities.emoji.Emoji;
import net.dv8tion.jda.api.entities.emoji.EmojiUnion;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
import net.dv8tion.jda.api.interactions.AutoCompleteQuery;
import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
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.commands.build.SubcommandData;
Expand All @@ -24,6 +27,7 @@
import org.togetherjava.tjbot.commands.SlashCommandAdapter;
import org.togetherjava.tjbot.commands.utils.MessageUtils;
import org.togetherjava.tjbot.commands.utils.Pagination;
import org.togetherjava.tjbot.commands.utils.StringDistances;
import org.togetherjava.tjbot.db.Database;
import org.togetherjava.tjbot.db.generated.tables.records.PendingRemindersRecord;

Expand Down Expand Up @@ -54,6 +58,8 @@
public final class ReminderCommand extends SlashCommandAdapter {
private static final String COMMAND_NAME = "reminder";
private static final String LIST_SUBCOMMAND = "list";
private static final String CANCEL_COMMAND = "cancel";
private static final String CANCEL_REMINDER_OPTION = "reminder";
static final String CREATE_SUBCOMMAND = "create";
static final String TIME_AMOUNT_OPTION = "time-amount";
static final String TIME_UNIT_OPTION = "time-unit";
Expand Down Expand Up @@ -94,6 +100,9 @@ public ReminderCommand(Database database) {
getData().addSubcommands(
new SubcommandData(CREATE_SUBCOMMAND, "creates a reminder").addOptions(timeAmount,
timeUnit, content),
new SubcommandData(CANCEL_COMMAND, "cancels a pending reminder").addOption(
OptionType.STRING, CANCEL_REMINDER_OPTION, "reminder to cancel", true,
true),
new SubcommandData(LIST_SUBCOMMAND, "shows all your currently pending reminders"));

this.database = database;
Expand All @@ -103,6 +112,7 @@ public ReminderCommand(Database database) {
public void onSlashCommand(SlashCommandInteractionEvent event) {
switch (event.getSubcommandName()) {
case CREATE_SUBCOMMAND -> handleCreateCommand(event);
case CANCEL_COMMAND -> handleCancelCommand(event);
case LIST_SUBCOMMAND -> handleListCommand(event);
default -> throw new AssertionError(
"Unexpected Subcommand: " + event.getSubcommandName());
Expand All @@ -127,6 +137,25 @@ public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
event.editMessage(MessageEditData.fromCreateData(message)).queue();
}

@Override
public void onAutoComplete(CommandAutoCompleteInteractionEvent event) {
AutoCompleteQuery focusedOption = event.getFocusedOption();

if (!focusedOption.getName().equals(CANCEL_REMINDER_OPTION)) {
throw new AssertionError("Unexpected option, was : " + focusedOption.getName());
}

List<String> pendingReminders = getPendingReminders(event.getGuild(), event.getUser())
.map(PendingRemindersRecord::getContent);
List<Command.Choice> choices = StringDistances
.closeMatches(focusedOption.getValue(), pendingReminders, REMINDERS_PER_PAGE)
.stream()
.map(content -> new Command.Choice(content, content))
.toList();

event.replyChoices(choices).queue();
}

private void handleCreateCommand(SlashCommandInteractionEvent event) {
int timeAmount = Math.toIntExact(event.getOption(TIME_AMOUNT_OPTION).getAsLong());
String timeUnit = event.getOption(TIME_UNIT_OPTION).getAsString();
Expand Down Expand Up @@ -157,6 +186,17 @@ private void handleCreateCommand(SlashCommandInteractionEvent event) {
.insert());
}

private void handleCancelCommand(SlashCommandInteractionEvent event) {
String content = event.getOption(CANCEL_REMINDER_OPTION).getAsString();

database.write(context -> context.delete(PENDING_REMINDERS)
.where(PENDING_REMINDERS.CONTENT.eq(content)
.and(PENDING_REMINDERS.AUTHOR_ID.eq(event.getUser().getIdLong())))
.execute());

event.reply("Your reminder is canceled").setEphemeral(true).queue();
}

private void handleListCommand(SlashCommandInteractionEvent event) {
Result<PendingRemindersRecord> pendingReminders =
getPendingReminders(event.getGuild(), event.getUser());
Expand Down