From fb067a2f2f5a9c194ae86adea0756e8f631f9b9f Mon Sep 17 00:00:00 2001 From: Zabuzard Date: Fri, 24 Jun 2022 09:19:29 +0200 Subject: [PATCH] Bugfix where top-helper uses wrong channel * now just using both channels to be extra safe in case we swap back and forth again --- .../commands/tophelper/TopHelpersMessageListener.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java b/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java index db10bf7527..5d43a1d68e 100644 --- a/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java +++ b/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java @@ -21,6 +21,7 @@ public final class TopHelpersMessageListener extends MessageReceiverAdapter { private final Database database; private final Predicate isStagingChannelName; + private final Predicate isOverviewChannelName; /** * Creates a new listener to receive all message sent in help channels. @@ -35,6 +36,8 @@ public TopHelpersMessageListener(@NotNull Database database, @NotNull Config con isStagingChannelName = Pattern.compile(config.getHelpSystem().getStagingChannelPattern()) .asMatchPredicate(); + isOverviewChannelName = Pattern.compile(config.getHelpSystem().getOverviewChannelPattern()) + .asMatchPredicate(); } @Override @@ -56,7 +59,9 @@ private boolean isHelpThread(@NotNull MessageReceivedEvent event) { } ThreadChannel thread = event.getThreadChannel(); - return isStagingChannelName.test(thread.getParentChannel().getName()); + String rootChannelName = thread.getParentChannel().getName(); + return isStagingChannelName.test(rootChannelName) + || isOverviewChannelName.test(rootChannelName); } private void addMessageRecord(@NotNull MessageReceivedEvent event) {