src/main/java/moe/nekojimi/chords/Main.java

@@ -5,32 +5,22 @@
  */
 package moe.nekojimi.chords;
 
-import com.amihaiemil.eoyaml.Yaml;
-import com.amihaiemil.eoyaml.YamlMapping;
 import java.io.File;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.file.Files;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.security.auth.login.LoginException;
 import moe.nekojimi.chords.commands.*;
-import moe.nekojimi.chords.commands.playlists.AddToPlaylistCommand;
+import moe.nekojimi.musicsearcher.Result;
-import moe.nekojimi.chords.commands.playlists.MakePlaylistCommand;
-import moe.nekojimi.chords.commands.playlists.PlaylistCommand;
-import moe.nekojimi.chords.commands.playlists.StopPlaylistCommand;
 import moe.nekojimi.musicsearcher.providers.MetaSearcher;
 import moe.nekojimi.musicsearcher.providers.Searcher;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
@@ -44,12 +34,9 @@ import net.dv8tion.jda.api.utils.cache.CacheFlag;
  *
  * @author jimj316
  */
-public final class Main extends ListenerAdapter
+public class Main extends ListenerAdapter
 {
 
-    private final File dataDirectory;
-    private final File playlistsDirectory;
-
     private MusicHandler musicHandler;
     private final Downloader downloader;
     private final Searcher searcher;
@@ -64,12 +51,10 @@ public final class Main extends ListenerAdapter
 
     private int trackNumber = 1;
 
-    private final Map<String, Playlist> playlists = new HashMap<>();
-
     /**
      * @param args the command line arguments
      */
-    public static void main(String[] args) throws LoginException, IOException
+    public static void main(String[] args) throws LoginException
     {
         // We only need 2 gateway intents enabled for this example:
         EnumSet<GatewayIntent> intents = EnumSet.of(
@@ -115,7 +100,7 @@ public final class Main extends ListenerAdapter
         if (ex == null)
             if (song.getLocation() != null)
             {
-                request.getInvocation().respond("Finished downloading " + song + ", added to queue!");
+                request.respond("Finished downloading " + song + ", added to queue!");
                 log("DOWN", "Downloaded " + song);
             } else
             {
@@ -129,30 +114,22 @@ public final class Main extends ListenerAdapter
                     String bitFmt = (bitrate <= 0 ? "??" : bitrate) + "k";
                     formatDetails = " (" + bitFmt + ", " + sizeFmt + ")";
                 }
-                request.getInvocation().respond("Now downloading " + song + formatDetails + " ...");
+                request.respond("Now downloading " + song + formatDetails + " ...");
                 log("DOWN", "Downloading " + song + "...");
             }
         else
         {
-            request.getInvocation().respond("Failed to download " + song + "! Reason: " + ex.getMessage());
+            request.respond("Failed to download " + song + "! Reason: " + ex.getMessage());
             log("DOWN", "Failed to download " + song + "! Reason: " + ex.getMessage());
         }
 
     };
 
-    public Main() throws IOException
+    public Main()
     {
         log("INFO", "Starting up...");
-
-        // init dirs
-        dataDirectory = new File(System.getProperty("user.dir"));
-        playlistsDirectory = initDirectory(dataDirectory, "playlists");
-
-        // init downloader
         downloader = new Downloader();
         downloader.setMessageHandler(downloaderMessageHandler);
-
-        // init searcher
         searcher = MetaSearcher.loadYAML(new File("searchproviders.yml"));
 
         // init queue manager
@@ -170,14 +147,6 @@ public final class Main extends ListenerAdapter
         helpCommand = new HelpCommand(this);
         addCommand(helpCommand);
 
-        addCommand(new AddToPlaylistCommand(this));
-        addCommand(new PlaylistCommand(this));
-        addCommand(new MakePlaylistCommand(this));
-        addCommand(new StopPlaylistCommand(this));
-
-        // load playlists
-        loadPlaylists();
-
         log("INFO", "Started OK!");
     }
 
@@ -226,7 +195,7 @@ public final class Main extends ListenerAdapter
         try
         {
             URL parseURL = new URL(content.trim());
-            playCommand.call(new Invocation(event, List.of(parseURL.toExternalForm())));
+            playCommand.call(event, List.of(parseURL.toExternalForm()));
         } catch (MalformedURLException ex)
         {
             // not a URL, then
@@ -234,7 +203,7 @@ public final class Main extends ListenerAdapter
 
         try
         {
-            String[] split = content.split("\\s+");
+            String[] split = content.split("\\s+", 2);
             String cmd = split[0].toLowerCase();
 
             if (!cmd.startsWith("!"))
@@ -242,21 +211,17 @@ public final class Main extends ListenerAdapter
 
             cmd = cmd.substring(1); // strip prefix char
 
-//            String arg = "";
+            String arg = "";
-            List<String> args = new ArrayList<>();
+            if (split.length > 1)
-            Collections.addAll(args, split);
+                arg = split[1];
-            args.remove(0);
-
-            Invocation invocation = new Invocation(event, args);
-            invocation.setRequestMessage(message);
 
             if (commands.containsKey(cmd))
             {
                 Command command = commands.get(cmd);
-                command.call(invocation);
+                command.call(event, List.of(arg));
             } else
             {
-                helpCommand.call(invocation);
+                helpCommand.call(event, List.of(arg));
             }
         } catch (Exception ex)
         {
@@ -265,9 +230,8 @@ public final class Main extends ListenerAdapter
         }
     }
 
-    public Song queueDownload(SongRequest request, Consumer<Song> destination)
+    public Song queueDownload(SongRequest request)
     {
-        // TODO: move this logic somewhere better
         Song song;
         if (request.getUrl() != null)
         {
@@ -277,16 +241,16 @@ public final class Main extends ListenerAdapter
             // interpret search result
             throw new UnsupportedOperationException("Not supported yet.");
         }
-        if (request.getInvocation().getRequestMessage() != null)
+        if (request.getRequestMessage() != null)
         {
-            song.setRequestedBy(request.getInvocation().getRequestMessage().getAuthor().getName());
+            song.setRequestedBy(request.getRequestMessage().getAuthor().getName());
-            song.setRequestedIn(request.getInvocation().getRequestMessage().getChannel().getId());
+            song.setRequestedIn(request.getRequestMessage().getChannel().getId());
         }
         song.setNumber(trackNumber);
         trackNumber++;
         request.setSong(song);
-        downloader.accept(new Downloader.DownloadTask(request, destination));
+        downloader.accept(new Downloader.DownloadTask(request, queueManager));
-        request.getInvocation().respond("Request pending...");
+        request.respond("Request pending...");
         return song;
     }
 
@@ -365,56 +329,6 @@ public final class Main extends ListenerAdapter
         System.out.println(type + " " + LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME) + "\t" + message);
     }
 
