Merge remote-tracking branch 'origin/main' into dynxsty/qotw

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/Bot.java

@@ -51,7 +51,7 @@ public class Bot {
 	private final DIH4JDA dih4jda;
 	private final BotConfig config;
 	private final List<SlashCommand> commands;
-	private final List<ContextCommand> contextCommands;
+	private final List<ContextCommand<?>> contextCommands;
 	private final List<ListenerAdapter> listeners;
 	private final ApplicationContext ctx;
 

src/main/java/net/javadiscord/javabot/systems/moderation/AutoMod.java

@@ -4,7 +4,7 @@
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -150,7 +150,7 @@ private void checkContentAutomod(@Nonnull Message message) {
 							"Automod: Advertising",
 							message.getGuild().getMember(message.getJDA().getSelfUser()),
 							message.getChannel(),
-							isSuggestionsChannel(message.getChannel().asTextChannel())
+							isSuggestionsChannel(message.getChannel())
 					);
 			message.delete().queue(success -> {
 			}, error -> log.info("Message was deleted before Automod was able to handle it."));
@@ -168,7 +168,7 @@ private void checkContentAutomod(@Nonnull Message message) {
 							"Automod: Suspicious Link",
 							message.getGuild().getMember(message.getJDA().getSelfUser()),
 							message.getChannel(),
-							isSuggestionsChannel(message.getChannel().asTextChannel())
+							isSuggestionsChannel(message.getChannel())
 					);
 			message.delete().queue(success -> {
 			}, error -> log.info("Message was deleted before Automod was able to handle it."));
@@ -256,7 +256,8 @@ public boolean hasAdvertisingLink(@NotNull Message message) {
 		return false;
 	}
 
-	private boolean isSuggestionsChannel(@NotNull TextChannel channel) {
-		return channel.equals(botConfig.get(channel.getGuild()).getModerationConfig().getSuggestionChannel());
+	private boolean isSuggestionsChannel(@NotNull MessageChannelUnion channel) {
+		return channel.getType().isGuild() &&
+				channel.getIdLong() == botConfig.get(channel.asGuildMessageChannel().getGuild()).getModerationConfig().getSuggestionChannel().getIdLong();
 	}
 }

src/main/java/net/javadiscord/javabot/systems/moderation/ModerateUserCommand.java

@@ -35,8 +35,8 @@ protected ReplyCallbackAction handleModerationCommand(@NotNull SlashCommandInter
 			return Responses.error(event, "You cannot perform this action on yourself.");
 		}
 		Objects.requireNonNull(event.getGuild()).retrieveMemberById(target.getIdLong()).queue(targetMember -> {
-			if (isRequireStaff() && targetMember.isOwner() || !moderator.canInteract(targetMember)) {
-				Responses.error(event.getHook(), "You cannot perform actions on a higher member staff member.").queue();
+			if (isRequireStaff() && (targetMember.isOwner() || !moderator.canInteract(targetMember))) {
+				Responses.error(event.getHook(), "You cannot perform actions on a higher staff member.").queue();
 				return;
 			}
 			WebhookMessageCreateAction<Message> action = handleModerationUserCommand(event, moderator, target, reasonOption.getAsString());

src/main/java/net/javadiscord/javabot/systems/moderation/ModerationService.java

@@ -208,8 +208,17 @@ public void removeTimeout(Member member, String reason, Member removedBy, Messag
 	 */
 	public void ban(User user, String reason, Member bannedBy, MessageChannel channel, boolean quiet) {
 		MessageEmbed banEmbed = buildBanEmbed(user, bannedBy, reason);
+		user.openPrivateChannel().flatMap(privateChannel -> privateChannel.sendMessageEmbeds(banEmbed)).queue(success -> {
+			banAndSendGuildNotifications(user, reason, bannedBy, channel, quiet, banEmbed);
+		}, err-> {
+			banAndSendGuildNotifications(user, reason, bannedBy, channel, quiet, banEmbed);
+			ExceptionLogger.capture(err, ModerationService.class.getName());
+		});
+	}
+
+	private void banAndSendGuildNotifications(User user, String reason, Member bannedBy, MessageChannel channel, boolean quiet,
+			MessageEmbed banEmbed) {
 		bannedBy.getGuild().ban(user, BAN_DELETE_DAYS, TimeUnit.DAYS).reason(reason).queue(s -> {
-			notificationService.withUser(user).sendDirectMessage(c -> c.sendMessageEmbeds(banEmbed));
 			notificationService.withGuild(bannedBy.getGuild()).sendToModerationLog(c -> c.sendMessageEmbeds(banEmbed));
 			if (!quiet) channel.sendMessageEmbeds(banEmbed).queue();
 		}, ExceptionLogger::capture);

src/main/java/net/javadiscord/javabot/systems/moderation/report/ReportManager.java

@@ -29,10 +29,13 @@
 import net.javadiscord.javabot.data.config.guild.ModerationConfig;
 import net.javadiscord.javabot.util.InteractionUtils;
 import net.javadiscord.javabot.util.Responses;
+import net.javadiscord.javabot.util.WebhookUtil;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Instant;
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * Manages all interactions regarding the report-system.
@@ -154,7 +157,11 @@ private void handleMessageReport(ModalInteractionEvent event, String messageId)
 			embed.setTitle(String.format("%s reported a Message from %s", event.getUser().getName(), target.getAuthor().getName()));
 			embed.addField("Message", String.format("[Jump to Message](%s)", target.getJumpUrl()), false);
 			MessageChannel reportChannel = config.getModerationConfig().getReportChannel();
-			reportChannel.sendMessageEmbeds(embed.build()).queue(m -> createReportThread(m, target.getAuthor().getIdLong(), config.getModerationConfig()));
+			reportChannel.sendMessageEmbeds(embed.build()).queue(m -> createReportThread(m, target.getAuthor().getIdLong(), config.getModerationConfig(), thread->{
+				WebhookUtil.ensureWebhookExists(thread.getParentChannel().asStandardGuildMessageChannel(), wh->{
+					WebhookUtil.mirrorMessageToWebhook(wh, target, target.getContentRaw(), thread.getIdLong());
+				});
+			}));
 			embed.setDescription("Successfully reported " + "`" + target.getAuthor().getAsTag() + "`!\nYour report has been send to our Moderators");
 			event.getHook().sendMessageEmbeds(embed.build()).queue();
 		}, failure -> {
@@ -173,13 +180,24 @@ private ActionRow setComponents(long targetId, long threadId) {
 	}
 
 	private void createReportThread(Message message, long targetId, ModerationConfig config) {
+		createReportThread(message, targetId, config, thread->{});
+	}
+
+	private void createReportThread(Message message, long targetId, ModerationConfig config, Consumer<ThreadChannel> onSuccess) {
 		message.createThreadChannel(message.getEmbeds().get(0).getTitle()).queue(
-				thread -> thread.sendMessage(config.getStaffRole().getAsMention())
+				thread -> {
+					thread.sendMessage(config.getStaffRole().getAsMention())
 						.setComponents(setComponents(targetId, thread.getIdLong()))
-						.queue()
+						.queue();
+					onSuccess.accept(thread);
+				}
 		);
 	}
 
+
+
+
+
 	private EmbedBuilder buildReportEmbed(User reported, User reportedBy, String reason, Channel channel) {
 		return new EmbedBuilder()
 				.setAuthor(reported.getAsTag(), null, reported.getEffectiveAvatarUrl())

src/main/java/net/javadiscord/javabot/systems/qotw/submissions/SubmissionManager.java

@@ -63,21 +63,22 @@ public WebhookMessageCreateAction<?> handleSubmission(@NotNull ButtonInteraction
 		config.getSubmissionChannel().createThreadChannel(
 				String.format(THREAD_NAME, questionNumber, member.getEffectiveName()), true).queue(
 				thread -> {
+					thread.addThreadMember(member).queue();
 					thread.getManager().setInvitable(false).setAutoArchiveDuration(ThreadChannel.AutoArchiveDuration.TIME_1_WEEK).queue();
-					try{
+					try {
 						QOTWSubmission submission = new QOTWSubmission();
 						submission.setThreadId(thread.getIdLong());
 						submission.setQuestionNumber(questionNumber);
 						submission.setGuildId(thread.getGuild().getIdLong());
 						submission.setAuthorId(member.getIdLong());
 						qotwSubmissionRepository.insert(submission);
-						asyncPool.execute(()->{
+						asyncPool.execute(() -> {
 							Optional<QOTWQuestion> questionOptional = questionQueueRepository.findByQuestionNumber(questionNumber);
 							if (questionOptional.isPresent()) {
 								thread.sendMessage(member.getAsMention())
 										.setEmbeds(buildSubmissionThreadEmbed(event.getUser(), questionOptional.get(), config))
 										.setComponents(ActionRow.of(Button.danger("qotw-submission:delete", "Delete Submission")))
-										.queue();
+										.queue(s -> {}, err -> ExceptionLogger.capture(err, getClass().getSimpleName()));
 							} else {
 								thread.sendMessage("Could not retrieve current QOTW Question. Please contact an Administrator if you think that this is a mistake.")
 										.queue();

src/main/java/net/javadiscord/javabot/util/WebhookUtil.java

@@ -9,7 +9,7 @@
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.Message.Attachment;
 import net.dv8tion.jda.api.entities.Webhook;
-import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.attribute.IWebhookContainer;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -32,9 +32,8 @@ private WebhookUtil() {
 	 * @param callback an action that is executed once a webhook is
 	 *                 found/created
 	 */
-	public static void ensureWebhookExists(StandardGuildMessageChannel channel, Consumer<? super Webhook> callback) {
-		ensureWebhookExists(channel, callback, err -> {
-		});
+	public static void ensureWebhookExists(@NotNull IWebhookContainer channel, @NotNull Consumer<? super Webhook> callback) {
+		ensureWebhookExists(channel, callback, ExceptionLogger::capture);
 	}
 
 	/**
@@ -47,7 +46,7 @@ public static void ensureWebhookExists(StandardGuildMessageChannel channel, Cons
 	 * @param failureCallback an action that is executed if the webhook
 	 *                        lookup/creation failed
 	 */
-	public static void ensureWebhookExists(@NotNull StandardGuildMessageChannel channel, Consumer<? super Webhook> callback, Consumer<? super Throwable> failureCallback) {
+	public static void ensureWebhookExists(@NotNull IWebhookContainer channel, @NotNull Consumer<? super Webhook> callback, @NotNull Consumer<? super Throwable> failureCallback) {
 
 		channel.retrieveWebhooks().queue(webhooks -> {
 			Optional<Webhook> hook = webhooks.stream()