play command accepts file uploads

jagrosh · Mar 15, 2018 · c49a559 · c49a559
1 parent af98eb5
commit c49a559
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/PlayCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/PlayCmd.java
@@ -56,7 +56,7 @@ public PlayCmd(Bot bot, String loadingEmoji)
 
     @Override
     public void doCommand(CommandEvent event) {
-        if(event.getArgs().isEmpty())
+        if(event.getArgs().isEmpty() && event.getMessage().getAttachments().isEmpty())
         {
             AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
             if(handler!=null && handler.getPlayer().getPlayingTrack()!=null && handler.getPlayer().isPaused())
@@ -85,7 +85,7 @@ public void doCommand(CommandEvent event) {
         }
         String args = event.getArgs().startsWith("<") && event.getArgs().endsWith(">") 
                 ? event.getArgs().substring(1,event.getArgs().length()-1) 
-                : event.getArgs();
+                : event.getArgs().isEmpty() ? event.getMessage().getAttachments().get(0).getUrl() : event.getArgs();
         event.reply(loadingEmoji+" Loading... `["+args+"]`", m -> bot.getAudioManager().loadItemOrdered(event.getGuild(), args, new ResultHandler(m,event,false)));
     }