Skip to content

Commit faadc3a

Browse files
committed
refactor: minor cleanups as requested
1 parent e92c09d commit faadc3a

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
144144
features.add(new HelpThreadActivityUpdater(helpSystemHelper));
145145
features
146146
.add(new AutoPruneHelperRoutine(config, helpSystemHelper, modAuditLogWriter, database));
147+
features.add(new HelpThreadAutoArchiver(helpSystemHelper));
147148
HelpThreadCreatedListener helpThreadCreatedListener =
148149
new HelpThreadCreatedListener(helpSystemHelper);
149-
features.add(new HelpThreadAutoArchiver(helpSystemHelper));
150150
features.add(new LeftoverBookmarksCleanupRoutine(bookmarksSystem));
151151
features.add(new MarkHelpThreadCloseInDBRoutine(database, helpThreadLifecycleListener));
152152
features.add(new MemberCountDisplayRoutine(config));

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public HelpThreadAutoArchiver(HelpSystemHelper helper) {
5555

5656
@Override
5757
public String getName() {
58-
return "thread-inactivity";
58+
return "help-thread-auto-archiver";
5959
}
6060

6161
@Override
@@ -70,25 +70,22 @@ public void acceptComponentIdGenerator(ComponentIdGenerator generator) {
7070

7171
@Override
7272
public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
73-
if (args.contains(MARK_ACTIVE_ID)) {
74-
onInactivityButton(event);
75-
}
73+
onMarkActiveButton(event);
7674
}
7775

78-
private void onInactivityButton(ButtonInteractionEvent event) {
76+
private void onMarkActiveButton(ButtonInteractionEvent event) {
7977
event.deferEdit().queue();
8078

81-
if (event.getChannel() instanceof ThreadChannel thread) {
82-
Message botClosedThreadMessage = event.getMessage();
79+
ThreadChannel thread = event.getChannel().asThreadChannel();
80+
Message botClosedThreadMessage = event.getMessage();
8381

84-
thread.getManager()
85-
.setArchived(false)
86-
.flatMap(_ -> botClosedThreadMessage.delete())
87-
.queue();
82+
thread.getManager()
83+
.setArchived(false)
84+
.flatMap(_ -> botClosedThreadMessage.delete())
85+
.queue();
8886

89-
logger.debug("Thread {} was manually reactivated via button by user {}", thread.getId(),
90-
event.getUser().getId());
91-
}
87+
logger.debug("Thread {} was manually reactivated via button by user {}", thread.getId(),
88+
event.getUser().getId());
9289
}
9390

9491
@Override

0 commit comments

Comments
 (0)