Skip to content

Make code actions autodetection not trigger for top helpers+ #733

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 14 commits into from
Dec 31, 2022
Merged

Make code actions autodetection not trigger for top helpers+ #733

Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8c7473c
Adjust onMessageReceived conditions to ignore codeformatting bot resp…
CodePawfect Dec 26, 2022
77cfd8f
adjust import and formatting
CodePawfect Dec 26, 2022
990f0a4
add missing import
CodePawfect Dec 26, 2022
6f7af7c
format code to match format conventions
CodePawfect Dec 26, 2022
74456a8
changed isSendByTopHelper method parament type;
CodePawfect Dec 26, 2022
3eb08e2
added ignoreCodeActionsForRolePattern to config.json.template and Con…
CodePawfect Dec 27, 2022
1601885
refactored method and variable name;
CodePawfect Dec 27, 2022
2aef706
changed key naming in config.json.template
CodePawfect Dec 27, 2022
bd7ef88
refactored config.json.template key and added addiditional roles to it;
CodePawfect Dec 30, 2022
b1f857d
add config vhanges
CodePawfect Dec 30, 2022
775a4dc
add changes from code findings
CodePawfect Dec 30, 2022
d2eb5ef
add changes from code findings
CodePawfect Dec 30, 2022
c5ad375
add changes from code findings
CodePawfect Dec 30, 2022
b9503d5
add changes from code findings
CodePawfect Dec 30, 2022
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
19 changes: 17 additions & 2 deletions application/src/main/java/org/togetherjava/tjbot/commands/code/CodeMessageAutoDetection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.togetherjava.tjbot.commands.code;

import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
Expand All @@ -10,6 +11,7 @@
import org.togetherjava.tjbot.commands.utils.MessageUtils;
import org.togetherjava.tjbot.config.Config;

import java.util.Objects;
import java.util.Optional;
import java.util.function.Predicate;
import java.util.regex.Pattern;
Expand All @@ -27,7 +29,7 @@ public final class CodeMessageAutoDetection extends MessageReceiverAdapter {

/**
* Creates a new instance.
*
*
* @param config to figure out whether a message is from a help thread
* @param codeMessageHandler to register detected code messages at for further handling
*/
Expand All @@ -42,7 +44,8 @@ public CodeMessageAutoDetection(Config config, CodeMessageHandler codeMessageHan

@Override
public void onMessageReceived(MessageReceivedEvent event) {
if (event.isWebhookMessage() || event.getAuthor().isBot() || !isHelpThread(event)) {
if (event.isWebhookMessage() || event.getAuthor().isBot() || !isHelpThread(event)
|| isSendByTopHelper(event)) {
return;
}

Expand All @@ -63,6 +66,18 @@ public void onMessageReceived(MessageReceivedEvent event) {
codeMessageHandler.addAndHandleCodeMessage(originalMessage, true);
}

private boolean isSendByTopHelper(MessageReceivedEvent event) {
if (Objects.requireNonNull(event.getMember()).getRoles().isEmpty()) {
return false;
}

return event.getMember()
.getRoles()
.stream()
.map(Role::getName)
.anyMatch(roleName -> roleName.matches("Top Helpers .+"));
}

private boolean isHelpThread(MessageReceivedEvent event) {
if (event.getChannelType() != ChannelType.GUILD_PUBLIC_THREAD) {
return false;
Expand Down