From c3ea84049977e83c84dddcc6a08494e90fcf9357 Mon Sep 17 00:00:00 2001
From: Yannic Link <yannic@lld-tec.com>
Date: Fri, 2 Apr 2021 23:49:18 +0200
Subject: [PATCH] List Command in Play-Command mit Option -list ausgelagert

---
 .../command/commands/ListCommand.java         | 37 -------------------
 .../command/commands/PlayCommand.java         | 18 ++++++++-
 2 files changed, 17 insertions(+), 38 deletions(-)
 delete mode 100644 app/src/main/java/de/yannicpunktdee/yoshibot/command/commands/ListCommand.java

diff --git a/app/src/main/java/de/yannicpunktdee/yoshibot/command/commands/ListCommand.java b/app/src/main/java/de/yannicpunktdee/yoshibot/command/commands/ListCommand.java
deleted file mode 100644
index 40631ae..0000000
--- a/app/src/main/java/de/yannicpunktdee/yoshibot/command/commands/ListCommand.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package de.yannicpunktdee.yoshibot.command.commands;
-
-import de.yannicpunktdee.yoshibot.command.YoshiCommand;
-import de.yannicpunktdee.yoshibot.command.YoshiCommandContext;
-import de.yannicpunktdee.yoshibot.utils.Resources;
-import net.dv8tion.jda.api.EmbedBuilder;
-
-import java.awt.*;
-import java.io.File;
-
-public class ListCommand extends YoshiCommand {
-
-	public ListCommand(YoshiCommandContext context) {
-		super(context);
-	}
-
-	@Override
-	public boolean execute() {
-		if(!super.execute()) return false;
-
-		File audioDirectory = new File(Resources.getAudioPath());
-		StringBuilder sb = new StringBuilder();
-		for(File f : audioDirectory.listFiles()){
-			String fName = f.getName();
-			if(!fName.endsWith(".opus")) continue;
-			sb.append(fName.substring(0, fName.lastIndexOf(".opus")));
-			sb.append("\n");
-		}
-		EmbedBuilder eb = new EmbedBuilder();
-		eb.setTitle("Es sind folgende Audios verf\u00fcgbar:");
-		eb.setColor(Color.blue);
-		eb.setDescription(sb.toString());
-		sendMessage(eb.build());
-
-		return true;
-	}
-}
diff --git a/app/src/main/java/de/yannicpunktdee/yoshibot/command/commands/PlayCommand.java b/app/src/main/java/de/yannicpunktdee/yoshibot/command/commands/PlayCommand.java
index 879d5e1..1436068 100644
--- a/app/src/main/java/de/yannicpunktdee/yoshibot/command/commands/PlayCommand.java
+++ b/app/src/main/java/de/yannicpunktdee/yoshibot/command/commands/PlayCommand.java
@@ -1,5 +1,6 @@
 package de.yannicpunktdee.yoshibot.command.commands;
 
+import java.awt.*;
 import java.io.File;
 import java.util.List;
 import java.util.UUID;
@@ -12,6 +13,7 @@ import de.yannicpunktdee.yoshibot.command.YoshiCommandContext;
 import de.yannicpunktdee.yoshibot.utils.Resources;
 import de.yannicpunktdee.yoshibot.main.YoshiBot;
 import lombok.NonNull;
+import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.VoiceChannel;
 
@@ -63,7 +65,21 @@ public class PlayCommand extends YoshiCommand {
 				sendMessage("Die Sounddatei konnte nicht ordnungsgemäß erstellt werden.");
 				return false;
 			}
-		} else {
+		} else if (context.containsArguments(new String[]{"list"})){
+			File audioDirectory = new File(Resources.getAudioPath());
+			StringBuilder sb = new StringBuilder();
+			for(File f : audioDirectory.listFiles()){
+				String fName = f.getName();
+				if(!fName.endsWith(".opus")) continue;
+				sb.append(fName.substring(0, fName.lastIndexOf(".opus")));
+				sb.append("\n");
+			}
+			EmbedBuilder eb = new EmbedBuilder();
+			eb.setTitle("Es sind folgende Audios verf\u00fcgbar:");
+			eb.setColor(Color.blue);
+			eb.setDescription(sb.toString());
+			sendMessage(eb.build());
+		}else {
 			VoiceChannel vc;
 			if (context.getEvent().getMember() == null ||
 				!context.getEvent().getMember().getVoiceState().inVoiceChannel()) {