Skip to content

Add option to use bot mention as prefix #302

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add option to use bot mention as prefix #302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a194c
Add option to use bot mention as prefix
SuSeu1414 Nov 15, 2020
c4b56fd
Cache leading spaces pattern
SuSeu1414 Nov 16, 2020
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
4 changes: 4 additions & 0 deletions jda/src/main/java/co/aikar/commands/CommandConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
public interface CommandConfig extends CommandConfigProvider {
@NotNull List<String> getCommandPrefixes();

default boolean mentionPrefixEnabled() {
return false;
}

@Override
default CommandConfig provide(MessageReceivedEvent event) {
return this;
Expand Down
10 changes: 10 additions & 0 deletions jda/src/main/java/co/aikar/commands/JDACommandConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

public class JDACommandConfig implements CommandConfig {
protected @NotNull List<String> commandPrefixes = new CopyOnWriteArrayList<>(new String[]{"!"});
protected boolean useMentionPrefix = false;

public JDACommandConfig() {

Expand All @@ -16,4 +17,13 @@ public JDACommandConfig() {
public List<String> getCommandPrefixes() {
return commandPrefixes;
}

public void useMentionPrefix(boolean useMentionPrefix) {
this.useMentionPrefix = useMentionPrefix;
}

@Override
public boolean mentionPrefixEnabled() {
return this.useMentionPrefix;
}
}
12 changes: 11 additions & 1 deletion jda/src/main/java/co/aikar/commands/JDACommandManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.SelfUser;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.jetbrains.annotations.NotNull;

Expand Down Expand Up @@ -237,6 +238,7 @@ public void log(LogLevel level, String message, Throwable throwable) {
void dispatchEvent(MessageReceivedEvent event) {
Message message = event.getMessage();
String msg = message.getContentRaw();
String selfUserId = event.getJDA().getSelfUser().getId();

CommandConfig config = getCommandConfig(event);

Expand All @@ -247,11 +249,19 @@ void dispatchEvent(MessageReceivedEvent event) {
break;
}
}
if (prefixFound == null && config.mentionPrefixEnabled()) {
if (msg.startsWith("<@" + selfUserId + ">")) {
prefixFound = "<@" + selfUserId + ">";
} else if (msg.startsWith("<@!" + selfUserId + ">")) {
prefixFound = "<@!" + selfUserId + ">";
}
}
if (prefixFound == null) {
return;
}

String[] args = ACFPatterns.SPACE.split(msg.substring(prefixFound.length()), -1);
// str.replaceAll("^[ \t]+", "") - works like String.stripLeading() from Java 11
String[] args = ACFPatterns.SPACE.split(msg.substring(prefixFound.length()).replaceAll("^[ \\t]+", ""), -1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say that this pattern should be cached

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, now I'm using ACFPatterns.getPattern() which caches patterns

if (args.length == 0) {
return;
}
Expand Down