changed context handling for command models for logging

added method to convert the user initiated context to a concrete command model
added method to find if a template exists
added method to render a context aware model
added banid command

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Ban.java

@@ -2,18 +2,14 @@ package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.command.Command;
 import dev.sheldan.abstracto.command.HelpInfo;
-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.*;
 import dev.sheldan.abstracto.moderation.Moderation;
-import dev.sheldan.abstracto.moderation.models.BanLog;
-import dev.sheldan.abstracto.moderation.models.WarnLog;
+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;
 import net.dv8tion.jda.api.entities.Member;
-import org.hibernate.sql.Template;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -36,15 +32,12 @@ public class Ban implements Command {
         Member member = (Member) parameters.get(0);
         String defaultReason = templateService.renderTemplate("ban_default_reason", null);
         String reason = parameters.size() == 2 ? (String) parameters.get(1) : defaultReason;
-        banService.banMember(member, reason);
-        BanLog banLogModel = BanLog
-                .parentBuilder()
-                .commandTemplateContext(commandContext.getCommandTemplateContext())
-                .bannedUser(member)
-                .banningUser(commandContext.getAuthor())
-                .reason(reason)
-                .build();
-        banService.sendBanLog(banLogModel);
+
+        BanLog banLogModel = (BanLog) ContextConverter.fromCommandContext(commandContext, BanLog.class);
+        banLogModel.setBannedUser(member);
+        banLogModel.setBanningUser(commandContext.getAuthor());
+        banLogModel.setReason(reason);
+        banService.banMember(member, reason, banLogModel);
         return Result.fromSuccess();
     }
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/BanId.java

