[maven-release-plugin] prepare release oneplusbot-1.5.8

restructured template module structure and naming

.github/workflows/release.yml

@@ -34,5 +34,5 @@ jobs:
         env:
           REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
           VERSION: ${{ env.version }}
-          ABSTRACTO_VERSION: 1.3.8
+          ABSTRACTO_VERSION: 1.3.9
           ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/

application/database/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/executable/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>

application/oneplus-bot-customizations/dynamic-activity-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
         <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/moderation-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-customizations</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomFeature.java

@@ -2,6 +2,7 @@ package dev.sheldan.oneplus.bot.custom.moderation.config;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.config.PostTargetEnum;
 import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureConfig;
 import dev.sheldan.oneplus.bot.custom.moderation.service.ModModeServiceBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,8 @@ import java.util.List;
 @Component
 public class ModerationCustomFeature implements FeatureConfig {
 
+    public static final String WARN_NOTIFICATION_THRESHOLD = "warnNotificationThreshold";
+
     @Autowired
     private ModerationFeatureConfig moderationFeatureConfig;
 
@@ -27,9 +30,14 @@ public class ModerationCustomFeature implements FeatureConfig {
         return Arrays.asList(moderationFeatureConfig);
     }
 
+    @Override
+    public List<PostTargetEnum> getRequiredPostTargets() {
+        return Arrays.asList(ModerationCustomPostTarget.WARN_THRESHOLD_NOTIFICATION);
+    }
+
     @Override
     public List<String> getRequiredSystemConfigKeys() {
         return Arrays.asList(ModModeServiceBean.MODMODE_ROLE_CONFIG_KEY,
-                ModModeServiceBean.MODMODE_CHANGED_ROLE_COLOR_CONFIG_KEY);
+                ModModeServiceBean.MODMODE_CHANGED_ROLE_COLOR_CONFIG_KEY, WARN_NOTIFICATION_THRESHOLD);
     }
 }

application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomPostTarget.java

@@ -0,0 +1,15 @@
+package dev.sheldan.oneplus.bot.custom.moderation.config;
+
+import dev.sheldan.abstracto.core.config.PostTargetEnum;
+import lombok.Getter;
+
+@Getter
+public enum ModerationCustomPostTarget implements PostTargetEnum {
+    WARN_THRESHOLD_NOTIFICATION("warnThresholdNotification");
+
+    private String key;
+
+    ModerationCustomPostTarget(String key) {
+        this.key = key;
+    }
+}

application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/listener/WarningAddedListener.java

