Fix arguments length and switch to java 17
This commit is contained in:
1 parent
94980bf419
commit
390e2c3163
7 files changed
+12
-11
No files matched your search
@@ -10,7 +10,7 @@
|
|||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<java.version>11</java.version>
|
<java.version>17</java.version>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
@@ -21,8 +21,10 @@
|
|||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.8.0</version>
|
<version>3.8.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<release>11</release>
|
<release>17</release>
|
||||||
<encoding>UTF-8</encoding>
|
<encoding>UTF-8</encoding>
|
||||||
|
<source>17</source>
|
||||||
|
<target>17</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import net.dv8tion.jda.api.entities.Activity;
|
|||||||
import net.dv8tion.jda.api.requests.GatewayIntent;
|
import net.dv8tion.jda.api.requests.GatewayIntent;
|
||||||
|
|
||||||
import netneutrality.db.DBController;
|
import netneutrality.db.DBController;
|
||||||
import netneutrality.handler.ConsoleHandler;
|
|
||||||
import netneutrality.handler.EditHandler;
|
import netneutrality.handler.EditHandler;
|
||||||
import netneutrality.handler.NewCommandListener;
|
import netneutrality.handler.NewCommandListener;
|
||||||
import netneutrality.http.server.WebApi;
|
import netneutrality.http.server.WebApi;
|
||||||
|
|||||||
@@ -28,6 +28,6 @@ public abstract class AbstractMusicCommand extends AbstractCommand {
|
|||||||
return member.getRoles().contains(neededRole);
|
return member.getRoles().contains(neededRole);
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,6 @@ public class PingCommand extends AbstractCommand {
|
|||||||
event.getChannel().sendMessage("Pong! [" + MusicBot.getJDA().getGatewayPing() + " ms]").queue();
|
event.getChannel().sendMessage("Pong! [" + MusicBot.getJDA().getGatewayPing() + " ms]").queue();
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -52,8 +52,9 @@ public class JoinCommand extends AbstractMusicCommand {
|
|||||||
@Override
|
@Override
|
||||||
public String execute(MessageReceivedEvent event, String[] args) {
|
public String execute(MessageReceivedEvent event, String[] args) {
|
||||||
Member member = event.getMember();
|
Member member = event.getMember();
|
||||||
MusicManager player = MusicManager.get(event.getGuild());
|
|
||||||
if (member.getVoiceState().inVoiceChannel()) {
|
if (member.getVoiceState().inVoiceChannel()) {
|
||||||
|
MusicManager player = MusicManager.get(event.getGuild());
|
||||||
VoiceChannel vChannel = member.getVoiceState().getChannel();
|
VoiceChannel vChannel = member.getVoiceState().getChannel();
|
||||||
|
|
||||||
if (!player.isConnected()) {
|
if (!player.isConnected()) {
|
||||||
|
|||||||
@@ -48,12 +48,14 @@ public class NewCommandListener extends ListenerAdapter {
|
|||||||
String msg = message.getContentDisplay().trim();
|
String msg = message.getContentDisplay().trim();
|
||||||
|
|
||||||
if (msg.startsWith(Settings.getInstance().get("BOT_PREFIX", "$"))) {
|
if (msg.startsWith(Settings.getInstance().get("BOT_PREFIX", "$"))) {
|
||||||
msg = msg.substring(Settings.getInstance().get("BOT_PREFIX", "$").length());
|
msg = msg.substring(Settings.getInstance().get("BOT_PREFIX", "$").length()).trim();
|
||||||
String cmd = msg.split(" ", 2)[0];
|
String cmd = msg.split(" ", 2)[0];
|
||||||
String[] args = msg.replaceFirst("(" + cmd + ")( )?", "").split(" ");
|
String[] args = msg.replaceFirst("(" + cmd + ")(\s)?", "").split("\s");
|
||||||
|
|
||||||
|
if (args.length == 1 && args[0].isEmpty())
|
||||||
|
args = new String[0];
|
||||||
|
|
||||||
if (CommandManager.commands.containsKey(cmd) || CommandManager.commandsAlias.containsKey(cmd)) {
|
if (CommandManager.commands.containsKey(cmd) || CommandManager.commandsAlias.containsKey(cmd)) {
|
||||||
|
|
||||||
AbstractCommand c = CommandManager.commands.containsKey(cmd) ? CommandManager.commands.get(cmd) : CommandManager.commandsAlias.get(cmd);
|
AbstractCommand c = CommandManager.commands.containsKey(cmd) ? CommandManager.commands.get(cmd) : CommandManager.commandsAlias.get(cmd);
|
||||||
|
|
||||||
if (Visibility.check(event.getChannel(), c.getVisibility())) {
|
if (Visibility.check(event.getChannel(), c.getVisibility())) {
|
||||||
@@ -66,7 +68,6 @@ public class NewCommandListener extends ListenerAdapter {
|
|||||||
if (c.canBeExecutedBy(event.getGuild(), event.getMember())) {
|
if (c.canBeExecutedBy(event.getGuild(), event.getMember())) {
|
||||||
c.execute(event, args);
|
c.execute(event, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ package netneutrality.handler.ratelimiter;/*
|
|||||||
import net.dv8tion.jda.api.entities.Member;
|
import net.dv8tion.jda.api.entities.Member;
|
||||||
import net.dv8tion.jda.api.entities.Message;
|
import net.dv8tion.jda.api.entities.Message;
|
||||||
import net.dv8tion.jda.api.entities.TextChannel;
|
import net.dv8tion.jda.api.entities.TextChannel;
|
||||||
import netneutrality.handler.ratelimiter.IMessageRateLimiter;
|
|
||||||
|
|
||||||
import java.time.OffsetDateTime;
|
import java.time.OffsetDateTime;
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user