reworked exception handling, different exceptions whether or why it failed, all of which are unchecked

added feature flags for commands/listeners added enable/disable command added feature flag handling to command received handler added boolean parameter support fixed 1 parameter commands fixed posttargets not working on multiple servers, removed unique constraint on posttarget names added setup validation to suggestions added quartz property loader moved join/leave logger to moderation reworked the way the message listener are handled (separate listener around)
2026-04-16 04:21:49 +00:00 · 2020-04-04 12:55:01 +02:00
parent c9557fccc2
commit bf94af66d5
132 changed files with 1378 additions and 530 deletions
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Ban.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Ban.java
@@ -1,11 +1,11 @@
 package dev.sheldan.abstracto.moderation.command;

-import dev.sheldan.abstracto.command.Command;
+import dev.sheldan.abstracto.command.AbstractFeatureFlaggedCommand;
 import dev.sheldan.abstracto.command.HelpInfo;
 import dev.sheldan.abstracto.command.execution.*;
 import dev.sheldan.abstracto.moderation.Moderation;
+import dev.sheldan.abstracto.moderation.config.ModerationFeatures;
 import dev.sheldan.abstracto.moderation.models.template.BanLog;
-import dev.sheldan.abstracto.moderation.models.template.WarnLog;
 import dev.sheldan.abstracto.moderation.service.BanService;
 import dev.sheldan.abstracto.templating.TemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -18,7 +18,7 @@ import java.util.List;

