From ae4d5850c6549710ee54ef0ef61d7a085e1749e7 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Mon, 27 May 2024 19:57:34 +0300 Subject: [PATCH] Fix reminds not being dismissible Closes #11 --- .../java/net/neoforged/camelot/db/schemas/Reminder.java | 6 +----- .../net/neoforged/camelot/listener/DismissListener.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/neoforged/camelot/db/schemas/Reminder.java b/src/main/java/net/neoforged/camelot/db/schemas/Reminder.java index d168d98..1b44002 100644 --- a/src/main/java/net/neoforged/camelot/db/schemas/Reminder.java +++ b/src/main/java/net/neoforged/camelot/db/schemas/Reminder.java @@ -16,11 +16,7 @@ * @param time the time to send the reminder at * @param reminder the text of the reminder */ -public record Reminder(int id, long user, long channel, Instant time, String reminder) implements Runnable { - @Override - public void run() { - - } +public record Reminder(int id, long user, long channel, Instant time, String reminder) { public static final class Mapper implements RowMapper { diff --git a/src/main/java/net/neoforged/camelot/listener/DismissListener.java b/src/main/java/net/neoforged/camelot/listener/DismissListener.java index f7ec6b2..110cc53 100644 --- a/src/main/java/net/neoforged/camelot/listener/DismissListener.java +++ b/src/main/java/net/neoforged/camelot/listener/DismissListener.java @@ -60,7 +60,7 @@ public void onEvent(@NotNull GenericEvent gevent) { private static RestAction deleteIf(final String targetId, final ButtonInteractionEvent event) { if (canDelete(targetId, event)) { - return event.getMessage().delete().reason("User dismissed the message"); + return event.deferEdit().flatMap(_ -> event.getMessage().delete().reason("User dismissed the message")); } else { return event.deferEdit(); }