Skip to content

fix duplicate close suggestions when multiple detectors match #435

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
Sep 18, 2023
Merged

fix duplicate close suggestions when multiple detectors match #435

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
41 changes: 24 additions & 17 deletions src/main/java/net/javadiscord/javabot/systems/help/HelpListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,29 +155,36 @@ private void replyCloseSuggestionIfPatternMatches(Message msg) {
return;
}
if (msg.getChannel().asThreadChannel().getOwnerIdLong() == msg.getAuthor().getIdLong()) {
for (String[] detector : closeSuggestionDetectors) {
if (doesMatchDetector(content, detector)) {
msg.reply("""
if(matchesAnyDetector(content)) {
msg.reply("""
If you are finished with your post, please close it.
If you are not, please ignore this message.
Note that you will not be able to send further messages here after this post have been closed but you will be able to create new posts.
""")
.addActionRow(
createCloseSuggestionButton(msg.getChannel()
.asThreadChannel()),
Button.secondary(
InteractionUtils.DELETE_ORIGINAL_TEMPLATE,
"\uD83D\uDDD1️"
)
)
.queue();
recentlyCloseSuggestedPosts.put(
postId,
System.currentTimeMillis() + SUGGEST_CLOSE_TIMEOUT
);
}
.addActionRow(
createCloseSuggestionButton(msg.getChannel()
.asThreadChannel()),
Button.secondary(
InteractionUtils.DELETE_ORIGINAL_TEMPLATE,
"\uD83D\uDDD1️"
)
)
.queue();
recentlyCloseSuggestedPosts.put(
postId,
System.currentTimeMillis() + SUGGEST_CLOSE_TIMEOUT
);
}
}
}

private boolean matchesAnyDetector(String content) {
for (String[] detector : closeSuggestionDetectors) {
if (doesMatchDetector(content, detector)) {
return true;
}
}
return false;
}

private boolean doesMatchDetector(String content, String[] detector) {
Expand Down