@@ -0,0 +1,98 @@
+package dev.sheldan.oneplus.bot.custom.moderation.listener;
+
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
+import dev.sheldan.abstracto.core.models.ServerUser;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
+import dev.sheldan.abstracto.core.models.template.display.ChannelDisplay;
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import dev.sheldan.abstracto.core.service.*;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
+import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import dev.sheldan.abstracto.core.utils.FutureUtils;
+import dev.sheldan.abstracto.moderation.listener.WarningCreatedListener;
+import dev.sheldan.abstracto.moderation.model.listener.WarningCreatedEventModel;
+import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
+import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomFeature;
+import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomFeatureDefinition;
+import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomPostTarget;
+import dev.sheldan.oneplus.bot.custom.moderation.model.template.WarningThresholdNotificationModel;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.TextChannel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class WarningAddedListener implements WarningCreatedListener {
+
+    @Autowired
+    private ConfigService configService;
+
+    @Autowired
+    private WarnManagementService warnManagementService;
+
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
+
+    @Autowired
+    private ChannelService channelService;
+
+    @Autowired
+    private PostTargetService postTargetService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    public static final String WARN_THRESHOLD_NOTIFICATION_TEMPLATE_KEY = "warning_threshold_notification";
+
+    @Override
+    public DefaultListenerResult execute(WarningCreatedEventModel model) {
+        Long warnNotificationAmount = configService.getLongValueOrConfigDefault(ModerationCustomFeature.WARN_NOTIFICATION_THRESHOLD, model.getServerId());
+        ServerUser warnedUser = ServerUser
+                .builder()
+                .userId(model.getWarnedUserId())
+                .serverId(model.getServerId())
+                .build();
+        AUserInAServer warnedUserInAServer = userInServerManagementService.loadOrCreateUser(warnedUser);
+        List<Long> activeWarnsForUser = warnManagementService.getActiveWarnsForUser(warnedUserInAServer)
+                .stream().map(warning -> warning.getWarnId().getId()).collect(Collectors.toList());
+        Set<Long> warnIds = new HashSet<>(activeWarnsForUser);
+        // we cant be sure we receive the newly persisted warning yet, sadly
+        warnIds.add(model.getWarningId());
+        if(warnIds.size() == warnNotificationAmount) {
+            Long serverId = model.getServerId();
+
+            Long channelId = model.getWarningChannelId();
+            Long warnedUserId = model.getWarnedUserId();
+            TextChannel channel = channelService.getTextChannelFromServer(serverId, channelId);
+            WarningThresholdNotificationModel notificationModel = WarningThresholdNotificationModel
+                    .builder()
+                    .channelDisplay(ChannelDisplay.fromChannel(channel))
+                    .memberDisplay(MemberDisplay.fromAUserInAServer(warnedUserInAServer))
+                    .messageId(model.getWarningMessageId())
+                    .warnCount(warnIds.size())
+                    .build();
+
+            MessageToSend messageToSend = templateService.renderEmbedTemplate(WARN_THRESHOLD_NOTIFICATION_TEMPLATE_KEY, notificationModel,  serverId);
+            FutureUtils.toSingleFutureGeneric(postTargetService.sendEmbedInPostTarget(messageToSend, ModerationCustomPostTarget.WARN_THRESHOLD_NOTIFICATION, serverId))
+            .thenAccept(unused -> log.info("Warn threshold notification sent for user {} in server {}.", warnedUserId, serverId))
+            .exceptionally(throwable -> {
+                log.error("Failed to sent warn threshold notification for user {} in server {}.", warnedUserId, serverId, throwable);
+                return null;
+            });
+        }
+        return DefaultListenerResult.PROCESSED;
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return ModerationCustomFeatureDefinition.MODERATION_CUSTOM;
+    }
+}

application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/model/template/WarningThresholdNotificationModel.java

@@ -0,0 +1,15 @@
+package dev.sheldan.oneplus.bot.custom.moderation.model.template;
+
+import dev.sheldan.abstracto.core.models.template.display.ChannelDisplay;
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class WarningThresholdNotificationModel {
+    private MemberDisplay memberDisplay;
+    private Integer warnCount;
+    private ChannelDisplay channelDisplay;
+    private Long messageId;
+}

application/oneplus-bot-customizations/moderation-custom/src/main/resources/moderation-custom.properties

@@ -5,4 +5,9 @@ abstracto.systemConfigs.modModeRoleId.name=modModeRoleId
 abstracto.systemConfigs.modModeRoleId.longValue=0
 
 abstracto.systemConfigs.modModeNewRoleColor.name=modModeNewRoleColor
-abstracto.systemConfigs.modModeNewRoleColor.stringValue=0,0,0
+abstracto.systemConfigs.modModeNewRoleColor.stringValue=0,0,0
+
+abstracto.systemConfigs.warnNotificationThreshold.name=warnNotificationThreshold
+abstracto.systemConfigs.warnNotificationThreshold.longValue=3
+
+abstracto.postTargets.warnThresholdNotification.name=warnThresholdNotification

application/oneplus-bot-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/starboard-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
         <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/faq/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-modules</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/converter/FAQCommandConfigConverter.java

