refactor(help): consolidate interactor and cleanup reactivation logic

Author: SleepyStack

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

@@ -131,16 +131,14 @@ private void handleArchiveFlow(ThreadChannel threadChannel, MessageEmbed embed)
 
     private void triggerArchiveFlow(ThreadChannel threadChannel, long authorId, MessageEmbed embed) {
 
-        // --- UPDATED: Added ActionRow with custom namespace ID ---
         Function<Member, RestAction<Message>> sendEmbedWithMention =
                 member -> threadChannel.sendMessage(member.getAsMention())
                         .addEmbeds(embed)
-                        .addActionRow(Button.primary("OTHER:thread-inactivity:mark-active", "Mark Active"));
+                        .addActionRow(Button.primary("OTHER:chatpgt-answer:mark-active", "Mark Active"));
 
         Supplier<RestAction<Message>> sendEmbedWithoutMention =
                 () -> threadChannel.sendMessageEmbeds(embed)
-                        .addActionRow(Button.primary("OTHER:thread-inactivity:mark-active", "Mark Active"));
-        // ---------------------------------------------------------
+                        .addActionRow(Button.primary("OTHER:chatpgt-answer:mark-active", "Mark Active"));
 
         threadChannel.getGuild()
                 .retrieveMemberById(authorId)
@@ -166,11 +164,9 @@ private void triggerAuthorIdNotFoundArchiveFlow(ThreadChannel threadChannel, Mes
                 "Was unable to find a matching thread for id: {} in DB, archiving thread without mentioning OP",
                 threadChannel.getId());
 
-        // --- UPDATED: Added ActionRow with custom namespace ID ---
         threadChannel.sendMessageEmbeds(embed)
-                .addActionRow(Button.primary("OTHER:thread-inactivity:mark-active", "Mark Active"))
+                .addActionRow(Button.primary("OTHER:chatpgt-answer:mark-active", "Mark Active"))
                 .flatMap(sentEmbed -> threadChannel.getManager().setArchived(true))
                 .queue();
-        // ---------------------------------------------
     }
 }

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

@@ -47,10 +47,6 @@ public final class HelpThreadCreatedListener extends ListenerAdapter
     private static final Logger log = LoggerFactory.getLogger(HelpThreadCreatedListener.class);
     private final HelpSystemHelper helper;
 
-    private static final String MARK_ACTIVE_ID = "mark-active";
-    private final ComponentIdInteractor inactivityInteractor =
-            new ComponentIdInteractor(UserInteractionType.OTHER, "thread-inactivity");
-
     private final Cache<Long, Instant> threadIdToCreatedAtCache = Caffeine.newBuilder()
         .maximumSize(1_000)
         .expireAfterAccess(2, TimeUnit.of(ChronoUnit.MINUTES))
@@ -191,16 +187,14 @@ private Consumer<Throwable> handleParentMessageDeleted(Member user, ThreadChanne
 
     @Override
     public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
-        // Check if the button belongs to the "thread-inactivity" namespace
-        if (inactivityInteractor.isMatch(event.getComponentId())) {
-            String subId = inactivityInteractor.getComponentId(event.getComponentId());
-
-            if (subId.equals("mark-active")) {
-                handleMarkActiveInteraction(event);
-                return; // EXIT: This logic is owned by handleMarkActiveInteraction
-            }
+        if (args.contains("mark-active")) {
+            onInactivityButton(event);
+        } else {
+            onAiHelpDismissButton(event, args);
         }
-        // Handle chatgpt's automatic response "dismiss" button
+    }
+
+    private void onAiHelpDismissButton(ButtonInteractionEvent event, List<String> args) {
         event.deferEdit().queue();
 
         ThreadChannel channel = event.getChannel().asThreadChannel();
@@ -210,7 +204,6 @@ public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
             .queue(forumPostMessage -> handleDismiss(interactionUser, channel, forumPostMessage,
                     event, args),
                     handleParentMessageDeleted(interactionUser, channel, event, args));
-
     }
 
     private boolean isPostAuthor(Member interactionUser, Message message) {
@@ -262,16 +255,18 @@ private void registerThreadDataInDB(Message message, ThreadChannel threadChannel
         helper.writeHelpThreadToDatabase(authorId, threadChannel);
     }
 
-    private void handleMarkActiveInteraction(ButtonInteractionEvent event) {
+    private void onInactivityButton(ButtonInteractionEvent event) {
         event.deferEdit().queue();
 
         if (event.getChannel() instanceof ThreadChannel thread) {
-            // Reopen the thread so people can chat, then delete the bot's warning
-            thread.getManager().setArchived(false).queue();
-            event.getMessage().delete().queue();
+            Message botClosedThreadMessage = event.getMessage();
+
+            thread.getManager().setArchived(false)
+                    .flatMap(v -> botClosedThreadMessage.delete())
+                    .queue();
 
-            log.info("Thread {} was manually reactivated via button by {}",
-                    thread.getId(), event.getUser().getName());
+            log.debug("Thread {} was manually reactivated via button by {}",
+                    thread.getId(), event.getUser().getId());
         }
     }
 }