Merge pull request #466 from danthe1st/fix-close

fix closing of help posts
Java-Discord · Dec 31, 2023 · b1fd094 · b1fd094
2 parents 86931fd + b21c017
commit b1fd094
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/net/discordjug/javabot/systems/help/HelpListener.java b/src/main/java/net/discordjug/javabot/systems/help/HelpListener.java
@@ -256,7 +256,7 @@ private void handleHelpThanksInteraction(@NotNull ButtonInteractionEvent event,
 		}
 		switch (id[2]) {
 			case "done" -> handleThanksCloseButton(event, manager, post);
-			case "cancel" -> event.getMessage().delete().queue();
+			case "cancel" -> event.deferEdit().flatMap(h -> event.getMessage().delete()).queue();
 			default -> {
 				List<Button> thankButtons = event.getMessage()
 						.getButtons()
@@ -277,10 +277,10 @@ private void handleHelpThanksInteraction(@NotNull ButtonInteractionEvent event,
 
 	private void handleThanksCloseButton(@NotNull ButtonInteractionEvent event, HelpManager manager, ThreadChannel post) {
 		List<Button> buttons = event.getMessage().getButtons();
-		// immediately delete the message
+		// close post
+		manager.close(event, false, null);
+		// delete the message
 		event.getMessage().delete().queue(s -> {
-			// close post
-			manager.close(event, false, null);
 			experienceService.addMessageBasedHelpXP(post, true);
 			// thank all helpers
 			buttons.stream()