play command accepts file uploads

more emojis

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,24 @@
+[download]: https://github.com/jagrosh/MusicBot/releases/latest
+[release]: https://img.shields.io/github/release/jagrosh/MusicBot.svg
+[setup]: https://github.com/jagrosh/MusicBot/wiki/Setup
+[rpi]: https://github.com/jagrosh/MusicBot/wiki/JMusicBot-on-Raspberry-Pi
+[features]: https://github.com/jagrosh/MusicBot/projects/1
+
+## General Troubleshooting
+
+Please check off these steps before suggesting a feature or reporting a bug:
+
+- [ ] I am running the [latest version][download]: [![Release][release]][download]
+- [ ] I have followed all instructions on the [setup page][setup] (and if applicable, [Raspberry Pi][rpi])
+- [ ] I have read through the [planned and suggested features][features]
+
+## Issue
+
+### Issue Type
+
+- [ ] Bug Report
+- [ ] Feature Request
+
+### Description
+
+Replace this with a description of your bug or feature request. Please provide screenshots and logs as applicable.

README.md

@@ -1,3 +1,10 @@
+<img align="right" src="https://i.imgur.com/zrE80HY.png" height="200" width="200">
+
+[![Downloads](https://img.shields.io/github/downloads/jagrosh/MusicBot/total.svg)](https://github.com/jagrosh/MusicBot/releases/latest)
+[![Release](https://img.shields.io/github/release/jagrosh/MusicBot.svg)](https://github.com/jagrosh/MusicBot/releases/latest)
+[![License](https://img.shields.io/github/license/jagrosh/MusicBot.svg)](https://github.com/jagrosh/MusicBot/blob/master/LICENSE)
+[![Discord](https://discordapp.com/api/guilds/147698382092238848/widget.png)](https://discord.gg/0p9LSGoRLu6Pet0k)
+
 # JMusicBot
 A Discord music bot with a clean interface, and that is easy to set up and run yourself
 
@@ -20,10 +27,10 @@ A Discord music bot with a clean interface, and that is easy to set up and run y
 Please see the [Setup Page](https://github.com/jagrosh/MusicBot/wiki/Setup) in the wiki to run this bot yourself!
 
 # Questions/Suggestions/Bug Reports
-If you'd like to suggest changes to how the bot functions, recommend more customization options, or report bugs, feel free to either open an [Issue](https://github.com/jagrosh/MusicBot/issues) on this repository, or join [my Discord server](https://discord.gg/0p9LSGoRLu6Pet0k). If you like this bot, be sure to add a star to the libraries that make this possible: [**JDA**](https://github.com/DV8FromTheWorld/JDA) and [**lavaplayer**](https://github.com/sedmelluq/lavaplayer)
+**Please read the [Suggested/Planned Features List](https://github.com/jagrosh/MusicBot/projects/1) before suggesting a feature**. If you'd like to suggest changes to how the bot functions, recommend more customization options, or report bugs, feel free to either open an [Issue](https://github.com/jagrosh/MusicBot/issues) on this repository, or join [my Discord server](https://discord.gg/0p9LSGoRLu6Pet0k). (Note: I will not accept any feature requests that will require additional API keys, nor any non-music features). If you like this bot, be sure to add a star to the libraries that make this possible: [**JDA**](https://github.com/DV8FromTheWorld/JDA) and [**lavaplayer**](https://github.com/sedmelluq/lavaplayer)
+
+# Example
+![Example](https://i.imgur.com/tevrtKt.png)
 
 # Editing
 This bot (and the source code here) is not meant to be edited. The main purpose of having the source public is to show the capabilities of the libraries, and to allow others to understand how the bot works. There are many requirements and dependencies required to edit and compile it, and there will not be support provided for people looking to make changes on their own. Instead, consider making a feature request (see the above section). If you still choose to make edits, please do so in accordance with the Apache 2.0 License.
-
-# Example
-![Example](http://i.imgur.com/gxDdlRL.png)

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.jagrosh</groupId>
     <artifactId>JMusicBot</artifactId>
-    <version>0.0.8</version>
+    <version>0.1.3</version>
     <packaging>jar</packaging>
     
     <repositories>
@@ -15,30 +15,26 @@
     </repositories>
     
     <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-            <version>1.7.22</version>
-        </dependency>
         <dependency>
             <groupId>net.dv8tion</groupId> 
             <artifactId>JDA</artifactId> 
-            <version>3.2.0_242</version>
+            <version>3.5.1_348</version>
         </dependency>
         <dependency>
             <groupId>com.sedmelluq</groupId>
             <artifactId>lavaplayer</artifactId>
-            <version>1.2.43</version>
+            <version>1.2.56</version>
         </dependency>
         <dependency>
             <groupId>com.jagrosh</groupId>
-            <artifactId>JDA-Utilities</artifactId>
-            <version>1.5</version>
+            <artifactId>jda-utilities</artifactId>
+            <version>2.1</version>
+            <type>pom</type>
         </dependency>
         <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20160810</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
         </dependency>
     </dependencies>
     

src/main/java/com/jagrosh/jmusicbot/Bot.java

@@ -27,26 +27,33 @@ import java.util.HashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import com.jagrosh.jdautilities.commandclient.Command.Category;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
-import com.jagrosh.jdautilities.waiter.EventWaiter;
+import com.jagrosh.jdautilities.command.Command.Category;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.jagrosh.jmusicbot.gui.GUI;
 import com.jagrosh.jmusicbot.utils.FormatUtil;
+import com.jagrosh.jmusicbot.utils.Pair;
+import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
+import java.util.Objects;
 import net.dv8tion.jda.core.JDA;
 import net.dv8tion.jda.core.Permission;
 import net.dv8tion.jda.core.entities.Game;
 import net.dv8tion.jda.core.entities.Guild;
+import net.dv8tion.jda.core.entities.Message;
 import net.dv8tion.jda.core.entities.Role;
 import net.dv8tion.jda.core.entities.TextChannel;
 import net.dv8tion.jda.core.entities.VoiceChannel;
 import net.dv8tion.jda.core.events.ReadyEvent;
 import net.dv8tion.jda.core.events.ShutdownEvent;
 import net.dv8tion.jda.core.events.guild.GuildJoinEvent;
+import net.dv8tion.jda.core.events.message.guild.GuildMessageDeleteEvent;
+import net.dv8tion.jda.core.exceptions.PermissionException;
 import net.dv8tion.jda.core.hooks.ListenerAdapter;
-import net.dv8tion.jda.core.utils.SimpleLog;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -55,6 +62,7 @@ import org.json.JSONObject;
 public class Bot extends ListenerAdapter {
     
     private final HashMap<String,Settings> settings;
+    private final HashMap<Long,Pair<Long,Long>> lastNP; // guild -> channel,message
     private final AudioPlayerManager manager;
     private final EventWaiter waiter;
     private final ScheduledExecutorService threadpool;
@@ -91,10 +99,12 @@ public class Bot extends ListenerAdapter {
         this.config = config;
         this.waiter = waiter;
         this.settings = new HashMap<>();
+        this.lastNP = new HashMap<>();
         manager = new DefaultAudioPlayerManager();
         threadpool = Executors.newSingleThreadScheduledExecutor();
         AudioSourceManagers.registerRemoteSources(manager);
         AudioSourceManagers.registerLocalSource(manager);
+        manager.source(YoutubeAudioSourceManager.class).setPlaylistPageCount(10);
         try {
             JSONObject loadedSettings = new JSONObject(new String(Files.readAllBytes(Paths.get("serversettings.json"))));
             loadedSettings.keySet().forEach((id) -> {
@@ -105,13 +115,19 @@ public class Bot extends ListenerAdapter {
                         o.has("voice_channel_id")? o.getString("voice_channel_id"): null,
                         o.has("dj_role_id")      ? o.getString("dj_role_id")      : null,
                         o.has("volume")          ? o.getInt("volume")             : 100,
-                        o.has("default_playlist")? o.getString("default_playlist"): null));
+                        o.has("default_playlist")? o.getString("default_playlist"): null,
+                        o.has("repeat")          ? o.getBoolean("repeat")         : false));
             });
         } catch(IOException | JSONException e) {
-            SimpleLog.getLog("Settings").warn("Failed to load server settings: "+e);
+            LoggerFactory.getLogger("Settings").warn("Failed to load server settings (this is normal if no settings have been set yet): "+e);
         }
     }
     
+    public JDA getJDA()
+    {
+        return jda;
+    }
+    
     public EventWaiter getWaiter()
     {
         return waiter;
@@ -122,6 +138,11 @@ public class Bot extends ListenerAdapter {
         return manager;
     }
     
+    public ScheduledExecutorService getThreadpool()
+    {
+        return threadpool;
+    }
+    
     public int queueTrack(CommandEvent event, AudioTrack track)
     {
         return setUpHandler(event).addTrack(track, event.getAuthor());
@@ -143,7 +164,8 @@ public class Bot extends ListenerAdapter {
             handler = new AudioHandler(player, guild, this);
             player.addListener(handler);
             guild.getAudioManager().setSendingHandler(handler);
-            threadpool.scheduleWithFixedDelay(() -> updateTopic(guild,handler), 0, 5, TimeUnit.SECONDS);
+            if(AudioHandler.USE_NP_REFRESH)
+                threadpool.scheduleWithFixedDelay(() -> updateLastNP(guild.getIdLong()), 0, 5, TimeUnit.SECONDS);
         }
         else
             handler = (AudioHandler)guild.getAudioManager().getSendingHandler();
@@ -152,14 +174,54 @@ public class Bot extends ListenerAdapter {
     
     public void resetGame()
     {
-        if(config.getGame()==null || config.getGame().equalsIgnoreCase("none"))
-            jda.getPresence().setGame(null);
-        else
-            jda.getPresence().setGame(Game.of(config.getGame()));
+        Game game = config.getGame()==null || config.getGame().getName().equalsIgnoreCase("none") ? null : config.getGame();
+        if(!Objects.equals(jda.getPresence().getGame(), game))
+            jda.getPresence().setGame(game);
     }
     
-    private void updateTopic(Guild guild, AudioHandler handler)
+    public void setLastNP(Message m)
     {
+        lastNP.put(m.getGuild().getIdLong(), new Pair<>(m.getTextChannel().getIdLong(), m.getIdLong()));
+    }
+
+    @Override
+    public void onGuildMessageDelete(GuildMessageDeleteEvent event) {
+        if(lastNP.containsKey(event.getGuild().getIdLong()))
+        {
+            Pair<Long,Long> pair = lastNP.get(event.getGuild().getIdLong());
+            if(pair.getValue()==event.getMessageIdLong())
+                lastNP.remove(event.getGuild().getIdLong());
+        }
+    }
+    
+    private void updateLastNP(long guildId)
+    {
+        Guild guild = jda.getGuildById(guildId);
+        if(guild==null)
+            return;
+        if(!lastNP.containsKey(guildId))
+            return;
+        Pair<Long,Long> pair = lastNP.get(guildId);
+        if(pair==null)
+            return;
+        TextChannel tc = guild.getTextChannelById(pair.getKey());
+        if(tc==null)
+        {
+            lastNP.remove(guildId);
+            return;
+        }
+        try {
+            tc.editMessageById(pair.getValue(), FormatUtil.nowPlayingMessage(guild, config.getSuccess())).queue(m->{}, t -> lastNP.remove(guildId));
+        } catch(Exception e) {
+            lastNP.remove(guildId);
+        }
+    }
+    
+    public void updateTopic(long guildId, AudioHandler handler)
+    {
+        Guild guild = jda.getGuildById(guildId);
+        if(guild==null)
+            return;
         TextChannel tchan = guild.getTextChannelById(getSettings(guild).getTextId());
         if(tchan!=null && guild.getSelfMember().hasPermission(tchan, Permission.MANAGE_CHANNEL))
         {
@@ -167,26 +229,30 @@ public class Bot extends ListenerAdapter {
             if(tchan.getTopic()==null || tchan.getTopic().isEmpty())
                 otherText = "\u200B";
             else if(tchan.getTopic().contains("\u200B"))
-                otherText = tchan.getTopic().substring(tchan.getTopic().indexOf("\u200B"));
+                otherText = tchan.getTopic().substring(tchan.getTopic().lastIndexOf("\u200B"));
             else
                 otherText = "\u200B\n "+tchan.getTopic();
-            String text = FormatUtil.formattedAudio(handler, guild.getJDA())+otherText;
+            String text = FormatUtil.topicFormat(handler, guild.getJDA())+otherText;
             if(!text.equals(tchan.getTopic()))
-                tchan.getManager().setTopic(text).queue();
+                try {
+                    tchan.getManager().setTopic(text).queue();
+                } catch(PermissionException e){}
         }
     }
 
-    public void shutdown(){
+    public void shutdown()
+    {
         manager.shutdown();
         threadpool.shutdownNow();
-        jda.getGuilds().stream().forEach(g -> {
+        jda.getGuilds().stream().forEach(g -> 
+        {
             g.getAudioManager().closeAudioConnection();
             AudioHandler ah = (AudioHandler)g.getAudioManager().getSendingHandler();
             if(ah!=null)
             {
                 ah.getQueue().clear();
                 ah.getPlayer().destroy();
-                updateTopic(g, ah);
+                updateTopic(g.getIdLong(), ah);
             }
         });
         jda.shutdown();
@@ -198,21 +264,25 @@ public class Bot extends ListenerAdapter {
     }
     
     @Override
-    public void onShutdown(ShutdownEvent event) {
+    public void onShutdown(ShutdownEvent event) 
+    {
         if(gui!=null)
             gui.dispose();
     }
 
     @Override
-    public void onReady(ReadyEvent event) {
+    public void onReady(ReadyEvent event) 
+    {
         this.jda = event.getJDA();
         if(jda.getGuilds().isEmpty())
         {
-            SimpleLog.getLog("MusicBot").warn("This bot is not on any guilds! Use the following link to add the bot to your guilds!");
-            SimpleLog.getLog("MusicBot").warn(event.getJDA().asBot().getInviteUrl(JMusicBot.RECOMMENDED_PERMS));
+            Logger log = LoggerFactory.getLogger("MusicBot");
+            log.warn("This bot is not on any guilds! Use the following link to add the bot to your guilds!");
+            log.warn(event.getJDA().asBot().getInviteUrl(JMusicBot.RECOMMENDED_PERMS));
         }
         credit(event.getJDA());
-        jda.getGuilds().forEach((guild) -> {
+        jda.getGuilds().forEach((guild) -> 
+        {
             try
             {
                 String defpl = getSettings(guild).getDefaultPlaylist();
@@ -228,7 +298,8 @@ public class Bot extends ListenerAdapter {
     }
 
     @Override
-    public void onGuildJoin(GuildJoinEvent event) {
+    public void onGuildJoin(GuildJoinEvent event) 
+    {
         credit(event.getJDA());
     }
     
@@ -257,7 +328,7 @@ public class Bot extends ListenerAdapter {
         Settings s = settings.get(channel.getGuild().getId());
         if(s==null)
         {
-            settings.put(channel.getGuild().getId(), new Settings(channel.getId(),null,null,100,null));
+            settings.put(channel.getGuild().getId(), new Settings(channel.getId(),null,null,100,null,false));
         }
         else
         {
@@ -271,7 +342,7 @@ public class Bot extends ListenerAdapter {
         Settings s = settings.get(channel.getGuild().getId());
         if(s==null)
         {
-            settings.put(channel.getGuild().getId(), new Settings(null,channel.getId(),null,100,null));
+            settings.put(channel.getGuild().getId(), new Settings(null,channel.getId(),null,100,null,false));
         }
         else
         {
@@ -285,7 +356,7 @@ public class Bot extends ListenerAdapter {
         Settings s = settings.get(role.getGuild().getId());
         if(s==null)
         {
-            settings.put(role.getGuild().getId(), new Settings(null,null,role.getId(),100,null));
+            settings.put(role.getGuild().getId(), new Settings(null,null,role.getId(),100,null,false));
         }
         else
         {
@@ -299,7 +370,7 @@ public class Bot extends ListenerAdapter {
         Settings s = settings.get(guild.getId());
         if(s==null)
         {
-            settings.put(guild.getId(), new Settings(null,null,null,100,playlist));
+            settings.put(guild.getId(), new Settings(null,null,null,100,playlist,false));
         }
         else
         {
@@ -313,7 +384,7 @@ public class Bot extends ListenerAdapter {
         Settings s = settings.get(guild.getId());
         if(s==null)
         {
-            settings.put(guild.getId(), new Settings(null,null,null,volume,null));
+            settings.put(guild.getId(), new Settings(null,null,null,volume,null,false));
         }
         else
         {
@@ -322,6 +393,20 @@ public class Bot extends ListenerAdapter {
         writeSettings();
     }
     
+    public void setRepeatMode(Guild guild, boolean mode)
+    {
+        Settings s = settings.get(guild.getId());
+        if(s==null)
+        {
+            settings.put(guild.getId(), new Settings(null,null,null,100,null,mode));
+        }
+        else
+        {
+            s.setRepeatMode(mode);
+        }
+        writeSettings();
+    }
+    
     public void clearTextChannel(Guild guild)
     {
         Settings s = getSettings(guild);
@@ -377,12 +462,14 @@ public class Bot extends ListenerAdapter {
                 o.put("volume",s.getVolume());
             if(s.getDefaultPlaylist()!=null)
                 o.put("default_playlist", s.getDefaultPlaylist());
+            if(s.getRepeatMode())
+                o.put("repeat", true);
             obj.put(key, o);
         });
         try {
             Files.write(Paths.get("serversettings.json"), obj.toString(4).getBytes());
         } catch(IOException ex){
-            SimpleLog.getLog("Settings").warn("Failed to write to file: "+ex);
+            LoggerFactory.getLogger("Settings").warn("Failed to write to file: "+ex);
         }
     }
     

src/main/java/com/jagrosh/jmusicbot/Config.java

@@ -15,41 +15,43 @@
  */
 package com.jagrosh.jmusicbot;
 
-import com.jagrosh.jmusicbot.utils.FormatUtil;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Scanner;
 import javax.swing.JOptionPane;
+import net.dv8tion.jda.core.OnlineStatus;
+import net.dv8tion.jda.core.entities.Game;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
  * @author John Grosh (jagrosh)
  */
-public class Config {
+public class Config
+{
+    private final static Logger LOG = LoggerFactory.getLogger(Config.class);
     private boolean nogui;
-    private String prefix;
-    private String altprefix;
-    private String token;
-    private String owner;
-    private String success;
-    private String warning;
-    private String error;
-    private String game;
-    private String help;
-    private boolean stay;
-    private boolean dbots;
-    private boolean songingame;
+    private String configLocation = null;
+    private String prefix, altprefix, token, owner, success, warning, error, game, 
+            help, loadingEmoji, searchingEmoji;
+    private boolean stay, dbots, songingame, useEval, npimages;
+    private long maxSeconds;
+    private OnlineStatus status = OnlineStatus.UNKNOWN;
     
     public Config(boolean nogui)
     {
         this.nogui = nogui;
         List<String> lines;
-        try {
-            lines = Files.readAllLines(Paths.get("config.txt"));
-            System.out.println("[INFO] Loading config: "+Paths.get("config.txt").toFile().getAbsolutePath());
+        try 
+        {
+            configLocation = Paths.get("config.txt").toFile().getAbsolutePath();
+            lines = Files.readAllLines(Paths.get("config.txt"), StandardCharsets.UTF_8);
+            //System.out.println("[INFO] Loading config: "+location);
             for(String line: lines)
             {
                 String[] parts = line.split("=",2);
@@ -78,28 +80,47 @@ public class Config {
                     case "error":
                         error = value;
                         break;
+                    case "loading":
+                        loadingEmoji = value;
+                        break;
+                    case "searching":
+                        searchingEmoji = value;
+                        break;
                     case "game":
                         game = value;
                         break;
                     case "help":
                         help = value;
                         break;
-                    case "noprogressintopic":
-                        FormatUtil.NO_PROGRESS_BAR_IN_TOPIC = "true".equalsIgnoreCase(value);
-                        break;
                     case "songinstatus":
                         songingame = "true".equalsIgnoreCase(value);
                         break;
                     case "stayinchannel":
                         stay = "true".equalsIgnoreCase(value);
                         break;
+                    case "eval":
+                        useEval = "true".equalsIgnoreCase(value);
+                        break;
                     case "dbots":
                         dbots = "110373943822540800".equals(value);
                         break;
+                    case "npimages":
+                        npimages = "true".equalsIgnoreCase(value);
+                        break;
+                    case "maxtime":
+                        try{
+                            maxSeconds = Long.parseLong(value);
+                        }catch(NumberFormatException e){}
+                        break;
+                    case "status":
+                        status = OnlineStatus.fromKey(value);
+                        break;
                 }
             }
-        } catch (IOException ex) {
-            alert("'config.txt' was not found!");
+        }
+        catch (IOException ex) 
+        {
+            alert("'config.txt' was not found at "+configLocation+"!");
             lines = new LinkedList<>();
         }
         boolean write = false;
@@ -142,15 +163,23 @@ public class Config {
         {
             StringBuilder builder = new StringBuilder();
             lines.stream().forEach(s -> builder.append(s).append("\r\n"));
-            try {
+            try 
+            {
                 Files.write(Paths.get("config.txt"), builder.toString().trim().getBytes());
-            } catch(IOException ex) {
+            }
+            catch(IOException ex) 
+            {
                 alert("Failed to write new config options to config.txt: "+ex
                     + "\nPlease make sure that the files are not on your desktop or some other restricted area.");
             }
         }
     }
     
+    public String getConfigLocation()
+    {
+        return configLocation;
+    }
+    
     public String getPrefix()
     {
         return prefix;
@@ -186,9 +215,29 @@ public class Config {
         return error==null ? "\uD83D\uDEAB" : error;
     }
     
-    public String getGame()
+    public String getLoading()
     {
-        return game;
+        return loadingEmoji==null ? "\u231A" : loadingEmoji;
+    }
+    
+    public String getSearching()
+    {
+        return searchingEmoji==null ? "\uD83D\uDD0E" : searchingEmoji;
+    }
+    
+    public Game getGame()
+    {
+        if(game==null || game.isEmpty())
+            return null;
+        if(game.toLowerCase().startsWith("playing"))
+            return Game.playing(game.substring(7).trim());
+        if(game.toLowerCase().startsWith("listening to"))
+            return Game.listening(game.substring(12).trim());
+        if(game.toLowerCase().startsWith("listening"))
+            return Game.listening(game.substring(9).trim());
+        if(game.toLowerCase().startsWith("watching"))
+            return Game.watching(game.substring(8).trim());
+        return Game.playing(game);
     }
     
     public String getHelp()
@@ -216,6 +265,26 @@ public class Config {
         return dbots;
     }
     
+    public boolean useEval()
+    {
+        return useEval;
+    }
+    
+    public boolean useNPImages()
+    {
+        return npimages;
+    }
+    
+    public long getMaxSeconds()
+    {
+        return maxSeconds;
+    }
+    
+    public OnlineStatus getStatus()
+    {
+        return status;
+    }
+    
     private void alert(String message)
     {
         if(nogui)

src/main/java/com/jagrosh/jmusicbot/JMusicBot.java

@@ -17,10 +17,10 @@ package com.jagrosh.jmusicbot;
 
 import java.awt.Color;
 import javax.security.auth.login.LoginException;
-import com.jagrosh.jdautilities.commandclient.CommandClient;
-import com.jagrosh.jdautilities.commandclient.CommandClientBuilder;
-import com.jagrosh.jdautilities.commandclient.examples.*;
-import com.jagrosh.jdautilities.waiter.EventWaiter;
+import com.jagrosh.jdautilities.command.CommandClient;
+import com.jagrosh.jdautilities.command.CommandClientBuilder;
+import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
+import com.jagrosh.jdautilities.examples.command.*;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.jagrosh.jmusicbot.commands.*;
 import com.jagrosh.jmusicbot.gui.GUI;
@@ -29,22 +29,24 @@ import net.dv8tion.jda.core.JDABuilder;
 import net.dv8tion.jda.core.OnlineStatus;
 import net.dv8tion.jda.core.Permission;
 import net.dv8tion.jda.core.entities.Game;
-import net.dv8tion.jda.core.exceptions.RateLimitedException;
-import net.dv8tion.jda.core.utils.SimpleLog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
  * @author John Grosh (jagrosh)
  */
-public class JMusicBot {
-    
-    public static Permission[] RECOMMENDED_PERMS = new Permission[]{Permission.MESSAGE_READ, Permission.MESSAGE_WRITE, Permission.MESSAGE_HISTORY, Permission.MESSAGE_ADD_REACTION,
+public class JMusicBot 
+{
+    public final static Permission[] RECOMMENDED_PERMS = new Permission[]{Permission.MESSAGE_READ, Permission.MESSAGE_WRITE, Permission.MESSAGE_HISTORY, Permission.MESSAGE_ADD_REACTION,
                                 Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_MANAGE, Permission.MESSAGE_EXT_EMOJI,
                                 Permission.MANAGE_CHANNEL, Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.NICKNAME_CHANGE};
+    public final static Logger LOG = LoggerFactory.getLogger("Startup"); 
     /**
      * @param args the command line arguments
      */
-    public static void main(String[] args){
+    public static void main(String[] args)
+    {
         // check run mode(s)
         boolean nogui = false;
         for(String arg: args)
@@ -58,11 +60,16 @@ public class JMusicBot {
         EventWaiter waiter = new EventWaiter();
         Bot bot = new Bot(waiter, config);
         
-        AboutCommand.IS_AUTHOR = false;
-        AboutCommand.REPLACEMENT_ICON = "\uD83C\uDFB6";
+        AboutCommand ab = new AboutCommand(Color.BLUE.brighter(),
+                                "a music bot that is [easy to host yourself!](https://github.com/jagrosh/MusicBot) (v0.1.3)",
+                                new String[]{"High-quality music playback", "FairQueue™ Technology", "Easy to host yourself"},
+                                RECOMMENDED_PERMS);
+        ab.setIsAuthor(false);
+        ab.setReplacementCharacter("\uD83C\uDFB6");
         AudioHandler.STAY_IN_CHANNEL = config.getStay();
         AudioHandler.SONG_IN_STATUS = config.getSongInStatus();
-        
+        AudioHandler.MAX_SECONDS = config.getMaxSeconds();
+        AudioHandler.USE_NP_REFRESH = !config.useNPImages();
         // set up the command client
         
         CommandClientBuilder cb = new CommandClientBuilder()
@@ -71,26 +78,25 @@ public class JMusicBot {
                 .setOwnerId(config.getOwnerId())
                 .setEmojis(config.getSuccess(), config.getWarning(), config.getError())
                 .setHelpWord(config.getHelp())
+                .setLinkedCacheSize(200)
                 .addCommands(
-                        new AboutCommand(Color.BLUE.brighter(),
-                                "a music bot that is [easy to host yourself!](https://github.com/jagrosh/MusicBot) (v0.0.8)",
-                                new String[]{"High-quality music playback", "FairQueue™ Technology", "Easy to host yourself"},
-                                RECOMMENDED_PERMS),
+                        ab,
                         new PingCommand(),
                         new SettingsCmd(bot),
                         
                         new NowplayingCmd(bot),
-                        new PlayCmd(bot),
+                        new PlayCmd(bot, config.getLoading()),
                         new PlaylistsCmd(bot),
                         new QueueCmd(bot),
                         new RemoveCmd(bot),
-                        new SearchCmd(bot),
-                        new SCSearchCmd(bot),
+                        new SearchCmd(bot, config.getSearching()),
+                        new SCSearchCmd(bot, config.getSearching()),
                         new ShuffleCmd(bot),
                         new SkipCmd(bot),
                         
                         new ForceskipCmd(bot),
                         new PauseCmd(bot),
+                        new RepeatCmd(bot),
                         new SkiptoCmd(bot),
                         new StopCmd(bot),
                         new VolumeCmd(bot),
@@ -100,6 +106,7 @@ public class JMusicBot {
                         new SetvcCmd(bot),
                         
                         //new GuildlistCommand(waiter),
+                        new AutoplaylistCmd(bot),
                         new PlaylistCmd(bot),
                         new SetavatarCmd(bot),
                         new SetgameCmd(bot),
@@ -107,40 +114,62 @@ public class JMusicBot {
                         new SetstatusCmd(bot),
                         new ShutdownCmd(bot)
                 );
+        if(config.useEval())
+            cb.addCommand(new EvalCmd(bot));
+        boolean nogame = false;
+        if(config.getStatus()!=OnlineStatus.UNKNOWN)
+            cb.setStatus(config.getStatus());
         if(config.getGame()==null)
             cb.useDefaultGame();
-        else if(config.getGame().equalsIgnoreCase("none"))
+        else if(config.getGame().getName().equalsIgnoreCase("none"))
+        {
             cb.setGame(null);
+            nogame = true;
+        }
         else
-            cb.setGame(Game.of(config.getGame()));
+            cb.setGame(config.getGame());
         CommandClient client = cb.build();
         
         if(!config.getNoGui())
         {
-            try {
+            try 
+            {
                 GUI gui = new GUI(bot);
                 bot.setGUI(gui);
                 gui.init();
-            } catch(Exception e) {
-                SimpleLog.getLog("Startup").fatal("Could not start GUI. If you are "
+            } 
+            catch(Exception e) 
+            {
+                LOG.error("Could not start GUI. If you are "
                         + "running on a server or in a location where you cannot display a "
                         + "window, please run in nogui mode using the -nogui flag.");
             }
         }
         
+        LOG.info("Loaded config from "+config.getConfigLocation());
+        
         // attempt to log in and start
-        try {
+        try
+        {
             new JDABuilder(AccountType.BOT)
                     .setToken(config.getToken())
                     .setAudioEnabled(true)
-                    .setGame(Game.of("loading..."))
-                    .setStatus(OnlineStatus.DO_NOT_DISTURB)
+                    .setGame(nogame ? null : Game.playing("loading..."))
+                    .setStatus(config.getStatus()==OnlineStatus.INVISIBLE||config.getStatus()==OnlineStatus.OFFLINE ? OnlineStatus.INVISIBLE : OnlineStatus.DO_NOT_DISTURB)
                     .addEventListener(client)
                     .addEventListener(waiter)
                     .addEventListener(bot)
                     .buildAsync();
-        } catch (LoginException | IllegalArgumentException | RateLimitedException ex) {
-            SimpleLog.getLog("Login").fatal(ex);
+        }
+        catch (LoginException ex)
+        {
+            LOG.error(ex+"\nPlease make sure you are "
+                    + "editing the correct config.txt file, and that you have used the "
+                    + "correct token (not the 'secret'!)");
+        }
+        catch(IllegalArgumentException ex)
+        {
+            LOG.error("Some aspect of the configuration is invalid: "+ex);
         }
     }
 }

src/main/java/com/jagrosh/jmusicbot/Settings.java

@@ -20,15 +20,16 @@ package com.jagrosh.jmusicbot;
  * @author John Grosh <john.a.grosh@gmail.com>
  */
 public class Settings {
-    public final static Settings DEFAULT_SETTINGS = new Settings(0, 0, 0, 100, null);
+    public final static Settings DEFAULT_SETTINGS = new Settings(0, 0, 0, 100, null, false);
     
     private long textId;
     private long voiceId;
     private long roleId;
     private int volume;
     private String defaultPlaylist;
+    private boolean repeatMode;
     
-    public Settings(String textId, String voiceId, String roleId, int volume, String defaultPlaylist)
+    public Settings(String textId, String voiceId, String roleId, int volume, String defaultPlaylist, boolean repeatMode)
     {
         try
         {
@@ -56,15 +57,17 @@ public class Settings {
         }
         this.volume = volume;
         this.defaultPlaylist = defaultPlaylist;
+        this.repeatMode = repeatMode;
     }
     
-    public Settings(long textId, long voiceId, long roleId, int volume, String defaultPlaylist)
+    public Settings(long textId, long voiceId, long roleId, int volume, String defaultPlaylist, boolean repeatMode)
     {
         this.textId = textId;
         this.voiceId = voiceId;
         this.roleId = roleId;
         this.volume = volume;
         this.defaultPlaylist = defaultPlaylist;
+        this.repeatMode = repeatMode;
     }
     
     public long getTextId()
@@ -92,6 +95,11 @@ public class Settings {
         return defaultPlaylist;
     }
     
+    public boolean getRepeatMode()
+    {
+        return repeatMode;
+    }
+    
     public void setTextId(long id)
     {
         this.textId = id;
@@ -117,5 +125,8 @@ public class Settings {
         this.defaultPlaylist = defaultPlaylist;
     }
     
-    
+    public void setRepeatMode(boolean mode)
+    {
+        this.repeatMode = mode;
+    }
 }

src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java

@@ -38,7 +38,7 @@ import net.dv8tion.jda.core.entities.User;
  */
 public class AudioHandler extends AudioEventAdapter implements AudioSendHandler {
     private final AudioPlayer audioPlayer;
-    private final Guild guild;
+    private final long guildId;
     private final FairQueue<QueuedTrack> queue;
     private final Set<String> votes;
     private final List<AudioTrack> defaultQueue;
@@ -47,10 +47,12 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
     private long requester;
     public static boolean STAY_IN_CHANNEL;
     public static boolean SONG_IN_STATUS;
+    public static long MAX_SECONDS = -1;
+    public static boolean USE_NP_REFRESH;
 
     public AudioHandler(AudioPlayer audioPlayer, Guild guild, Bot bot) {
       this.audioPlayer = audioPlayer;
-      this.guild = guild;
+      this.guildId = guild.getIdLong();
       this.bot = bot;
       queue = new FairQueue<>();
       votes = new HashSet<>();
@@ -59,7 +61,7 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
 
     public int addTrack(AudioTrack track, User user)
     {
-        if(requester==0)
+        if(audioPlayer.getPlayingTrack()==null)
         {
             requester = user.getIdLong();
             audioPlayer.playTrack(track);
@@ -84,7 +86,7 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
     
     public boolean isMusicPlaying()
     {
-        return guild.getSelfMember().getVoiceState().inVoiceChannel() && audioPlayer.getPlayingTrack()!=null;
+        return bot.getJDA().getGuildById(guildId).getSelfMember().getVoiceState().inVoiceChannel() && audioPlayer.getPlayingTrack()!=null;
     }
     
     public Set<String> getVotes()
@@ -109,6 +111,7 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
             audioPlayer.playTrack(defaultQueue.remove(0));
             return true;
         }
+        Guild guild = bot.getJDA().getGuildById(guildId);
         if(bot.getSettings(guild)==null || bot.getSettings(guild).getDefaultPlaylist()==null)
             return false;
         Playlist pl = Playlist.loadPlaylist(bot.getSettings(guild).getDefaultPlaylist());
@@ -128,14 +131,20 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
     
     @Override
     public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
+        if(endReason==AudioTrackEndReason.FINISHED && bot.getSettings(bot.getJDA().getGuildById(guildId)).getRepeatMode())
+        {
+            queue.add(new QueuedTrack(track.makeClone(), requester));
+        }
         requester = 0;
         if(queue.isEmpty())
         {
             if(!playFromDefault())
             {
-                bot.resetGame();
+                if(SONG_IN_STATUS)
+                    bot.resetGame();
                 if(!STAY_IN_CHANNEL)
-                    guild.getAudioManager().closeAudioConnection();
+                    bot.getThreadpool().submit(() -> bot.getJDA().getGuildById(guildId).getAudioManager().closeAudioConnection());
+                bot.updateTopic(guildId, this);
             }
         }
         else
@@ -149,10 +158,14 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
     @Override
     public void onTrackStart(AudioPlayer player, AudioTrack track) {
         votes.clear();
-        if(SONG_IN_STATUS && guild.getJDA().getGuilds().size()==1)
+        if(SONG_IN_STATUS)
         {
-            guild.getJDA().getPresence().setGame(Game.of(track.getInfo().title));
+            if(bot.getJDA().getGuilds().stream().filter(g -> g.getSelfMember().getVoiceState().inVoiceChannel()).count()<=1)
+                bot.getJDA().getPresence().setGame(Game.listening(track.getInfo().title));
+            else
+                bot.resetGame();
         }
+        bot.updateTopic(guildId, this);
     }
     
     @Override
@@ -170,4 +183,11 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
     public boolean isOpus() {
       return true;
     }
+    
+    public static boolean isTooLong(AudioTrack track)
+    {
+        if(MAX_SECONDS<=0)
+            return false;
+        return Math.round(track.getDuration()/1000.0) > MAX_SECONDS;
+    }
 }

src/main/java/com/jagrosh/jmusicbot/commands/AutoplaylistCmd.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.jagrosh.jmusicbot.commands;
+
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jmusicbot.Bot;
+import com.jagrosh.jmusicbot.playlist.Playlist;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class AutoplaylistCmd extends Command {
+
+    private final Bot bot;
+    public AutoplaylistCmd(Bot bot)
+    {
+        this.bot = bot;
+        this.category = bot.OWNER;
+        this.ownerCommand = true;
+        this.guildOnly = true;
+        this.name = "autoplaylist";
+        this.arguments = "<name|NONE>";
+        this.help = "sets the default playlist for the server";
+    }
+
+    @Override
+    public void execute(CommandEvent event) {
+        if(event.getArgs().isEmpty())
+        {
+            event.reply(event.getClient().getError()+" Please include a playlist name or NONE");
+            return;
+        }
+        if(event.getArgs().equalsIgnoreCase("none"))
+        {
+            bot.setDefaultPlaylist(event.getGuild(), null);
+            event.reply(event.getClient().getSuccess()+" Cleared the default playlist for **"+event.getGuild().getName()+"**");
+            return;
+        }
+        String pname = event.getArgs().replaceAll("\\s+", "_");
+        if(Playlist.loadPlaylist(pname)==null)
+        {
+            event.reply(event.getClient().getError()+" Could not find `"+pname+".txt`!");
+        }
+        else
+        {
+            bot.setDefaultPlaylist(event.getGuild(), pname);
+            event.reply(event.getClient().getSuccess()+" The default playlist for **"+event.getGuild().getName()+"** is now `"+pname+"`");
+        }
+    }
+}

src/main/java/com/jagrosh/jmusicbot/commands/EvalCmd.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016 John Grosh (jagrosh).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.jagrosh.jmusicbot.commands;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jmusicbot.Bot;
+
+/**
+ *
+ * @author John Grosh (jagrosh)
+ */
+public class EvalCmd extends Command {
+
+    public EvalCmd(Bot bot)
+    {
+        this.name = "eval";
+        this.help = "evaluates nashorn code";
+        this.ownerCommand = true;
+        this.guildOnly = false;
+        this.category = bot.OWNER;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        ScriptEngine se = new ScriptEngineManager().getEngineByName("Nashorn");
+        se.put("event", event);
+        se.put("jda", event.getJDA());
+        se.put("guild", event.getGuild());
+        se.put("channel", event.getChannel());
+        try
+        {
+            event.reply(event.getClient().getSuccess()+" Evaluated Successfully:\n```\n"+se.eval(event.getArgs())+" ```");
+        } 
+        catch(Exception e)
+        {
+            event.reply(event.getClient().getError()+" An exception was thrown:\n```\n"+e+" ```");
+        }
+    }
+    
+}

src/main/java/com/jagrosh/jmusicbot/commands/ForceskipCmd.java

@@ -15,7 +15,7 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import net.dv8tion.jda.core.entities.User;

src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java

@@ -15,8 +15,8 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.Settings;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
@@ -51,7 +51,7 @@ public abstract class MusicCommand extends Command {
             try {
                 event.getMessage().delete().queue();
             } catch(PermissionException e){}
-            event.replyInDM(event.getClient().getError()+" You can only use that command in <#"+settings.getTextId()+">!");
+            event.replyInDm(event.getClient().getError()+" You can only use that command in <#"+settings.getTextId()+">!");
             return;
         }
         if(bePlaying

src/main/java/com/jagrosh/jmusicbot/commands/NowplayingCmd.java

@@ -15,14 +15,10 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
-import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.jagrosh.jmusicbot.utils.FormatUtil;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack;
-import net.dv8tion.jda.core.EmbedBuilder;
 import net.dv8tion.jda.core.Permission;
-import net.dv8tion.jda.core.entities.User;
 
 /**
  *
@@ -41,39 +37,7 @@ public class NowplayingCmd extends MusicCommand {
 
     @Override
     public void doCommand(CommandEvent event) {
-        EmbedBuilder eb = new EmbedBuilder();
-        eb.setColor(event.getSelfMember().getColor());
-        AudioHandler ah = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
-        
-        if(ah==null || !ah.isMusicPlaying())
-        {
-            eb.setTitle("No music playing");
-            eb.setDescription("\u23F9 "+FormatUtil.progressBar(-1)+" "+FormatUtil.volumeIcon(ah==null?100:ah.getPlayer().getVolume()));
-            event.reply(eb.build());
-            return;
-        }
-        
-        if(ah.getRequester()!=0)
-        {
-            User u = event.getJDA().getUserById(ah.getRequester());
-            if(u==null)
-                eb.setAuthor("Unknown (ID:"+ah.getRequester()+")", null, null);
-            else
-                eb.setAuthor(u.getName()+"#"+u.getDiscriminator(), null, u.getEffectiveAvatarUrl());
-        }
-        
-        try {
-            eb.setTitle(ah.getPlayer().getPlayingTrack().getInfo().title, ah.getPlayer().getPlayingTrack().getInfo().uri);
-        } catch(Exception e) {
-            eb.setTitle(ah.getPlayer().getPlayingTrack().getInfo().title);
-        }
-        
-        if(ah.getPlayer().getPlayingTrack() instanceof YoutubeAudioTrack)
-            eb.setThumbnail("https://img.youtube.com/vi/"+ah.getPlayer().getPlayingTrack().getIdentifier()+"/maxresdefault.jpg");
-        
-        eb.setDescription(FormatUtil.embedformattedAudio(ah));
-        
-        event.reply(eb.build());
+        event.reply(FormatUtil.nowPlayingMessage(event.getGuild(), event.getClient().getSuccess()), m->bot.setLastNP(m));
     }
     
 }

src/main/java/com/jagrosh/jmusicbot/commands/PauseCmd.java

@@ -15,7 +15,7 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import net.dv8tion.jda.core.entities.User;

src/main/java/com/jagrosh/jmusicbot/commands/PlayCmd.java

@@ -20,24 +20,32 @@ import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jdautilities.menu.ButtonMenu;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.jagrosh.jmusicbot.playlist.Playlist;
 import com.jagrosh.jmusicbot.utils.FormatUtil;
+import java.util.concurrent.TimeUnit;
 import net.dv8tion.jda.core.Permission;
 import net.dv8tion.jda.core.entities.Message;
+import net.dv8tion.jda.core.exceptions.PermissionException;
 
 /**
  *
  * @author John Grosh <john.a.grosh@gmail.com>
  */
-public class PlayCmd extends MusicCommand {
-
-    public PlayCmd(Bot bot)
+public class PlayCmd extends MusicCommand
+{
+    public final static String LOAD = "\uD83D\uDCE5";
+    public final static String CANCEL = "\uD83D\uDEAB";
+    private final String loadingEmoji;
+    
+    public PlayCmd(Bot bot, String loadingEmoji)
     {
         super(bot);
+        this.loadingEmoji = loadingEmoji;
         this.name = "play";
         this.arguments = "<title|URL|subcommand>";
         this.help = "plays the provided song";
@@ -48,12 +56,14 @@ public class PlayCmd extends MusicCommand {
 
     @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())
             {
                 boolean isDJ = event.getMember().hasPermission(Permission.MANAGE_SERVER);
+                if(!isDJ)
+                    isDJ = event.isOwner();
                 if(!isDJ)
                     isDJ = event.getMember().getRoles().contains(event.getGuild().getRoleById(bot.getSettings(event.getGuild()).getRoleId()));
                 if(!isDJ)
@@ -75,16 +85,16 @@ public class PlayCmd extends MusicCommand {
         }
         String args = event.getArgs().startsWith("<") && event.getArgs().endsWith(">") 
                 ? event.getArgs().substring(1,event.getArgs().length()-1) 
-                : event.getArgs();
-        event.getChannel().sendMessage("\u231A Loading... `["+args+"]`").queue(m -> {
-            bot.getAudioManager().loadItemOrdered(event.getGuild(), args, new ResultHandler(m,event,false));
-        });
+                : 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)));
     }
     
-    private class ResultHandler implements AudioLoadResultHandler {
+    private class ResultHandler implements AudioLoadResultHandler
+    {
         final Message m;
         final CommandEvent event;
         final boolean ytsearch;
+        
         private ResultHandler(Message m, CommandEvent event, boolean ytsearch)
         {
             this.m = m;
@@ -92,45 +102,102 @@ public class PlayCmd extends MusicCommand {
             this.ytsearch = ytsearch;
         }
         
-        @Override
-        public void trackLoaded(AudioTrack track) {
+        private void loadSingle(AudioTrack track, AudioPlaylist playlist)
+        {
+            if(AudioHandler.isTooLong(track))
+            {
+                m.editMessage(FormatUtil.filter(event.getClient().getWarning()+" This track (**"+track.getInfo().title+"**) is longer than the allowed maximum: `"
+                        +FormatUtil.formatTime(track.getDuration())+"` > `"+FormatUtil.formatTime(AudioHandler.MAX_SECONDS*1000)+"`")).queue();
+                return;
+            }
             int pos = bot.queueTrack(event, track)+1;
-            m.editMessage(event.getClient().getSuccess()+" Added **"+track.getInfo().title
-                    +"** (`"+FormatUtil.formatTime(track.getDuration())+"`) "+(pos==0 ? "to begin playing" 
-                        : " to the queue at position "+pos)).queue();
+            String addMsg = FormatUtil.filter(event.getClient().getSuccess()+" Added **"+track.getInfo().title
+                    +"** (`"+FormatUtil.formatTime(track.getDuration())+"`) "+(pos==0?"to begin playing":" to the queue at position "+pos));
+            if(playlist==null || !event.getSelfMember().hasPermission(event.getTextChannel(), Permission.MESSAGE_ADD_REACTION))
+                m.editMessage(addMsg).queue();
+            else
+            {
+                new ButtonMenu.Builder()
+                        .setText(addMsg+"\n"+event.getClient().getWarning()+" This track has a playlist of **"+playlist.getTracks().size()+"** tracks attached. Select "+LOAD+" to load playlist.")
+                        .setChoices(LOAD, CANCEL)
+                        .setEventWaiter(bot.getWaiter())
+                        .setTimeout(30, TimeUnit.SECONDS)
+                        .setAction(re ->
+                        {
+                            if(re.getName().equals(LOAD))
+                                m.editMessage(addMsg+"\n"+event.getClient().getSuccess()+" Loaded **"+loadPlaylist(playlist, track)+"** additional tracks!").queue();
+                            else
+                                m.editMessage(addMsg).queue();
+                        }).setFinalAction(m ->
+                        {
+                            try{m.clearReactions().queue();}catch(PermissionException ex){}
+                        }).build().display(m);
+            }
+        }
+        
+        private int loadPlaylist(AudioPlaylist playlist, AudioTrack exclude)
+        {
+            int[] count = {0};
+            playlist.getTracks().stream().forEach((track) -> {
+                if(!AudioHandler.isTooLong(track) && !track.equals(exclude))
+                {
+                    bot.queueTrack(event, track);
+                    count[0]++;
+                }
+            });
+            return count[0];
+        }
+        
+        @Override
+        public void trackLoaded(AudioTrack track)
+        {
+            loadSingle(track, null);
         }
 
         @Override
-        public void playlistLoaded(AudioPlaylist playlist) {
-            if(playlist.getTracks().size()==1 || playlist.isSearchResult() || playlist.getSelectedTrack()!=null)
+        public void playlistLoaded(AudioPlaylist playlist)
+        {
+            if(playlist.getTracks().size()==1 || playlist.isSearchResult())
             {
-                AudioTrack single = playlist.getSelectedTrack()==null?playlist.getTracks().get(0):playlist.getSelectedTrack();
-                int pos = bot.queueTrack(event, single)+1;
-                m.editMessage(event.getClient().getSuccess()+" Added **"+single.getInfo().title
-                    +"** (`"+FormatUtil.formatTime(single.getDuration())+"`) "+(pos==0 ? "to begin playing" 
-                        : " to the queue at position "+pos)).queue();
+                AudioTrack single = playlist.getSelectedTrack()==null ? playlist.getTracks().get(0) : playlist.getSelectedTrack();
+                loadSingle(single, null);
+            }
+            else if (playlist.getSelectedTrack()!=null)
+            {
+                AudioTrack single = playlist.getSelectedTrack();
+                loadSingle(single, playlist);
             }
             else
             {
-                m.editMessage(event.getClient().getSuccess()+" Found "
-                        +(playlist.getName()==null?"a playlist":"playlist **"+playlist.getName()+"**")+" with `"
-                        +playlist.getTracks().size()+"` entries; added to the queue!").queue();
-                playlist.getTracks().stream().forEach((track) -> {
-                    bot.queueTrack(event, track);
-                });
+                int count = loadPlaylist(playlist, null);
+                if(count==0)
+                {
+                    m.editMessage(FormatUtil.filter(event.getClient().getWarning()+" All entries in this playlist "+(playlist.getName()==null ? "" : "(**"+playlist.getName()
+                            +"**) ")+"were longer than the allowed maximum (`"+FormatUtil.formatTime(AudioHandler.MAX_SECONDS*1000)+"`)")).queue();
+                }
+                else
+                {
+                    m.editMessage(FormatUtil.filter(event.getClient().getSuccess()+" Found "
+                            +(playlist.getName()==null?"a playlist":"playlist **"+playlist.getName()+"**")+" with `"
+                            + playlist.getTracks().size()+"` entries; added to the queue!"
+                            + (count<playlist.getTracks().size() ? "\n"+event.getClient().getWarning()+" Tracks longer than the allowed maximum (`"
+                            + FormatUtil.formatTime(AudioHandler.MAX_SECONDS*1000)+"`) have been omitted." : ""))).queue();
+                }
             }
         }
 
         @Override
-        public void noMatches() {
+        public void noMatches()
+        {
             if(ytsearch)
-                m.editMessage(event.getClient().getWarning()+" No results found for `"+event.getArgs()+"`.").queue();
+                m.editMessage(FormatUtil.filter(event.getClient().getWarning()+" No results found for `"+event.getArgs()+"`.")).queue();
             else
                 bot.getAudioManager().loadItemOrdered(event.getGuild(), "ytsearch:"+event.getArgs(), new ResultHandler(m,event,true));
         }
 
         @Override
-        public void loadFailed(FriendlyException throwable) {
+        public void loadFailed(FriendlyException throwable)
+        {
             if(throwable.severity==Severity.COMMON)
                 m.editMessage(event.getClient().getError()+" Error loading: "+throwable.getMessage()).queue();
             else
@@ -164,7 +231,7 @@ public class PlayCmd extends MusicCommand {
                 event.reply(event.getClient().getError()+" I could not find `"+event.getArgs()+".txt` in the Playlists folder.");
                 return;
             }
-            event.getChannel().sendMessage("\u231A Loading playlist **"+event.getArgs()+"**... ("+playlist.getItems().size()+" items)").queue(m -> {
+            event.getChannel().sendMessage(loadingEmoji+" Loading playlist **"+event.getArgs()+"**... ("+playlist.getItems().size()+" items)").queue(m -> {
                 playlist.loadTracks(bot.getAudioManager(), (at)->bot.queueTrack(event, at), () -> {
                     StringBuilder builder = new StringBuilder(playlist.getTracks().isEmpty() 
                             ? event.getClient().getWarning()+" No tracks were loaded!" 
@@ -175,7 +242,7 @@ public class PlayCmd extends MusicCommand {
                     String str = builder.toString();
                     if(str.length()>2000)
                         str = str.substring(0,1994)+" (...)";
-                    m.editMessage(str).queue();
+                    m.editMessage(FormatUtil.filter(str)).queue();
                 });
             });
         }

src/main/java/com/jagrosh/jmusicbot/commands/PlaylistCmd.java

@@ -20,8 +20,8 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.playlist.Playlist;
 

src/main/java/com/jagrosh/jmusicbot/commands/PlaylistsCmd.java

@@ -16,7 +16,7 @@
 package com.jagrosh.jmusicbot.commands;
 
 import java.util.List;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.playlist.Playlist;
 

src/main/java/com/jagrosh/jmusicbot/commands/QueueCmd.java

@@ -17,8 +17,8 @@ package com.jagrosh.jmusicbot.commands;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
-import com.jagrosh.jdautilities.menu.pagination.PaginatorBuilder;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jdautilities.menu.Paginator;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.jagrosh.jmusicbot.audio.QueuedTrack;
@@ -32,7 +32,7 @@ import net.dv8tion.jda.core.exceptions.PermissionException;
  */
 public class QueueCmd extends MusicCommand {
 
-    private final PaginatorBuilder builder;
+    private final Paginator.Builder builder;
     public QueueCmd(Bot bot)
     {
         super(bot);
@@ -42,7 +42,7 @@ public class QueueCmd extends MusicCommand {
         this.aliases = new String[]{"list"};
         this.bePlaying = true;
         this.botPermissions = new Permission[]{Permission.MESSAGE_ADD_REACTION,Permission.MESSAGE_EMBED_LINKS};
-        builder = new PaginatorBuilder()
+        builder = new Paginator.Builder()
                 .setColumns(1)
                 .setFinalAction(m -> {try{m.clearReactions().queue();}catch(PermissionException e){}})
                 .setItemsPerPage(10)
@@ -50,12 +50,12 @@ public class QueueCmd extends MusicCommand {
                 .useNumberedItems(true)
                 .showPageNumbers(true)
                 .setEventWaiter(bot.getWaiter())
-                .setTimeout(1, TimeUnit.MINUTES)
-                ;
+                .setTimeout(1, TimeUnit.MINUTES);
     }
 
     @Override
-    public void doCommand(CommandEvent event) {
+    public void doCommand(CommandEvent event)
+    {
         int pagenum = 1;
         try{
             pagenum = Integer.parseInt(event.getArgs());
@@ -65,7 +65,7 @@ public class QueueCmd extends MusicCommand {
         if(list.isEmpty())
         {
             event.replyWarning("There is no music in the queue!"
-                    +(!ah.isMusicPlaying() ? "" : " Now playing:\n\n**"+ah.getPlayer().getPlayingTrack().getInfo().title+"**\n"+FormatUtil.embedformattedAudio(ah)));
+                    +(!ah.isMusicPlaying() ? "" : " Now playing:\n\n**"+ah.getPlayer().getPlayingTrack().getInfo().title+"**\n"+FormatUtil.embedFormat(ah)));
             return;
         }
         String[] songs = new String[list.size()];
@@ -76,7 +76,7 @@ public class QueueCmd extends MusicCommand {
             songs[i] = list.get(i).toString();
         }
         long fintotal = total;
-        builder.setText((i1,i2) -> getQueueTitle(ah, event.getClient().getSuccess(), songs.length, fintotal))
+        builder.setText((i1,i2) -> event.getClient().getSuccess()+" "+getQueueTitle(ah, event.getClient().getSuccess(), songs.length, fintotal, bot.getSettings(event.getGuild()).getRepeatMode()))
                 .setItems(songs)
                 .setUsers(event.getAuthor())
                 .setColor(event.getSelfMember().getColor())
@@ -84,11 +84,13 @@ public class QueueCmd extends MusicCommand {
         builder.build().paginate(event.getChannel(), pagenum);
     }
     
-    private String getQueueTitle(AudioHandler ah, String success, int songslength, long total)
+    private String getQueueTitle(AudioHandler ah, String success, int songslength, long total, boolean repeatmode)
     {
         StringBuilder sb = new StringBuilder();
         if(ah.getPlayer().getPlayingTrack()!=null)
-            sb.append("**").append(ah.getPlayer().getPlayingTrack().getInfo().title).append("**\n").append(FormatUtil.embedformattedAudio(ah)).append("\n\n");
-        return sb.append(success).append(" Current Queue | ").append(songslength).append(" entries | `").append(FormatUtil.formatTime(total)).append("` ").toString();
+            sb.append("**").append(ah.getPlayer().getPlayingTrack().getInfo().title).append("**\n").append(FormatUtil.embedFormat(ah)).append("\n\n");
+        return FormatUtil.filter(sb.append(success).append(" Current Queue | ").append(songslength)
+                .append(" entries | `").append(FormatUtil.formatTime(total)).append("` ")
+                .append(repeatmode ? "| \uD83D\uDD01" : "").toString());
     }
 }

src/main/java/com/jagrosh/jmusicbot/commands/RemoveCmd.java

@@ -15,7 +15,7 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.jagrosh.jmusicbot.audio.QueuedTrack;
@@ -44,16 +44,16 @@ public class RemoveCmd extends MusicCommand {
         AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
         if(handler.getQueue().isEmpty())
         {
-            event.reply(event.getClient().getError()+" There is nothing in the queue!");
+            event.replyError("There is nothing in the queue!");
             return;
         }
         if(event.getArgs().equalsIgnoreCase("all"))
         {
             int count = handler.getQueue().removeAll(event.getAuthor().getIdLong());
             if(count==0)
-                event.reply(event.getClient().getWarning()+" You don't have any songs in the queue!");
+                event.replyWarning("You don't have any songs in the queue!");
             else
-                event.reply(event.getClient().getSuccess()+" Successfully removed your "+count+" entries.");
+                event.replySuccess("Successfully removed your "+count+" entries.");
             return;
         }
         int pos;
@@ -64,7 +64,7 @@ public class RemoveCmd extends MusicCommand {
         }
         if(pos<1 || pos>handler.getQueue().size())
         {
-            event.reply(event.getClient().getError()+" Position must be a valid integer between 1 and "+handler.getQueue().size()+"!");
+            event.replyError("Position must be a valid integer between 1 and "+handler.getQueue().size()+"!");
             return;
         }
         boolean isDJ = event.getMember().hasPermission(Permission.MANAGE_SERVER);
@@ -74,7 +74,7 @@ public class RemoveCmd extends MusicCommand {
         if(qt.getIdentifier()==event.getAuthor().getIdLong())
         {
             handler.getQueue().remove(pos-1);
-            event.reply(event.getClient().getSuccess()+" Removed **"+qt.getTrack().getInfo().title+"** from the queue");
+            event.replySuccess("Removed **"+qt.getTrack().getInfo().title+"** from the queue");
         }
         else if(isDJ)
         {
@@ -85,12 +85,12 @@ public class RemoveCmd extends MusicCommand {
             } catch(Exception e) {
                 u = null;
             }
-            event.reply(event.getClient().getSuccess()+" Removed **"+qt.getTrack().getInfo().title
+            event.replySuccess("Removed **"+qt.getTrack().getInfo().title
                     +"** from the queue (requested by "+(u==null ? "someone" : "**"+u.getName()+"**")+")");
         }
         else
         {
-            event.reply(event.getClient().getError()+" You cannot remove **"+qt.getTrack().getInfo().title+"** because you didn't add it!");
+            event.replyError("You cannot remove **"+qt.getTrack().getInfo().title+"** because you didn't add it!");
         }
     }
     

src/main/java/com/jagrosh/jmusicbot/commands/RepeatCmd.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.jagrosh.jmusicbot.commands;
+
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jmusicbot.Bot;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class RepeatCmd extends Command {
+
+    private final Bot bot;
+    public RepeatCmd(Bot bot)
+    {
+        this.bot = bot;
+        this.name = "repeat";
+        this.help = "re-adds music to the queue when finished";
+        this.arguments = "[on|off]";
+        this.guildOnly = true;
+        this.category = bot.DJ;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        boolean value;
+        if(event.getArgs().isEmpty())
+        {
+            value = !bot.getSettings(event.getGuild()).getRepeatMode();
+        }
+        else if(event.getArgs().equalsIgnoreCase("true") || event.getArgs().equalsIgnoreCase("on"))
+        {
+            value = true;
+        }
+        else if(event.getArgs().equalsIgnoreCase("false") || event.getArgs().equalsIgnoreCase("off"))
+        {
+            value = false;
+        }
+        else
+        {
+            event.replyError("Valid options are `on` or `off` (or leave empty to toggle)");
+            return;
+        }
+        bot.setRepeatMode(event.getGuild(), value);
+        event.replySuccess("Repeat mode is now `"+(value ? "ON" : "OFF")+"`");
+    }
+    
+}

src/main/java/com/jagrosh/jmusicbot/commands/SCSearchCmd.java

@@ -21,9 +21,10 @@ import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import java.util.concurrent.TimeUnit;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
-import com.jagrosh.jdautilities.menu.orderedmenu.OrderedMenuBuilder;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jdautilities.menu.OrderedMenu;
 import com.jagrosh.jmusicbot.Bot;
+import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.jagrosh.jmusicbot.utils.FormatUtil;
 import net.dv8tion.jda.core.Permission;
 import net.dv8tion.jda.core.entities.Message;
@@ -34,17 +35,19 @@ import net.dv8tion.jda.core.entities.Message;
  */
 public class SCSearchCmd extends MusicCommand {
 
-    private final OrderedMenuBuilder builder;
-    public SCSearchCmd(Bot bot)
+    private final OrderedMenu.Builder builder;
+    private final String searchingEmoji;
+    public SCSearchCmd(Bot bot, String searchingEmoji)
     {
         super(bot);
+        this.searchingEmoji = searchingEmoji;
         this.name = "scsearch";
         this.arguments = "<query>";
         this.help = "searches Soundcloud for a provided query";
         this.beListening = true;
         this.bePlaying = false;
         this.botPermissions = new Permission[]{Permission.MESSAGE_EMBED_LINKS};
-        builder = new OrderedMenuBuilder()
+        builder = new OrderedMenu.Builder()
                 .allowTextInput(true)
                 .useNumbers()
                 .useCancelButton(true)
@@ -59,9 +62,7 @@ public class SCSearchCmd extends MusicCommand {
             event.reply(event.getClient().getError()+" Please include a query.");
             return;
         }
-        event.getChannel().sendMessage("\uD83D\uDD0E Searching... `["+event.getArgs()+"]`").queue(m -> {
-            bot.getAudioManager().loadItemOrdered(event.getGuild(), "scsearch:"+event.getArgs(), new ResultHandler(m,event));
-        });
+        event.reply(searchingEmoji+" Searching... `["+event.getArgs()+"]`",m -> bot.getAudioManager().loadItemOrdered(event.getGuild(), "scsearch:"+event.getArgs(), new ResultHandler(m,event)));
     }
     
     private class ResultHandler implements AudioLoadResultHandler {
@@ -75,25 +76,37 @@ public class SCSearchCmd extends MusicCommand {
         
         @Override
         public void trackLoaded(AudioTrack track) {
+            if(AudioHandler.isTooLong(track))
+            {
+                m.editMessage(FormatUtil.filter(event.getClient().getWarning()+" This track (**"+track.getInfo().title+"**) is longer than the allowed maximum: `"
+                        +FormatUtil.formatTime(track.getDuration())+"` > `"+FormatUtil.formatTime(AudioHandler.MAX_SECONDS*1000)+"`")).queue();
+                return;
+            }
             int pos = bot.queueTrack(event, track)+1;
-            m.editMessage(event.getClient().getSuccess()+" Added **"+track.getInfo().title
+            m.editMessage(FormatUtil.filter(event.getClient().getSuccess()+" Added **"+track.getInfo().title
                     +"** (`"+FormatUtil.formatTime(track.getDuration())+"`) "+(pos==0 ? "to begin playing" 
-                        : " to the queue at position "+pos)).queue();
+                        : " to the queue at position "+pos))).queue();
         }
 
         @Override
         public void playlistLoaded(AudioPlaylist playlist) {
             builder.setColor(event.getSelfMember().getColor())
-                    .setText(event.getClient().getSuccess()+" Search results for `"+event.getArgs()+"`:")
+                    .setText(FormatUtil.filter(event.getClient().getSuccess()+" Search results for `"+event.getArgs()+"`:"))
                     .setChoices(new String[0])
-                    .setAction(i -> {
+                    .setSelection((msg, i) -> {
                         AudioTrack track = playlist.getTracks().get(i-1);
+                        if(AudioHandler.isTooLong(track))
+                        {
+                            event.replyWarning("This track (**"+track.getInfo().title+"**) is longer than the allowed maximum: `"
+                                    +FormatUtil.formatTime(track.getDuration())+"` > `"+FormatUtil.formatTime(AudioHandler.MAX_SECONDS*1000)+"`");
+                            return;
+                        }
                         int pos = bot.queueTrack(event, track)+1;
-                        event.getChannel().sendMessage(event.getClient().getSuccess()+" Added **"+track.getInfo().title
+                        event.replySuccess("Added **"+track.getInfo().title
                                 +"** (`"+FormatUtil.formatTime(track.getDuration())+"`) "+(pos==0 ? "to begin playing" 
-                                    : " to the queue at position "+pos)).queue();
+                                    : " to the queue at position "+pos));
                     })
-                    .setCancel(() -> m.delete().queue())
+                    .setCancel((msg) -> {})
                     .setUsers(event.getAuthor())
                     ;
             for(int i=0; i<4&&i<playlist.getTracks().size(); i++)
@@ -107,7 +120,7 @@ public class SCSearchCmd extends MusicCommand {
 
         @Override
         public void noMatches() {
-            m.editMessage(event.getClient().getWarning()+" No results found for `"+event.getArgs()+"`.").queue();
+            m.editMessage(FormatUtil.filter(event.getClient().getWarning()+" No results found for `"+event.getArgs()+"`.")).queue();
         }
 
         @Override

src/main/java/com/jagrosh/jmusicbot/commands/SearchCmd.java

@@ -21,9 +21,10 @@ import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import java.util.concurrent.TimeUnit;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
-import com.jagrosh.jdautilities.menu.orderedmenu.OrderedMenuBuilder;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jdautilities.menu.OrderedMenu;
 import com.jagrosh.jmusicbot.Bot;
+import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.jagrosh.jmusicbot.utils.FormatUtil;
 import net.dv8tion.jda.core.Permission;
 import net.dv8tion.jda.core.entities.Message;
@@ -34,10 +35,12 @@ import net.dv8tion.jda.core.entities.Message;
  */
 public class SearchCmd extends MusicCommand {
 
-    private final OrderedMenuBuilder builder;
-    public SearchCmd(Bot bot)
+    private final OrderedMenu.Builder builder;
+    private final String searchingEmoji;
+    public SearchCmd(Bot bot, String searchingEmoji)
     {
         super(bot);
+        this.searchingEmoji = searchingEmoji;
         this.name = "search";
         this.aliases = new String[]{"ytsearch"};
         this.arguments = "<query>";
@@ -45,7 +48,7 @@ public class SearchCmd extends MusicCommand {
         this.beListening = true;
         this.bePlaying = false;
         this.botPermissions = new Permission[]{Permission.MESSAGE_EMBED_LINKS};
-        builder = new OrderedMenuBuilder()
+        builder = new OrderedMenu.Builder()
                 .allowTextInput(true)
                 .useNumbers()
                 .useCancelButton(true)
@@ -60,9 +63,7 @@ public class SearchCmd extends MusicCommand {
             event.reply(event.getClient().getError()+" Please include a query.");
             return;
         }
-        event.getChannel().sendMessage("\uD83D\uDD0E Searching... `["+event.getArgs()+"]`").queue(m -> {
-            bot.getAudioManager().loadItemOrdered(event.getGuild(), "ytsearch:"+event.getArgs(), new ResultHandler(m,event));
-        });
+        event.reply(searchingEmoji+" Searching... `["+event.getArgs()+"]`",m ->bot.getAudioManager().loadItemOrdered(event.getGuild(), "ytsearch:"+event.getArgs(), new ResultHandler(m,event)));
     }
     
     private class ResultHandler implements AudioLoadResultHandler {
@@ -76,25 +77,38 @@ public class SearchCmd extends MusicCommand {
         
         @Override
         public void trackLoaded(AudioTrack track) {
+            if(AudioHandler.isTooLong(track))
+            {
+                m.editMessage(FormatUtil.filter(event.getClient().getWarning()+" This track (**"+track.getInfo().title+"**) is longer than the allowed maximum: `"
+                        +FormatUtil.formatTime(track.getDuration())+"` > `"+FormatUtil.formatTime(AudioHandler.MAX_SECONDS*1000)+"`")).queue();
+                return;
+            }
             int pos = bot.queueTrack(event, track)+1;
-            m.editMessage(event.getClient().getSuccess()+" Added **"+track.getInfo().title
+            m.editMessage(FormatUtil.filter(event.getClient().getSuccess()+" Added **"+track.getInfo().title
                     +"** (`"+FormatUtil.formatTime(track.getDuration())+"`) "+(pos==0 ? "to begin playing" 
-                        : " to the queue at position "+pos)).queue();
+                        : " to the queue at position "+pos))).queue();
         }
 
         @Override
-        public void playlistLoaded(AudioPlaylist playlist) {
+        public void playlistLoaded(AudioPlaylist playlist)
+        {
             builder.setColor(event.getSelfMember().getColor())
-                    .setText(event.getClient().getSuccess()+" Search results for `"+event.getArgs()+"`:")
+                    .setText(FormatUtil.filter(event.getClient().getSuccess()+" Search results for `"+event.getArgs()+"`:"))
                     .setChoices(new String[0])
-                    .setAction(i -> {
+                    .setSelection((msg,i) -> {
                         AudioTrack track = playlist.getTracks().get(i-1);
+                        if(AudioHandler.isTooLong(track))
+                        {
+                            event.replyWarning("This track (**"+track.getInfo().title+"**) is longer than the allowed maximum: `"
+                                    +FormatUtil.formatTime(track.getDuration())+"` > `"+FormatUtil.formatTime(AudioHandler.MAX_SECONDS*1000)+"`");
+                            return;
+                        }
                         int pos = bot.queueTrack(event, track)+1;
-                        event.getChannel().sendMessage(event.getClient().getSuccess()+" Added **"+track.getInfo().title
+                        event.replySuccess("Added **"+track.getInfo().title
                                 +"** (`"+FormatUtil.formatTime(track.getDuration())+"`) "+(pos==0 ? "to begin playing" 
-                                    : " to the queue at position "+pos)).queue();
+                                    : " to the queue at position "+pos));
                     })
-                    .setCancel(() -> m.delete().queue())
+                    .setCancel((msg) -> {})
                     .setUsers(event.getAuthor())
                     ;
             for(int i=0; i<4&&i<playlist.getTracks().size(); i++)
@@ -108,7 +122,7 @@ public class SearchCmd extends MusicCommand {
 
         @Override
         public void noMatches() {
-            m.editMessage(event.getClient().getWarning()+" No results found for `"+event.getArgs()+"`.").queue();
+            m.editMessage(FormatUtil.filter(event.getClient().getWarning()+" No results found for `"+event.getArgs()+"`.")).queue();
         }
 
         @Override

src/main/java/com/jagrosh/jmusicbot/commands/SetavatarCmd.java

@@ -18,8 +18,8 @@ package com.jagrosh.jmusicbot.commands;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.utils.OtherUtil;
 import net.dv8tion.jda.core.entities.Icon;

src/main/java/com/jagrosh/jmusicbot/commands/SetdjCmd.java

@@ -16,8 +16,8 @@
 package com.jagrosh.jmusicbot.commands;
 
 import java.util.List;
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.utils.FinderUtil;
 import com.jagrosh.jmusicbot.utils.FormatUtil;

src/main/java/com/jagrosh/jmusicbot/commands/SetgameCmd.java

@@ -1,49 +1,153 @@
-/*
- * Copyright 2017 John Grosh <john.a.grosh@gmail.com>.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.jagrosh.jmusicbot.commands;
-
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
-import com.jagrosh.jmusicbot.Bot;
-import net.dv8tion.jda.core.entities.Game;
-
-/**
- *
- * @author John Grosh <john.a.grosh@gmail.com>
- */
-public class SetgameCmd extends Command {
-
-    public SetgameCmd(Bot bot)
-    {
-        this.name = "setgame";
-        this.help = "sets the game the bot is playing";
-        this.arguments = "[game]";
-        this.ownerCommand = true;
-        this.category = bot.OWNER;
-    }
-    
-    @Override
-    protected void execute(CommandEvent event) {
-        try {
-            event.getJDA().getPresence().setGame(event.getArgs().isEmpty() ? null : Game.of(event.getArgs()));
-            event.reply(event.getClient().getSuccess()+" **"+event.getSelfUser().getName()
-                    +"** is "+(event.getArgs().isEmpty() ? "no longer playing anything." : "now playing `"+event.getArgs()+"`"));
-        } catch(Exception e) {
-            event.reply(event.getClient().getError()+" The game could not be set!");
-        }
-    }
-    
-}
+/*
+ * Copyright 2017 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.jagrosh.jmusicbot.commands;
+
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jmusicbot.Bot;
+import net.dv8tion.jda.core.entities.Game;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class SetgameCmd extends Command
+{
+    public SetgameCmd(Bot bot)
+    {
+        this.name = "setgame";
+        this.help = "sets the game the bot is playing";
+        this.arguments = "[action] [game]";
+        this.ownerCommand = true;
+        this.category = bot.OWNER;
+        this.children = new Command[]{
+            new SetlistenCmd(bot),
+            new SetstreamCmd(bot),
+            new SetwatchCmd(bot)
+        };
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        String title = event.getArgs().toLowerCase().startsWith("playing") ? event.getArgs().substring(7).trim() : event.getArgs();
+        try
+        {
+            event.getJDA().getPresence().setGame(title.isEmpty() ? null : Game.playing(title));
+            event.reply(event.getClient().getSuccess()+" **"+event.getSelfUser().getName()
+                    +"** is "+(title.isEmpty() ? "no longer playing anything." : "now playing `"+title+"`"));
+        }
+        catch(Exception e)
+        {
+            event.reply(event.getClient().getError()+" The game could not be set!");
+        }
+    }
+    
+    private class SetstreamCmd extends Command
+    {
+        private SetstreamCmd(Bot bot)
+        {
+            this.name = "stream";
+            this.aliases = new String[]{"twitch","streaming"};
+            this.help = "sets the game the bot is playing to a stream";
+            this.arguments = "<username> <game>";
+            this.ownerCommand = true;
+            this.category = bot.OWNER;
+        }
+
+        @Override
+        protected void execute(CommandEvent event)
+        {
+            String[] parts = event.getArgs().split("\\s+", 2);
+            if(parts.length<2)
+            {
+                event.replyError("Please include a twitch username and the name of the game to 'stream'");
+                return;
+            }
+            try
+            {
+                event.getJDA().getPresence().setGame(Game.streaming(parts[1], "https://twitch.tv/"+parts[0]));
+                event.replySuccess("**"+event.getSelfUser().getName()
+                        +"** is now streaming `"+parts[1]+"`");
+            }
+            catch(Exception e)
+            {
+                event.reply(event.getClient().getError()+" The game could not be set!");
+            }
+        }
+    }
+    
+    private class SetlistenCmd extends Command
+    {
+        private SetlistenCmd(Bot bot)
+        {
+            this.name = "listen";
+            this.aliases = new String[]{"listening"};
+            this.help = "sets the game the bot is listening to";
+            this.arguments = "<title>";
+            this.ownerCommand = true;
+            this.category = bot.OWNER;
+        }
+
+        @Override
+        protected void execute(CommandEvent event)
+        {
+            if(event.getArgs().isEmpty())
+            {
+                event.replyError("Please include a title to listen to!");
+                return;
+            }
+            String title = event.getArgs().toLowerCase().startsWith("to") ? event.getArgs().substring(2).trim() : event.getArgs();
+            try
+            {
+                event.getJDA().getPresence().setGame(Game.listening(title));
+                event.replySuccess("**"+event.getSelfUser().getName()+"** is now listening to `"+title+"`");
+            } catch(Exception e) {
+                event.reply(event.getClient().getError()+" The game could not be set!");
+            }
+        }
+    }
+    
+    private class SetwatchCmd extends Command
+    {
+        private SetwatchCmd(Bot bot)
+        {
+            this.name = "watch";
+            this.aliases = new String[]{"watching"};
+            this.help = "sets the game the bot is watching";
+            this.arguments = "<title>";
+            this.ownerCommand = true;
+            this.category = bot.OWNER;
+        }
+
+        @Override
+        protected void execute(CommandEvent event)
+        {
+            if(event.getArgs().isEmpty())
+            {
+                event.replyError("Please include a title to watch!");
+                return;
+            }
+            String title = event.getArgs();
+            try
+            {
+                event.getJDA().getPresence().setGame(Game.watching(title));
+                event.replySuccess("**"+event.getSelfUser().getName()+"** is now watching `"+title+"`");
+            } catch(Exception e) {
+                event.reply(event.getClient().getError()+" The game could not be set!");
+            }
+        }
+    }
+}

src/main/java/com/jagrosh/jmusicbot/commands/SetnameCmd.java

@@ -15,8 +15,8 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import net.dv8tion.jda.core.exceptions.RateLimitedException;
 

src/main/java/com/jagrosh/jmusicbot/commands/SetstatusCmd.java

@@ -15,8 +15,8 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import net.dv8tion.jda.core.OnlineStatus;
 
@@ -30,7 +30,7 @@ public class SetstatusCmd extends Command {
     {
         this.name = "setstatus";
         this.help = "sets the status the bot displays";
-        this.arguments = "[game]";
+        this.arguments = "<status>";
         this.ownerCommand = true;
         this.category = bot.OWNER;
     }

src/main/java/com/jagrosh/jmusicbot/commands/SettcCmd.java

@@ -16,8 +16,8 @@
 package com.jagrosh.jmusicbot.commands;
 
 import java.util.List;
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.utils.FinderUtil;
 import com.jagrosh.jmusicbot.utils.FormatUtil;

src/main/java/com/jagrosh/jmusicbot/commands/SettingsCmd.java

@@ -15,8 +15,8 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.Settings;
 import net.dv8tion.jda.core.EmbedBuilder;
@@ -56,6 +56,7 @@ public class SettingsCmd extends Command {
                 .setDescription("Text Channel: "+(tchan==null ? "Any" : "**#"+tchan.getName()+"**")
                         + "\nVoice Channel: "+(vchan==null ? "Any" : "**"+vchan.getName()+"**")
                         + "\nDJ Role: "+(role==null ? "None" : "**"+role.getName()+"**")
+                        + "\nRepeat Mode: **"+(s.getRepeatMode() ? "On" : "Off")+"**"
                         + "\nDefault Playlist: "+(s.getDefaultPlaylist()==null ? "None" : "**"+s.getDefaultPlaylist()+"**")
                         )
                 .setFooter(event.getJDA().getGuilds().size()+" servers | "

src/main/java/com/jagrosh/jmusicbot/commands/SetvcCmd.java

@@ -16,8 +16,8 @@
 package com.jagrosh.jmusicbot.commands;
 
 import java.util.List;
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.utils.FinderUtil;
 import com.jagrosh.jmusicbot.utils.FormatUtil;

src/main/java/com/jagrosh/jmusicbot/commands/ShuffleCmd.java

@@ -15,7 +15,7 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 

src/main/java/com/jagrosh/jmusicbot/commands/ShutdownCmd.java

@@ -15,8 +15,8 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.Command;
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 
 /**

src/main/java/com/jagrosh/jmusicbot/commands/SkipCmd.java

@@ -15,7 +15,7 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import net.dv8tion.jda.core.entities.User;

src/main/java/com/jagrosh/jmusicbot/commands/SkiptoCmd.java

@@ -15,7 +15,7 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import net.dv8tion.jda.core.entities.User;

src/main/java/com/jagrosh/jmusicbot/commands/StopCmd.java

@@ -15,7 +15,7 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 
@@ -30,14 +30,15 @@ public class StopCmd extends MusicCommand {
         super(bot);
         this.name = "stop";
         this.help = "stops the current song and clears the queue";
-        this.bePlaying = true;
+        this.bePlaying = false;
         this.category = bot.DJ;
     }
 
     @Override
     public void doCommand(CommandEvent event) {
         AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
-        handler.stopAndClear();
+        if(handler!=null)
+            handler.stopAndClear();
         event.getGuild().getAudioManager().closeAudioConnection();
         event.reply(event.getClient().getSuccess()+" The player has stopped and the queue has been cleared.");
     }

src/main/java/com/jagrosh/jmusicbot/commands/VolumeCmd.java

@@ -15,7 +15,7 @@
  */
 package com.jagrosh.jmusicbot.commands;
 
-import com.jagrosh.jdautilities.commandclient.CommandEvent;
+import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.jagrosh.jmusicbot.utils.FormatUtil;

src/main/java/com/jagrosh/jmusicbot/playlist/Playlist.java

@@ -1,11 +1,21 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright 2018 John Grosh (jagrosh).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.jagrosh.jmusicbot.playlist;
 
-import com.jagrosh.jmusicbot.Bot;
+import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
@@ -54,8 +64,13 @@ public class Playlist {
                 manager.loadItemOrdered(name, items.get(i), new AudioLoadResultHandler() {
                     @Override
                     public void trackLoaded(AudioTrack at) {
-                        tracks.add(at);
-                        consumer.accept(at);
+                        if(AudioHandler.isTooLong(at))
+                            errors.add(new PlaylistLoadError(index, items.get(index), "This track is longer than the allowed maximum"));
+                        else
+                        {
+                            tracks.add(at);
+                            consumer.accept(at);
+                        }
                         if(last)
                         {
                             if(callback!=null)
@@ -66,13 +81,23 @@ public class Playlist {
                     public void playlistLoaded(AudioPlaylist ap) {
                         if(ap.isSearchResult())
                         {
-                            tracks.add(ap.getTracks().get(0));
-                            consumer.accept(ap.getTracks().get(0));
+                            if(AudioHandler.isTooLong(ap.getTracks().get(0)))
+                                errors.add(new PlaylistLoadError(index, items.get(index), "This track is longer than the allowed maximum"));
+                            else
+                            {
+                                tracks.add(ap.getTracks().get(0));
+                                consumer.accept(ap.getTracks().get(0));
+                            }
                         }
                         else if(ap.getSelectedTrack()!=null)
                         {
-                            tracks.add(ap.getSelectedTrack());
-                            consumer.accept(ap.getSelectedTrack());
+                            if(AudioHandler.isTooLong(ap.getSelectedTrack()))
+                                errors.add(new PlaylistLoadError(index, items.get(index), "This track is longer than the allowed maximum"));
+                            else
+                            {
+                                tracks.add(ap.getSelectedTrack());
+                                consumer.accept(ap.getSelectedTrack());
+                            }
                         }
                         else
                         {
@@ -85,6 +110,7 @@ public class Playlist {
                                     loaded.set(first, loaded.get(second));
                                     loaded.set(second, tmp);
                                 }
+                            loaded.removeIf(track -> AudioHandler.isTooLong(track));
                             tracks.addAll(loaded);
                             loaded.forEach(at -> consumer.accept(at));
                         }

src/main/java/com/jagrosh/jmusicbot/utils/FormatUtil.java

@@ -18,7 +18,12 @@ package com.jagrosh.jmusicbot.utils;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import java.util.List;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
+import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack;
+import net.dv8tion.jda.core.EmbedBuilder;
 import net.dv8tion.jda.core.JDA;
+import net.dv8tion.jda.core.MessageBuilder;
+import net.dv8tion.jda.core.entities.Guild;
+import net.dv8tion.jda.core.entities.Message;
 import net.dv8tion.jda.core.entities.Role;
 import net.dv8tion.jda.core.entities.TextChannel;
 import net.dv8tion.jda.core.entities.User;
@@ -30,8 +35,6 @@ import net.dv8tion.jda.core.entities.VoiceChannel;
  */
 public class FormatUtil {
     
-    public static boolean NO_PROGRESS_BAR_IN_TOPIC = false;
-    
     public static String formatTime(long duration)
     {
         if(duration == Long.MAX_VALUE)
@@ -44,7 +47,44 @@ public class FormatUtil {
         return (hours>0 ? hours+":" : "") + (minutes<10 ? "0"+minutes : minutes) + ":" + (seconds<10 ? "0"+seconds : seconds);
     }
     
-    public static String formattedAudio(AudioHandler handler, JDA jda)
+    public static Message nowPlayingMessage(Guild guild, String successEmoji)
+    {
+        MessageBuilder mb = new MessageBuilder();
+        mb.append(successEmoji+" **Now Playing...**");
+        EmbedBuilder eb = new EmbedBuilder();
+        AudioHandler ah = (AudioHandler)guild.getAudioManager().getSendingHandler();
+        eb.setColor(guild.getSelfMember().getColor());
+        if(ah==null || !ah.isMusicPlaying())
+        {
+            eb.setTitle("No music playing");
+            eb.setDescription("\u23F9 "+FormatUtil.progressBar(-1)+" "+FormatUtil.volumeIcon(ah==null?100:ah.getPlayer().getVolume()));
+        }
+        else
+        {
+            if(ah.getRequester()!=0)
+            {
+                User u = guild.getJDA().getUserById(ah.getRequester());
+                if(u==null)
+                    eb.setAuthor("Unknown (ID:"+ah.getRequester()+")", null, null);
+                else
+                    eb.setAuthor(u.getName()+"#"+u.getDiscriminator(), null, u.getEffectiveAvatarUrl());
+            }
+
+            try {
+                eb.setTitle(ah.getPlayer().getPlayingTrack().getInfo().title, ah.getPlayer().getPlayingTrack().getInfo().uri);
+            } catch(Exception e) {
+                eb.setTitle(ah.getPlayer().getPlayingTrack().getInfo().title);
+            }
+
+            if(!AudioHandler.USE_NP_REFRESH && ah.getPlayer().getPlayingTrack() instanceof YoutubeAudioTrack)
+                eb.setThumbnail("https://img.youtube.com/vi/"+ah.getPlayer().getPlayingTrack().getIdentifier()+"/mqdefault.jpg");
+
+            eb.setDescription(FormatUtil.embedFormat(ah));
+        }
+        return mb.setEmbed(eb.build()).build();
+    }
+    
+    public static String topicFormat(AudioHandler handler, JDA jda)
     {
         if(handler==null)
             return "No music playing\n\u23F9 "+progressBar(-1)+" "+volumeIcon(100);
@@ -55,30 +95,37 @@ public class FormatUtil {
             long userid = handler.getRequester();
             AudioTrack track = handler.getPlayer().getPlayingTrack();
             String title = track.getInfo().title;
-            if(!NO_PROGRESS_BAR_IN_TOPIC && title.length()>30)
-                title = title.substring(0,27)+"...";
-            double progress = (double)track.getPosition()/track.getDuration();
-            String str = "**"+title+"** ["+(userid==0 ? "autoplay" : "<@"+userid+">")+"]";
-            String str2 = "\n"+(handler.getPlayer().isPaused()?"\u23F8":"\u25B6")+" "
-                    +(NO_PROGRESS_BAR_IN_TOPIC ? "["+formatTime(track.getDuration())+"] " :
-                    progressBar(progress)+" ["+formatTime(track.getPosition()) + "/" + formatTime(track.getDuration())+"] ")
+            if(title==null || title.equals("Unknown Title"))
+                title = track.getInfo().uri;
+            return "**"+title+"** ["+(userid==0 ? "autoplay" : "<@"+userid+">")+"]"
+                    + "\n"+(handler.getPlayer().isPaused()?"\u23F8":"\u25B6")+" "
+                    +"["+formatTime(track.getDuration())+"] "
                     +volumeIcon(handler.getPlayer().getVolume());
-            return str+str2;
         }
     }
     
-    public static String embedformattedAudio(AudioHandler ah)
+    public static String embedFormat(AudioHandler handler)
     {
-        return (ah.getPlayer().isPaused()?"\u23F8":"\u25B6")+" "+progressBar((double)ah.getPlayer().getPlayingTrack().getPosition()/ah.getPlayer().getPlayingTrack().getDuration())
-                +" `["+formatTime(ah.getPlayer().getPlayingTrack().getPosition()) + "/" + formatTime(ah.getPlayer().getPlayingTrack().getDuration()) +"]` "
-                +volumeIcon(ah.getPlayer().getVolume());
+        if(handler==null)
+            return "No music playing\n\u23F9 "+progressBar(-1)+" "+volumeIcon(100);
+        else if (!handler.isMusicPlaying())
+            return "No music playing\n\u23F9 "+progressBar(-1)+" "+volumeIcon(handler.getPlayer().getVolume());
+        else
+        {
+            AudioTrack track = handler.getPlayer().getPlayingTrack();
+            double progress = (double)track.getPosition()/track.getDuration();
+            return (handler.getPlayer().isPaused()?"\u23F8":"\u25B6")
+                    +" "+progressBar(progress)
+                    +" `["+formatTime(track.getPosition()) + "/" + formatTime(track.getDuration()) +"]` "
+                    +volumeIcon(handler.getPlayer().getVolume());
+        }
     }
-    
+        
     public static String progressBar(double percent)
     {
         String str = "";
-        for(int i=0; i<8; i++)
-            if(i == (int)(percent*8))
+        for(int i=0; i<12; i++)
+            if(i == (int)(percent*12))
                 str+="\uD83D\uDD18";
             else
                 str+="▬";
@@ -105,6 +152,7 @@ public class FormatUtil {
             out+="\n**And "+(list.size()-6)+" more...**";
         return out;
     }
+    
     public static String listOfVChannels(List<VoiceChannel> list, String query)
     {
         String out = " Multiple voice channels found matching \""+query+"\":";
@@ -114,6 +162,7 @@ public class FormatUtil {
             out+="\n**And "+(list.size()-6)+" more...**";
         return out;
     }
+    
     public static String listOfRoles(List<Role> list, String query)
     {
         String out = " Multiple text channels found matching \""+query+"\":";
@@ -123,4 +172,9 @@ public class FormatUtil {
             out+="\n**And "+(list.size()-6)+" more...**";
         return out;
     }
+    
+    public static String filter(String input)
+    {
+        return input.replace("@everyone", "@\u0435veryone").replace("@here", "@h\u0435re").trim();
+    }
 }

src/main/java/com/jagrosh/jmusicbot/utils/Pair.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2018 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.jagrosh.jmusicbot.utils;
+
+/**
+ *
+ * @author John Grosh (john.a.grosh@gmail.com)
+ * @param <K>
+ * @param <V>
+ */
+public class Pair<K,V>
+{
+    private final K key;
+    private final V value;
+    
+    public Pair(K key, V value)
+    {
+        this.key = key;
+        this.value = value;
+    }
+    
+    public K getKey()
+    {
+        return key;
+    }
+    
+    public V getValue()
+    {
+        return value;
+    }
+}

src/main/resources/logback.xml

@@ -0,0 +1,17 @@
+<!-- author: Kaidan Gustave -->
+<configuration>
+
+    <appender name="Simple" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <!-- Pattern -->
+            <pattern>
+                %nopex[%d{HH:mm:ss}] [%level] [%logger{0}]: %msg%n%ex
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="Simple"/>
+    </root>
+
+</configuration>