@@ -65,7 +65,8 @@ public class FAQCommandConfigConverter {
 
     private FaqCommandResponseMessageConfig convertCommandResponse(FAQCommandResponse response, Long botUserId) {
         FaqCommandResponseEmbedConfig embedConfig = null;
-        if(response.getDescription() != null) {
+        // one of those must not be null, for it to be considered a proper embed
+        if(response.getDescription() != null || response.getImageURL() != null) {
             boolean useBot = response.getAuthorUserId().equals(botUserId);
             FaqCommandResponseEmbedColorConfig colorConfig = FaqCommandResponseEmbedColorConfig
                     .builder()

application/oneplus-bot-modules/faq/src/main/resources/validation/createScheme.json

@@ -18,7 +18,7 @@
       },
       "aliases": {
         "type": "array",
-        "minItems": 1,
+        "minItems": 0,
         "maxItems": 20,
         "items": {
           "type": "string",

application/oneplus-bot-modules/news/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/referral/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/setup/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-modules</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
 
     <groupId>dev.sheldan.oneplus.bot.application</groupId>
     <artifactId>application</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.7</version>
+    <version>1.5.8</version>
     <modules>
         <module>executable</module>
         <module>oneplus-bot-customizations</module>

deployment/docker-compose/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

deployment/docker-compose/src/main/resources/.env

@@ -29,4 +29,4 @@ PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
 PGADMIN_DEFAULT_PASSWORD=admin
 TOKEN=<INSERT TOKEN>
 YOUTUBE_API_KEY=<INSERT KEY>
-ONEPLUS_BOT_VERSION=1.5.7
+ONEPLUS_BOT_VERSION=1.5.8

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -221,8 +221,8 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
-                            <artifactId>starboard-custom-templates</artifactId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
+                            <artifactId>starboard-customization-templates</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
@@ -453,8 +453,8 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
-                            <artifactId>starboard-custom-translations</artifactId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
+                            <artifactId>starboard-customization-translations</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
@@ -463,8 +463,8 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
-                            <artifactId>moderation-custom</artifactId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
+                            <artifactId>moderation-customization-translations</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
@@ -473,7 +473,7 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
                             <artifactId>dynamic-activity-custom-translations</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
@@ -484,7 +484,7 @@
 
                         <!-- custom -->
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
                             <artifactId>news-translations</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
@@ -494,7 +494,7 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
                             <artifactId>setup-translations</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
@@ -504,7 +504,7 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
                             <artifactId>referral-translations</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
@@ -514,7 +514,7 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
                             <artifactId>faq-translations</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
@@ -848,8 +848,8 @@
                         <!-- overrides -->
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-                            <artifactId>core</artifactId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
+                            <artifactId>core-template-overrides</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
@@ -858,8 +858,8 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-                            <artifactId>webservices</artifactId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
+                            <artifactId>webservices-template-overrides</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
@@ -868,8 +868,8 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-                            <artifactId>logging</artifactId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
+                            <artifactId>logging-template-overrides</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
@@ -879,8 +879,8 @@
 
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-                            <artifactId>statistic</artifactId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
+                            <artifactId>statistic-template-overrides</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
@@ -889,8 +889,8 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-                            <artifactId>modmail</artifactId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
+                            <artifactId>modmail-template-overrides</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
@@ -899,8 +899,8 @@
                         </artifactItem>
 
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-                            <artifactId>moderation</artifactId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
+                            <artifactId>moderation-template-overrides</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
@@ -910,8 +910,8 @@
 
                         <!-- overrides translations -->
                         <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.translations</groupId>
-                            <artifactId>moderation</artifactId>
+                            <groupId>dev.sheldan.oneplus.bot.templates.translations.overrides</groupId>
+                            <artifactId>moderation-translation-overrides</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>

deployment/image-packaging/src/main/docker/grafana/dashboards/oneplus-bot-logs.json

@@ -21,13 +21,12 @@
     {
       "datasource": "Loki",
       "gridPos": {
-        "h": 10,
+        "h": 14,
         "w": 24,
         "x": 0,
         "y": 0
       },
       "id": 2,
-      "maxDataPoints": 10000,
       "options": {
         "dedupStrategy": "none",
         "enableLogDetails": true,
@@ -62,5 +61,5 @@
   "timezone": "",
   "title": "OnePlus Bot logs",
   "uid": "1uGb0q4nz",
-  "version": 1
+  "version": 2
 }

deployment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplusbot</artifactId>
         <groupId>dev.sheldan.oneplus.bot</groupId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -12,15 +12,15 @@
 
     <groupId>dev.sheldan.oneplus.bot</groupId>
     <artifactId>oneplusbot</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8</version>
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
         <!-- edit in release.yml as well -->
         <!-- when releasing a new opbot version, update the .env as well-->
-        <abstracto.version>1.3.8</abstracto.version>
-        <abstracto.templates.version>1.2.20</abstracto.templates.version>
+        <abstracto.version>1.3.9</abstracto.version>
+        <abstracto.templates.version>1.2.21</abstracto.templates.version>
     </properties>
 
     <modules>
@@ -56,7 +56,7 @@
     <scm>
         <url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
         <developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
-        <tag>oneplusbot-1.5.7</tag>
+        <tag>oneplusbot-1.5.8</tag>
     </scm>
 
 </project>

templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/pom.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
+        <artifactId>customization-templates</artifactId>
+        <version>1.5.8</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>moderation-customization-templates</artifactId>
+    <packaging>pom</packaging>
+
+</project>

templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl

@@ -0,0 +1,13 @@
+{
+  "title": {
+    "title": "<@safe_include "warning_threshold_reached_notification_title"/>"
+  },
+  <#include "abstracto_color">,
+  <#assign warnedMemberMention=memberDisplay.memberMention>
+  <#assign warnedUserId=memberDisplay.userId>
+  <#assign memberMention=memberDisplay.memberMention>
+  <#assign warnCount=warnCount>
+  <#assign channelDisplay=channelDisplay>
+  <#assign messageId=messageId>
+  "description": "<@safe_include "warning_threshold_reached_notification_description"/>"
+}

templates/oneplus-bot-templates/customization-templates/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>dev.sheldan.oneplus.bot.templates</groupId>
+        <artifactId>oneplus-bot-templates</artifactId>
+        <version>1.5.8</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
+    <artifactId>customization-templates</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>starboard-customization-templates</module>
+        <module>moderation-customization-templates</module>
+    </modules>
+
+
+</project>

templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
-        <artifactId>oneplus-bot-modules-templates</artifactId>
-        <version>1.5.7</version>
+        <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
+        <artifactId>customization-templates</artifactId>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>starboard-custom-templates</artifactId>
+    <artifactId>starboard-customization-templates</artifactId>
     <packaging>pom</packaging>
 
     <build>

templates/oneplus-bot-templates/module-templates/faq-templates/pom.xml

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>oneplus-bot-modules-templates</artifactId>
         <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
-        <version>1.5.7</version>
+        <artifactId>oneplus-bot-module-templates</artifactId>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>faq-templates</artifactId>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
     <build>
         <plugins>
             <plugin>

templates/oneplus-bot-templates/module-templates/news-templates/pom.xml

@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
-        <artifactId>oneplus-bot-modules-templates</artifactId>
-        <version>1.5.7</version>
+        <artifactId>oneplus-bot-module-templates</artifactId>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/module-templates/pom.xml

@@ -2,21 +2,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
-        <artifactId>templates</artifactId>
-        <version>1.5.7</version>
+        <artifactId>oneplus-bot-templates</artifactId>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
-    <artifactId>oneplus-bot-modules-templates</artifactId>
+    <artifactId>oneplus-bot-module-templates</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.7</version>
+
     <modules>
-        <module>starboard-custom-templates</module>
+        <module>faq-templates</module>
         <module>news-templates</module>
         <module>referral-templates</module>
-        <module>faq-templates</module>
     </modules>
 
-
 </project>

templates/oneplus-bot-templates/module-templates/referral-templates/pom.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>oneplus-bot-modules-templates</artifactId>
         <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
-        <version>1.5.7</version>
+        <artifactId>oneplus-bot-module-templates</artifactId>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/pom.xml

@@ -3,17 +3,18 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
-    <artifactId>overrides</artifactId>
+    <artifactId>oneplus-bot-templates</artifactId>
     <packaging>pom</packaging>
-
+    <version>1.5.8</version>
     <modules>
+        <module>module-templates</module>
+        <module>customization-templates</module>
         <module>template-overrides</module>
-        <module>translation-overrides</module>
     </modules>
 
+
 </project>

templates/oneplus-bot-templates/template-overrides/core-template-overrides/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>core</artifactId>
+    <artifactId>core-template-overrides</artifactId>
 
     <build>
         <plugins>

templates/oneplus-bot-templates/template-overrides/logging-template-overrides/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>logging</artifactId>
+    <artifactId>logging-template-overrides</artifactId>
 
     <build>
         <plugins>

templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>moderation</artifactId>
+    <artifactId>moderation-template-overrides</artifactId>
 
     <build>
         <plugins>

templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>modmail</artifactId>
+    <artifactId>modmail-template-overrides</artifactId>
 
     <build>
         <plugins>

templates/oneplus-bot-templates/template-overrides/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>dev.sheldan.oneplus.bot.templates</groupId>
+        <artifactId>oneplus-bot-templates</artifactId>
+        <version>1.5.8</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
+    <artifactId>template-overrides</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>webservices-template-overrides</module>
+        <module>core-template-overrides</module>
+        <module>logging-template-overrides</module>
+        <module>statistic-template-overrides</module>
+        <module>modmail-template-overrides</module>
+        <module>moderation-template-overrides</module>
+    </modules>
+
+</project>

templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>statistic</artifactId>
+    <artifactId>statistic-template-overrides</artifactId>
 
     <build>
         <plugins>

templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>webservices</artifactId>
+    <artifactId>webservices-template-overrides</artifactId>
     <packaging>pom</packaging>
 
     <build>

templates/overrides/template-overrides/pom.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
-        <artifactId>overrides</artifactId>
-        <version>1.5.7</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-    <artifactId>template-overrides</artifactId>
-    <packaging>pom</packaging>
-
-
-    <modules>
-        <module>webservices</module>
-        <module>core</module>
-        <module>logging</module>
-        <module>statistic</module>
-        <module>modmail</module>
-        <module>moderation</module>
-    </modules>
-
-</project>

templates/pom.xml

@@ -4,18 +4,17 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
 
     <modules>
-        <module>oneplus-bot-modules-templates</module>
+        <module>oneplus-bot-templates</module>
         <module>translations</module>
-        <module>overrides</module>
     </modules>
 
     <groupId>dev.sheldan.oneplus.bot.templates</groupId>
     <artifactId>templates</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8</version>
     <packaging>pom</packaging>
 
 </project>

templates/translations/customization-translations/dynamic-activity-customization-translations/pom.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
-        <artifactId>translations</artifactId>
-        <version>1.5.7</version>
+        <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
+        <artifactId>customization-translations</artifactId>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/customization-translations/moderation-customization-translations/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>translations</artifactId>
-        <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
-        <version>1.5.7</version>
+        <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
+        <artifactId>customization-translations</artifactId>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>moderation-custom</artifactId>
+    <artifactId>moderation-customization-translations</artifactId>
 
     <build>
         <plugins>

templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_long_help_en_US.ftl

@@ -0,0 +1 @@
+Changes the colors of the staff role (if enabled) to a defined color. If turned off, it removes the color again.

templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_parameter_newState_help_en_US.ftl

@@ -0,0 +1 @@
+'true' to enable, anything else to disable.

templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_warnNotificationThreshold_en_US.ftl

@@ -0,0 +1 @@
+The amount of warnings to notify at. Default: ${defaultValue}

templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl

@@ -0,0 +1 @@
+The channel in which warn threshold notifications should be sent to. Default: ${defaultValue}