@@ -0,0 +1,54 @@
+package dev.sheldan.abstracto.moderation.command;
+
+import dev.sheldan.abstracto.command.Command;
+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.models.template.BanIdLog;
+import dev.sheldan.abstracto.moderation.service.BanService;
+import dev.sheldan.abstracto.templating.TemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BanId implements Command {
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Autowired
+    private BanService banService;
+
+    @Override
+    public Result execute(CommandContext commandContext) {
+        List<Object> parameters = commandContext.getParameters().getParameters();
+        Long userId = (Long) parameters.get(0);
+        String defaultReason = templateService.renderTemplate("ban_default_reason", null);
+        String reason = parameters.size() == 2 ? (String) parameters.get(1) : defaultReason;
+        BanIdLog banLogModel = (BanIdLog) ContextConverter.fromCommandContext(commandContext, BanIdLog.class);
+        banLogModel.setBannedUserId(userId);
+        banLogModel.setBanningUser(commandContext.getAuthor());
+        banLogModel.setReason(reason);
+        banService.banMember(userId, commandContext.getGuild().getIdLong(), reason, banLogModel);
+
+        return Result.fromSuccess();
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        List<Parameter> parameters = new ArrayList<>();
+        parameters.add(Parameter.builder().name("user").type(Long.class).optional(false).build());
+        parameters.add(Parameter.builder().name("reason").type(String.class).optional(true).remainder(true).build());
+        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        return CommandConfiguration.builder()
+                .name("banid")
+                .module(Moderation.MODERATION)
+                .templated(true)
+                .causesReaction(true)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+}

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Kick.java

@@ -2,13 +2,10 @@ package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.command.Command;
 import dev.sheldan.abstracto.command.HelpInfo;
-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.*;
 import dev.sheldan.abstracto.moderation.Moderation;
-import dev.sheldan.abstracto.moderation.models.BanLog;
-import dev.sheldan.abstracto.moderation.models.KickLogModel;
+import dev.sheldan.abstracto.moderation.models.template.BanIdLog;
+import dev.sheldan.abstracto.moderation.models.template.KickLogModel;
 import dev.sheldan.abstracto.moderation.service.KickServiceBean;
 import dev.sheldan.abstracto.templating.TemplateService;
 import net.dv8tion.jda.api.entities.Member;
@@ -33,15 +30,12 @@ public class Kick implements Command {
         Member member = (Member) parameters.get(0);
         String defaultReason = templateService.renderTemplate("ban_default_reason", null);
         String reason = parameters.size() == 2 ? (String) parameters.get(1) : defaultReason;
-        kickService.kickMember(member, reason);
-        KickLogModel kickLogModel = KickLogModel
-                .parentBuilder()
-                .commandTemplateContext(commandContext.getCommandTemplateContext())
-                .kickedUser(member)
-                .kickingUser(commandContext.getAuthor())
-                .reason(reason)
-                .build();
-        kickService.sendKickLog(kickLogModel);
+
+        KickLogModel kickLogModel = (KickLogModel) ContextConverter.fromCommandContext(commandContext, KickLogModel.class);
+        kickLogModel.setKickedUser(member);
+        kickLogModel.setKickingUser(commandContext.getAuthor());
+        kickLogModel.setReason(reason);
+        kickService.kickMember(member, reason, kickLogModel);
         return Result.fromSuccess();
     }
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Warn.java

@@ -1,15 +1,13 @@
 package dev.sheldan.abstracto.moderation.command;
 
+import dev.sheldan.abstracto.command.execution.*;
 import dev.sheldan.abstracto.moderation.Moderation;
-import dev.sheldan.abstracto.moderation.models.WarnLog;
+import dev.sheldan.abstracto.moderation.models.template.BanIdLog;
+import dev.sheldan.abstracto.moderation.models.template.WarnLog;
 import dev.sheldan.abstracto.moderation.models.Warning;
 import dev.sheldan.abstracto.moderation.service.WarnService;
 import dev.sheldan.abstracto.command.Command;
 import dev.sheldan.abstracto.command.HelpInfo;
-import dev.sheldan.abstracto.command.execution.CommandContext;
-import dev.sheldan.abstracto.command.execution.CommandConfiguration;
-import dev.sheldan.abstracto.command.execution.Parameter;
-import dev.sheldan.abstracto.command.execution.Result;
 import dev.sheldan.abstracto.core.management.UserManagementService;
 import dev.sheldan.abstracto.templating.TemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -39,15 +37,11 @@ public class Warn implements Command {
         Member member = (Member) parameters.get(0);
         String defaultReason = templateService.renderTemplate("warn_default_reason", null);
         String reason = parameters.size() == 2 ? (String) parameters.get(1) : defaultReason;
-        Warning warning = warnService.warnUser(member, commandContext.getAuthor(), reason);
-        WarnLog warnLogModel = WarnLog
-                .parentBuilder()
-                .commandTemplateContext(commandContext.getCommandTemplateContext())
-                .warnedUser(member)
-                .warningUser(commandContext.getAuthor())
-                .warning(warning)
-                .build();
-        warnService.sendWarnLog(warnLogModel);
+        WarnLog warnLogModel = (WarnLog) ContextConverter.fromCommandContext(commandContext, WarnLog.class);
+        warnLogModel.setWarnedUser(member);
+        warnLogModel.setReason(reason);
+        warnLogModel.setWarningUser(commandContext.getAuthor());
+        warnService.warnUser(member, commandContext.getAuthor(), reason, warnLogModel);
         return Result.fromSuccess();
     }
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java

@@ -1,9 +1,11 @@
 package dev.sheldan.abstracto.moderation.service;
 
-import dev.sheldan.abstracto.core.models.PostTarget;
+import dev.sheldan.abstracto.core.models.ServerContext;
+import dev.sheldan.abstracto.core.models.database.PostTarget;
 import dev.sheldan.abstracto.core.service.Bot;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.moderation.models.BanLog;
+import dev.sheldan.abstracto.moderation.models.template.BanIdLog;
+import dev.sheldan.abstracto.moderation.models.template.BanLog;
 import dev.sheldan.abstracto.templating.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Guild;
@@ -16,6 +18,7 @@ import org.springframework.stereotype.Component;
 public class BanServiceBean implements BanService {
 
     public static final String BAN_LOG_TEMPLATE = "ban_log";
+    public static final String BAN_ID_LOG_TEMPLATE = "banid_log";
     @Autowired
     private Bot bot;
 
@@ -26,19 +29,26 @@ public class BanServiceBean implements BanService {
     private PostTargetService postTargetService;
 
     @Override
-    public void banMember(Member member, String reason) {
-        Guild guild = bot.getInstance().getGuildById(member.getGuild().getIdLong());
-        if(guild != null) {
-            log.info("Banning user {} in guild {}.", member.getId(), guild.getIdLong());
-            guild.ban(member, 0, reason).queue();
-        } else {
-            log.warn("Guild id {} from member was not found.", member.getGuild().getIdLong());
-        }
+    public void banMember(Member member, String reason, ServerContext banLog) {
+        this.banUser(member.getGuild().getIdLong(), member.getIdLong(), reason);
+        String warnLogMessage = templateService.renderContextAwareTemplate(BAN_LOG_TEMPLATE, banLog);
+        postTargetService.sendTextInPostTarget(warnLogMessage, PostTarget.BAN_LOG, banLog.getServer().getId());
     }
 
     @Override
-    public void sendBanLog(BanLog banLog) {
-        String warnLogMessage = templateService.renderTemplate(BAN_LOG_TEMPLATE, banLog);
-        postTargetService.sendTextInPostTarget(warnLogMessage, PostTarget.BAN_LOG, banLog.getServer().getId());
+    public void banMember(Long guildId, Long userId, String reason, ServerContext banIdLog) {
+        banUser(guildId, userId, reason);
+        String warnLogMessage = templateService.renderContextAwareTemplate(BAN_ID_LOG_TEMPLATE, banIdLog);
+        postTargetService.sendTextInPostTarget(warnLogMessage, PostTarget.BAN_LOG, guildId);
+    }
+
+    private void banUser(Long guildId, Long userId, String reason) {
+        Guild guildById = bot.getInstance().getGuildById(guildId);
+        if(guildById != null) {
+            log.info("Banning user {} in guild {}.", userId, guildId);
+            guildById.ban(userId.toString(), 0, reason).queue();
+        } else {
+            log.warn("Guild id {} from member was not found.", guildId);
+        }
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java

@@ -1,9 +1,9 @@
 package dev.sheldan.abstracto.moderation.service;
 
-import dev.sheldan.abstracto.core.models.PostTarget;
+import dev.sheldan.abstracto.core.models.database.PostTarget;
 import dev.sheldan.abstracto.core.service.Bot;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.moderation.models.KickLogModel;
+import dev.sheldan.abstracto.moderation.models.template.KickLogModel;
 import dev.sheldan.abstracto.templating.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Guild;
@@ -26,18 +26,18 @@ public class KickServiceBean implements KickService {
     private PostTargetService postTargetService;
 
     @Override
-    public void kickMember(Member member, String reason) {
+    public void kickMember(Member member, String reason, KickLogModel kickLogModel) {
         Guild guildById = bot.getInstance().getGuildById(member.getGuild().getIdLong());
         if(guildById != null) {
             guildById.kick(member, reason).queue();
+            this.sendKickLog(kickLogModel);
         } else {
             log.warn("Failed to kick member {} from guild {}. Guild was not found.", member.getId(), member.getGuild().getId());
         }
     }
 
-    @Override
-    public void sendKickLog(KickLogModel kickLogModel) {
-        String warnLogMessage = templateService.renderTemplate(KICK_LOG_TEMPLATE, kickLogModel);
+    private void sendKickLog(KickLogModel kickLogModel) {
+        String warnLogMessage = templateService.renderContextAwareTemplate(KICK_LOG_TEMPLATE, kickLogModel);
         postTargetService.sendTextInPostTarget(warnLogMessage, PostTarget.WARN_LOG, kickLogModel.getServer().getId());
     }
 }

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.models.AChannel;
+import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.service.Bot;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.JDA;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java

@@ -1,15 +1,17 @@
 package dev.sheldan.abstracto.moderation.service;
 
-import dev.sheldan.abstracto.core.models.AServer;
-import dev.sheldan.abstracto.core.models.AUser;
-import dev.sheldan.abstracto.moderation.models.WarnLog;
-import dev.sheldan.abstracto.moderation.models.WarnNotification;
+import dev.sheldan.abstracto.core.models.ServerContext;
+import dev.sheldan.abstracto.core.models.UserInitiatedServerContext;
+import dev.sheldan.abstracto.core.models.database.AServer;
+import dev.sheldan.abstracto.core.models.database.AUser;
+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.models.AUserInAServer;
-import dev.sheldan.abstracto.core.models.PostTarget;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
+import dev.sheldan.abstracto.core.models.database.PostTarget;
 import dev.sheldan.abstracto.core.service.Bot;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.templating.TemplateService;
@@ -47,7 +49,7 @@ public class WarnServiceBean implements WarnService {
     private static final String WARN_NOTIFICATION_TEMPLATE = "warn_notification";
 
     @Override
-    public Warning warnUser(AUserInAServer warnedAUserInAServer, AUserInAServer warningAUserInAServer, String reason) {
+    public void warnUser(AUserInAServer warnedAUserInAServer, AUserInAServer warningAUserInAServer, String reason, ServerContext warnLog) {
         AUser warningAUser = warningAUserInAServer.getUserReference();
         AUser warnedAUser = warnedAUserInAServer.getUserReference();
         AServer serverOfWarning = warnedAUserInAServer.getServerReference();
@@ -70,19 +72,18 @@ public class WarnServiceBean implements WarnService {
         } else {
             log.warn("Unable to find user {} in guild {} to warn.", warnedAUser.getId(), serverOfWarning.getId());
         }
-        return warning;
+        this.sendWarnLog(warnLog);
     }
 
     @Override
-    public Warning warnUser(Member warnedMember, Member warningMember, String reason) {
+    public void warnUser(Member warnedMember, Member warningMember, String reason, ServerContext warnLog) {
         AUserInAServer warnedAUser = userManagementService.loadUser(warnedMember);
         AUserInAServer warningAUser = userManagementService.loadUser(warningMember);
-        return this.warnUser(warnedAUser, warningAUser, reason);
+        this.warnUser(warnedAUser, warningAUser, reason, warnLog);
     }
 
-    @Override
-    public void sendWarnLog(WarnLog warnLogModel) {
-        String warnLogMessage = templateService.renderTemplate(WARN_LOG_TEMPLATE, warnLogModel);
+    public void sendWarnLog(ServerContext warnLogModel) {
+        String warnLogMessage = templateService.renderContextAwareTemplate(WARN_LOG_TEMPLATE, warnLogModel);
         postTargetService.sendTextInPostTarget(warnLogMessage, PostTarget.WARN_LOG, warnLogModel.getServer().getId());
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementServiceBean.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.moderation.service.management;
 
 import dev.sheldan.abstracto.moderation.models.Warning;
 import dev.sheldan.abstracto.moderation.repository.WarnRepository;
-import dev.sheldan.abstracto.core.models.AUserInAServer;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/warn/warn_log_en_US.ftl

@@ -1 +1 @@
-User ${warnedUser.effectiveName} (${warnedUser.asMention}) has been warned with reason ${warning.reason}.
+User ${warnedUser.effectiveName} (${warnedUser.asMention}) has been warned with reason ${reason}.