[maven-release-plugin] prepare release v1.5.24

.env

@@ -1,2 +1,2 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.5.22
+VERSION=1.5.24

.github/workflows/release.yml

@@ -1,55 +0,0 @@
-name: Publish package to GitHub Packages and deploy documentation to GitHub pages
-on:
-  release:
-    types: [created]
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
-      - name: Set up Java for publishing to GitHub Packages
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: 17
-      - name: Load current version
-        id: version
-        run: echo "version=$(mvn --file abstracto-application/pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
-      - name: Publish to GitHub Packages
-        run: mvn --file abstracto-application/pom.xml -B deploy -P documentation,javadoc -Dmaven.wagon.http.pool=false -DskipTests=true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Deploy documentation to GitHub pages
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          repository-name: Sheldan/abstracto-docs
-          target-folder: docs/${{ env.version }}
-          branch: master
-          ssh-key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-          folder: abstracto-application/documentation/target/generated-docs
-      - name: Deploy documentation to GitHub pages latest
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          repository-name: Sheldan/abstracto-docs
-          target-folder: docs/current
-          branch: master
-          ssh-key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-          folder: abstracto-application/documentation/target/generated-docs
-      - name: Login to Harbor
-        uses: docker/login-action@v2
-        with:
-          registry: harbor.sheldan.dev
-          username: ${{ secrets.HARBOR_USERNAME }}
-          password: ${{ secrets.HARBOR_TOKEN }}
-      - name: Load env files
-        id: dotenv
-        uses: falti/dotenv-action@v1.0.4
-        with:
-          path: .env
-      - name: Push container
-        run: docker-compose build && docker-compose push
-        env:
-          REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
-          VERSION: ${{ steps.dotenv.outputs.version }}

abstracto-application/abstracto-modules/anti-raid/anti-raid-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>anti-raid</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/anti-raid/anti-raid-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>anti-raid</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/anti-raid/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>assignable-roles</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>assignable-roles</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>assignable-roles-int</artifactId>

abstracto-application/abstracto-modules/assignable-roles/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/custom-command/custom-command-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>custom-command</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/custom-command/custom-command-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>custom-command</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/custom-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/dynamic-activity/dynamic-activity-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>dynamic-activity</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/dynamic-activity/dynamic-activity-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>dynamic-activity</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/dynamic-activity/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/entertainment-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>entertainment</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/entertainment-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>entertainment</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>experience-tracking</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>experience-tracking</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/giveaway/giveaway-impl/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>giveaway</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
 
     <artifactId>giveaway-impl</artifactId>

abstracto-application/abstracto-modules/giveaway/giveaway-int/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>giveaway</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
 
     <artifactId>giveaway-int</artifactId>

abstracto-application/abstracto-modules/giveaway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
 
     <artifactId>giveaway</artifactId>

abstracto-application/abstracto-modules/image-generation/image-generation-impl/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>image-generation</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
 
     <artifactId>image-generation-impl</artifactId>

abstracto-application/abstracto-modules/image-generation/image-generation-int/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>image-generation</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
 
     <artifactId>image-generation-int</artifactId>

abstracto-application/abstracto-modules/image-generation/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
 
     <artifactId>image-generation</artifactId>

abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>invite-filter</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/invite-filter/invite-filter-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>invite-filter</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/invite-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/link-embed/link-embed-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>link-embed</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/link-embed/link-embed-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>link-embed</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/link-embed/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/logging/logging-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>logging</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/logging/logging-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>logging</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/logging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/moderation/moderation-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>moderation</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/HoneyPotRoleAddedListener.java

@@ -4,19 +4,30 @@ import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.ListenerPriority;
 import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
 import dev.sheldan.abstracto.core.listener.sync.jda.RoleAddedListener;
+import dev.sheldan.abstracto.core.models.ConditionContextInstance;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.models.listener.RoleAddedModel;
 import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
 import dev.sheldan.abstracto.core.models.template.display.RoleDisplay;
