refactor: move thread reactivation logic to HelpThreadAutoArchiver

- Make HelpThreadAutoArchiver implement UserInteractor (name: thread-inactivity)

- Own ComponentIdInteractor for mark-active button ID generation

- Move onButtonClick/onInactivityButton from listener to archiver

- Remove mark-active routing and getComponentIdInteractor from listener

- Remove unused generateMarkActiveId from HelpSystemHelper

- Extract mark-active literal to constant (SonarLint S1192)

Author: SleepyStack

application/src/main/java/org/togetherjava/tjbot/features/Features.java

@@ -146,8 +146,7 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
             .add(new AutoPruneHelperRoutine(config, helpSystemHelper, modAuditLogWriter, database));
         HelpThreadCreatedListener helpThreadCreatedListener =
                 new HelpThreadCreatedListener(helpSystemHelper);
-        features.add(new HelpThreadAutoArchiver(helpSystemHelper,
-                helpThreadCreatedListener.getComponentIdInteractor()));
+        features.add(new HelpThreadAutoArchiver(helpSystemHelper));
         features.add(new LeftoverBookmarksCleanupRoutine(bookmarksSystem));
         features.add(new MarkHelpThreadCloseInDBRoutine(database, helpThreadLifecycleListener));
         features.add(new MemberCountDisplayRoutine(config));

application/src/main/java/org/togetherjava/tjbot/features/help/HelpSystemHelper.java

@@ -419,17 +419,6 @@ Optional<Long> getAuthorByHelpThreadId(final long channelId) {
     }
 
 
-    /**
-     * Generates a component ID for the "Mark Active" button, derived from the given interactor's
-     * namespace.
-     *
-     * @param interactor the component ID interactor whose namespace should be used
-     * @return a valid component ID string for the mark-active button
-     */
-    public String generateMarkActiveId(ComponentIdInteractor interactor) {
-        return interactor.generateComponentId("mark-active");
-    }
-
     /**
      * will be used to filter a tag based on categories config
      * 

application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadAutoArchiver.java

@@ -8,13 +8,17 @@
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.TimeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.togetherjava.tjbot.features.Routine;
+import org.togetherjava.tjbot.features.UserInteractionType;
+import org.togetherjava.tjbot.features.UserInteractor;
+import org.togetherjava.tjbot.features.componentids.ComponentIdGenerator;
 import org.togetherjava.tjbot.features.componentids.ComponentIdInteractor;
 
 import java.time.Duration;
@@ -29,25 +33,62 @@
  * Routine, which periodically checks all help threads and archives them if there has not been any
  * recent activity.
  */
