Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Added global Prefix #17

Open
Stupremee wants to merge 1 commit into
base: next-patch
Choose a base branch
from
Open

Added global Prefix #17

Show file tree
Hide file tree
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
29 changes: 29 additions & 0 deletions CommandAPI.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: net.dv8tion:JDA:3.8.0_433" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:16.0.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.11.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
<orderEntry type="library" name="Maven: club.minnced:opus-java-api:1.0.4" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: net.java.dev.jna:jna:4.4.0" level="project" />
<orderEntry type="library" name="Maven: club.minnced:opus-java-natives:1.0.4" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.json:json:20160810" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
</component>
</module>
6 changes: 4 additions & 2 deletions src/main/java/com/github/johnnyjayjay/discord/commandapi/CommandListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@

class CommandListener implements EventListener {

private String globalPrefix; // The Global Prefix
private CommandSettings settings;
private Map<Long, Long> cooldowns; // Long: User id, Long: last timestamp

public CommandListener(CommandSettings settings) {
public CommandListener(CommandSettings settings, String globalPrefix) {
this.settings = settings;
this.cooldowns = new HashMap<>();
this.globalPrefix = globalPrefix;
}

@Override
Expand All @@ -34,7 +36,7 @@ public void onEvent(Event e) {
settings.execute(() -> {
String raw = event.getMessage().getContentRaw();
String prefix = settings.getPrefix(event.getGuild().getIdLong());
if (raw.startsWith(prefix)) {
if (raw.startsWith(prefix) || raw.startsWith(globalPrefix)) {
CommandEvent.Command cmd = CommandEvent.parseCommand(raw, prefix, settings); // parse command
CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), cmd, settings); // create event
if (cmd.getExecutor() != null) { // if command exists
Expand Down
Loading