Commit from GitHub Actions (Publishes a new version of abstracto)

fixing message embed cleanup job not being able to deal with missing channels

.env

@@ -1,2 +1,2 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.6.22
+VERSION=1.6.25

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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>dev.sheldan.abstracto.modules</groupId>
             <artifactId>moderation-int</artifactId>
-            <version>1.6.23-SNAPSHOT</version>
+            <version>1.6.26-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java

@@ -26,9 +26,11 @@ import dev.sheldan.abstracto.linkembed.service.management.MessageEmbedPostManage
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.interactions.commands.CommandInteraction;
 import org.apache.commons.lang3.tuple.Pair;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -191,11 +193,20 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
                 .builder()
                 .message(embeddedMessage)
                 .build();
-            MessageToSend messageToSend =
-                templateService.renderEmbedTemplate(MESSAGE_EMBED_CLEANUP_REPLACEMENT_TEMPLATE, model, embeddingMessage.getServerId());
-            return channelService.editMessageInAChannelFuture(messageToSend, embeddingMessage.getServerId(), embeddingMessage.getChannelId(),
-                embeddingMessage.getMessageId());
-        }).toList();
+            Optional<GuildChannel> existingChannel =
+                channelService.getGuildChannelFromServerOptional(embeddingMessage.getServerId(), embeddingMessage.getChannelId());
+            // if the channel doesnt exist, we dont need to cleanup
+            if(existingChannel.isPresent()) {
+                MessageToSend messageToSend =
+                    templateService.renderEmbedTemplate(MESSAGE_EMBED_CLEANUP_REPLACEMENT_TEMPLATE, model, embeddingMessage.getServerId());
+                return channelService.editMessageInAChannelFuture(messageToSend, embeddingMessage.getServerId(), embeddingMessage.getChannelId(),
+                    embeddingMessage.getMessageId());
+            } else {
+                return null;
+            }
+        })
+        .filter(Objects::nonNull)
+        .toList();
         return FutureUtils.toSingleFutureGeneric(editList).whenComplete((unused, throwable) -> {
             if(throwable != null) {
                 log.warn("Failed to cleanup embedded messages..", throwable);

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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -18,7 +18,7 @@ import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
 import dev.sheldan.abstracto.moderation.config.ModerationSlashCommandNames;
 import dev.sheldan.abstracto.moderation.config.feature.HoneyPotFeatureConfig;
 import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
-import dev.sheldan.abstracto.moderation.listener.HoneyPotServiceBean;
+import dev.sheldan.abstracto.moderation.service.HoneyPotServiceBean;
 import dev.sheldan.abstracto.moderation.model.template.command.HoneyPotBanResponseModel;
 import java.time.Duration;
 import java.time.Instant;
@@ -98,7 +98,7 @@ public class HoneyPotBan extends AbstractConditionableCommand {
             .toList();
         Role honeyPotRole = guild.getRoleById(honeyPotServiceBean.getHoneyPotRoleId(guild.getIdLong()));
         List<CompletableFuture<Void>> futures = currentMembersWithHoneypotRole.stream().map(member ->
-            honeyPotServiceBean.banForHoneyPot(member, honeyPotRole)
+            honeyPotServiceBean.banForHoneyPotRole(member, honeyPotRole)
         ).toList();
         Integer memberCount = currentMembersWithHoneypotRole.size();
         CompletableFutureList<Void> futureList = new CompletableFutureList<>(futures);

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

@@ -0,0 +1,61 @@
+package dev.sheldan.abstracto.moderation.listener;
+
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.config.FeatureMode;
+import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
+import dev.sheldan.abstracto.core.listener.async.jda.AsyncMessageReceivedListener;
+import dev.sheldan.abstracto.core.models.listener.MessageReceivedModel;
+import dev.sheldan.abstracto.core.service.ConfigService;
+import dev.sheldan.abstracto.core.service.MessageService;
+import dev.sheldan.abstracto.moderation.config.feature.HoneyPotFeatureConfig;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.HoneypotMode;
+import dev.sheldan.abstracto.moderation.service.HoneyPotServiceBean;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class HoneyPotMessageListener implements AsyncMessageReceivedListener {
+
+    @Autowired
+    private ConfigService configService;
+
+    @Autowired
+    private HoneyPotServiceBean honeyPotServiceBean;
+
+    @Autowired
+    private MessageService messageService;
+
+    @Override
+    public DefaultListenerResult execute(MessageReceivedModel model) {
+        Long honeyPotChannel = configService.getLongValueOrConfigDefault(HoneyPotFeatureConfig.HONEYPOT_CHANNEL, model.getServerId());
+        if(honeyPotChannel == 0) {
+            return DefaultListenerResult.IGNORED;
+        }
+        if(model.getMessage().getChannelId().equals(honeyPotChannel.toString())) {
+            boolean honeyPotActivated = honeyPotServiceBean.fellIntoHoneyPotIgnoringJoinDate(model.getServerId(), model.getMessage().getMember());
+            if(honeyPotActivated) {
+                log.info("Banning user {} in guild {} due to a message in channel {}.", model.getMessage().getAuthor().getIdLong(), model.getServerId(), honeyPotChannel);
+                honeyPotServiceBean.banForHoneyPotMessage(model.getMessage().getMember(), honeyPotChannel);
+            } else {
+                log.info("NOT banning user {} in guild {} due to a message in honeypot channel {}.", model.getMessage().getAuthor().getIdLong(), model.getServerId(), honeyPotChannel);
+                messageService.deleteMessage(model.getMessage());
+            }
+            return DefaultListenerResult.PROCESSED;
+        }
+        return DefaultListenerResult.IGNORED;
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.HONEYPOT;
+    }
+
+    @Override
+    public List<FeatureMode> getFeatureModeLimitations() {
+        return List.of(HoneypotMode.MESSAGE);
+    }
+}

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

@@ -1,12 +1,15 @@
 package dev.sheldan.abstracto.moderation.listener;
 
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.config.FeatureMode;
 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.listener.RoleAddedModel;
 import dev.sheldan.abstracto.core.service.RoleService;
 import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.HoneypotMode;
+import dev.sheldan.abstracto.moderation.service.HoneyPotServiceBean;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -37,7 +40,7 @@ public class HoneyPotRoleAddedListener implements RoleAddedListener {
             boolean fellIntoHoneyPot = honeyPotServiceBean.fellIntoHoneyPot(model.getServerId(), model.getTargetMember());
             if (fellIntoHoneyPot) {
                 log.info("Banning user {} in guild {} due to role {}.", model.getTargetUser().getUserId(), model.getTargetUser().getServerId(), model.getRoleId());
-                honeyPotServiceBean.banForHoneyPot(model.getTargetMember(), model.getRole());
+                honeyPotServiceBean.banForHoneyPotRole(model.getTargetMember(), model.getRole());
             } else {
                 log.info("User {} in server {}  will not get banned by honeypot. All existing roles besides {} will be removed.",
                         model.getTargetUser().getUserId(), model.getTargetUser().getServerId(), honeyPotRoleId);
@@ -83,4 +86,8 @@ public class HoneyPotRoleAddedListener implements RoleAddedListener {
         return ListenerPriority.MEDIUM;
     }
 
+    @Override
+    public List<FeatureMode> getFeatureModeLimitations() {
+        return List.of(HoneypotMode.ROLE);
+    }
 }

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.listener;
+package dev.sheldan.abstracto.moderation.service;
 
 import dev.sheldan.abstracto.core.models.ConditionContextInstance;
 import dev.sheldan.abstracto.core.models.ServerUser;
@@ -13,7 +13,6 @@ import dev.sheldan.abstracto.core.service.management.UserInServerManagementServi
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import dev.sheldan.abstracto.moderation.config.feature.HoneyPotFeatureConfig;
 import dev.sheldan.abstracto.moderation.model.listener.HoneyPotReasonModel;
-import dev.sheldan.abstracto.moderation.service.BanService;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
@@ -68,11 +67,33 @@ public class HoneyPotServiceBean {
         return !allowed;
     }
 
+    public boolean fellIntoHoneyPotIgnoringJoinDate(Long serverId, Member member) {
+        Integer levelToSkipBan = configService.getLongValueOrConfigDefault(HoneyPotFeatureConfig.HONEYPOT_IGNORED_LEVEL, serverId).intValue();
+        boolean allowed =  userHasLevel(member, levelToSkipBan);
+        return !allowed;
+    }
+
     public List<Member> getCurrentMembersWithHoneypotRole(Guild guild) {
         return memberService.getMembersWithRole(guild.getIdLong(), getHoneyPotRoleId(guild.getIdLong()));
     }
 
-    public CompletableFuture<Void> banForHoneyPot(Member targetMember, Role role) {
+    public CompletableFuture<Void> banForHoneyPotMessage(Member targetMember, Long channelId) {
+        HoneyPotReasonModel reasonModel = HoneyPotReasonModel
+            .builder()
+            .memberDisplay(MemberDisplay.fromMember(targetMember))
+            .build();
+        ServerUser bannedUser = ServerUser.fromMember(targetMember);
+        String banReason = templateService.renderTemplate(HONEYPOT_BAN_REASON_TEMPLATE, reasonModel, bannedUser.getServerId());
+        return banService.banUserWithNotification(bannedUser, banReason, ServerUser.fromMember(targetMember.getGuild().getSelfMember()),
+            targetMember.getGuild(), Duration.ofDays(7)).thenAccept(banResult -> {
+            log.info("Banned user {} in guild {} due to a message in channel {}.", bannedUser.getUserId(), bannedUser.getServerId(), channelId);
+        }).exceptionally(throwable -> {
+            log.error("Failed to ban user {} in guild {} due to a message in channel {}.", bannedUser.getUserId(), bannedUser.getServerId(), channelId, throwable);
+            return null;
+        });
+    }
+
+    public CompletableFuture<Void> banForHoneyPotRole(Member targetMember, Role role) {
         HoneyPotReasonModel reasonModel = HoneyPotReasonModel
             .builder()
             .memberDisplay(MemberDisplay.fromMember(targetMember))
@@ -91,7 +112,7 @@ public class HoneyPotServiceBean {
     }
 
     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());
+        log.info("Checking if member {} is ignored by 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());

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

@@ -99,3 +99,14 @@ abstracto.systemConfigs.honeypotIgnoredJoinDurationSeconds.longValue=86400
 
 abstracto.featureFlags.honeypot.featureName=honeypot
 abstracto.featureFlags.honeypot.enabled=false
+
+abstracto.featureModes.honeypotRole.featureName=honeypot
+abstracto.featureModes.honeypotRole.mode=honeypotRole
+abstracto.featureModes.honeypotRole.enabled=false
+
+abstracto.featureModes.honeypotMessage.featureName=honeypot
+abstracto.featureModes.honeypotMessage.mode=honeypotMessage
+abstracto.featureModes.honeypotMessage.enabled=false
+
+abstracto.systemConfigs.honeypotChannel.name=honeypotChannel
+abstracto.systemConfigs.honeypotChannel.longValue=0

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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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

@@ -2,6 +2,8 @@ package dev.sheldan.abstracto.moderation.config.feature;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.config.FeatureMode;
+import dev.sheldan.abstracto.moderation.config.feature.mode.HoneypotMode;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -12,6 +14,7 @@ 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_CHANNEL = "honeypotChannel";
     public static final String HONEYPOT_IGNORED_JOIN_DURATION_SECONDS = "honeypotIgnoredJoinDurationSeconds";
 
     @Override
@@ -21,6 +24,11 @@ public class HoneyPotFeatureConfig implements FeatureConfig {
 
     @Override
     public List<String> getRequiredSystemConfigKeys() {
-        return Arrays.asList(HONEYPOT_ROLE_ID, HONEYPOT_IGNORED_LEVEL, HONEYPOT_IGNORED_JOIN_DURATION_SECONDS);
+        return Arrays.asList(HONEYPOT_ROLE_ID, HONEYPOT_IGNORED_LEVEL, HONEYPOT_IGNORED_JOIN_DURATION_SECONDS, HONEYPOT_CHANNEL);
+    }
+
+    @Override
+    public List<FeatureMode> getAvailableModes() {
+        return Arrays.asList(HoneypotMode.values());
     }
 }

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

@@ -0,0 +1,16 @@
+package dev.sheldan.abstracto.moderation.config.feature.mode;
+
+import dev.sheldan.abstracto.core.config.FeatureMode;
+import lombok.Getter;
+
+@Getter
+public enum HoneypotMode implements FeatureMode {
+    ROLE("honeypotRole"),
+    MESSAGE("honeypotMessage");
+
+    private final String key;
+
+    HoneypotMode(String key) {
+        this.key = key;
+    }
+}

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

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModmailReminderListener.java

@@ -75,7 +75,7 @@ public class ModmailReminderListener implements ModmailThreadActionListener {
                 log.debug("Thread {} is closed - ignoring.", model.getThreadId());
                 return ModmailThreadActionListenerResult.IGNORED;
             }
-            Instant timeStampToConsider = getTimestampToUse(thread);
+            Instant timeStampToConsider = getTimestampToUse(thread, duration);
             boolean mustBeReminded = timeInPastDuration.isAfter(timeStampToConsider);
             if (mustBeReminded) {
                     sendReminder(thread)
@@ -97,14 +97,17 @@ public class ModmailReminderListener implements ModmailThreadActionListener {
     }
 
 
-    private static Instant getTimestampToUse(ModMailThread thread) {
+    private static Instant getTimestampToUse(ModMailThread thread, Duration configuredDuration) {
         if (thread.getRemindersSnoozedUntil() != null) {
-            return thread.getRemindersSnoozedUntil();
+            return thread.getRemindersSnoozedUntil().minus(configuredDuration);
         }
         return getUpdatedOrCrated(thread);
     }
 
     private static Instant getUpdatedOrCrated(ModMailThread thread) {
+        if(thread.getLastUpdated() != null) {
+            return thread.getLastUpdated();
+        }
         if(thread.getUpdated() != null) {
             return thread.getUpdated();
         }

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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

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

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>sticky-roles</artifactId>
-        <version>1.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
 
     <artifactId>sticky-roles-impl</artifactId>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>sticky-roles</artifactId>
-        <version>1.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
 
     <artifactId>sticky-roles-int</artifactId>

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

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/twitch/twitch-impl/src/main/java/dev/sheldan/abstracto/twitch/service/StreamerServiceBean.java

@@ -13,6 +13,7 @@ import dev.sheldan.abstracto.core.service.management.UserInServerManagementServi
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import dev.sheldan.abstracto.core.utils.CompletableFutureList;
+import dev.sheldan.abstracto.core.utils.ParseUtils;
 import dev.sheldan.abstracto.twitch.config.TwitchFeatureConfig;
 import dev.sheldan.abstracto.twitch.config.TwitchFeatureDefinition;
 import dev.sheldan.abstracto.twitch.config.TwitchFeatureMode;
@@ -26,6 +27,8 @@ import dev.sheldan.abstracto.twitch.model.template.*;
 import dev.sheldan.abstracto.twitch.service.management.StreamSessionManagementService;
 import dev.sheldan.abstracto.twitch.service.management.StreamSessionSectionManagementService;
 import dev.sheldan.abstracto.twitch.service.management.StreamerManagementService;
+import java.time.Duration;
+import java.time.Instant;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
@@ -92,6 +95,9 @@ public class StreamerServiceBean implements StreamerService {
     @Autowired
     private MessageService messageService;
 
+    @Autowired
+    private ConfigService configService;
+
     @Autowired
     private StreamerServiceBean self;
 
@@ -277,6 +283,8 @@ public class StreamerServiceBean implements StreamerService {
         log.debug("Searching through {} servers for twitch notifications and {} have twitch feature enabled.", servers.size(), serversWithEnabledFeature.size());
         serversWithEnabledFeature.forEach(server -> {
             List<Streamer> streamersInServer = streamerManagementService.getStreamersForServer(server);
+            String refreshDurationString = configService.getStringValueOrConfigDefault(TwitchFeatureConfig.TWITCH_REFRESH_INTERVAL, server.getId());
+            Duration refreshDuration = ParseUtils.parseDuration(refreshDurationString);
             Map<Long, Streamer> streamerIdMap = streamersInServer
                     .stream()
                     .collect(Collectors.toMap(Streamer::getId, Function.identity()));
@@ -295,7 +303,7 @@ public class StreamerServiceBean implements StreamerService {
             List<Stream> streamsOfUsers = twitchService.getStreamsByUserIds(userIds);
             Set<Long> onlineStreamers = new HashSet<>();
             Map<Long, Boolean> updateNotificationFlagValues = new HashMap<>();
-            streamsOfUsers.forEach(stream -> self.processOnlineStreamer(server, streamerMap, onlineStreamers, updateNotificationFlagValues, stream));
+            streamsOfUsers.forEach(stream -> self.processOnlineStreamer(server, streamerMap, onlineStreamers, updateNotificationFlagValues, stream, refreshDuration));
             Set<Long> allStreamersInServer = streamerIdMap.keySet();
             allStreamersInServer.removeAll(onlineStreamers); // then we have those that went offline
             Map<Long, Boolean> deleteFlagValues = new HashMap<>();
@@ -370,7 +378,8 @@ public class StreamerServiceBean implements StreamerService {
     }
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    public void processOnlineStreamer(AServer server, Map<String, Streamer> streamerMap, Set<Long> onlineStreamers, Map<Long, Boolean> updateNotificationFlagValues, Stream stream) {
+    public void processOnlineStreamer(AServer server, Map<String, Streamer> streamerMap, Set<Long> onlineStreamers, Map<Long, Boolean> updateNotificationFlagValues,
+                                      Stream stream, Duration refreshDuration) {
         Streamer streamer = streamerMap.get(stream.getUserId());
         Long streamerId = streamer.getId();
         onlineStreamers.add(streamerId);
@@ -378,18 +387,19 @@ public class StreamerServiceBean implements StreamerService {
         // that is the case if you add an online streamer
         User streamerUser = twitchService.getStreamerById(stream.getUserId());
         StreamSession currentSession = streamer.getCurrentSession();
+        Long serverId = streamer.getServer().getId();
         if (Boolean.TRUE.equals(streamer.getOnline()) && currentSession != null) {
             // we already know that this streamer is online
             log.debug("Not notifying for streamer {} in server {} - streamer is already online.", streamerId, server.getId());
             if(!stream.getGameId().equals(streamer.getCurrentGameId())) {
                 log.info("Streamer {} changed game from {} to {} - storing new section.", streamerId, streamer.getCurrentGameId(), stream.getGameId());
                 streamSessionSectionService.createSectionFromStream(currentSession, stream);
+                currentSession.setLastUpdated(Instant.now());
                 if (updateNotificationFlagValues.computeIfAbsent(streamer.getServer().getId(),
                         aLong -> featureModeService.featureModeActive(TwitchFeatureDefinition.TWITCH, aLong, TwitchFeatureMode.UPDATE_NOTIFICATION))) {
                     log.info("Updating notification is enabled - updating notification for streamer {}.", streamer.getId());
                     Long notificationMessageId = currentSession.getId();
                     Long notificationChannelId = currentSession.getChannel().getId();
-                    Long serverId = streamer.getServer().getId();
                     updateExistingNotification(stream, streamer, streamerUser).thenAccept(unused -> {
                         log.info("Updating existing notification {} for server {} in channel {} about streamer {}.",
                                 notificationMessageId, serverId, notificationChannelId, streamerId);
@@ -400,6 +410,20 @@ public class StreamerServiceBean implements StreamerService {
                     });
                 }
                 streamer.setCurrentGameId(stream.getGameId());
+            } else if(currentSession.getLastUpdated().isBefore(Instant.now().minus(refreshDuration)) &&
+                updateNotificationFlagValues.computeIfAbsent(streamer.getServer().getId(),
+                serverIdKey -> featureModeService.featureModeActive(TwitchFeatureDefinition.TWITCH, serverIdKey, TwitchFeatureMode.UPDATE_NOTIFICATION))) {
+                Long notificationMessageId = currentSession.getId();
+                currentSession.setLastUpdated(Instant.now());
+                Long notificationChannelId = currentSession.getChannel().getId();
+                updateExistingNotification(stream, streamer, streamerUser).thenAccept(unused -> {
+                    log.info("Updating existing notification {} for server {} in channel {} about streamer {}.",
+                        notificationMessageId, serverId, notificationChannelId, streamerId);
+                }).exceptionally(throwable -> {
+                    log.error("Failed to update existing notification {} for server {} in channel {} about streamer {}.",
+                        notificationMessageId, serverId, notificationChannelId, streamerId, throwable);
+                    return null;
+                });
             }
         } else if(currentSession == null &&
                 !postTargetService.postTargetUsableInServer(TwitchPostTarget.TWITCH_LIVE_NOTIFICATION, server.getId())) {

abstracto-application/abstracto-modules/twitch/twitch-impl/src/main/java/dev/sheldan/abstracto/twitch/service/management/StreamSessionManagementServiceBean.java

@@ -6,6 +6,7 @@ import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.twitch.model.database.Streamer;
 import dev.sheldan.abstracto.twitch.model.database.StreamSession;
 import dev.sheldan.abstracto.twitch.repository.StreamSessionRepository;
+import java.time.Instant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -26,6 +27,7 @@ public class StreamSessionManagementServiceBean implements StreamSessionManageme
                 .id(messageId)
                 .startTime(stream.getStartedAtInstant())
                 .channel(channel)
+                .lastUpdated(Instant.now())
                 .streamer(streamer)
                 .streamId(stream.getId())
                 .build();

abstracto-application/abstracto-modules/twitch/twitch-impl/src/main/resources/migrations/1.6.25/collection.xml

@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
+    <include file="tables/tables.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/twitch/twitch-impl/src/main/resources/migrations/1.6.25/tables/stream_session.xml

@@ -0,0 +1,12 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
+    <changeSet author="Sheldan" id="stream_session-add_last_updated">
+        <addColumn tableName="stream_session">
+            <column name="last_updated" type="TIMESTAMP WITHOUT TIME ZONE" defaultValueComputed="CURRENT_TIMESTAMP">
+                <constraints nullable="false" />
+            </column>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>

abstracto-application/abstracto-modules/twitch/twitch-impl/src/main/resources/migrations/1.6.25/tables/tables.xml

@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
+    <include file="stream_session.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/twitch/twitch-impl/src/main/resources/migrations/twitch-changeLog.xml

@@ -3,4 +3,5 @@
                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                      xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="1.4.27/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.6.25/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

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

@@ -12,4 +12,7 @@ abstracto.featureModes.deleteNotification.enabled=true
 
 abstracto.featureModes.updateNotification.featureName=twitch
 abstracto.featureModes.updateNotification.mode=updateNotification
-abstracto.featureModes.updateNotification.enabled=true
+abstracto.featureModes.updateNotification.enabled=true
+
+abstracto.systemConfigs.twitchRefreshInterval.name=twitchRefreshInterval
+abstracto.systemConfigs.twitchRefreshInterval.stringValue=30m

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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

abstracto-application/abstracto-modules/twitch/twitch-int/src/main/java/dev/sheldan/abstracto/twitch/config/TwitchFeatureConfig.java

@@ -11,6 +11,9 @@ import java.util.List;
 
 @Component
 public class TwitchFeatureConfig implements FeatureConfig {
+
+    public static final String TWITCH_REFRESH_INTERVAL = "twitchRefreshInterval";
+
     @Override
     public FeatureDefinition getFeature() {
         return TwitchFeatureDefinition.TWITCH;
@@ -25,4 +28,9 @@ public class TwitchFeatureConfig implements FeatureConfig {
     public List<FeatureMode> getAvailableModes() {
         return Arrays.asList(TwitchFeatureMode.DELETE_NOTIFICATION, TwitchFeatureMode.UPDATE_NOTIFICATION);
     }
+
+    @Override
+    public List<String> getRequiredSystemConfigKeys() {
+        return List.of(TWITCH_REFRESH_INTERVAL);
+    }
 }

abstracto-application/abstracto-modules/twitch/twitch-int/src/main/java/dev/sheldan/abstracto/twitch/model/database/StreamSession.java

@@ -39,6 +39,9 @@ public class StreamSession {
     @Column(name = "updated", insertable = false, updatable = false)
     private Instant updated;
 
+    @Column(name = "lastUpdated")
+    private Instant lastUpdated;
+
     @Column(name = "startTime", nullable = false)
     private Instant startTime;
 

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

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/DisableMode.java

@@ -1,6 +1,7 @@
 package dev.sheldan.abstracto.core.commands.config.features;
 
 import dev.sheldan.abstracto.core.command.service.management.FeatureManagementService;
+import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.interaction.slash.CoreSlashCommandNames;
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -15,9 +16,7 @@ import dev.sheldan.abstracto.core.config.FeatureMode;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
-import dev.sheldan.abstracto.core.models.database.AFeature;
 import dev.sheldan.abstracto.core.models.database.AFeatureFlag;
-import dev.sheldan.abstracto.core.models.database.AFeatureMode;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.FeatureConfigService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
@@ -59,12 +58,6 @@ public class DisableMode extends AbstractConditionableCommand {
     @Autowired
     private FeatureFlagManagementService featureFlagManagementService;
 
-    @Autowired
-    private FeatureModeManagementService featureModeManagementService;
-
-    @Autowired
-    private FeatureManagementService featureManagementService;
-
     private static final String DISABLE_MODE_RESPONSE_KEY = "disableMode_response";
     private static final String FEATURE_PARAMETER = "feature";
     private static final String MODE_PARAMETER = "mode";
@@ -99,11 +92,11 @@ public class DisableMode extends AbstractConditionableCommand {
                 return new ArrayList<>();
             }
             FeatureDefinition featureDefinition = featureConfigService.getFeatureEnum(featureName);
-            AFeature feature = featureManagementService.getFeature(featureDefinition.getKey());
-            List<AFeatureMode> modes = featureModeManagementService.getFeatureModesOfFeatureInServer(server, feature);
+            FeatureConfig feature = featureConfigService.getFeatureDisplayForFeature(featureDefinition);
+            List<FeatureMode> modes = feature.getAvailableModes();
             return modes
                 .stream()
-                .map(mode -> mode.getFeatureMode().toLowerCase())
+                .map(mode -> mode.getKey().toLowerCase())
                 .filter(string -> string.startsWith(input))
                 .toList();
         }

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/EnableMode.java

@@ -1,6 +1,7 @@
 package dev.sheldan.abstracto.core.commands.config.features;
 
 import dev.sheldan.abstracto.core.command.service.management.FeatureManagementService;
+import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.interaction.slash.CoreSlashCommandNames;
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -15,9 +16,7 @@ import dev.sheldan.abstracto.core.config.FeatureMode;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
-import dev.sheldan.abstracto.core.models.database.AFeature;
 import dev.sheldan.abstracto.core.models.database.AFeatureFlag;
-import dev.sheldan.abstracto.core.models.database.AFeatureMode;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.FeatureConfigService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
@@ -59,12 +58,6 @@ public class EnableMode extends AbstractConditionableCommand {
     @Autowired
     private FeatureFlagManagementService featureFlagManagementService;
 
-    @Autowired
-    private FeatureModeManagementService featureModeManagementService;
-
-    @Autowired
-    private FeatureManagementService featureManagementService;
-
     private static final String ENABLE_MODE_RESPONSE_KEY = "enableMode_response";
     private static final String FEATURE_PARAMETER = "feature";
     private static final String MODE_PARAMETER = "mode";
@@ -99,11 +92,11 @@ public class EnableMode extends AbstractConditionableCommand {
                 return new ArrayList<>();
             }
             FeatureDefinition featureDefinition = featureConfigService.getFeatureEnum(featureName);
-            AFeature feature = featureManagementService.getFeature(featureDefinition.getKey());
-            List<AFeatureMode> modes = featureModeManagementService.getFeatureModesOfFeatureInServer(server, feature);
+            FeatureConfig feature = featureConfigService.getFeatureDisplayForFeature(featureDefinition);
+            List<FeatureMode> modes = feature.getAvailableModes();
             return modes
                 .stream()
-                .map(mode -> mode.getFeatureMode().toLowerCase())
+                .map(mode -> mode.getKey().toLowerCase())
                 .filter(string -> string.startsWith(input))
                 .toList();
         }

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

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

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

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>dev.sheldan.abstracto.core</groupId>
-        <version>1.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</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.6.23-SNAPSHOT</version>
+        <version>1.6.26-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>