-public final class HelpThreadAutoArchiver implements Routine {
+public final class HelpThreadAutoArchiver implements Routine, UserInteractor {
     private static final Logger logger = LoggerFactory.getLogger(HelpThreadAutoArchiver.class);
     private static final int SCHEDULE_MINUTES = 60;
     private static final Duration ARCHIVE_AFTER_INACTIVITY_OF = Duration.ofHours(12);
     private static final String MARK_ACTIVE_LABEL = "Mark Active";
+    private static final String MARK_ACTIVE_ID = "mark-active";
 
     private final HelpSystemHelper helper;
-    private final ComponentIdInteractor componentIdInteractor;
+    private final ComponentIdInteractor inactivityInteractor =
+            new ComponentIdInteractor(getInteractionType(), getName());
 
     /**
      * Creates a new instance.
      *
      * @param helper the helper to use
-     * @param componentIdInteractor the interactor used to generate component IDs for buttons
      */
-    public HelpThreadAutoArchiver(HelpSystemHelper helper,
-            ComponentIdInteractor componentIdInteractor) {
+    public HelpThreadAutoArchiver(HelpSystemHelper helper) {
         this.helper = helper;
-        this.componentIdInteractor = componentIdInteractor;
+    }
+
+    @Override
+    public String getName() {
+        return "thread-inactivity";
+    }
+
+    @Override
+    public UserInteractionType getInteractionType() {
+        return UserInteractionType.OTHER;
+    }
+
+    @Override
+    public void acceptComponentIdGenerator(ComponentIdGenerator generator) {
+        inactivityInteractor.acceptComponentIdGenerator(generator);
+    }
+
+    @Override
+    public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
+        if (args.contains(MARK_ACTIVE_ID)) {
+            onInactivityButton(event);
+        }
+    }
+
+    private void onInactivityButton(ButtonInteractionEvent event) {
+        event.deferEdit().queue();
+
+        if (event.getChannel() instanceof ThreadChannel thread) {
+            Message botClosedThreadMessage = event.getMessage();
+
+            thread.getManager()
+                .setArchived(false)
+                .flatMap(_ -> botClosedThreadMessage.delete())
+                .queue();
+
+            logger.debug("Thread {} was manually reactivated via button by user {}", thread.getId(),
+                    event.getUser().getId());
+        }
     }
 
     @Override
@@ -138,7 +179,7 @@ private void handleArchiveFlow(ThreadChannel threadChannel, MessageEmbed embed)
     private void triggerArchiveFlow(ThreadChannel threadChannel, long authorId,
             MessageEmbed embed) {
 
-        String markActiveId = helper.generateMarkActiveId(componentIdInteractor);
+        String markActiveId = inactivityInteractor.generateComponentId(MARK_ACTIVE_ID);
 
         Function<Member, RestAction<Message>> sendEmbedWithMention =
                 member -> threadChannel.sendMessage(member.getAsMention())
@@ -174,7 +215,7 @@ private void triggerAuthorIdNotFoundArchiveFlow(ThreadChannel threadChannel,
                 "Was unable to find a matching thread for id: {} in DB, archiving thread without mentioning OP",
                 threadChannel.getId());
 
-        String markActiveId = helper.generateMarkActiveId(componentIdInteractor);
+        String markActiveId = inactivityInteractor.generateComponentId(MARK_ACTIVE_ID);
 
         threadChannel.sendMessageEmbeds(embed)
             .addActionRow(Button.primary(markActiveId, MARK_ACTIVE_LABEL))

application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadCreatedListener.java

@@ -166,16 +166,6 @@ public void acceptComponentIdGenerator(ComponentIdGenerator generator) {
         componentIdInteractor.acceptComponentIdGenerator(generator);
     }
 
-    /**
-     * Returns the component ID interactor used by this listener, so that other components (e.g. the
-     * archiver) can generate IDs within the same namespace.
-     *
-     * @return the component ID interactor
-     */
-    public ComponentIdInteractor getComponentIdInteractor() {
-        return componentIdInteractor;
-    }
-
     private Consumer<Throwable> handleParentMessageDeleted(Member user, ThreadChannel channel,
             ButtonInteractionEvent event, List<String> args) {
         int noOfMessages = 1; // we only care about first message from channel history
@@ -197,11 +187,7 @@ private Consumer<Throwable> handleParentMessageDeleted(Member user, ThreadChanne
 
     @Override
     public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
-        if (args.contains("mark-active")) {
-            onInactivityButton(event);
-        } else {
-            onAiHelpDismissButton(event, args);
-        }
+        onAiHelpDismissButton(event, args);
     }
 
     private void onAiHelpDismissButton(ButtonInteractionEvent event, List<String> args) {
@@ -264,20 +250,4 @@ private void registerThreadDataInDB(Message message, ThreadChannel threadChannel
 
         helper.writeHelpThreadToDatabase(authorId, threadChannel);
     }
-
-    private void onInactivityButton(ButtonInteractionEvent event) {
-        event.deferEdit().queue();
-
-        if (event.getChannel() instanceof ThreadChannel thread) {
-            Message botClosedThreadMessage = event.getMessage();
-
-            thread.getManager()
-                .setArchived(false)
-                .flatMap(_ -> botClosedThreadMessage.delete())
-                .queue();
-
-            log.debug("Thread {} was manually reactivated via button by user {}", thread.getId(),
-                    event.getUser().getId());
-        }
-    }
 }