-    public File initDirectory(File parent, String name) throws IOException
-    {
-        File ret = new File(parent, name);
-        if (!ret.exists())
-            Files.createDirectories(ret.toPath());
-        if (!ret.canRead())
-            throw new RuntimeException("Cannot read directory " + ret.getAbsolutePath() + "!");
-        if (!ret.canWrite())
-            throw new RuntimeException("Cannot write to directory " + ret.getAbsolutePath() + "!");
-        return ret;
-    }
-
-    private void loadPlaylists()
-    {
-        File[] files = playlistsDirectory.listFiles((File file, String name) -> name.endsWith(".yaml"));
-        for (File file : files)
-        {
-            try
-            {
-                YamlMapping map = Yaml.createYamlInput(file).readYamlMapping();
-                Playlist playlist = Playlist.fromYaml(map);
-                playlist.setBot(this);
-                playlists.put(playlist.getName(), playlist);
-            } catch (IOException ex)
-            {
-                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-    }
-
-    public void addPlaylist(Playlist playlist)
-    {
-        playlists.put(playlist.getName(), playlist);
-        playlist.setBot(this);
-        savePlaylist(playlist);
-    }
-
-    public void savePlaylist(Playlist playlist)
-    {
-        File file = new File(playlistsDirectory, playlist.getName() + ".yaml");
-        try
-        {
-            Yaml.createYamlPrinter(new FileWriter(file))
-                    .print(playlist.toYaml());
-        } catch (IOException ex)
-        {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
-
     public MusicHandler getMusicHandler()
     {
         return musicHandler;
@@ -449,14 +363,4 @@ public final class Main extends ListenerAdapter
         return trackNumber;
     }
 
-    public File getDataDirectory()
-    {
-        return dataDirectory;
-    }
-
-    public Map<String, Playlist> getPlaylists()
-    {
-        return playlists;
-    }
-
 }

src/main/java/moe/nekojimi/chords/MusicHandler.java

@@ -94,8 +94,6 @@ public class MusicHandler implements AudioSendHandler, Closeable
                 if (!currentSong.isKept())
                     currentSong.delete();
                 currentSong = null;
-                player.close();
-                player = null;
             }
             currentSong = queueManager.nextSongNeeded();
             if (nowPlayingConsumer != null)

src/main/java/moe/nekojimi/chords/Playlist.java

@@ -16,29 +16,19 @@
  */
 package moe.nekojimi.chords;
 
-import com.amihaiemil.eoyaml.Yaml;
 import com.amihaiemil.eoyaml.YamlMapping;
-import com.amihaiemil.eoyaml.YamlSequence;
+import java.util.ArrayList;
-import com.amihaiemil.eoyaml.YamlSequenceBuilder;
+import java.util.List;
-import java.net.MalformedURLException;
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *
  * @author jimj316
  */
-public class Playlist implements Consumer<Song>
+public class Playlist
 {
 
-    private static final int SHUFFLE_DONT_REPEAT_LAST = 3;
-
     private final String name;
-    private Main bot;
     private final List<Song> songs = new ArrayList<>();
-    private final LinkedList<Song> playHistory = new LinkedList<>();
 
     public Playlist(String name)
     {
@@ -47,40 +37,18 @@ public class Playlist implements Consumer<Song>
 
     public YamlMapping toYaml()
     {
-        YamlSequenceBuilder songList = Yaml.createYamlSequenceBuilder();
+        throw new UnsupportedOperationException("Not supported yet.");
-        for (Song song : songs)
-            songList = songList.add(song.toYaml());
-
-        return Yaml.createYamlMappingBuilder()
-                .add("name", name)
-                .add("songs", songList.build())
-                .build();
     }
 
     public static Playlist fromYaml(YamlMapping yaml)
     {
-        Playlist ret = new Playlist(yaml.string("name"));
+        throw new UnsupportedOperationException("Not supported yet.");
-        YamlSequence songList = yaml.value("songs").asSequence();
-        for (int i = 0; i < songList.size(); i++)
-        {
-            try
-            {
-                ret.addSong(Song.fromYaml(songList.yamlMapping(i)));
-            } catch (MalformedURLException ex)
-            {
-                Logger.getLogger(Playlist.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-        return ret;
     }
 
     public void addSong(Song song)
     {
         song.setKept(true);
         songs.add(song);
-
-        if (bot != null)
-            bot.savePlaylist(this);
     }
 
     public String getName()
@@ -93,44 +61,9 @@ public class Playlist implements Consumer<Song>
         return songs;
     }
 
-    public Song getNextSong()
+    Song getNextSong()
     {
-        Song ret;
+        throw new UnsupportedOperationException("Not supported yet.");
-
-        // copy the song list
-        List<Song> toShuffle = new LinkedList<>(songs);
-
-        // remove play history from candidates, latest first, unless we'd have less than 2 options
-        for (int i = playHistory.size() - 1; i >= 0; i--)
-        {
-            if (toShuffle.size() <= 2)
-                break;
-            toShuffle.remove(playHistory.get(i));
-        }
-
-        Collections.shuffle(toShuffle);
-        ret = toShuffle.get(0);
-
-        playHistory.add(ret);
-        if (playHistory.size() > SHUFFLE_DONT_REPEAT_LAST)
-            playHistory.remove();
-        return ret;
-    }
-
-    @Override
-    public void accept(Song t)
-    {
-        addSong(t);
-    }
-
-    public Main getBot()
-    {
-        return bot;
-    }
-
-    public void setBot(Main bot)
-    {
-        this.bot = bot;
     }
 
 }

src/main/java/moe/nekojimi/chords/QueueManager.java

@@ -26,6 +26,8 @@ import java.util.function.Consumer;
  */
 public class QueueManager implements Consumer<Song>
 {
+
+    private Mode mode;
     private final Queue<Song> jukeboxQueue;
     private Playlist playlist;
     private MusicHandler handler;
@@ -114,12 +116,26 @@ public class QueueManager implements Consumer<Song>
     public void setPlaylist(Playlist playlist)
     {
         this.playlist = playlist;
-        if (playlist == null || !handler.isPlaying())
+    }
-            handler.playNext();
+
+    public Mode getMode()
+    {
+        return mode;
+    }
+
+    public void setMode(Mode mode)
+    {
+        this.mode = mode;
     }
 
     public boolean restartSong()
     {
         throw new UnsupportedOperationException("Not supported yet.");
     }
+
+    public enum Mode
+    {
+        JUKEBOX,
+        PLAYLIST;
+    }
 }

src/main/java/moe/nekojimi/chords/Song.java

@@ -60,7 +60,6 @@ public class Song
     {
         Song song = new Song(new URL(map.string("url")));
         song.setArtist(map.string("artist"));
-        song.setTitle(map.string("title"));
         song.setLocation(new File(map.string("location")));
         song.setNumber(map.integer("num"));
         song.setKept(Boolean.parseBoolean(map.string("kept")));

src/main/java/moe/nekojimi/chords/SongRequest.java

@@ -18,8 +18,11 @@ package moe.nekojimi.chords;
 
 import java.net.URL;
 import java.util.List;
-import moe.nekojimi.chords.commands.Invocation;
 import moe.nekojimi.musicsearcher.Result;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.requests.restaction.MessageAction;
+import net.dv8tion.jda.internal.entities.DataMessage;
 
 /**
  *
@@ -27,7 +30,9 @@ import moe.nekojimi.musicsearcher.Result;
  */
 public class SongRequest
 {
-    private Invocation invocation;
+
+    private Message requestMessage;
+    private Message responseMessage;
 
     private String query;
     private URL url;
@@ -38,6 +43,21 @@ public class SongRequest
 
     private Song song;
 
+    @SuppressWarnings("null")
+    public void respond(String text)
+    {
+        MessageAction action = null;
+
+        if (responseMessage == null)
+        {
+            action = requestMessage.reply(text);
+        } else
+        {
+            action = responseMessage.editMessage(text);
+        }
+
+        responseMessage = action.complete();
+    }
 
 
     public List<Result> getSearchResults()
@@ -60,35 +80,25 @@ public class SongRequest
         this.result = result;
     }
 
-    public Invocation getInvocation()
+    public Message getRequestMessage()
     {
-        return invocation;
+        return requestMessage;
     }
 
-    public void setInvocation(Invocation invocation)
+    public void setRequestMessage(Message requestMessage)
     {
-        this.invocation = invocation;
+        this.requestMessage = requestMessage;
     }
 
-//    public Message getRequestMessage()
+    public Message getResponseMessage()
-//    {
+    {
-//        return requestMessage;
+        return responseMessage;
-//    }
+    }
-//
+
-//    public void setRequestMessage(Message requestMessage)
+    public void setResponseMessage(Message responseMessage)
-//    {
+    {
-//        this.requestMessage = requestMessage;
+        this.responseMessage = responseMessage;
-//    }
+    }
-//
-//    public Message getResponseMessage()
-//    {
-//        return responseMessage;
-//    }
-//
-//    public void setResponseMessage(Message responseMessage)
-//    {
-//        this.responseMessage = responseMessage;
-//    }
 
     public String getQuery()
     {

src/main/java/moe/nekojimi/chords/TrackPlayer.java

@@ -132,7 +132,7 @@ public class TrackPlayer implements Closeable
 
     public void close() throws IOException
     {
-        input.close(); //q
+        input.close();
     }
 
 

src/main/java/moe/nekojimi/chords/commands/Command.java

@@ -5,7 +5,9 @@
  */
 package moe.nekojimi.chords.commands;
 
+import java.util.List;
 import moe.nekojimi.chords.Main;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
 /**
  *
@@ -24,7 +26,7 @@ public abstract class Command
         this.keyword = keyword;
     }
 
-    public abstract void call(Invocation invocation);
+    public abstract void call(GuildMessageReceivedEvent event, List<String> arg);
 
     public String getKeyword()
     {

src/main/java/moe/nekojimi/chords/commands/HelpCommand.java

@@ -16,7 +16,9 @@
  */
 package moe.nekojimi.chords.commands;
 
+import java.util.List;
 import moe.nekojimi.chords.Main;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
 public class HelpCommand extends Command
 {
@@ -27,7 +29,7 @@ public class HelpCommand extends Command
     }
 
     @Override
-    public void call(Invocation invocation)
+    public void call(GuildMessageReceivedEvent event, List<String> arg)
     {
         String help = "Commands available:\n"
                 + "!join <Channel>       - Joins a voice channel\n"
@@ -42,7 +44,7 @@ public class HelpCommand extends Command
 //        {
 //            help += "!" + key + ":"
 //        }
-        invocation.respond(help);
+        event.getChannel().sendMessage(help).queue();
     }
 
 }

src/main/java/moe/nekojimi/chords/commands/Invocation.java

@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2022 jimj316
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package moe.nekojimi.chords.commands;
-
-import java.util.List;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
-import net.dv8tion.jda.api.requests.restaction.MessageAction;
-
-/**
- *
- * @author jimj316
- */
-public class Invocation
-{
-
-    private Message requestMessage;
-    private Message responseMessage;
-
-    private final GuildMessageReceivedEvent event;
-    private final List<String> args;
-
-    public Invocation(GuildMessageReceivedEvent event, List<String> args)
-    {
-        this.event = event;
-        this.args = args;
-    }
-
-    public GuildMessageReceivedEvent getEvent()
-    {
-        return event;
-    }
-
-    public List<String> getArgs()
-    {
-        return args;
-    }
-
-    @SuppressWarnings("null")
-    public void respond(String text)
-    {
-        MessageAction action = null;
-
-        if (responseMessage == null)
-        {
-            action = requestMessage.reply(text);
-        } else
-        {
-            action = responseMessage.editMessage(text);
-        }
-
-        responseMessage = action.complete();
-    }
-
-    public Message getRequestMessage()
-    {
-        return requestMessage;
-    }
-
-    public void setRequestMessage(Message requestMessage)
-    {
-        this.requestMessage = requestMessage;
-    }
-
-    public Message getResponseMessage()
-    {
-        return responseMessage;
-    }
-
-    public void setResponseMessage(Message responseMessage)
-    {
-        this.responseMessage = responseMessage;
-    }
-
-}

src/main/java/moe/nekojimi/chords/commands/JoinCommand.java

@@ -6,6 +6,7 @@
 package moe.nekojimi.chords.commands;
 
 import java.util.List;
+import java.util.Optional;
 import moe.nekojimi.chords.Main;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
@@ -19,10 +20,8 @@ public class JoinCommand extends Command
     }
 
     @Override
-    public void call(Invocation invocation)
+    public void call(GuildMessageReceivedEvent event, List<String> args)
     {
-        GuildMessageReceivedEvent event = invocation.getEvent();
-        List<String> args = invocation.getArgs();
         TextChannel textChannel = event.getChannel();
         VoiceChannel channel = null;
         if (args.isEmpty() || args.get(0).isBlank())

src/main/java/moe/nekojimi/chords/commands/LeaveCommand.java

@@ -18,7 +18,7 @@ public class LeaveCommand extends Command
     }
 
     @Override
-    public void call(Invocation invocation)
+    public void call(GuildMessageReceivedEvent event, List<String> arg)
     {
         if (bot.getCurrentVoiceChannel() != null)
         {

src/main/java/moe/nekojimi/chords/commands/PlayCommand.java

@@ -25,6 +25,7 @@ import moe.nekojimi.chords.Main;
 import moe.nekojimi.chords.SongRequest;
 import moe.nekojimi.musicsearcher.Query;
 import moe.nekojimi.musicsearcher.Result;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
 /**
  *
@@ -43,13 +44,13 @@ public class PlayCommand extends Command
     }
 
     @Override
-    public void call(Invocation invocation)
+    public void call(GuildMessageReceivedEvent event, List<String> arg)
     {
         SongRequest request = new SongRequest();
-        request.setInvocation(invocation);
+        request.setRequestMessage(event.getMessage());
         try
         {
-            final URL url = new URL(invocation.getArgs().get(0));
+            final URL url = new URL(arg.get(0));
             request.setUrl(url);
             bot.queueDownload(request);
 
@@ -60,18 +61,18 @@ public class PlayCommand extends Command
             {
                 try
                 {
-                    int index = Integer.parseInt(invocation.getArgs().get(0));
+                    int index = Integer.parseInt(arg.get(0));
                     int size = request.getSearchResults().size();
                     if (index >= 1 && index <= size)
                     {
                         Result result = request.getSearchResults().get(index - 1);
                         request.setResult(result);
-                        bot.queueDownload(request, bot.getQueueManager());
+                        bot.queueDownload(request);
 //                        event.getChannel().sendMessage("Song removed.").queue();
                     } else if (size > 1)
-                        invocation.respond("That's not a number between 1 and " + size + "!");
+                        event.getChannel().sendMessage("That's not a number between 1 and " + size + "!").queue();
                     else if (size == 1)
-                        invocation.respond("There's only one song and that's not one of them!");
+                        event.getChannel().sendMessage("There's only one song and that's not one of them!").queue();
 
                     return;
                 } catch (NumberFormatException nfx)
@@ -81,13 +82,13 @@ public class PlayCommand extends Command
             }
 
             // otherwise, try searching
-            CompletableFuture<List<Result>> search = bot.getSearcher().search(Query.fullText(invocation.getArgs().stream().reduce((t, u) -> t + " " + u).get()));
+            CompletableFuture<List<Result>> search = bot.getSearcher().search(Query.fullText(arg.stream().reduce((t, u) -> t + " " + u).get()));
-            invocation.respond("Searching for \"" + invocation.getArgs() + "\" ...");
+            event.getChannel().sendMessage("Searching for \"" + arg + "\" ...").queue();
             search.orTimeout(30, TimeUnit.SECONDS).whenCompleteAsync((List<Result> results, Throwable exec) ->
             {
                 if (exec != null)
                 {
-                    invocation.respond("Failed to search! Reason: " + exec.getMessage());
+                    event.getChannel().sendMessage("Failed to search! Reason: " + exec.getMessage()).queue();
                     return;
                 }
 
@@ -96,7 +97,7 @@ public class PlayCommand extends Command
 
                 if (results.isEmpty())
                 {
-                    invocation.respond("Found nothing! :(");
+                    event.getChannel().sendMessage("Found nothing! :(").queue();
                     return;
                 }
 
@@ -124,7 +125,7 @@ public class PlayCommand extends Command
                     i++;
                 }
                 resultString += "Type eg. `!play 1` to select";
-                invocation.respond(resultString);
+                event.getChannel().sendMessage(resultString).queue();
             });
 //            event.getChannel().sendMessage("That's not a valid URL you idiot! " + ex.getMessage()).queue();
         }

src/main/java/moe/nekojimi/chords/commands/QueueCommand.java

@@ -21,6 +21,7 @@ import java.util.Queue;
 import moe.nekojimi.chords.Downloader;
 import moe.nekojimi.chords.Main;
 import moe.nekojimi.chords.Song;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
 public class QueueCommand extends Command
 {
@@ -31,7 +32,7 @@ public class QueueCommand extends Command
     }
 
     @Override
-    public void call(Invocation invocation)
+    public void call(GuildMessageReceivedEvent event, List<String> arg)
     {
         String message = ">>> ";
         int i = 1;
@@ -67,7 +68,7 @@ public class QueueCommand extends Command
         if (downloadQueue.isEmpty() && songQueue.isEmpty())
             message += ":mailbox_with_no_mail: The track queue is empty.";
         // :inbox_tray:
-        invocation.respond(message);
+        event.getChannel().sendMessage(message).queue();
     }
 
 }

src/main/java/moe/nekojimi/chords/commands/RemoveCommand.java

@@ -16,7 +16,9 @@
  */
 package moe.nekojimi.chords.commands;
 
+import java.util.List;
 import moe.nekojimi.chords.Main;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
 public class RemoveCommand extends Command
 {
@@ -27,23 +29,23 @@ public class RemoveCommand extends Command
     }
 
     @Override
-    public void call(Invocation invocation)
+    public void call(GuildMessageReceivedEvent event, List<String> arg)
     {
         try
         {
-            int i = Integer.parseInt(invocation.getArgs().get(0));
+            int i = Integer.parseInt(arg.get(0));
             boolean removed = bot.getQueueManager().removeSong(i - 1);
             final int size = bot.getQueueManager().getJukeboxQueue().size();
             if (removed)
-                invocation.respond("Song removed.");
+                event.getChannel().sendMessage("Song removed.").queue();
             else if (size > 1)
-                invocation.respond("That's not a number between 1 and " + size + "!");
+                event.getChannel().sendMessage("That's not a number between 1 and " + size + "!").queue();
             else if (size == 1)
-                invocation.respond("There's only one song to remove and that's not one of them!");
+                event.getChannel().sendMessage("There's only one song to remove and that's not one of them!").queue();
 
         } catch (NumberFormatException ex)
         {
-            invocation.respond(invocation.getArgs().get(0) + " isn't a number!");
+            event.getChannel().sendMessage(arg + " isn't a number!").queue();
         }
     }
 

src/main/java/moe/nekojimi/chords/commands/RestartCommand.java

@@ -16,7 +16,9 @@
  */
 package moe.nekojimi.chords.commands;
 
+import java.util.List;
 import moe.nekojimi.chords.Main;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
 public class RestartCommand extends Command
 {
@@ -27,14 +29,14 @@ public class RestartCommand extends Command
     }
 
     @Override
-    public void call(Invocation invocation)
+    public void call(GuildMessageReceivedEvent event, List<String> arg)
     {
         // TODO: this needs to clear the current data queue
         boolean ok = bot.getQueueManager().restartSong();
         if (ok)
-            invocation.respond("Restarted current song!");
+            event.getChannel().sendMessage("Restarted current song!").queue();
         else
-            invocation.respond("Cannot restart!");
+            event.getChannel().sendMessage("Cannot restart!").queue();
     }
 
 }

src/main/java/moe/nekojimi/chords/commands/SkipCommand.java

@@ -16,7 +16,9 @@
  */
 package moe.nekojimi.chords.commands;
 
+import java.util.List;
 import moe.nekojimi.chords.Main;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
 public class SkipCommand extends Command
 {
@@ -27,13 +29,13 @@ public class SkipCommand extends Command
     }
 
     @Override
-    public void call(Invocation invocation)
+    public void call(GuildMessageReceivedEvent event, List<String> arg)
     {
         boolean ok = bot.getMusicHandler().nextSong(true);
         if (ok)
-            invocation.respond("Skipped to next song!");
+            event.getChannel().sendMessage("Skipped to next song!").queue();
         else
-            invocation.respond("There's no more songs!");
+            event.getChannel().sendMessage("There's no more songs!").queue();
     }
 
 }

src/main/java/moe/nekojimi/chords/commands/playlists/AddToPlaylistCommand.java

@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2022 jimj316
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package moe.nekojimi.chords.commands.playlists;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import moe.nekojimi.chords.Main;
-import moe.nekojimi.chords.Playlist;
-import moe.nekojimi.chords.SongRequest;
-import moe.nekojimi.chords.commands.Command;
-import moe.nekojimi.chords.commands.Invocation;
-
-/**
- *
- * @author jimj316
- */
-public class AddToPlaylistCommand extends Command
-{
-
-    public AddToPlaylistCommand(Main bot)
-    {
-        super(bot, "addlist");
-    }
-
-    @Override
-    public void call(Invocation invocation)
-    {
-        String playlistName = invocation.getArgs().get(0);
-        Playlist playlist = bot.getPlaylists().get(playlistName);
-        if (playlist == null)
-        {
-            invocation.respond("There's no playlist named \"" + playlistName + "\"!");
-            return;
-        }
-
-        try
-        {
-            URL url = new URL(invocation.getArgs().get(1));
-            final SongRequest request = new SongRequest();
-            request.setInvocation(invocation);
-            request.setUrl(url);
-            bot.queueDownload(request, playlist);
-        } catch (MalformedURLException ex)
-        {
-            invocation.respond("That's not a valid URL!");
-            Logger.getLogger(AddToPlaylistCommand.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
-
-}

src/main/java/moe/nekojimi/chords/commands/playlists/MakePlaylistCommand.java

@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2022 jimj316
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package moe.nekojimi.chords.commands.playlists;
-
-import moe.nekojimi.chords.Main;
-import moe.nekojimi.chords.Playlist;
-import moe.nekojimi.chords.commands.Command;
-import moe.nekojimi.chords.commands.Invocation;
-
-/**
- *
- * @author jimj316
- */
-public class MakePlaylistCommand extends Command
-{
-
-    public MakePlaylistCommand(Main bot)
-    {
-        super(bot, "makelist");
-    }
-
-    @Override
-    public void call(Invocation invocation)
-    {
-        String name = invocation.getArgs().get(0);
-        if (bot.getPlaylists().containsKey(name))
-        {
-            invocation.respond("There's already a playlist named \"" + name + "\"!");
-            return;
-        }
-
-        Playlist list = new Playlist(name);
-        bot.addPlaylist(list);
-
-        invocation.respond("Playlist created!");
-    }
-
-}

src/main/java/moe/nekojimi/chords/commands/playlists/PlaylistCommand.java

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2022 jimj316
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package moe.nekojimi.chords.commands.playlists;
-
-import moe.nekojimi.chords.Main;
-import moe.nekojimi.chords.Playlist;
-import moe.nekojimi.chords.commands.Command;
-import moe.nekojimi.chords.commands.Invocation;
-
-/**
- *
- * @author jimj316
- */
-public class PlaylistCommand extends Command
-{
-
-    public PlaylistCommand(Main bot)
-    {
-        super(bot, "playlist");
-    }
-
-    @Override
-    public void call(Invocation invocation)
-    {
-        String name = invocation.getArgs().get(0);
-        Playlist list = bot.getPlaylists().get(name);
-        if (list == null)
-        {
-            invocation.respond("There's no playlist named \"" + name + "\"!");
-            return;
-        }
-
-        bot.getQueueManager().setPlaylist(list);
-        invocation.respond("Playing from list \"" + name + "\"!");
-    }
-
-}

src/main/java/moe/nekojimi/chords/commands/playlists/StopPlaylistCommand.java

@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2022 jimj316
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package moe.nekojimi.chords.commands.playlists;
-
-import moe.nekojimi.chords.Main;
-import moe.nekojimi.chords.commands.Command;
-import moe.nekojimi.chords.commands.Invocation;
-
-/**
- *
- * @author jimj316
- */
-public class StopPlaylistCommand extends Command
-{
-
-    public StopPlaylistCommand(Main bot)
-    {
-        super(bot, "stoplist");
-    }
-
-    @Override
-    public void call(Invocation invocation)
-    {
-        if (bot.getQueueManager().getPlaylist() == null)
-        {
-            invocation.respond("There's no playlist running!");
-            return;
-        }
-
-        bot.getQueueManager().setPlaylist(null);
-        invocation.respond("Playlist stopped!");
-    }
-
-}