diff --git a/pom.xml b/pom.xml index fd4e686..185c8ee 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ net.dv8tion JDA - 4.2.0_194 + 4.2.0_204 org.json @@ -89,7 +89,7 @@ club.minnced discord-webhooks - 0.3.2 + 0.4.1 org.kohsuke @@ -149,7 +149,7 @@ maven-project-info-reports-plugin - 3.1.0 + 3.1.1 diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index bd1e4cd..99f5f48 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -68,6 +68,7 @@ public class InviteDetectCommand implements Command { break; default: e.getHelpCommand().sendHelp(this, e); + break; } } else e.getHelpCommand().sendHelp(this, e); } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleAssignmentCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleAssignmentCommand.java deleted file mode 100644 index 601b6cf..0000000 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleAssignmentCommand.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2019-2020 GregTCLTK and Schlauer-Hax - * - * Licensed under the GNU Affero General Public License, Version 3.0; - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.gnu.org/licenses/agpl-3.0.en.html - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.bbn.hadder.commands.moderation; - -import com.bbn.hadder.commands.Command; -import com.bbn.hadder.commands.CommandEvent; -import com.bbn.hadder.core.Perm; -import com.bbn.hadder.core.Perms; -import com.bbn.hadder.utils.MessageEditor; -import net.dv8tion.jda.api.Permission; - -@Perms(Perm.MANAGE_ROLES) -public class RoleAssignmentCommand implements Command { - - @Override - public void executed(String[] args, CommandEvent e) { - //TODO: THIS LOL - if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { - - } else - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); - } - - @Override - public String[] labels() { - return new String[0]; - } - - @Override - public String description() { - return null; - } - - @Override - public String usage() { - return null; - } - - @Override - public String example() { - return null; - } -} diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java index f7bd31c..5695395 100644 --- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java @@ -32,7 +32,12 @@ public class SkipCommand implements Command { "commands.music.skip.success.title", "commands.music.skip.success.description").build()).queue(); } else { - e.getTextChannel().sendMessage("Get rekt lol Mach Loop aus noob").queue(); + e.getAudioManager().getTrackManager(e.getGuild()).setLoop(false); + e.getAudioManager().forceSkipTrack(e); + e.getAudioManager().getTrackManager(e.getGuild()).setLoop(true); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.skip.success.title", + "commands.music.skip.success.description").build()).queue(); } } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,