added message to user initiated context

fixed templates for ban and kick logging
refactored kicking service
fixed guild not found exception template
added command validator to be used for unit testing commands
added default values for command configuration
changed some interfaces to message channel instead of text channel
added separate executor service for un-mutes, which is shared
updated spring boot version to 2.3.1
removed database connection string from properties
added logback configuration
changed some future logic in purge
refactored error message for un mute, when there is no active mute
refactored listener interface and removed usage of context utils
added tests for moderation services

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListenerBean.java

@@ -2,10 +2,17 @@ package dev.sheldan.abstracto.core.listener;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
+import dev.sheldan.abstracto.core.exception.ChannelNotFoundException;
+import dev.sheldan.abstracto.core.models.AServerAChannelAUser;
+import dev.sheldan.abstracto.core.models.GuildChannelMember;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
+import dev.sheldan.abstracto.core.service.BotService;
 import dev.sheldan.abstracto.core.service.FeatureConfigService;
 import dev.sheldan.abstracto.core.service.FeatureFlagService;
 import dev.sheldan.abstracto.core.service.MessageCache;
+import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
+import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageDeleteEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -35,6 +42,18 @@ public class MessageDeletedListenerBean extends ListenerAdapter {
     @Autowired
     private FeatureFlagService featureFlagService;
 
+    @Autowired
+    private ServerManagementService serverManagementService;
+
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
+
+    @Autowired
+    private ChannelManagementService channelManagementService;
+
+    @Autowired
+    private BotService botService;
+
     @Override
     @Transactional
     public void onGuildMessageDelete(@Nonnull GuildMessageDeleteEvent event) {
@@ -49,13 +68,27 @@ public class MessageDeletedListenerBean extends ListenerAdapter {
 
     @Transactional
     public void executeListener(CachedMessage cachedMessage) {
+        // TODO maybe lazy load, when there is actually a listener which has its feature enabled
+        AServerAChannelAUser authorUser = AServerAChannelAUser
+                .builder()
+                .guild(serverManagementService.loadOrCreate(cachedMessage.getServerId()))
+                .channel(channelManagementService.loadChannel(cachedMessage.getChannelId()).orElseThrow(() -> new ChannelNotFoundException(cachedMessage.getServerId(), cachedMessage.getChannelId())))
+                .aUserInAServer(userInServerManagementService.loadUser(cachedMessage.getServerId(), cachedMessage.getAuthorId()))
+                .build();
+
+        GuildChannelMember authorMember = GuildChannelMember
+                .builder()
+                .guild(botService.getGuildByIdNullable(cachedMessage.getServerId()))
+                .textChannel(botService.getTextChannelFromServer(cachedMessage.getServerId(), cachedMessage.getChannelId()).orElseThrow(() -> new ChannelNotFoundException(cachedMessage.getServerId(), cachedMessage.getChannelId())))
+                .member(botService.getMemberInServer(cachedMessage.getServerId(), cachedMessage.getAuthorId()))
+                .build();
         listener.forEach(messageDeletedListener -> {
             FeatureConfig feature = featureConfigService.getFeatureDisplayForFeature(messageDeletedListener.getFeature());
             if(!featureFlagService.isFeatureEnabled(feature, cachedMessage.getServerId())) {
                 return;
             }
             try {
-                messageDeletedListener.execute(cachedMessage);
+                messageDeletedListener.execute(cachedMessage, authorUser, authorMember);
             } catch (AbstractoRunTimeException e) {
                 log.error("Listener {} failed with exception:", messageDeletedListener.getClass().getName(), e);
             }

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java

@@ -104,13 +104,13 @@ public class MessageServiceBean implements MessageService {
     }
 
     @Override
-    public void sendMessageToUser(AUserInAServer userInAServer, String text, TextChannel feedbackChannel) {
+    public void sendMessageToUser(AUserInAServer userInAServer, String text, MessageChannel feedbackChannel) {
         Member memberInServer = botService.getMemberInServer(userInAServer);
         sendMessageToUser(memberInServer.getUser(), text, feedbackChannel);
     }
 
     @Override
-    public void sendMessageToUser(User user, String text, TextChannel feedbackChannel) {
+    public void sendMessageToUser(User user, String text, MessageChannel feedbackChannel) {
         CompletableFuture<Message> messageFuture = new CompletableFuture<>();
 
         user.openPrivateChannel().queue(privateChannel ->
@@ -127,7 +127,7 @@ public class MessageServiceBean implements MessageService {
     }
 
     @Transactional
-    public void sendFeedbackAboutException(Throwable e, TextChannel feedbackChannel) {
+    public void sendFeedbackAboutException(Throwable e, MessageChannel feedbackChannel) {
         channelService.sendTextToChannelNoFuture(String.format("Failed to send message: %s", e.getMessage()), feedbackChannel);
     }
 }

abstracto-application/core/core-impl/src/main/resources/config/application.properties

@@ -1,7 +1,3 @@
-spring.datasource.url=jdbc:postgresql://localhost:5432/abstracto
-spring.datasource.username= abstracto
-spring.datasource.password= abstracto
-spring.jpa.hibernate.default_schema=abstracto
 spring.jpa.show-sql = false
 
 spring.jpa.hibernate.ddl-auto = update

abstracto-application/core/core-impl/src/main/resources/logback.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property name="LOG_PATH" value="logs"/>
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>
+                %d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <appender name="logFileAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+
+        <file>${LOG_PATH}/log.log</file>
+
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <Pattern>
+                %d{dd-MM-yyyy HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </Pattern>
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>
+                ${LOG_PATH}/archived/log_%d{dd-MM-yyyy}.log
+            </fileNamePattern>
+            <maxHistory>10</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
+        </rollingPolicy>
+
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="logFileAppender"/>
+        <appender-ref ref="stdout"/>
+    </root>
+
+</configuration>

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/CommandConfiguration.java

@@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.command.config;
 import lombok.Builder;
 import lombok.Getter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Getter @Builder
@@ -11,10 +12,18 @@ public class CommandConfiguration {
     private String name;
     private String module;
     private String description;
-    private List<Parameter> parameters;
-    private List<String> aliases;
-    private boolean causesReaction;
-    private boolean templated;
+
+    @Builder.Default
+    private List<Parameter> parameters = new ArrayList<>();
+
+    @Builder.Default
+    private List<String> aliases = new ArrayList<>();
+
+    @Builder.Default
+    private boolean causesReaction = false;
+
+    @Builder.Default
+    private boolean templated = false;
     private HelpInfo help;
 
     public int getNecessaryParameterCount(){

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/HelpInfo.java

@@ -11,5 +11,6 @@ public class HelpInfo {
     private String example;
     @Builder.Default
     private boolean hasExample = false;
-    private boolean templated;
+    @Builder.Default
+    private boolean templated = false;
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/Parameter.java

@@ -9,8 +9,11 @@ public class Parameter {
     private String name;
     private Class type;
     private String description;
-    private boolean optional;
-    private boolean remainder;
+    @Builder.Default
+    private boolean optional = false;
+    @Builder.Default
+    private boolean remainder = false;
     private Integer maxLength;
-    private Boolean templated;
+    @Builder.Default
+    private Boolean templated = false;
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/ContextConverter.java

@@ -22,6 +22,7 @@ public class ContextConverter {
             return builder
                     .member(commandContext.getAuthor())
                     .guild(commandContext.getGuild())
+                    .message(commandContext.getMessage())
                     .messageChannel(commandContext.getChannel())
                     .channel(commandContext.getUserInitiatedContext().getChannel())
                     .server(commandContext.getUserInitiatedContext().getServer())

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListener.java

@@ -1,7 +1,9 @@
 package dev.sheldan.abstracto.core.listener;
 
+import dev.sheldan.abstracto.core.models.AServerAChannelAUser;
+import dev.sheldan.abstracto.core.models.GuildChannelMember;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 
 public interface MessageDeletedListener extends FeatureAware {
-    void execute(CachedMessage messageBefore);
+    void execute(CachedMessage messageBefore, AServerAChannelAUser authorUser, GuildChannelMember authorMember);
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/UserInitiatedServerContext.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageChannel;
 
 @Getter @NoArgsConstructor
@@ -18,6 +19,7 @@ public class UserInitiatedServerContext extends ServerContext {
     private MessageChannel messageChannel;
     private Member member;
     private AUser user;
+    private Message message;
     private AUserInAServer aUserInAServer;
 
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/MessageService.java

@@ -5,7 +5,6 @@ import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.templating.model.MessageToSend;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageChannel;
-import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.entities.User;
 
 import java.util.List;
@@ -21,6 +20,6 @@ public interface MessageService {
     CompletableFuture<Long> createStatusMessageId(MessageToSend messageToSend, MessageChannel channel);
     void updateStatusMessage(AChannel channel, Long messageId, MessageToSend messageToSend);
     void updateStatusMessage(MessageChannel channel, Long messageId, MessageToSend messageToSend);
-    void sendMessageToUser(AUserInAServer userInAServer, String text, TextChannel feedbackChannel);
-    void sendMessageToUser(User user, String text, TextChannel feedbackChannel);
+    void sendMessageToUser(AUserInAServer userInAServer, String text, MessageChannel feedbackChannel);
+    void sendMessageToUser(User user, String text, MessageChannel feedbackChannel);
 }