restrict closing of posts by non-original posters

Author: danthe1st

src/main/java/net/discordjug/javabot/systems/help/HelpListener.java

@@ -245,7 +245,6 @@ private boolean isInvalidHelpForumChannel(@NotNull ForumChannel forum) {
 
 	private void handleHelpThanksInteraction(@NotNull ButtonInteractionEvent event, @NotNull HelpManager manager, String @NotNull [] id) {
 		ThreadChannel post = manager.getPostThread();
-		HelpConfig config = botConfig.get(event.getGuild()).getHelpConfig();
 		if (event.getUser().getIdLong() != post.getOwnerIdLong()) {
 			Responses.warning(
 							event,
@@ -301,16 +300,14 @@ private void handleReplyGuidelines(@NotNull IReplyCallback callback, @NotNull Fo
 	}
 
 	private void handlePostClose(ButtonInteractionEvent event, @NotNull HelpManager manager) {
-		if (manager.isForumEligibleToBeUnreserved(event)) {
-			manager.close(event, event.getUser().getIdLong() == manager.getPostThread()
-					.getOwnerIdLong(), null);
-		} else {
+		if (event.getUser().getIdLong() != manager.getPostThread().getOwnerIdLong()) {
 			Responses.warning(
 							event,
-							"Could not close this post",
-							"You're not allowed to close this post."
+							"Sorry, but only the original poster can close this post using these buttons."
 					)
 					.queue();
+			return;
 		}
+		manager.close(event, true, null);
 	}
 }

src/main/java/net/discordjug/javabot/systems/help/HelpManager.java

@@ -117,9 +117,23 @@ public void close(IReplyCallback callback, boolean withHelpers, @Nullable String
 				.queue(s -> postThread.getManager().setLocked(true).setArchived(true).queue());
 		if (callback.getMember().getIdLong() != postThread.getOwnerIdLong() &&
 				Boolean.parseBoolean(preferenceService.getOrCreate(postThread.getOwnerIdLong(), Preference.PRIVATE_CLOSE_NOTIFICATIONS).getState())) {
+
 			postThread.getOwner().getUser().openPrivateChannel()
 					.flatMap(c -> createDMCloseInfoEmbed(callback.getMember(), postThread, reason, c))
 					.queue(success -> {}, failure -> {});
+			
+			botConfig.get(callback.getGuild())
+				.getModerationConfig()
+				.getLogChannel()
+				.sendMessageEmbeds(new EmbedBuilder()
+						.setTitle("Post closed by non-original poster")
+						.setDescription("The post " + postThread.getAsMention() +
+								" has been closed by " + callback.getMember().getAsMention() + ".\n\n" +
+								"[Post link](" + postThread.getJumpUrl() + ")")
+						.addField("Reason", reason, false)
+						.setAuthor(callback.getMember().getEffectiveName(), null, callback.getMember().getEffectiveAvatarUrl())
+						.build())
+				.queue();
 		}
 	}
 

src/main/java/net/discordjug/javabot/systems/help/commands/UnreserveCommand.java

@@ -62,9 +62,14 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 		}
 		HelpManager manager = new HelpManager(postThread, dbActions, botConfig, helpAccountRepository, helpTransactionRepository, preferenceService);
 		if (manager.isForumEligibleToBeUnreserved(event.getInteraction())) {
+			String reason = event.getOption("reason", null, OptionMapping::getAsString);
+			if (event.getUser().getIdLong() != postThread.getOwnerIdLong() && reason == null) {
+				Responses.warning(event, "Could not close this post", "Closing a post of another user requires a reason to be set.").queue();
+				return;
+			}
 			manager.close(event,
 					event.getUser().getIdLong() == manager.getPostThread().getOwnerIdLong(),
-					event.getOption("reason", null, OptionMapping::getAsString));
+					reason);
 		} else {
 			Responses.warning(event, "Could not close this post", "You're not allowed to close this post.").queue();
 		}