From 52c0ac730c7a487385600f5f1713d2e6cf458211 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Mon, 23 Dec 2019 18:07:40 +0100
Subject: [PATCH 1/2] Skip command without skip

---
 src/main/java/com/bbn/hadder/Hadder.java      |  1 +
 .../hadder/commands/music/InfoCommand.java    | 13 +++++---
 .../hadder/commands/music/SkipCommand.java    | 33 +++++++++++++++++++
 3 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/bbn/hadder/commands/music/SkipCommand.java

diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index f89a23c..5626793 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -93,6 +93,7 @@ public class Hadder {
                         new StarBoardCommand(),
                         new QueueCommand(),
                         new InfoCommand(),
+                        new SkipCommand(),
                         new StopCommand()), config, helpCommand);
 
         builder.addEventListeners(
diff --git a/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java b/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java
index 85605b3..3baeb46 100644
--- a/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java
@@ -13,15 +13,18 @@ public class InfoCommand implements Command {
 
     private static final String CD = "\uD83D\uDCBF";
     private static final String MIC = "\uD83C\uDFA4";
-
-    private static final String QUEUE_TITLE = "__%s has added %d new track%s to the Queue:__";
     private static final String QUEUE_DESCRIPTION = "%s **|>**  %s\n%s\n%s %s\n%s";
-    private static final String QUEUE_INFO = "Info about the Queue: (Size - %d)";
-    private static final String ERROR = "Error while loading \"%s\"";
+
     @Override
     public void executed(String[] args, CommandEvent event) {
+        if (new AudioManager().hasPlayer(event.getGuild())) {
+            event.getTextChannel().sendMessage("Ja Player is auch wieder da");
+        }
+        if (new AudioManager().getPlayer(event.getGuild()).getPlayingTrack() == null) {
+            event.getTextChannel().sendMessage("Joo playing track net anwesend^^").queue();
+        }
         if (!new AudioManager().hasPlayer(event.getGuild()) || new AudioManager().getPlayer(event.getGuild()).getPlayingTrack() == null) {
-            event.getTextChannel().sendMessage("No song is being played at the moment! *It's your time to shine..*").queue();
+            event.getTextChannel().sendMessage("Shut up eyyyy du kek").queue();
         } else {
             AudioTrack track = new AudioManager().getPlayer(event.getGuild()).getPlayingTrack();
             event.getTextChannel().sendMessage("Track Info" + String.format(QUEUE_DESCRIPTION, CD, new AudioManager().getOrNull(track.getInfo().title),
diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
new file mode 100644
index 0000000..ea36991
--- /dev/null
+++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
@@ -0,0 +1,33 @@
+package com.bbn.hadder.commands.music;
+
+import com.bbn.hadder.audio.AudioInfo;
+import com.bbn.hadder.audio.AudioManager;
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class SkipCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"skip"};
+    }
+
+    @Override
+    public String description() {
+        return "Skips the song";
+    }
+
+    @Override
+    public String usage() {
+        return "";
+    }
+}
-- 
2.45.3


From 8fdf2c42a8ae1559c1f71b64a7baeed018829df4 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Tue, 24 Dec 2019 13:29:54 +0100
Subject: [PATCH 2/2] Fix #245

---
 .../java/com/bbn/hadder/commands/moderation/RulesCommand.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
index 23fb16e..78db7b3 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
@@ -96,7 +96,7 @@ public class RulesCommand implements Command {
                     }, event.getJDA(), event.getAuthor());
                 }, event.getJDA(), event.getAuthor());
             } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION)
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION)
                         .build()).queue();
             }
         } else {
-- 
2.45.3