Skip to content

Bugfix where top-helper uses wrong channel #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2022
Merged

Bugfix where top-helper uses wrong channel #462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...on/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public final class TopHelpersMessageListener extends MessageReceiverAdapter {
private final Database database;

private final Predicate<String> isStagingChannelName;
private final Predicate<String> isOverviewChannelName;

/**
* Creates a new listener to receive all message sent in help channels.
Expand All @@ -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
Expand All @@ -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) {
Expand Down