dependency updates

more emojis
perm and id fix
2026-11-05 17:02:35 -05:00 · 2018-02-07 11:07:37 -05:00 · 2017-12-18 11:48:30 -05:00 · 2017-12-18 10:33:26 -05:00 · 2017-12-18 10:33:08 -05:00 · 2017-10-25 18:26:33 -04:00
42 changed files with 1319 additions and 613 deletions
@@ -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,7 +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](http://i.imgur.com/gxDdlRL.png)
+![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.
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.jagrosh</groupId>
    <artifactId>JMusicBot</artifactId>
-    <version>0.0.4</version>
+    <version>0.1.2</version>
    <packaging>jar</packaging>
    
    <repositories>
@@ -17,28 +17,28 @@
    <dependencies>
        <dependency>
            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
-            <version>1.7.22</version>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.25</version>
        </dependency>
        <dependency>
            <groupId>net.dv8tion</groupId> 
            <artifactId>JDA</artifactId> 
-            <version>3.0.0_168</version>
+            <version>3.5.0_335</version>
        </dependency>
        <dependency>
            <groupId>com.sedmelluq</groupId>
            <artifactId>lavaplayer</artifactId>
-            <version>1.2.36</version>
+            <version>1.2.47</version>
        </dependency>
        <dependency>
            <groupId>com.jagrosh</groupId>
            <artifactId>JDA-Utilities</artifactId>
-            <version>1.1</version>
+            <version>2.0</version>
        </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>
    
@@ -27,25 +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.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
+import java.util.Objects;
+import javafx.util.Pair;
 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.MessageDeleteEvent;
+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;

 /**
 *
@@ -54,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;
@@ -90,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) -> {
@@ -104,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;
@@ -121,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());
@@ -142,15 +164,64 @@ 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();
        return handler;
    }
    
-    private void updateTopic(Guild guild, AudioHandler handler)
+    public void resetGame()
    {
+        Game game = config.getGame()==null || config.getGame().getName().equalsIgnoreCase("none") ? null : config.getGame();
+        if(!Objects.equals(jda.getPresence().getGame(), game))
+            jda.getPresence().setGame(game);
+    }
+    
+    public void setLastNP(Message m)
+    {
+        lastNP.put(m.getGuild().getIdLong(), new Pair<>(m.getTextChannel().getIdLong(), m.getIdLong()));
+    }
+
+    @Override
+    public void onMessageDelete(MessageDeleteEvent 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))
        {
@@ -158,12 +229,14 @@ 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){}
        }
    }

@@ -177,7 +250,7 @@ public class Bot extends ListenerAdapter {
            {
                ah.getQueue().clear();
                ah.getPlayer().destroy();
-                updateTopic(g, ah);
+                updateTopic(g.getIdLong(), ah);
            }
        });
        jda.shutdown();
@@ -199,8 +272,9 @@ public class Bot extends ListenerAdapter {
        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) -> {
@@ -248,7 +322,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
        {
@@ -262,7 +336,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
        {
@@ -276,7 +350,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
        {
@@ -290,7 +364,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
        {
@@ -304,7 +378,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
        {
@@ -313,6 +387,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);
@@ -368,12 +456,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);
        }
    }
    
@@ -15,14 +15,16 @@
 */
 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;

 /**
 *
@@ -30,23 +32,18 @@ import javax.swing.JOptionPane;
 */
 public class Config {
    private boolean nogui;
-    private String prefix;
-    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 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"));
+            lines = Files.readAllLines(Paths.get("config.txt"), StandardCharsets.UTF_8);
            System.out.println("[INFO] Loading config: "+Paths.get("config.txt").toFile().getAbsolutePath());
            for(String line: lines)
            {
@@ -61,6 +58,9 @@ public class Config {
                    case "prefix":
                        prefix = value;
                        break;
+                    case "altprefix":
+                        altprefix = value;
+                        break;
                    case "owner":
                        owner = value;
                        break;
@@ -73,21 +73,41 @@ 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);
+                    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) {
@@ -148,6 +168,11 @@ public class Config {
        return prefix;
    }
    
+    public String getAltPrefix()
+    {
+        return altprefix;
+    }
+    
    public String getToken()
    {
        return token;
@@ -173,9 +198,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()
@@ -193,11 +238,36 @@ public class Config {
        return stay;
    }
    
+    public boolean getSongInStatus()
+    {
+        return songingame;
+    }
+    
    public boolean getDBots()
    {
        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)
@@ -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,8 +29,7 @@ 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.LoggerFactory;

 /**
 *
@@ -58,36 +57,42 @@ public class JMusicBot {
        EventWaiter waiter = new EventWaiter();
        Bot bot = new Bot(waiter, config);
        
-        AboutCommand.IS_AUTHOR = false;
+        AboutCommand ab = new AboutCommand(Color.BLUE.brighter(),
+                                "a music bot that is [easy to host yourself!](https://github.com/jagrosh/MusicBot) (v0.1.2)",
+                                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()
                .setPrefix(config.getPrefix())
+                .setAlternativePrefix(config.getAltPrefix())
                .setOwnerId(config.getOwnerId())
                .setEmojis(config.getSuccess(), config.getWarning(), config.getError())
                .setHelpWord(config.getHelp())
                .addCommands(
-                        new AboutCommand(Color.BLUE.brighter(),
-                                "a music bot that is [easy to host yourself!](https://github.com/jagrosh/MusicBot) (v0.0.7)",
-                                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),
@@ -97,16 +102,28 @@ public class JMusicBot {
                        new SetvcCmd(bot),
                        
                        //new GuildlistCommand(waiter),
+                        new AutoplaylistCmd(bot),
                        new PlaylistCmd(bot),
                        new SetavatarCmd(bot),
                        new SetgameCmd(bot),
                        new SetnameCmd(bot),
+                        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().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())
@@ -116,7 +133,7 @@ public class JMusicBot {
                bot.setGUI(gui);
                gui.init();
            } catch(Exception e) {
-                SimpleLog.getLog("Startup").fatal("Could not start GUI. If you are "
+                LoggerFactory.getLogger("Startup").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.");
            }
@@ -127,14 +144,21 @@ public class JMusicBot {
            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)
+        {
+            LoggerFactory.getLogger("Startup").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)
+        {
+            LoggerFactory.getLogger("Startup").error(""+ex);
        }
    }
 }
@@ -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;
+    }
 }
@@ -28,6 +28,7 @@ import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.playlist.Playlist;
 import com.jagrosh.jmusicbot.queue.FairQueue;
 import net.dv8tion.jda.core.audio.AudioSendHandler;
+import net.dv8tion.jda.core.entities.Game;
 import net.dv8tion.jda.core.entities.Guild;
 import net.dv8tion.jda.core.entities.User;

@@ -37,18 +38,21 @@ 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;
    private final Bot bot;
    private AudioFrame lastFrame;
-    private QueuedTrack current;
+    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<>();
@@ -57,22 +61,14 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler

    public int addTrack(AudioTrack track, User user)
    {
-        QueuedTrack qt = new QueuedTrack(track, user.getId());
-        if(current==null)
+        if(audioPlayer.getPlayingTrack()==null)
        {
-            current = qt;
+            requester = user.getIdLong();
            audioPlayer.playTrack(track);
            return -1;
        }
        else
-        {
-            return queue.add(qt);
-        }
-    }
-    
-    public QueuedTrack getCurrentTrack()
-    {
-        return current;
+            return queue.add(new QueuedTrack(track, user.getIdLong()));
    }
    
    public FairQueue<QueuedTrack> getQueue()
@@ -90,7 +86,7 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
    
    public boolean isMusicPlaying()
    {
-        return guild.getSelfMember().getVoiceState().inVoiceChannel() && current!=null;
+        return bot.getJDA().getGuildById(guildId).getSelfMember().getVoiceState().inVoiceChannel() && audioPlayer.getPlayingTrack()!=null;
    }
    
    public Set<String> getVotes()
@@ -103,60 +99,73 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
        return audioPlayer;
    }
    
+    public long getRequester()
+    {
+        return requester;
+    }
+    
    public boolean playFromDefault()
    {
        if(!defaultQueue.isEmpty())
        {
-            current = new QueuedTrack(defaultQueue.remove(0), null);
-            audioPlayer.playTrack(current.getTrack());
+            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());
        if(pl==null || pl.getItems().isEmpty())
            return false;
        pl.loadTracks(bot.getAudioManager(), (at) -> {
-            if(current==null)
-            {
-                current = new QueuedTrack(at, null);
+            if(audioPlayer.getPlayingTrack()==null)
                audioPlayer.playTrack(at);
-            }
            else
                defaultQueue.add(at);
        }, () -> {
-            if(pl.getTracks().isEmpty())
-            {
-                current = null;
-                if(!STAY_IN_CHANNEL)
-                    guild.getAudioManager().closeAudioConnection();
-            }
+            if(pl.getTracks().isEmpty() && !STAY_IN_CHANNEL)
+                guild.getAudioManager().closeAudioConnection();
        });
        return true;
    }
    
    @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())
        {
-            current = null;
            if(!playFromDefault())
            {
-                current = null;
+                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
        {
-            current = queue.pull();
-            player.playTrack(current.getTrack());
+            QueuedTrack qt = queue.pull();
+            requester = qt.getIdentifier();
+            player.playTrack(qt.getTrack());
        }
    }

    @Override
    public void onTrackStart(AudioPlayer player, AudioTrack track) {
        votes.clear();
+        if(SONG_IN_STATUS)
+        {
+            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
@@ -174,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;
+    }
 }
@@ -1,52 +1,52 @@
-/*
- * 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.audio;
-
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.jagrosh.jmusicbot.queue.Queueable;
-import com.jagrosh.jmusicbot.utils.FormatUtil;
-
-/**
- *
- * @author John Grosh <john.a.grosh@gmail.com>
- */
-public class QueuedTrack implements Queueable {
-
-    private final AudioTrack track;
-    private final String owner;
-    
-    public QueuedTrack(AudioTrack track, String owner)
-    {
-        this.track = track;
-        this.owner = owner;
-    }
-    
-    @Override
-    public String getIdentifier() {
-        return owner;
-    }
-    
-    public AudioTrack getTrack()
-    {
-        return track;
-    }
-
-    @Override
-    public String toString() {
-        return "`["+FormatUtil.formatTime(track.getDuration())+"]` **" + track.getInfo().title +"** - <@"+owner+">";
-    }
-    
-}
+/*
+ * 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.audio;
+
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.jagrosh.jmusicbot.queue.Queueable;
+import com.jagrosh.jmusicbot.utils.FormatUtil;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class QueuedTrack implements Queueable {
+
+    private final AudioTrack track;
+    private final long owner;
+    
+    public QueuedTrack(AudioTrack track, long owner)
+    {
+        this.track = track;
+        this.owner = owner;
+    }
+    
+    @Override
+    public long getIdentifier() {
+        return owner;
+    }
+    
+    public AudioTrack getTrack()
+    {
+        return track;
+    }
+
+    @Override
+    public String toString() {
+        return "`["+FormatUtil.formatTime(track.getDuration())+"]` **" + track.getInfo().title +"** - <@"+owner+">";
+    }
+    
+}
@@ -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+"`");
+        }
+    }
+}
@@ -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+" ```");
+        }
+    }
+    
+}
@@ -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;
@@ -39,13 +39,8 @@ public class ForceskipCmd extends MusicCommand {
    @Override
    public void doCommand(CommandEvent event) {
        AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
-        User u;
-        try {
-            u = event.getJDA().getUserById(handler.getCurrentTrack().getIdentifier());
-        } catch(Exception e) {
-            u = null;
-        }
-        event.reply(event.getClient().getSuccess()+" Skipped **"+handler.getCurrentTrack().getTrack().getInfo().title
+        User u = event.getJDA().getUserById(handler.getRequester());
+        event.reply(event.getClient().getSuccess()+" Skipped **"+handler.getPlayer().getPlayingTrack().getInfo().title
                +"** (requested by "+(u==null ? "someone" : "**"+u.getName()+"**")+")");
        handler.getPlayer().stopTrack();
    }
@@ -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
@@ -15,15 +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.soundcloud.SoundCloudAudioTrack;
-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;

 /**
 *
@@ -42,44 +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.getCurrentTrack().getIdentifier()!=null)
-        {
-            User u;
-            try {
-                u = event.getJDA().getUserById(ah.getCurrentTrack().getIdentifier());
-            } catch(Exception e) {
-                u = null;
-            }
-            if(u==null)
-                eb.setAuthor("Unknown (ID:"+ah.getCurrentTrack().getIdentifier()+")", null, null);
-            else
-                eb.setAuthor(u.getName()+"#"+u.getDiscriminator(), null, u.getEffectiveAvatarUrl());
-        }
-        
-        try {
-            eb.setTitle(ah.getCurrentTrack().getTrack().getInfo().title, ah.getCurrentTrack().getTrack().getInfo().uri);
-        } catch(Exception e) {
-            eb.setTitle(ah.getCurrentTrack().getTrack().getInfo().title);
-        }
-        
-        if(ah.getCurrentTrack().getTrack() instanceof YoutubeAudioTrack)
-            eb.setThumbnail("https://img.youtube.com/vi/"+ah.getCurrentTrack().getTrack().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));
    }
    
 }
@@ -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;
@@ -44,7 +44,7 @@ public class PauseCmd extends MusicCommand {
            return;
        }
        handler.getPlayer().setPaused(true);
-        event.replySuccess("Paused **"+handler.getCurrentTrack().getTrack().getInfo().title+"**. Type `"+event.getClient().getPrefix()+"play` to unpause!");
+        event.replySuccess("Paused **"+handler.getPlayer().getPlayingTrack().getInfo().title+"**. Type `"+event.getClient().getPrefix()+"play` to unpause!");
    }
    
 }
@@ -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";
@@ -51,9 +59,11 @@ public class PlayCmd extends MusicCommand {
        if(event.getArgs().isEmpty())
        {
            AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
-            if(handler!=null && handler.getCurrentTrack()!=null && handler.getPlayer().isPaused())
+            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)
@@ -61,7 +71,7 @@ public class PlayCmd extends MusicCommand {
                else
                {
                    handler.getPlayer().setPaused(false);
-                    event.replySuccess("Resumed **"+handler.getCurrentTrack().getTrack().getInfo().title+"**.");
+                    event.replySuccess("Resumed **"+handler.getPlayer().getPlayingTrack().getInfo().title+"**.");
                }
                return;
            }
@@ -76,15 +86,15 @@ 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.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();
                });
            });
        }
@@ -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;

@@ -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;

@@ -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.getCurrentTrack().getTrack().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.getCurrentTrack()!=null)
-            sb.append("**").append(ah.getCurrentTrack().getTrack().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();
+        if(ah.getPlayer().getPlayingTrack()!=null)
+            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());
    }
 }
@@ -15,13 +15,12 @@
 */
 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;
 import net.dv8tion.jda.core.Permission;
 import net.dv8tion.jda.core.entities.User;
-import net.dv8tion.jda.core.utils.PermissionUtil;

 /**
 *
@@ -45,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().getId());
+            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;
@@ -65,17 +64,17 @@ 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);
        if(!isDJ)
            isDJ = event.getMember().getRoles().contains(event.getGuild().getRoleById(bot.getSettings(event.getGuild()).getRoleId()));
        QueuedTrack qt = handler.getQueue().get(pos-1);
-        if(qt.getIdentifier().equals(event.getAuthor().getId()))
+        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)
        {
@@ -86,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!");
        }
    }
    
@@ -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")+"`");
+    }
+    
+}
@@ -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
@@ -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
@@ -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;
@@ -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;
@@ -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!");
+            }
+        }
+    }
+}
@@ -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;

@@ -0,0 +1,56 @@
+/*
+ * 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.OnlineStatus;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class SetstatusCmd extends Command {
+
+    public SetstatusCmd(Bot bot)
+    {
+        this.name = "setstatus";
+        this.help = "sets the status the bot displays";
+        this.arguments = "<status>";
+        this.ownerCommand = true;
+        this.category = bot.OWNER;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        try {
+            OnlineStatus status = OnlineStatus.fromKey(event.getArgs());
+            if(status==OnlineStatus.UNKNOWN)
+            {
+                event.replyError("Please include one of the following statuses: `ONLINE`, `IDLE`, `DND`, `INVISIBLE`");
+            }
+            else
+            {
+                event.getJDA().getPresence().setStatus(status);
+                event.replySuccess("Set the status to `"+status.getKey().toUpperCase()+"`");
+            }
+        } catch(Exception e) {
+            event.reply(event.getClient().getError()+" The status could not be set!");
+        }
+    }
+    
+}
@@ -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;
@@ -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 | "
@@ -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;
@@ -1,54 +1,54 @@
-/*
- * 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.commandclient.CommandEvent;
-import com.jagrosh.jmusicbot.Bot;
-import com.jagrosh.jmusicbot.audio.AudioHandler;
-
-/**
- *
- * @author John Grosh <john.a.grosh@gmail.com>
- */
-public class ShuffleCmd extends MusicCommand {
-
-    public ShuffleCmd(Bot bot)
-    {
-        super(bot);
-        this.name = "shuffle";
-        this.help = "shuffles songs you have added";
-        this.beListening = true;
-        this.bePlaying = true;
-    }
-
-    @Override
-    public void doCommand(CommandEvent event) {
-        AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
-        int s = handler.getQueue().shuffle(event.getAuthor().getId());
-        switch (s) {
-            case 0:
-                event.reply(event.getClient().getError()+" You don't have any music in the queue to shuffle!");
-                break;
-            case 1:
-                event.reply(event.getClient().getWarning()+" You only have one song in the queue!");
-                break;
-            default:
-                event.reply(event.getClient().getSuccess()+" You successfully shuffled your "+s+" entries.");
-                break;
-        }
-    }
-    
-}
+/*
+ * 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.CommandEvent;
+import com.jagrosh.jmusicbot.Bot;
+import com.jagrosh.jmusicbot.audio.AudioHandler;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class ShuffleCmd extends MusicCommand {
+
+    public ShuffleCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "shuffle";
+        this.help = "shuffles songs you have added";
+        this.beListening = true;
+        this.bePlaying = true;
+    }
+
+    @Override
+    public void doCommand(CommandEvent event) {
+        AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
+        int s = handler.getQueue().shuffle(event.getAuthor().getIdLong());
+        switch (s) {
+            case 0:
+                event.reply(event.getClient().getError()+" You don't have any music in the queue to shuffle!");
+                break;
+            case 1:
+                event.reply(event.getClient().getWarning()+" You only have one song in the queue!");
+                break;
+            default:
+                event.reply(event.getClient().getSuccess()+" You successfully shuffled your "+s+" entries.");
+                break;
+        }
+    }
+    
+}
@@ -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;

 /**
@@ -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;
@@ -39,10 +39,9 @@ public class SkipCmd extends MusicCommand {
    @Override
    public void doCommand(CommandEvent event) {
        AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
-        if(event.getAuthor().getId().equals(handler.getCurrentTrack().getIdentifier()))
+        if(event.getAuthor().getIdLong()==handler.getRequester())
        {
-            event.reply(event.getClient().getSuccess()+" Skipped **"+handler.getCurrentTrack().getTrack().getInfo().title
-                    +"**");
+            event.reply(event.getClient().getSuccess()+" Skipped **"+handler.getPlayer().getPlayingTrack().getInfo().title+"**");
            handler.getPlayer().stopTrack();
        }
        else
@@ -63,14 +62,9 @@ public class SkipCmd extends MusicCommand {
            msg+= skippers+" votes, "+required+"/"+listeners+" needed]`";
            if(skippers>=required)
            {
-                User u;
-                try {
-                    u = event.getJDA().getUserById(handler.getCurrentTrack().getIdentifier());
-                } catch(Exception e) {
-                    u = null;
-                }
-                msg+="\n"+event.getClient().getSuccess()+" Skipped **"+handler.getCurrentTrack().getTrack().getInfo().title
-                    +"**"+(handler.getCurrentTrack().getIdentifier()==null ? "" : " (requested by "+(u==null ? "someone" : "**"+u.getName()+"**")+")");
+                User u = event.getJDA().getUserById(handler.getRequester());
+                msg+="\n"+event.getClient().getSuccess()+" Skipped **"+handler.getPlayer().getPlayingTrack().getInfo().title
+                    +"**"+(handler.getRequester()==0 ? "" : " (requested by "+(u==null ? "someone" : "**"+u.getName()+"**")+")");
                handler.getPlayer().stopTrack();
            }
            event.reply(msg);
@@ -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;
@@ -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.");
    }
@@ -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;
@@ -1,111 +1,111 @@
-/*
- * 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.gui;
-
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.util.List;
-import javax.swing.DefaultListModel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionEvent;
-import com.jagrosh.jmusicbot.Bot;
-import com.jagrosh.jmusicbot.audio.AudioHandler;
-import com.jagrosh.jmusicbot.utils.FormatUtil;
-import net.dv8tion.jda.core.entities.Guild;
-
-/**
- *
- * @author John Grosh <john.a.grosh@gmail.com>
- */
-public class GuildsPanel extends JPanel {
-    
-    private final Bot bot;
-    private final JList guildList;
-    private final JTextArea guildQueue;
-    private int index = -1;
-    
-    public GuildsPanel(Bot bot)
-    {
-        super();
-        super.setLayout(new GridBagLayout());
-        this.bot = bot;
-        
-        guildList = new JList();
-        guildQueue = new JTextArea();
-        guildList.setModel(new DefaultListModel());
-        guildList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        guildList.setFixedCellHeight(20);
-        guildList.setPreferredSize(new Dimension(100,300));
-        guildQueue.setPreferredSize(new Dimension(300,300));
-        guildQueue.setEditable(false);
-        JScrollPane pane = new JScrollPane();
-        JScrollPane pane2 = new JScrollPane();
-        pane.setViewportView(guildList);
-        pane2.setViewportView(guildQueue);
-        GridBagConstraints c = new GridBagConstraints();
-        c.fill = GridBagConstraints.BOTH;
-        c.anchor = GridBagConstraints.LINE_START;
-        c.gridx = 0;
-        c.gridwidth = 1;
-        super.add(pane, c);
-        c.gridx = 1;
-        c.gridwidth = 3;
-        super.add(pane2, c);
-        //bot.registerPanel(this);
-        guildList.addListSelectionListener((ListSelectionEvent e) -> {
-            index = guildList.getSelectedIndex();
-            //bot.updatePanel();
-        });
-    }
-    
-    public void updateList(List<Guild> guilds)
-    {
-        String[] strs = new String[guilds.size()];
-        for(int i=0; i<guilds.size(); i++)
-            strs[i] = guilds.get(i).getName();
-        guildList.setListData(strs);
-    }
-    
-    public int getIndex()
-    {
-        return guildList.getSelectedIndex();
-    }
-    
-    public void updatePanel(AudioHandler handler) {
-        StringBuilder builder = new StringBuilder("Now Playing: ");
-        if(handler==null || handler.getCurrentTrack()==null)
-        {
-            builder.append("nothing");
-        }
-        else
-        {
-            builder.append(handler.getCurrentTrack().getTrack().getInfo().title)
-                    .append(" [")
-                    .append(FormatUtil.formatTime(handler.getCurrentTrack().getTrack().getDuration()))
-                    .append("]\n");
-            for(int i=0; i<handler.getQueue().size(); i++)
-                builder.append("\n").append(i+1).append(". ").append(handler.getQueue().get(i).getTrack().getInfo().title);
-        }
-        guildQueue.setText(builder.toString());
-        guildQueue.updateUI();
-    }
-    
-}
+/*
+ * 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.gui;
+
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.util.List;
+import javax.swing.DefaultListModel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import com.jagrosh.jmusicbot.Bot;
+import com.jagrosh.jmusicbot.audio.AudioHandler;
+import com.jagrosh.jmusicbot.utils.FormatUtil;
+import net.dv8tion.jda.core.entities.Guild;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class GuildsPanel extends JPanel {
+    
+    private final Bot bot;
+    private final JList guildList;
+    private final JTextArea guildQueue;
+    private int index = -1;
+    
+    public GuildsPanel(Bot bot)
+    {
+        super();
+        super.setLayout(new GridBagLayout());
+        this.bot = bot;
+        
+        guildList = new JList();
+        guildQueue = new JTextArea();
+        guildList.setModel(new DefaultListModel());
+        guildList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        guildList.setFixedCellHeight(20);
+        guildList.setPreferredSize(new Dimension(100,300));
+        guildQueue.setPreferredSize(new Dimension(300,300));
+        guildQueue.setEditable(false);
+        JScrollPane pane = new JScrollPane();
+        JScrollPane pane2 = new JScrollPane();
+        pane.setViewportView(guildList);
+        pane2.setViewportView(guildQueue);
+        GridBagConstraints c = new GridBagConstraints();
+        c.fill = GridBagConstraints.BOTH;
+        c.anchor = GridBagConstraints.LINE_START;
+        c.gridx = 0;
+        c.gridwidth = 1;
+        super.add(pane, c);
+        c.gridx = 1;
+        c.gridwidth = 3;
+        super.add(pane2, c);
+        //bot.registerPanel(this);
+        guildList.addListSelectionListener((ListSelectionEvent e) -> {
+            index = guildList.getSelectedIndex();
+            //bot.updatePanel();
+        });
+    }
+    
+    public void updateList(List<Guild> guilds)
+    {
+        String[] strs = new String[guilds.size()];
+        for(int i=0; i<guilds.size(); i++)
+            strs[i] = guilds.get(i).getName();
+        guildList.setListData(strs);
+    }
+    
+    public int getIndex()
+    {
+        return guildList.getSelectedIndex();
+    }
+    
+    /*public void updatePanel(AudioHandler handler) {
+        StringBuilder builder = new StringBuilder("Now Playing: ");
+        if(handler==null || handler.getCurrentTrack()==null)
+        {
+            builder.append("nothing");
+        }
+        else
+        {
+            builder.append(handler.getCurrentTrack().getTrack().getInfo().title)
+                    .append(" [")
+                    .append(FormatUtil.formatTime(handler.getCurrentTrack().getTrack().getDuration()))
+                    .append("]\n");
+            for(int i=0; i<handler.getQueue().size(); i++)
+                builder.append("\n").append(i+1).append(". ").append(handler.getQueue().get(i).getTrack().getInfo().title);
+        }
+        guildQueue.setText(builder.toString());
+        guildQueue.updateUI();
+    }*/
+    
+}
@@ -6,6 +6,7 @@
 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;
@@ -32,11 +33,13 @@ public class Playlist {
    private final List<String> items;
    private List<AudioTrack> tracks;
    private List<PlaylistLoadError> errors;
+    private final boolean shuffle;
    
-    private Playlist(String name, List<String> items)
+    private Playlist(String name, List<String> items, boolean shuffle)
    {
        this.name = name;
        this.items = items;
+        this.shuffle = shuffle;
    }
    
    public void loadTracks(AudioPlayerManager manager, Consumer<AudioTrack> consumer, Runnable callback)
@@ -52,8 +55,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)
@@ -64,18 +72,38 @@ 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
                        {
-                            tracks.addAll(ap.getTracks());
-                            ap.getTracks().forEach(at -> consumer.accept(at));
+                            List<AudioTrack> loaded = new ArrayList<>(ap.getTracks());
+                            if(shuffle)
+                                for(int first =0; first<loaded.size(); first++)
+                                {
+                                    int second = (int)(Math.random()*loaded.size());
+                                    AudioTrack tmp = loaded.get(first);
+                                    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));
                        }
                        if(last)
                        {
@@ -202,7 +230,7 @@ public class Playlist {
                        list.set(second, tmp);
                    }
                }
-                return new Playlist(name, list);
+                return new Playlist(name, list, shuffle[0]);
            }
            else
            {
@@ -27,13 +27,13 @@ import java.util.Set;
 */
 public class FairQueue<T extends Queueable> {
    private final List<T> list = new ArrayList<>();
-    private final Set<String> set = new HashSet<>();
+    private final Set<Long> set = new HashSet<>();
    
    public int add(T item)
    {
        int lastIndex;
        for(lastIndex=list.size()-1; lastIndex>-1; lastIndex--)
-            if(list.get(lastIndex).getIdentifier().equals(item.getIdentifier()))
+            if(list.get(lastIndex).getIdentifier()==item.getIdentifier())
                break;
        lastIndex++;
        set.clear();
@@ -77,12 +77,12 @@ public class FairQueue<T extends Queueable> {
        return list.remove(index);
    }
    
-    public int removeAll(String identifier)
+    public int removeAll(long identifier)
    {
        int count = 0;
        for(int i=list.size()-1; i>=0; i--)
        {
-            if(list.get(i).getIdentifier().equals(identifier))
+            if(list.get(i).getIdentifier()==identifier)
            {
                list.remove(i);
                count++;
@@ -96,12 +96,12 @@ public class FairQueue<T extends Queueable> {
        list.clear();
    }
    
-    public int shuffle(String identifier)
+    public int shuffle(long identifier)
    {
        List<Integer> iset = new ArrayList<>();
        for(int i=0; i<list.size(); i++)
        {
-            if(list.get(i).getIdentifier().equals(identifier))
+            if(list.get(i).getIdentifier()==identifier)
                iset.add(i);
        }
        for(int j=0; j<iset.size(); j++)
@@ -1,25 +1,25 @@
-/*
- * 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.queue;
-
-/**
- *
- * @author John Grosh <john.a.grosh@gmail.com>
- */
-public interface Queueable {
-    
-    public String getIdentifier();
-}
+/*
+ * 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.queue;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public interface Queueable {
+    
+    public long getIdentifier();
+}
@@ -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);
@@ -52,33 +92,38 @@ public class FormatUtil {
            return "No music playing\n\u23F9 "+progressBar(-1)+" "+volumeIcon(handler.getPlayer().getVolume());
        else
        {
-            String userid = handler.getCurrentTrack().getIdentifier();
-            AudioTrack track = handler.getCurrentTrack().getTrack();
+            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==null ? "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())+"] ")
+            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.getCurrentTrack().getTrack().getPosition()/ah.getCurrentTrack().getTrack().getDuration())
-                +" `["+formatTime(ah.getCurrentTrack().getTrack().getPosition()) + "/" + formatTime(ah.getCurrentTrack().getTrack().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 +150,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 +160,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 +170,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();
+    }
 }
@@ -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>
Author	SHA1	Message	Date
John Grosh	2eeffb374f	dependency updates more emojis	2018-02-07 11:07:37 -05:00
John Grosh	e478fa43c8	perm and id fix	2017-12-18 11:48:30 -05:00
John Grosh	1093f92d67	Merge origin/master	2017-12-18 10:33:26 -05:00
John Grosh	6148dc6a89	updated deps updated logger added repeat mode added loading playlist from video added more game types stop command improved	2017-12-18 10:33:08 -05:00
John Grosh	a20ade9016	Update README.md	2017-10-25 18:26:33 -04:00
John Grosh	fbbb7bd3a7	Update README.md	2017-10-18 23:54:55 -04:00
John Grosh	0c44160023	Update README.md	2017-10-12 23:41:16 -04:00
John Grosh	13427cdab7	Update README.md	2017-10-12 23:39:15 -04:00
John Grosh	d0ffc0308c	Update README.md	2017-10-12 23:35:35 -04:00
John Grosh	fe62e03367	updated lib versions fixed config loading format filtered more output longer yt playlists supported	2017-09-10 23:38:59 -04:00
John Grosh	5deb41c651	updated libs fixed internal bugs lots of other things (see 0.0.9 release)	2017-09-02 16:39:08 -04:00
John Grosh	6b454c299d	fixed NONE for game	2017-08-18 16:42:32 -04:00
John Grosh	dddf4c8e38	added altprefix, songinstatus, and setstatus features slight change to internals to reduce some bugs	2017-08-18 15:43:20 -04:00
John Grosh	0912de74e9	Merge origin/master	2017-07-04 02:58:24 -04:00
John Grosh	3752e5b9e0	update pom	2017-07-04 02:57:56 -04:00
John Grosh	ae62d5771f	Update README.md	2017-07-04 02:32:26 -04:00
John Grosh	434749a250	fixed playlist shuffling	2017-07-04 02:19:08 -04:00