Merge pull request #402 from danthe1st/private-thread-dm-alternative

send notification in private thread when DM is unavailable

Author: MoonTM-GIT

src/main/java/net/javadiscord/javabot/data/config/guild/ModerationConfig.java

@@ -55,6 +55,12 @@ public class ModerationConfig extends GuildConfigItem {
 	 */
 	private int maxWarnSeverity = 100;
 
+	/**
+	 * ID of the channel where direct user notifications should be sent to (using private threads).
+	 * @see net.javadiscord.javabot.systems.notification.UserNotificationService
+	 */
+	private long notificationThreadChannelId;
+
 	/**
 	 * Invite links AutoMod should exclude.
 	 */
@@ -104,4 +110,8 @@ public Role getAdminRole() {
 	public Role getExpertRole() {
 		return this.getGuild().getRoleById(this.expertRoleId);
 	}
+
+	public TextChannel getNotificationThreadChannel() {
+		return this.getGuild().getTextChannelById(this.notificationThreadChannelId);
+	}
 }

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

@@ -88,7 +88,7 @@ public void warn(User user, WarnSeverity severity, String reason, Member warnedB
 				warnRepository.insert(new Warn(user.getIdLong(), warnedBy.getIdLong(), severity, reason));
 				int totalSeverity = warnRepository.getTotalSeverityWeight(user.getIdLong(), LocalDateTime.now().minusDays(moderationConfig.getWarnTimeoutDays()));
 				MessageEmbed warnEmbed = buildWarnEmbed(user, warnedBy, severity, totalSeverity, reason);
-				notificationService.withUser(user).sendDirectMessage(c -> c.sendMessageEmbeds(warnEmbed));
+				notificationService.withUser(user, warnedBy.getGuild()).sendDirectMessage(c -> c.sendMessageEmbeds(warnEmbed));
 				notificationService.withGuild(moderationConfig.getGuild()).sendToModerationLog(c -> c.sendMessageEmbeds(warnEmbed));
 				if (!quiet && channel.getIdLong() != moderationConfig.getLogChannelId()) {
 					channel.sendMessageEmbeds(warnEmbed).queue();
@@ -108,12 +108,12 @@ public void warn(User user, WarnSeverity severity, String reason, Member warnedB
 	 * @param user      The user to clear warns from.
 	 * @param clearedBy The user who cleared the warns.
 	 */
-	public void discardAllWarns(User user, User clearedBy) {
+	public void discardAllWarns(User user, Member clearedBy) {
 		asyncPool.execute(() -> {
 			try {
 				warnRepository.discardAll(user.getIdLong());
-				MessageEmbed embed = buildClearWarnsEmbed(user, clearedBy);
-				notificationService.withUser(user).sendDirectMessage(c -> c.sendMessageEmbeds(embed));
+				MessageEmbed embed = buildClearWarnsEmbed(user, clearedBy.getUser());
+				notificationService.withUser(user, clearedBy.getGuild()).sendDirectMessage(c -> c.sendMessageEmbeds(embed));
 				notificationService.withGuild(moderationConfig.getGuild()).sendToModerationLog(c -> c.sendMessageEmbeds(embed));
 			} catch (DataAccessException e) {
 				ExceptionLogger.capture(e, ModerationService.class.getSimpleName());
@@ -189,7 +189,7 @@ public List<Warn> getAllWarns(long userId) {
 	public void timeout(@Nonnull Member member, @Nonnull String reason, @Nonnull Member timedOutBy, @Nonnull Duration duration, @Nonnull MessageChannel channel, boolean quiet) {
 		MessageEmbed timeoutEmbed = buildTimeoutEmbed(member, timedOutBy, reason, duration);
 		member.getGuild().timeoutFor(member, duration).queue(s -> {
-			notificationService.withUser(member.getUser()).sendDirectMessage(c -> c.sendMessageEmbeds(timeoutEmbed));
+			notificationService.withUser(member.getUser(), timedOutBy.getGuild()).sendDirectMessage(c -> c.sendMessageEmbeds(timeoutEmbed));
 			notificationService.withGuild(member.getGuild()).sendToModerationLog(c -> c.sendMessageEmbeds(timeoutEmbed));
 			if (!quiet) channel.sendMessageEmbeds(timeoutEmbed).queue();
 		}, ExceptionLogger::capture);
@@ -207,7 +207,7 @@ public void timeout(@Nonnull Member member, @Nonnull String reason, @Nonnull Mem
 	public void removeTimeout(Member member, String reason, Member removedBy, MessageChannel channel, boolean quiet) {
 		MessageEmbed removeTimeoutEmbed = buildTimeoutRemovedEmbed(member, removedBy, reason);
 		removedBy.getGuild().removeTimeout(member).queue(s -> {
-			notificationService.withUser(member.getUser()).sendDirectMessage(c -> c.sendMessageEmbeds(removeTimeoutEmbed));
+			notificationService.withUser(member.getUser(), removedBy.getGuild()).sendDirectMessage(c -> c.sendMessageEmbeds(removeTimeoutEmbed));
 			notificationService.withGuild(member.getGuild()).sendToModerationLog(c -> c.sendMessageEmbeds(removeTimeoutEmbed));
 			if (!quiet) channel.sendMessageEmbeds(removeTimeoutEmbed).queue();
 		}, ExceptionLogger::capture);

src/main/java/net/javadiscord/javabot/systems/moderation/warn/DiscardAllWarnsSubcommand.java

@@ -54,7 +54,7 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 			return;
 		}
 		User target = userMapping.getAsUser();
-		new ModerationService(notificationService, botConfig, event.getInteraction(), warnRepository, asyncPool).discardAllWarns(target, event.getUser());
+		new ModerationService(notificationService, botConfig, event.getInteraction(), warnRepository, asyncPool).discardAllWarns(target, event.getMember());
 		Responses.success(event, "Warns Discarded", "Successfully discarded all warns from **%s**.", target.getAsTag()).queue();
 	}
 }

src/main/java/net/javadiscord/javabot/systems/notification/NotificationService.java

@@ -33,6 +33,11 @@ public class NotificationService {
 		return new UserNotificationService(user);
 	}
 
+	@Contract("_ -> new")
+	public @NotNull UserNotificationService withUser(User user, Guild guild) {
+		return new UserNotificationService(user, botConfig.get(guild).getModerationConfig());
+	}
+
 	public @NotNull QOTWGuildNotificationService withQOTW(Guild guild) {
 		return new QOTWGuildNotificationService(this, guild);
 	}

src/main/java/net/javadiscord/javabot/systems/notification/UserNotificationService.java

@@ -1,11 +1,16 @@
 package net.javadiscord.javabot.systems.notification;
 
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel.AutoArchiveDuration;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
+import net.javadiscord.javabot.data.config.guild.ModerationConfig;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Function;
@@ -15,18 +20,34 @@
  */
 @Slf4j
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
+@AllArgsConstructor(access = AccessLevel.PACKAGE)
 public final class UserNotificationService extends NotificationService.MessageChannelNotification {
 	private final User user;
+	private ModerationConfig config;
 
 	/**
 	 * Sends a notification to a {@link User}s' {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel}.
 	 *
 	 * @param function The {@link Function} to use which MUST return a {@link MessageCreateAction}.
 	 */
 	public void sendDirectMessage(@NotNull Function<MessageChannel, MessageCreateAction> function) {
-		user.openPrivateChannel().queue(
-				channel -> send(channel, function),
-				error -> log.error("Could not open PrivateChannel with user " + user.getAsTag(), error)
+		user.openPrivateChannel().flatMap(function::apply).queue(
+				msg -> {},
+				error -> {
+					log.error("Could not open PrivateChannel with user " + user.getAsTag(), error);
+					if(config != null) {
+						TextChannel container = config.getNotificationThreadChannel();
+						if(container != null) {
+							container
+								.createThreadChannel("JavaBot notification", true)
+								.setAutoArchiveDuration(AutoArchiveDuration.TIME_1_HOUR)
+								.queue(c -> {
+									c.addThreadMember(user).queue();
+									send(c, function);
+								});
+						}
+					}
+				}
 		);
 	}
 }