@Component
@Slf4j
-public class Ban implements Command {
+public class Ban extends AbstractFeatureFlaggedCommand {

    @Autowired
    private BanService banService;
@@ -27,7 +27,7 @@ public class Ban implements Command {
    private TemplateService templateService;

    @Override
-    public Result execute(CommandContext commandContext) {
+    public CommandResult execute(CommandContext commandContext) {
        List<Object> parameters = commandContext.getParameters().getParameters();
        Member member = (Member) parameters.get(0);
        String defaultReason = templateService.renderTemplate("ban_default_reason", null);
@@ -38,7 +38,7 @@ public class Ban implements Command {
        banLogModel.setBanningUser(commandContext.getAuthor());
        banLogModel.setReason(reason);
        banService.banMember(member, reason, banLogModel);
-        return Result.fromSuccess();
+        return CommandResult.fromSuccess();
    }

    @Override
@@ -56,4 +56,9 @@ public class Ban implements Command {
                .help(helpInfo)
                .build();
    }
+
+    @Override
+    public String getFeature() {
+        return ModerationFeatures.MODERATION;
+    }
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/BanId.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/BanId.java
@@ -1,19 +1,21 @@
 package dev.sheldan.abstracto.moderation.command;

-import dev.sheldan.abstracto.command.Command;
+import dev.sheldan.abstracto.command.AbstractFeatureFlaggedCommand;
 import dev.sheldan.abstracto.command.HelpInfo;
 import dev.sheldan.abstracto.command.execution.*;
-import dev.sheldan.abstracto.core.models.UserInitiatedServerContext;
 import dev.sheldan.abstracto.moderation.Moderation;
+import dev.sheldan.abstracto.moderation.config.ModerationFeatures;
 import dev.sheldan.abstracto.moderation.models.template.BanIdLog;
 import dev.sheldan.abstracto.moderation.service.BanService;
 import dev.sheldan.abstracto.templating.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;

 import java.util.ArrayList;
 import java.util.List;

-public class BanId implements Command {
+@Component
+public class BanId extends AbstractFeatureFlaggedCommand {

    @Autowired
    private TemplateService templateService;
@@ -22,7 +24,7 @@ public class BanId implements Command {
    private BanService banService;

    @Override
-    public Result execute(CommandContext commandContext) {
+    public CommandResult execute(CommandContext commandContext) {
        List<Object> parameters = commandContext.getParameters().getParameters();
        Long userId = (Long) parameters.get(0);
        String defaultReason = templateService.renderTemplate("ban_default_reason", null);
@@ -33,7 +35,7 @@ public class BanId implements Command {
        banLogModel.setReason(reason);
        banService.banMember(userId, commandContext.getGuild().getIdLong(), reason, banLogModel);

-        return Result.fromSuccess();
+        return CommandResult.fromSuccess();
    }

    @Override
@@ -51,4 +53,9 @@ public class BanId implements Command {
                .help(helpInfo)
                .build();
    }
+
+    @Override
+    public String getFeature() {
+        return ModerationFeatures.MODERATION;
+    }
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Kick.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Kick.java
@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.moderation.command;

-import dev.sheldan.abstracto.command.Command;
+import dev.sheldan.abstracto.command.AbstractFeatureFlaggedCommand;
 import dev.sheldan.abstracto.command.HelpInfo;
 import dev.sheldan.abstracto.command.execution.*;
 import dev.sheldan.abstracto.moderation.Moderation;
-import dev.sheldan.abstracto.moderation.models.template.BanIdLog;
+import dev.sheldan.abstracto.moderation.config.ModerationFeatures;
 import dev.sheldan.abstracto.moderation.models.template.KickLogModel;
 import dev.sheldan.abstracto.moderation.service.KickServiceBean;
 import dev.sheldan.abstracto.templating.TemplateService;
@@ -16,15 +16,16 @@ import java.util.ArrayList;
 import java.util.List;

@Component
-public class Kick implements Command {
+public class Kick extends AbstractFeatureFlaggedCommand {

    @Autowired
    private TemplateService templateService;

    @Autowired
    private KickServiceBean kickService;
+
    @Override
-    public Result execute(CommandContext commandContext) {
+    public CommandResult execute(CommandContext commandContext) {

        List<Object> parameters = commandContext.getParameters().getParameters();
        Member member = (Member) parameters.get(0);
@@ -36,7 +37,7 @@ public class Kick implements Command {
        kickLogModel.setKickingUser(commandContext.getAuthor());
        kickLogModel.setReason(reason);
        kickService.kickMember(member, reason, kickLogModel);
-        return Result.fromSuccess();
+        return CommandResult.fromSuccess();
    }

    @Override
@@ -54,4 +55,9 @@ public class Kick implements Command {
                .help(helpInfo)
                .build();
    }
+
+    @Override
+    public String getFeature() {
+        return ModerationFeatures.MODERATION;
+    }
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/SlowMode.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/SlowMode.java
@@ -1,12 +1,13 @@
 package dev.sheldan.abstracto.moderation.command;

-import dev.sheldan.abstracto.command.Command;
-import dev.sheldan.abstracto.command.HelpInfo;
+import dev.sheldan.abstracto.command.*;
 import dev.sheldan.abstracto.command.execution.CommandConfiguration;
 import dev.sheldan.abstracto.command.execution.CommandContext;
 import dev.sheldan.abstracto.command.execution.Parameter;
-import dev.sheldan.abstracto.command.execution.Result;
+import dev.sheldan.abstracto.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.service.Bot;
 import dev.sheldan.abstracto.moderation.Moderation;
+import dev.sheldan.abstracto.moderation.config.ModerationFeatures;
 import dev.sheldan.abstracto.moderation.service.SlowModeService;
 import net.dv8tion.jda.api.entities.TextChannel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,25 +18,22 @@ import java.util.ArrayList;
 import java.util.List;

@Component
-public class SlowMode implements Command {
+public class SlowMode extends AbstractFeatureFlaggedCommand {

    @Autowired
    private SlowModeService slowModeService;

    @Override
-    public Result execute(CommandContext commandContext) {
+    public CommandResult execute(CommandContext commandContext) {
        TextChannel channel;
        long seconds = (Long) commandContext.getParameters().getParameters().get(0);
        if(commandContext.getParameters().getParameters().size() == 2) {
            channel = (TextChannel) commandContext.getParameters().getParameters().get(1);
-            if(commandContext.getGuild().getGuildChannelById(channel.getIdLong()) == null) {
-                throw new IllegalArgumentException("Given channel was not part of the current guild.");
-            }
        } else {
            channel = commandContext.getChannel();
        }
        slowModeService.setSlowMode(channel, Duration.ofSeconds(seconds));
-        return Result.fromSuccess();
+        return CommandResult.fromSuccess();
    }

    @Override
@@ -53,4 +51,9 @@ public class SlowMode implements Command {
                .help(helpInfo)
                .build();
    }
+
+    @Override
+    public String getFeature() {
+        return ModerationFeatures.MODERATION;
+    }
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Warn.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Warn.java
@@ -1,12 +1,13 @@
 package dev.sheldan.abstracto.moderation.command;

+import dev.sheldan.abstracto.command.AbstractFeatureFlaggedCommand;
+import dev.sheldan.abstracto.command.HelpInfo;
 import dev.sheldan.abstracto.command.execution.*;
+import dev.sheldan.abstracto.core.service.management.UserManagementService;
 import dev.sheldan.abstracto.moderation.Moderation;
+import dev.sheldan.abstracto.moderation.config.ModerationFeatures;
 import dev.sheldan.abstracto.moderation.models.template.WarnLog;
 import dev.sheldan.abstracto.moderation.service.WarnService;
-import dev.sheldan.abstracto.command.Command;
-import dev.sheldan.abstracto.command.HelpInfo;
-import dev.sheldan.abstracto.core.management.UserManagementService;
 import dev.sheldan.abstracto.templating.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
@@ -18,7 +19,7 @@ import java.util.List;

@Component
@Slf4j
-public class Warn implements Command {
+public class Warn extends AbstractFeatureFlaggedCommand {

    @Autowired
    private UserManagementService userManagementService;
@@ -30,7 +31,7 @@ public class Warn implements Command {
    private TemplateService templateService;

    @Override
-    public Result execute(CommandContext commandContext) {
+    public CommandResult execute(CommandContext commandContext) {
        List<Object> parameters = commandContext.getParameters().getParameters();
        Member member = (Member) parameters.get(0);
        String defaultReason = templateService.renderTemplate("warn_default_reason", null);
@@ -41,7 +42,7 @@ public class Warn implements Command {
        warnLogModel.setReason(reason);
        warnLogModel.setWarningUser(commandContext.getAuthor());
        warnService.warnUser(member, commandContext.getAuthor(), reason, warnLogModel);
-        return Result.fromSuccess();
+        return CommandResult.fromSuccess();
    }

    @Override
@@ -59,4 +60,9 @@ public class Warn implements Command {
                .help(helpInfo)
                .build();
    }
+
+    @Override
+    public String getFeature() {
+        return ModerationFeatures.WARNINGS;
+    }
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/config/ModerationFeatures.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/config/ModerationFeatures.java
@@ -0,0 +1,7 @@
+package dev.sheldan.abstracto.moderation.config;
+
+public class ModerationFeatures {
+    public static String MODERATION = "moderation";
+    public static String WARNINGS = "warnings";
+    public static String LOGGING = "logging";
+}
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java
@@ -0,0 +1,54 @@
+package dev.sheldan.abstracto.moderation.listener;
+
+import dev.sheldan.abstracto.core.listener.JoinListener;
+import dev.sheldan.abstracto.core.service.PostTargetService;
+import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import dev.sheldan.abstracto.moderation.config.ModerationFeatures;
+import dev.sheldan.abstracto.templating.TemplateService;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.User;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+
+@Service
+@Slf4j
+public class JoinLogger implements JoinListener {
+
+    private static final String USER_JOIN_TEMPLATE = "user_join";
+    private static final String JOIN_LOG_TARGET = "joinLog";
+
+    @Autowired
+    private ServerManagementService serverManagementService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Autowired
+    private PostTargetService postTargetService;
+
+
+    @NotNull
+    private HashMap<String, Object> getUserParameter(@Nonnull User user) {
+        HashMap<String, Object> parameters = new HashMap<>();
+        parameters.put("user", user);
+        return parameters;
+    }
+
+    @Override
+    public void execute(Member member, Guild guild) {
+        HashMap<String, Object> parameters = getUserParameter(member.getUser());
+        String text = templateService.renderTemplate(USER_JOIN_TEMPLATE, parameters);;
+        postTargetService.sendTextInPostTarget(text, JOIN_LOG_TARGET, guild.getIdLong());
+    }
+
+    @Override
+    public String getFeature() {
+        return ModerationFeatures.LOGGING;
+    }
+}
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java
@@ -0,0 +1,54 @@
+package dev.sheldan.abstracto.moderation.listener;
+
+import dev.sheldan.abstracto.core.listener.LeaveListener;
+import dev.sheldan.abstracto.core.service.PostTargetService;
+import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import dev.sheldan.abstracto.moderation.config.ModerationFeatures;
+import dev.sheldan.abstracto.templating.TemplateService;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.User;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+
+@Service
+@Slf4j
+public class LeaveLogger implements LeaveListener {
+
+    private static final String USER_LEAVE_TEMPLATE = "user_leave";
+    private static final String LEAVE_LOG_TARGET = "leaveLog";
+
+    @Autowired
+    private ServerManagementService serverManagementService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Autowired
+    private PostTargetService postTargetService;
+
+
+    @NotNull
+    private HashMap<String, Object> getUserParameter(@Nonnull User user) {
+        HashMap<String, Object> parameters = new HashMap<>();
+        parameters.put("user", user);
+        parameters.put("userMention",  user.getAsMention());
+        return parameters;
+    }
+
+    @Override
+    public void execute(Member member, Guild guild) {
+        String text = templateService.renderTemplate(USER_LEAVE_TEMPLATE, getUserParameter(member.getUser()));
+        postTargetService.sendTextInPostTarget(text, LEAVE_LOG_TARGET, guild.getIdLong());
+    }
+
+    @Override
+    public String getFeature() {
+        return ModerationFeatures.LOGGING;
+    }
+}
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java
@@ -2,12 +2,13 @@ package dev.sheldan.abstracto.moderation.listener;

 import dev.sheldan.abstracto.core.listener.MessageDeletedListener;
 import dev.sheldan.abstracto.core.models.CachedMessage;
-import dev.sheldan.abstracto.core.utils.ContextUtils;
+import dev.sheldan.abstracto.core.models.embed.MessageToSend;
 import dev.sheldan.abstracto.core.service.MessageCache;
 import dev.sheldan.abstracto.core.service.PostTargetService;
+import dev.sheldan.abstracto.core.utils.ContextUtils;
+import dev.sheldan.abstracto.moderation.config.ModerationFeatures;
 import dev.sheldan.abstracto.moderation.models.template.listener.MessageDeletedAttachmentLog;
 import dev.sheldan.abstracto.moderation.models.template.listener.MessageDeletedLog;
-import dev.sheldan.abstracto.core.models.embed.MessageToSend;
 import dev.sheldan.abstracto.templating.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,4 +50,9 @@ public class MessageDeleteLogListener implements MessageDeletedListener {
            postTargetService.sendEmbedInPostTarget(attachmentEmbed, DELETE_LOG_TARGET, messageFromCache.getServerId());
        }
    }
+
+    @Override
+    public String getFeature() {
+        return ModerationFeatures.LOGGING;
+    }
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java
@@ -5,6 +5,7 @@ import dev.sheldan.abstracto.core.models.CachedMessage;
 import dev.sheldan.abstracto.core.models.embed.MessageToSend;
 import dev.sheldan.abstracto.core.service.MessageCache;
 import dev.sheldan.abstracto.core.service.PostTargetService;
+import dev.sheldan.abstracto.moderation.config.ModerationFeatures;
 import dev.sheldan.abstracto.moderation.models.template.listener.MessageEditedLog;
 import dev.sheldan.abstracto.templating.TemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -40,13 +41,17 @@ public class MessageEditedListener implements MessageTextUpdatedListener {
                builder().
                messageAfter(messageAfter)
                .messageBefore(messageBefore)
-                .textChannel(messageAfter.getTextChannel())
+                .messageChannel(messageAfter.getTextChannel())
                .guild(messageAfter.getGuild())
                .member(messageAfter.getMember()).build();
        String simpleMessageUpdatedMessage = templateService.renderTemplate(MESSAGE_EDITED_TEMPLATE, log);
        postTargetService.sendTextInPostTarget(simpleMessageUpdatedMessage, EDIT_LOG_TARGET, messageAfter.getGuild().getIdLong());
        MessageToSend message = templateService.renderEmbedTemplate(MESSAGE_EDITED_TEMPLATE, log);
        postTargetService.sendEmbedInPostTarget(message, EDIT_LOG_TARGET, messageBefore.getServerId());
+    }

+    @Override
+    public String getFeature() {
+        return ModerationFeatures.LOGGING;
    }
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java
@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.moderation.service;

-import dev.sheldan.abstracto.core.exception.NotFoundException;
+import dev.sheldan.abstracto.core.exception.GuildException;
 import dev.sheldan.abstracto.core.models.ServerContext;
 import dev.sheldan.abstracto.core.service.Bot;
 import dev.sheldan.abstracto.core.service.PostTargetService;
@@ -50,7 +50,7 @@ public class BanServiceBean implements BanService {
            guildByIdOptional.get().ban(userId.toString(), 0, reason).queue();
        } else {
            log.warn("Guild {} not found. Not able to ban user {}", guildId, userId);
-            throw new NotFoundException(String.format("Guild %s not found. Not able to ban user %s", guildId, userId));
+            throw new GuildException(String.format("Guild %s not found. Not able to ban user %s", guildId, userId));
        }
    }
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java
@@ -1,6 +1,7 @@
 package dev.sheldan.abstracto.moderation.service;

-import dev.sheldan.abstracto.core.exception.NotFoundException;
+import dev.sheldan.abstracto.core.exception.ChannelException;
+import dev.sheldan.abstracto.core.exception.GuildException;
 import dev.sheldan.abstracto.core.service.Bot;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.moderation.models.template.KickLogModel;
@@ -29,18 +30,18 @@ public class KickServiceBean implements KickService {
    private PostTargetService postTargetService;

    @Override
-    public void kickMember(Member member, String reason, KickLogModel kickLogModel) {
+    public void kickMember(Member member, String reason, KickLogModel kickLogModel)  {
        Optional<Guild> guildById = bot.getGuildById(kickLogModel.getGuild().getIdLong());
        if(guildById.isPresent()) {
            guildById.get().kick(member, reason).queue();
            this.sendKickLog(kickLogModel);
        } else {
            log.warn("Not able to kick. Guild {} not found.", kickLogModel.getGuild().getIdLong());
-            throw new NotFoundException(String.format("Not able to kick %s. Guild %s not found", kickLogModel.getMember().getIdLong(), kickLogModel.getGuild().getIdLong()));
+            throw new GuildException(String.format("Not able to kick %s. Guild %s not found", kickLogModel.getMember().getIdLong(), kickLogModel.getGuild().getIdLong()));
        }
    }

-    private void sendKickLog(KickLogModel kickLogModel) {
+    private void sendKickLog(KickLogModel kickLogModel)  {
        String warnLogMessage = templateService.renderContextAwareTemplate(KICK_LOG_TEMPLATE, kickLogModel);
        postTargetService.sendTextInPostTarget(warnLogMessage, WARN_LOG_TARGET, kickLogModel.getServer().getId());
    }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/SlowModeServiceBean.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/SlowModeServiceBean.java
@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.moderation.service;

-import dev.sheldan.abstracto.core.exception.NotFoundException;
+import dev.sheldan.abstracto.core.exception.ChannelException;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.service.Bot;
 import lombok.extern.slf4j.Slf4j;
@@ -28,13 +28,13 @@ public class SlowModeServiceBean implements SlowModeService {
    }

    @Override
-    public void setSlowMode(AChannel channel, Duration duration) {
+    public void setSlowMode(AChannel channel, Duration duration)  {
        Optional<TextChannel> textChannelOptional = bot.getTextChannelFromServer(channel.getServer().getId(), channel.getId());
        if(textChannelOptional.isPresent()) {
            TextChannel textChannel = textChannelOptional.get();
            this.setSlowMode(textChannel, duration);
        } else {
-            throw new NotFoundException(String.format("Channel %s not found in guild %s", channel.getId(), channel.getServer().getId()));
+            throw new ChannelException(String.format("Channel %s not found in guild %s", channel.getId(), channel.getServer().getId()));
        }
    }
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java
@@ -1,5 +1,6 @@
 package dev.sheldan.abstracto.moderation.service;

+import dev.sheldan.abstracto.core.exception.UserException;
 import dev.sheldan.abstracto.core.models.ServerContext;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUser;
@@ -8,8 +9,8 @@ import dev.sheldan.abstracto.moderation.models.template.WarnLog;
 import dev.sheldan.abstracto.moderation.models.template.WarnNotification;
 import dev.sheldan.abstracto.moderation.models.Warning;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
-import dev.sheldan.abstracto.core.management.ServerManagementService;
-import dev.sheldan.abstracto.core.management.UserManagementService;
+import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import dev.sheldan.abstracto.core.service.management.UserManagementService;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.Bot;
 import dev.sheldan.abstracto.core.service.PostTargetService;
@@ -18,11 +19,13 @@ import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;

@Slf4j
@Component
@@ -51,7 +54,7 @@ public class WarnServiceBean implements WarnService {
    private static final String WARN_NOTIFICATION_TEMPLATE = "warn_notification";

    @Override
-    public void warnUser(AUserInAServer warnedAUserInAServer, AUserInAServer warningAUserInAServer, String reason, WarnLog warnLog) {
+    public void warnUser(AUserInAServer warnedAUserInAServer, AUserInAServer warningAUserInAServer, String reason, WarnLog warnLog)  {
        AUser warningAUser = warningAUserInAServer.getUserReference();
        AUser warnedAUser = warnedAUserInAServer.getUserReference();
        AServer serverOfWarning = warnedAUserInAServer.getServerReference();
@@ -64,28 +67,37 @@ public class WarnServiceBean implements WarnService {
        if(guildById.isPresent()) {
            guildName = guildById.get().getName();
        }
+        warnLog.setWarning(warning);
+        this.sendWarnLog(warnLog);
        WarnNotification warnNotification = WarnNotification.builder().warning(warning).serverName(guildName).build();
        if(userBeingWarned != null) {
            String warnLogMessage = templateService.renderTemplate(WARN_NOTIFICATION_TEMPLATE, warnNotification);
+            CompletableFuture<Message> messageFuture = new CompletableFuture<>();
+
+            // TODO the person executing this, is unaware that the message failed
            userBeingWarned.openPrivateChannel().queue(privateChannel -> {
                log.info("Messaging user {} about warn {}", warnedAUser.getId(), warning.getId());
-                privateChannel.sendMessage(warnLogMessage).queue();
+                privateChannel.sendMessage(warnLogMessage).queue(messageFuture::complete, messageFuture::completeExceptionally);
+            });
+
+            messageFuture.exceptionally(e -> {
+                log.warn("Failed to send message. ", e);
+                return null;
            });
        } else {
            log.warn("Unable to find user {} in guild {} to warn.", warnedAUser.getId(), serverOfWarning.getId());
+            throw new UserException(String.format("Unable to find user %s.", warnedAUser.getId()));
        }
-        warnLog.setWarning(warning);
-        this.sendWarnLog(warnLog);
    }

    @Override
-    public void warnUser(Member warnedMember, Member warningMember, String reason, WarnLog warnLog) {
+    public void warnUser(Member warnedMember, Member warningMember, String reason, WarnLog warnLog)  {
        AUserInAServer warnedAUser = userManagementService.loadUser(warnedMember);
        AUserInAServer warningAUser = userManagementService.loadUser(warningMember);
        this.warnUser(warnedAUser, warningAUser, reason, warnLog);
    }

-    private void sendWarnLog(ServerContext warnLogModel) {
+    private void sendWarnLog(ServerContext warnLogModel)  {
        String warnLogMessage = templateService.renderContextAwareTemplate(WARN_LOG_TEMPLATE, warnLogModel);
        postTargetService.sendTextInPostTarget(warnLogMessage, WARN_LOG_TARGET, warnLogModel.getServer().getId());
        MessageToSend message = templateService.renderEmbedTemplate("warn_log", warnLogModel);
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/moderation.properties
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/moderation.properties
@@ -1 +1,4 @@
-abstracto.postTargets.moderation=joinLog,leaveLog,warnLog,kickLog,banLog,editLog,deleteLog
+abstracto.postTargets.moderation=joinLog,leaveLog,warnLog,kickLog,banLog,editLog,deleteLog
+abstracto.features.moderation=false
+abstracto.features.warnings=false
+abstracto.features.logging=true
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/listener/message_deleted/message_deleted_embed_en_US.ftl
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/listener/message_deleted/message_deleted_embed_en_US.ftl
@@ -3,7 +3,7 @@
    "name": "${member.effectiveName}#${member.user.discriminator}",
    "avatar":  "${member.user.effectiveAvatarUrl}"
  },
-  "description": "Message from ${member.effectiveName}#${member.user.discriminator} (${member.idLong?c}) removed in ${textChannel.asMention}",
+  "description": "Message from ${member.effectiveName}#${member.user.discriminator} (${member.idLong?c}) removed in ${messageChannel.asMention}",
  "color" : {
    "r": 200,
    "g": 0,
@@ -16,7 +16,7 @@
    },
    {
        "name": "Link",
-        "value": "[${textChannel.name}](${message.messageUrl})"
+        "value": "[${messageChannel.name}](${message.messageUrl})"
    }
  ]
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/listener/message_deleted/message_deleted_en_US.ftl
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/listener/message_deleted/message_deleted_en_US.ftl
@@ -1,2 +1,2 @@
-Message from ${member.effectiveName} (${member.idLong?c}) deleted in ${textChannel.asMention}.
+Message from ${member.effectiveName} (${member.idLong?c}) deleted in ${messageChannel.asMention}.
 Message: ${message.content}
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/listener/message_edited/message_edited_embed_en_US.ftl
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/listener/message_edited/message_edited_embed_en_US.ftl
@@ -3,7 +3,7 @@
    "name": "${member.effectiveName}#${member.user.discriminator}",
    "avatar":  "${member.user.effectiveAvatarUrl}"
  },
-  "description": "Message from ${member.effectiveName}#${member.user.discriminator} (${member.idLong?c}) edited in ${textChannel.asMention}",
+  "description": "Message from ${member.effectiveName}#${member.user.discriminator} (${member.idLong?c}) edited in ${messageChannel.asMention}",
  "color" : {
    "r": 200,
    "g": 0,
@@ -12,7 +12,7 @@
  "fields": [
    {
      "name": "Original Message: ",
-      "value": "${messageBefore.contentRaw}"
+      "value": "${messageBefore.content}"
    },
    {
          "name": "New Message: ",
@@ -20,7 +20,7 @@
    },
    {
        "name": "Jump link",
-        "value": "[${textChannel.name}](${messageBefore.jumpUrl})"
+        "value": "[${messageChannel.name}](${messageBefore.messageUrl})"
    }
  ]
 }
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/listener/message_edited/message_edited_en_US.ftl
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/listener/message_edited/message_edited_en_US.ftl
@@ -1,3 +1,3 @@
-Message from ${member.effectiveName} (${member.idLong?c}) edited in ${textChannel.asMention}.
-Before: ${messageBefore.contentRaw}
+Message from ${member.effectiveName} (${member.idLong?c}) edited in ${messageChannel.asMention}.
+Before: ${messageBefore.content}
 After: ${messageAfter.contentRaw}
--- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/warn/warn_log_embed_en_US.ftl
+++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/warn/warn_log_embed_en_US.ftl
@@ -25,7 +25,7 @@
     <#if warning?has_content>
    {
        "name": "Location of the incident",
-        "value": "[${textChannel.name}](${message.jumpUrl})"
+        "value": "[${messageChannel.name}](${message.jumpUrl})"
    },
    </#if>
    {