+import dev.sheldan.abstracto.core.service.ConditionService;
 import dev.sheldan.abstracto.core.service.ConfigService;
+import dev.sheldan.abstracto.core.service.SystemCondition;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import dev.sheldan.abstracto.moderation.config.feature.HoneyPotFeatureConfig;
 import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.model.listener.HoneyPotReasonModel;
 import dev.sheldan.abstracto.moderation.service.BanService;
 import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Member;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
+import java.util.Map;
+
 @Component
 @Slf4j
 public class HoneyPotRoleAddedListener implements RoleAddedListener {
@@ -30,8 +41,20 @@ public class HoneyPotRoleAddedListener implements RoleAddedListener {
     @Autowired
     private TemplateService templateService;
 
+    @Autowired
+    private ConditionService conditionService;
+
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
+
     private static final String HONEYPOT_BAN_REASON_TEMPLATE = "honeypot_ban_reason";
 
+    private static final String LEVEL_CONDITION_USER_ID_PARAMETER = "userId";
+    private static final String LEVEL_CONDITION_LEVEL_PARAMETER = "level";
+    private static final String LEVEL_CONDITION_SERVER_PARAMETER = "serverId";
+
+    private static final String LEVEL_CONDITION_NAME = "HAS_LEVEL";
+
     @Override
     public DefaultListenerResult execute(RoleAddedModel model) {
         Long roleId = configService.getLongValueOrConfigDefault(HoneyPotFeatureConfig.HONEYPOT_ROLE_ID, model.getServerId());
@@ -40,24 +63,54 @@ public class HoneyPotRoleAddedListener implements RoleAddedListener {
             return DefaultListenerResult.IGNORED;
         }
         if(roleId.equals(model.getRoleId())) {
-            log.info("Banning user {} in guild {} due to role {}.", model.getTargetUser().getUserId(), model.getTargetUser().getServerId(), model.getRoleId());
-            HoneyPotReasonModel reasonModel = HoneyPotReasonModel
-                    .builder()
-                    .memberDisplay(MemberDisplay.fromMember(model.getTargetMember()))
-                    .roleDisplay(RoleDisplay.fromRole(model.getRole()))
-                    .build();
-            String banReason = templateService.renderTemplate(HONEYPOT_BAN_REASON_TEMPLATE, reasonModel);
-            banService.banUserWithNotification(model.getTargetMember().getUser(), banReason, model.getTargetMember().getGuild().getSelfMember(), null).thenAccept(banResult -> {
-                log.info("Banned user {} in guild {} due to role {}.", model.getTargetUser().getUserId(), model.getTargetUser().getServerId(), model.getRoleId());
-            }).exceptionally(throwable -> {
-                log.error("Failed to ban user {} in guild {} due to role {}.", model.getTargetUser().getUserId(), model.getTargetUser().getServerId(), model.getRoleId(), throwable);
-                return null;
-            });
+            Integer levelToSkipBan = configService.getLongValueOrConfigDefault(HoneyPotFeatureConfig.HONEYPOT_IGNORED_LEVEL, model.getServerId()).intValue();
+            Long amountOfSecondsToIgnore = configService.getLongValueOrConfigDefault(HoneyPotFeatureConfig.HONEYPOT_IGNORED_JOIN_DURATION_SECONDS, model.getServerId());
+            boolean allowed = userHasLevel(model.getTargetMember(), levelToSkipBan) || userJoinedLongerThanSeconds(model.getTargetMember(), amountOfSecondsToIgnore);
+            if(allowed) {
+                log.info("User {} in server {} has at least level {} or joined more than {} seconds ago and will not get banned by honeypot.",
+                        model.getTargetUser().getUserId(), model.getTargetUser().getServerId(), levelToSkipBan, amountOfSecondsToIgnore);
+            } else  {
+                log.info("Banning user {} in guild {} due to role {}.", model.getTargetUser().getUserId(), model.getTargetUser().getServerId(), model.getRoleId());
+                HoneyPotReasonModel reasonModel = HoneyPotReasonModel
+                        .builder()
+                        .memberDisplay(MemberDisplay.fromMember(model.getTargetMember()))
+                        .roleDisplay(RoleDisplay.fromRole(model.getRole()))
+                        .build();
+                String banReason = templateService.renderTemplate(HONEYPOT_BAN_REASON_TEMPLATE, reasonModel);
+                banService.banUserWithNotification(model.getTargetMember().getUser(), banReason, model.getTargetMember().getGuild().getSelfMember(), null).thenAccept(banResult -> {
+                    log.info("Banned user {} in guild {} due to role {}.", model.getTargetUser().getUserId(), model.getTargetUser().getServerId(), model.getRoleId());
+                }).exceptionally(throwable -> {
+                    log.error("Failed to ban user {} in guild {} due to role {}.", model.getTargetUser().getUserId(), model.getTargetUser().getServerId(), model.getRoleId(), throwable);
+                    return null;
+                });
+            }
             return DefaultListenerResult.PROCESSED;
         }
         return DefaultListenerResult.IGNORED;
     }
 
+    private boolean userHasLevel(Member member, Integer level) {
+        log.info("Checking if member {} is ignored to click on the honeypot in server {}.", member.getIdLong(),member.getGuild().getIdLong());
+        Map<String, Object> parameters = new HashMap<>();
+        AUserInAServer userInAServer = userInServerManagementService.loadOrCreateUser(member);
+        parameters.put(LEVEL_CONDITION_USER_ID_PARAMETER, userInAServer.getUserInServerId());
+        parameters.put(LEVEL_CONDITION_LEVEL_PARAMETER, level);
+        parameters.put(LEVEL_CONDITION_SERVER_PARAMETER, member.getGuild().getIdLong());
+        ConditionContextInstance contextInstance = ConditionContextInstance
+                .builder()
+                .conditionName(LEVEL_CONDITION_NAME)
+                .parameters(parameters)
+                .build();
+        SystemCondition.Result result = conditionService.checkConditions(contextInstance);
+        return SystemCondition.Result.isSuccessful(result);
+    }
+
+    private boolean userJoinedLongerThanSeconds(Member member, Long seconds) {
+        log.info("Checking if member {} joined the server more than {} seconds ago.", member.getIdLong(), seconds);
+        // the incorrectness of timejoined should not matter, we chunk anyway
+        return member.getTimeJoined().toInstant().isBefore(Instant.now().minus(seconds, ChronoUnit.SECONDS));
+    }
+
     @Override
     public FeatureDefinition getFeature() {
         return ModerationFeatureDefinition.HONEYPOT;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/moderation-config.properties

@@ -98,5 +98,11 @@ abstracto.featureModes.notifyMemberWarningDecays.enabled=true
 abstracto.systemConfigs.honeypotRoleId.name=honeypotRoleId
 abstracto.systemConfigs.honeypotRoleId.longValue=0
 
+abstracto.systemConfigs.honeypotIgnoredLevel.name=honeypotIgnoredLevel
+abstracto.systemConfigs.honeypotIgnoredLevel.longValue=100
+
+abstracto.systemConfigs.honeypotIgnoredJoinDurationSeconds.name=honeypotIgnoredJoinDurationSeconds
+abstracto.systemConfigs.honeypotIgnoredJoinDurationSeconds.longValue=86400
+
 abstracto.featureFlags.honeypot.featureName=honeypot
 abstracto.featureFlags.honeypot.enabled=false

abstracto-application/abstracto-modules/moderation/moderation-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>moderation</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/feature/HoneyPotFeatureConfig.java

@@ -11,6 +11,8 @@ import java.util.List;
 public class HoneyPotFeatureConfig implements FeatureConfig {
 
     public static final String HONEYPOT_ROLE_ID = "honeypotRoleId";
+    public static final String HONEYPOT_IGNORED_LEVEL = "honeypotIgnoredLevel";
+    public static final String HONEYPOT_IGNORED_JOIN_DURATION_SECONDS = "honeypotIgnoredJoinDurationSeconds";
 
     @Override
     public FeatureDefinition getFeature() {
@@ -19,6 +21,6 @@ public class HoneyPotFeatureConfig implements FeatureConfig {
 
     @Override
     public List<String> getRequiredSystemConfigKeys() {
-        return Arrays.asList(HONEYPOT_ROLE_ID);
+        return Arrays.asList(HONEYPOT_ROLE_ID, HONEYPOT_IGNORED_LEVEL, HONEYPOT_IGNORED_JOIN_DURATION_SECONDS);
     }
 }

abstracto-application/abstracto-modules/moderation/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/modmail/modmail-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>modmail</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/modmail/modmail-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>modmail</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/modmail/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto</groupId>
         <artifactId>abstracto-application</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/profanity-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/profanity-filter/profanity-filter-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>profanity-filter</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/profanity-filter/profanity-filter-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>profanity-filter</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/remind/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/remind/remind-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>remind</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/remind/remind-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>remind</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/repost-detection/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/repost-detection/repost-detection-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>repost-detection</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/repost-detection/repost-detection-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>repost-detection</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/starboard-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>starboard</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/starboard-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>starboard</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/statistic/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/statistic/statistic-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>statistic</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/statistic/statistic-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>statistic</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/suggestion/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/suggestion/suggestion-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>suggestion</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/suggestion/suggestion-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>suggestion</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/twitch/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/twitch/twitch-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>twitch</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/twitch/twitch-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>twitch</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/utility/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/utility/utility-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>utility</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/utility/utility-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>utility</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/voice-channel-context/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/voice-channel-context/voice-channel-context-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>voice-channel-context</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/voice-channel-context/voice-channel-context-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>voice-channel-context</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/webservices/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/webservices/webservices-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>webservices</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/webservices/webservices-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>webservices</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/bundle/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto</groupId>
         <artifactId>abstracto-application</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/core/core-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.core</groupId>
         <artifactId>core</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

abstracto-application/core/core-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.core</groupId>
         <artifactId>core</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/SystemCondition.java

@@ -18,5 +18,9 @@ public interface SystemCondition {
         public static boolean consideredSuccessful(Result result) {
             return result == Result.SUCCESSFUL || result == Result.IGNORED;
         }
+
+        public static boolean isSuccessful(Result result) {
+            return result == Result.SUCCESSFUL;
+        }
     }
 }

abstracto-application/core/metrics-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>dev.sheldan.abstracto.core</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/core/metrics-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>dev.sheldan.abstracto.core</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto</groupId>
         <artifactId>abstracto-application</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/documentation/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-application</artifactId>
         <groupId>dev.sheldan.abstracto</groupId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>dev.sheldan.abstracto</groupId>
     <artifactId>abstracto-application</artifactId>
-    <version>1.5.23</version>
+    <version>1.5.24</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -33,7 +33,7 @@
         <connection>scm:git:${project.scm.url}</connection>
         <developerConnection>scm:git:${project.scm.url}</developerConnection>
         <url>https://github.com/Sheldan/abstracto.git</url>
-        <tag>v1.5.23</tag>
+        <tag>v1.5.24</tag>
     </scm>
 
     <repositories>

abstracto-application/scheduling/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto</groupId>
         <artifactId>abstracto-application</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/scheduling/scheduling-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.scheduling</groupId>
         <artifactId>scheduling</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

abstracto-application/scheduling/scheduling-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.scheduling</groupId>
         <artifactId>scheduling</artifactId>
-        <version>1.5.23</version>
+        <version>1.5.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>