updated readme

bumped license year
removed unnecessary import

LICENSE

@@ -1,201 +1,201 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   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.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2017 John Grosh
+
+   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.

README.md

@@ -1,6 +1,8 @@
 # JMusicBot
 A Discord music bot with a clean interface, and that is easy to set up and run yourself
 
+[![Setup](http://i.imgur.com/VvXYp5j.png)](https://github.com/jagrosh/MusicBot/wiki/Setup)
+
 # Features
 * Easy to run (just make sure Java is installed, and run!)
 * Fast loading of songs
@@ -10,6 +12,8 @@ A Discord music bot with a clean interface, and that is easy to set up and run y
 * Clean and beautiful menus
 * Channel-topic playback bar
 * Supports many sites, including Youtube, Soundcloud, and more
+* Supports many online radio/streams
+* Supports local files
 * Playlist support (both web/youtube, and local)
 
 # Setup

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

@@ -42,7 +42,6 @@ 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.hooks.ListenerAdapter;
-import net.dv8tion.jda.core.utils.PermissionUtil;
 import net.dv8tion.jda.core.utils.SimpleLog;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -67,7 +66,7 @@ public class Bot extends ListenerAdapter {
             return true;
         if(event.getGuild()==null)
             return true;
-        if(PermissionUtil.checkPermission(event.getGuild(), event.getMember(), Permission.MANAGE_SERVER))
+        if(event.getMember().hasPermission(Permission.MANAGE_SERVER))
             return true;
         Role dj = event.getGuild().getRoleById(getSettings(event.getGuild()).getRoleId());
         return event.getMember().getRoles().contains(dj);
@@ -79,7 +78,7 @@ public class Bot extends ListenerAdapter {
             return true;
         if(event.getGuild()==null)
             return true;
-        return PermissionUtil.checkPermission(event.getGuild(), event.getMember(), Permission.MANAGE_SERVER);
+        return event.getMember().hasPermission(Permission.MANAGE_SERVER);
     });
     
     public final Category OWNER = new Category("Owner");
@@ -91,10 +90,12 @@ public class Bot extends ListenerAdapter {
         manager = new DefaultAudioPlayerManager();
         threadpool = Executors.newSingleThreadScheduledExecutor();
         AudioSourceManagers.registerRemoteSources(manager);
+        AudioSourceManagers.registerLocalSource(manager);
         try {
             JSONObject loadedSettings = new JSONObject(new String(Files.readAllBytes(Paths.get("serversettings.json"))));
             loadedSettings.keySet().forEach((id) -> {
                 JSONObject o = loadedSettings.getJSONObject(id);
+                
                 settings.put(id, new Settings(
                         o.has("text_channel_id") ? o.getString("text_channel_id") : null,
                         o.has("voice_channel_id")? o.getString("voice_channel_id"): null,
@@ -148,7 +149,7 @@ public class Bot extends ListenerAdapter {
     private void updateTopic(Guild guild, AudioHandler handler)
     {
         TextChannel tchan = guild.getTextChannelById(getSettings(guild).getTextId());
-        if(tchan!=null && PermissionUtil.checkPermission(tchan, guild.getSelfMember(), Permission.MANAGE_CHANNEL))
+        if(tchan!=null && guild.getSelfMember().hasPermission(tchan, Permission.MANAGE_CHANNEL))
         {
             String otherText;
             if(tchan.getTopic()==null || tchan.getTopic().isEmpty())
@@ -229,7 +230,7 @@ public class Bot extends ListenerAdapter {
         }
         else
         {
-            s.setTextId(channel.getId());
+            s.setTextId(channel.getIdLong());
         }
         writeSettings();
     }
@@ -243,7 +244,7 @@ public class Bot extends ListenerAdapter {
         }
         else
         {
-            s.setVoiceId(channel.getId());
+            s.setVoiceId(channel.getIdLong());
         }
         writeSettings();
     }
@@ -257,7 +258,7 @@ public class Bot extends ListenerAdapter {
         }
         else
         {
-            s.setRoleId(role.getId());
+            s.setRoleId(role.getIdLong());
         }
         writeSettings();
     }
@@ -295,10 +296,10 @@ public class Bot extends ListenerAdapter {
         Settings s = getSettings(guild);
         if(s!=Settings.DEFAULT_SETTINGS)
         {
-            if(s.getVoiceId()==null && s.getRoleId()==null)
+            if(s.getVoiceId()==0 && s.getRoleId()==0)
                 settings.remove(guild.getId());
             else
-                s.setTextId(null);
+                s.setTextId(0);
             writeSettings();
         }
     }
@@ -308,10 +309,10 @@ public class Bot extends ListenerAdapter {
         Settings s = getSettings(guild);
         if(s!=Settings.DEFAULT_SETTINGS)
         {
-            if(s.getTextId()==null && s.getRoleId()==null)
+            if(s.getTextId()==0 && s.getRoleId()==0)
                 settings.remove(guild.getId());
             else
-                s.setVoiceId(null);
+                s.setVoiceId(0);
             writeSettings();
         }
     }
@@ -321,10 +322,10 @@ public class Bot extends ListenerAdapter {
         Settings s = getSettings(guild);
         if(s!=Settings.DEFAULT_SETTINGS)
         {
-            if(s.getVoiceId()==null && s.getTextId()==null)
+            if(s.getVoiceId()==0 && s.getTextId()==0)
                 settings.remove(guild.getId());
             else
-                s.setRoleId(null);
+                s.setRoleId(0);
             writeSettings();
         }
     }
@@ -335,12 +336,12 @@ public class Bot extends ListenerAdapter {
         settings.keySet().stream().forEach(key -> {
             JSONObject o = new JSONObject();
             Settings s = settings.get(key);
-            if(s.getTextId()!=null)
-                o.put("text_channel_id", s.getTextId());
-            if(s.getVoiceId()!=null)
-                o.put("voice_channel_id", s.getVoiceId());
-            if(s.getRoleId()!=null)
-                o.put("dj_role_id", s.getRoleId());
+            if(s.getTextId()!=0)
+                o.put("text_channel_id", Long.toString(s.getTextId()));
+            if(s.getVoiceId()!=0)
+                o.put("voice_channel_id", Long.toString(s.getVoiceId()));
+            if(s.getRoleId()!=0)
+                o.put("dj_role_id", Long.toString(s.getRoleId()));
             if(s.getVolume()!=100)
                 o.put("volume",s.getVolume());
             if(s.getDefaultPlaylist()!=null)

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

@@ -15,6 +15,7 @@
  */
 package com.jagrosh.jmusicbot;
 
+import com.jagrosh.jmusicbot.utils.FormatUtil;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -75,6 +76,9 @@ public class Config {
                     case "help":
                         help = value;
                         break;
+                    case "noprogressintopic":
+                        FormatUtil.NO_PROGRESS_BAR_IN_TOPIC = "true".equalsIgnoreCase(value);
+                        break;
                 }
             }
         } catch (IOException ex) {

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

@@ -68,7 +68,7 @@ public class JMusicBot {
                 .setHelpWord(config.getHelp())
                 .addCommands(
                         new AboutCommand(Color.BLUE.brighter(),
-                                "a music bot that is [easy to host yourself!](https://github.com/jagrosh/MusicBot)",
+                                "a music bot that is [easy to host yourself!](https://github.com/jagrosh/MusicBot) (v0.0.5)",
                                 new String[]{"High-quality music playback", "FairQueue™ Technology", "Easy to host yourself"},
                                 RECOMMENDED_PERMS),
                         new PingCommand(),
@@ -126,9 +126,9 @@ public class JMusicBot {
                     .setAudioEnabled(true)
                     .setGame(Game.of("loading..."))
                     .setStatus(OnlineStatus.DO_NOT_DISTURB)
-                    .addListener(client)
-                    .addListener(waiter)
-                    .addListener(bot)
+                    .addEventListener(client)
+                    .addEventListener(waiter)
+                    .addEventListener(bot)
                     .buildAsync();
         } catch (LoginException | IllegalArgumentException | RateLimitedException ex) {
             SimpleLog.getLog("Login").fatal(ex);

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

@@ -20,15 +20,45 @@ package com.jagrosh.jmusicbot;
  * @author John Grosh <john.a.grosh@gmail.com>
  */
 public class Settings {
-    public final static Settings DEFAULT_SETTINGS = new Settings(null, null, null, 100, null);
+    public final static Settings DEFAULT_SETTINGS = new Settings(0, 0, 0, 100, null);
     
-    private String textId;
-    private String voiceId;
-    private String roleId;
+    private long textId;
+    private long voiceId;
+    private long roleId;
     private int volume;
     private String defaultPlaylist;
     
     public Settings(String textId, String voiceId, String roleId, int volume, String defaultPlaylist)
+    {
+        try
+        {
+            this.textId = Long.parseLong(textId);
+        }
+        catch(NumberFormatException e)
+        {
+            this.textId = 0;
+        }
+        try
+        {
+            this.voiceId = Long.parseLong(voiceId);
+        }
+        catch(NumberFormatException e)
+        {
+            this.voiceId = 0;
+        }
+        try
+        {
+            this.roleId = Long.parseLong(roleId);
+        }
+        catch(NumberFormatException e)
+        {
+            this.roleId = 0;
+        }
+        this.volume = volume;
+        this.defaultPlaylist = defaultPlaylist;
+    }
+    
+    public Settings(long textId, long voiceId, long roleId, int volume, String defaultPlaylist)
     {
         this.textId = textId;
         this.voiceId = voiceId;
@@ -37,17 +67,17 @@ public class Settings {
         this.defaultPlaylist = defaultPlaylist;
     }
     
-    public String getTextId()
+    public long getTextId()
     {
         return textId;
     }
     
-    public String getVoiceId()
+    public long getVoiceId()
     {
         return voiceId;
     }
     
-    public String getRoleId()
+    public long getRoleId()
     {
         return roleId;
     }
@@ -62,17 +92,17 @@ public class Settings {
         return defaultPlaylist;
     }
     
-    public void setTextId(String id)
+    public void setTextId(long id)
     {
         this.textId = id;
     }
     
-    public void setVoiceId(String id)
+    public void setVoiceId(long id)
     {
         this.voiceId = id;
     }
     
-    public void setRoleId(String id)
+    public void setRoleId(long id)
     {
         this.roleId = id;
     }

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

@@ -1,48 +1,53 @@
-/*
- * 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;
-import net.dv8tion.jda.core.entities.User;
-
-/**
- *
- * @author John Grosh <john.a.grosh@gmail.com>
- */
-public class ForceskipCmd extends MusicCommand {
-
-    public ForceskipCmd(Bot bot)
-    {
-        super(bot);
-        this.name = "forceskip";
-        this.help = "skips the current song";
-        this.aliases = new String[]{"modskip"};
-        this.bePlaying = true;
-        this.category = bot.DJ;
-    }
-
-    @Override
-    public void doCommand(CommandEvent event) {
-        AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
-        User u = event.getJDA().getUserById(handler.getCurrentTrack().getIdentifier());
-        event.reply(event.getClient().getSuccess()+" Skipped **"+handler.getCurrentTrack().getTrack().getInfo().title
-                +"** (requested by "+(u==null ? "someone" : "**"+u.getName()+"**")+")");
-        handler.getPlayer().stopTrack();
-    }
-    
-}
+/*
+ * 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;
+import net.dv8tion.jda.core.entities.User;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class ForceskipCmd extends MusicCommand {
+
+    public ForceskipCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "forceskip";
+        this.help = "skips the current song";
+        this.aliases = new String[]{"modskip"};
+        this.bePlaying = true;
+        this.category = bot.DJ;
+    }
+
+    @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
+                +"** (requested by "+(u==null ? "someone" : "**"+u.getName()+"**")+")");
+        handler.getPlayer().stopTrack();
+    }
+    
+}

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

@@ -68,7 +68,7 @@ public class RemoveCmd extends MusicCommand {
             event.reply(event.getClient().getError()+" Position must be a valid integer between 1 and "+handler.getQueue().size()+"!");
             return;
         }
-        boolean isDJ = PermissionUtil.checkPermission(event.getGuild(), event.getMember(), Permission.MANAGE_SERVER);
+        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);
@@ -80,7 +80,12 @@ public class RemoveCmd extends MusicCommand {
         else if(isDJ)
         {
             handler.getQueue().remove(pos-1);
-            User u = event.getJDA().getUserById(qt.getIdentifier());
+            User u;
+            try {
+                u = event.getJDA().getUserById(qt.getIdentifier());
+            } catch(Exception e) {
+                u = null;
+            }
             event.reply(event.getClient().getSuccess()+" Removed **"+qt.getTrack().getInfo().title
                     +"** from the queue (requested by "+(u==null ? "someone" : "**"+u.getName()+"**")+")");
         }

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

@@ -63,7 +63,12 @@ public class SkipCmd extends MusicCommand {
             msg+= skippers+" votes, "+required+"/"+listeners+" needed]`";
             if(skippers>=required)
             {
-                User u = event.getJDA().getUserById(handler.getCurrentTrack().getIdentifier());
+                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()+"**")+")");
                 handler.getPlayer().stopTrack();

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

@@ -1,140 +1,156 @@
-/*
- * 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.utils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import net.dv8tion.jda.core.entities.Guild;
-import net.dv8tion.jda.core.entities.Role;
-import net.dv8tion.jda.core.entities.TextChannel;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-
-/**
- *
- * @author John Grosh <john.a.grosh@gmail.com>
- */
-public class FinderUtil {
-    
-    public static List<TextChannel> findTextChannel(String query, Guild guild)
-    {
-        String id;
-        if(query.matches("<#\\d+>"))
-        {
-            id = query.replaceAll("<#(\\d+)>", "$1");
-            TextChannel tc = guild.getJDA().getTextChannelById(id);
-            if(tc!=null && tc.getGuild().equals(guild))
-                return Collections.singletonList(tc);
-        }
-        ArrayList<TextChannel> exact = new ArrayList<>();
-        ArrayList<TextChannel> wrongcase = new ArrayList<>();
-        ArrayList<TextChannel> startswith = new ArrayList<>();
-        ArrayList<TextChannel> contains = new ArrayList<>();
-        String lowerquery = query.toLowerCase();
-        guild.getTextChannels().stream().forEach((tc) -> {
-            if(tc.getName().equals(lowerquery))
-                exact.add(tc);
-            else if (tc.getName().equalsIgnoreCase(lowerquery) && exact.isEmpty())
-                wrongcase.add(tc);
-            else if (tc.getName().toLowerCase().startsWith(lowerquery) && wrongcase.isEmpty())
-                startswith.add(tc);
-            else if (tc.getName().toLowerCase().contains(lowerquery) && startswith.isEmpty())
-                contains.add(tc);
-        });
-        if(!exact.isEmpty())
-            return exact;
-        if(!wrongcase.isEmpty())
-            return wrongcase;
-        if(!startswith.isEmpty())
-            return startswith;
-        return contains;
-    }
-    
-    public static List<VoiceChannel> findVoiceChannel(String query, Guild guild)
-    {
-        String id;
-        if(query.matches("<#\\d+>"))
-        {
-            id = query.replaceAll("<#(\\d+)>", "$1");
-            VoiceChannel tc = guild.getJDA().getVoiceChannelById(id);
-            if(tc!=null && tc.getGuild().equals(guild))
-                return Collections.singletonList(tc);
-        }
-        ArrayList<VoiceChannel> exact = new ArrayList<>();
-        ArrayList<VoiceChannel> wrongcase = new ArrayList<>();
-        ArrayList<VoiceChannel> startswith = new ArrayList<>();
-        ArrayList<VoiceChannel> contains = new ArrayList<>();
-        String lowerquery = query.toLowerCase();
-        guild.getVoiceChannels().stream().forEach((tc) -> {
-            if(tc.getName().equals(lowerquery))
-                exact.add(tc);
-            else if (tc.getName().equalsIgnoreCase(lowerquery) && exact.isEmpty())
-                wrongcase.add(tc);
-            else if (tc.getName().toLowerCase().startsWith(lowerquery) && wrongcase.isEmpty())
-                startswith.add(tc);
-            else if (tc.getName().toLowerCase().contains(lowerquery) && startswith.isEmpty())
-                contains.add(tc);
-        });
-        if(!exact.isEmpty())
-            return exact;
-        if(!wrongcase.isEmpty())
-            return wrongcase;
-        if(!startswith.isEmpty())
-            return startswith;
-        return contains;
-    }
-    
-    public static List<Role> findRole(String query, Guild guild)
-    {
-        String id;
-        if(query.matches("<@&\\d+>"))
-        {
-            id = query.replaceAll("<@&(\\d+)>", "$1");
-            Role role = guild.getRoleById(id);
-            if(role!=null)
-                return Collections.singletonList(role);
-        }
-        if(query.matches("[Ii][Dd]\\s*:\\s*\\d+"))
-        {
-            id = query.replaceAll("[Ii][Dd]\\s*:\\s*(\\d+)", "$1");
-            for(Role role: guild.getRoles())
-                if(role.getId().equals(id))
-                    return Collections.singletonList(role);
-        }
-        ArrayList<Role> exact = new ArrayList<>();
-        ArrayList<Role> wrongcase = new ArrayList<>();
-        ArrayList<Role> startswith = new ArrayList<>();
-        ArrayList<Role> contains = new ArrayList<>();
-        String lowerQuery = query.toLowerCase();
-        guild.getRoles().stream().forEach((role) -> {
-            if(role.getName().equals(query))
-                exact.add(role);
-            else if (role.getName().equalsIgnoreCase(query) && exact.isEmpty())
-                wrongcase.add(role);
-            else if (role.getName().toLowerCase().startsWith(lowerQuery) && wrongcase.isEmpty())
-                startswith.add(role);
-            else if (role.getName().toLowerCase().contains(lowerQuery) && startswith.isEmpty())
-                contains.add(role);
-        });
-        if(!exact.isEmpty())
-            return exact;
-        if(!wrongcase.isEmpty())
-            return wrongcase;
-        if(!startswith.isEmpty())
-            return startswith;
-        return contains;
-    }
-}
+/*
+ * 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.utils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import net.dv8tion.jda.core.entities.Guild;
+import net.dv8tion.jda.core.entities.Role;
+import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.core.entities.VoiceChannel;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class FinderUtil {
+    
+    public final static String DISCORD_ID = "\\d{17,20}";
+    
+    public static List<TextChannel> findTextChannel(String query, Guild guild)
+    {
+        String id;
+        if(query.matches("<#\\d+>"))
+        {
+            id = query.replaceAll("<#(\\d+)>", "$1");
+            TextChannel tc = guild.getJDA().getTextChannelById(id);
+            if(tc!=null && tc.getGuild().equals(guild))
+                return Collections.singletonList(tc);
+        }
+        else if(query.matches(DISCORD_ID))
+        {
+            id = query;
+            TextChannel tc = guild.getJDA().getTextChannelById(id);
+            if(tc!=null && tc.getGuild().equals(guild))
+                return Collections.singletonList(tc);
+        }
+        ArrayList<TextChannel> exact = new ArrayList<>();
+        ArrayList<TextChannel> wrongcase = new ArrayList<>();
+        ArrayList<TextChannel> startswith = new ArrayList<>();
+        ArrayList<TextChannel> contains = new ArrayList<>();
+        String lowerquery = query.toLowerCase();
+        guild.getTextChannels().stream().forEach((tc) -> {
+            if(tc.getName().equals(lowerquery))
+                exact.add(tc);
+            else if (tc.getName().equalsIgnoreCase(lowerquery) && exact.isEmpty())
+                wrongcase.add(tc);
+            else if (tc.getName().toLowerCase().startsWith(lowerquery) && wrongcase.isEmpty())
+                startswith.add(tc);
+            else if (tc.getName().toLowerCase().contains(lowerquery) && startswith.isEmpty())
+                contains.add(tc);
+        });
+        if(!exact.isEmpty())
+            return exact;
+        if(!wrongcase.isEmpty())
+            return wrongcase;
+        if(!startswith.isEmpty())
+            return startswith;
+        return contains;
+    }
+    
+    public static List<VoiceChannel> findVoiceChannel(String query, Guild guild)
+    {
+        String id;
+        if(query.matches("<#\\d+>"))
+        {
+            id = query.replaceAll("<#(\\d+)>", "$1");
+            VoiceChannel vc = guild.getJDA().getVoiceChannelById(id);
+            if(vc!=null && vc.getGuild().equals(guild))
+                return Collections.singletonList(vc);
+        }
+        else if(query.matches(DISCORD_ID))
+        {
+            id = query;
+            VoiceChannel vc = guild.getJDA().getVoiceChannelById(id);
+            if(vc!=null && vc.getGuild().equals(guild))
+                return Collections.singletonList(vc);
+        }
+        ArrayList<VoiceChannel> exact = new ArrayList<>();
+        ArrayList<VoiceChannel> wrongcase = new ArrayList<>();
+        ArrayList<VoiceChannel> startswith = new ArrayList<>();
+        ArrayList<VoiceChannel> contains = new ArrayList<>();
+        String lowerquery = query.toLowerCase();
+        guild.getVoiceChannels().stream().forEach((vc) -> {
+            if(vc.getName().equals(lowerquery))
+                exact.add(vc);
+            else if (vc.getName().equalsIgnoreCase(lowerquery) && exact.isEmpty())
+                wrongcase.add(vc);
+            else if (vc.getName().toLowerCase().startsWith(lowerquery) && wrongcase.isEmpty())
+                startswith.add(vc);
+            else if (vc.getName().toLowerCase().contains(lowerquery) && startswith.isEmpty())
+                contains.add(vc);
+        });
+        if(!exact.isEmpty())
+            return exact;
+        if(!wrongcase.isEmpty())
+            return wrongcase;
+        if(!startswith.isEmpty())
+            return startswith;
+        return contains;
+    }
+    
+    public static List<Role> findRole(String query, Guild guild)
+    {
+        String id;
+        if(query.matches("<@&\\d+>"))
+        {
+            id = query.replaceAll("<@&(\\d+)>", "$1");
+            Role r = guild.getRoleById(id);
+            if(r!=null)
+                return Collections.singletonList(r);
+        }
+        else if(query.matches(DISCORD_ID))
+        {
+            id = query;
+            Role r = guild.getRoleById(id);
+            if(r!=null)
+                return Collections.singletonList(r);
+        }
+        ArrayList<Role> exact = new ArrayList<>();
+        ArrayList<Role> wrongcase = new ArrayList<>();
+        ArrayList<Role> startswith = new ArrayList<>();
+        ArrayList<Role> contains = new ArrayList<>();
+        String lowerQuery = query.toLowerCase();
+        guild.getRoles().stream().forEach((role) -> {
+            if(role.getName().equals(query))
+                exact.add(role);
+            else if (role.getName().equalsIgnoreCase(query) && exact.isEmpty())
+                wrongcase.add(role);
+            else if (role.getName().toLowerCase().startsWith(lowerQuery) && wrongcase.isEmpty())
+                startswith.add(role);
+            else if (role.getName().toLowerCase().contains(lowerQuery) && startswith.isEmpty())
+                contains.add(role);
+        });
+        if(!exact.isEmpty())
+            return exact;
+        if(!wrongcase.isEmpty())
+            return wrongcase;
+        if(!startswith.isEmpty())
+            return startswith;
+        return contains;
+    }
+}

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

@@ -30,6 +30,8 @@ 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)
@@ -51,17 +53,24 @@ public class FormatUtil {
         else
         {
             String userid = handler.getCurrentTrack().getIdentifier();
-            User user = jda.getUserById(userid);
+            User user;
+            try {
+                user = jda.getUserById(userid);
+            } catch(Exception e) {
+                user = null;
+            }
             AudioTrack track = handler.getCurrentTrack().getTrack();
             String title = track.getInfo().title;
-            if(inTopic && title.length()>30)
+            if(inTopic && !NO_PROGRESS_BAR_IN_TOPIC && title.length()>30)
                 title = title.substring(0,27)+"...";
             double progress = (double)track.getPosition()/track.getDuration();
-            String str = "**"+title+"** ["+(user==null||inTopic ? (userid==null ? "autoplay" : "<@"+userid+">") : user.getName())+"]\n\u25B6 "+progressBar(progress)
-                    +" "+(inTopic ? "" : "`")+"["+formatTime(track.getPosition()) + "/" + formatTime(track.getDuration())
-                    +"]"+(inTopic ? "" : "`")+" " +volumeIcon(handler.getPlayer().getVolume())
-                    +(inTopic ? "" : "\n**<"+track.getInfo().uri+">**");
-            return str;
+            String str = "**"+title+"** ["+(user==null||inTopic ? (userid==null ? "autoplay" : "<@"+userid+">") : user.getName())+"]";
+            String str2 = "\n\u25B6 "
+                    +(NO_PROGRESS_BAR_IN_TOPIC&&inTopic ? "["+formatTime(track.getDuration())+"] " : progressBar(progress)
+                    +" "+(inTopic ? "" : "`")+"["+formatTime(track.getPosition()) + "/" + formatTime(track.getDuration())+"]"+(inTopic ? "" : "`") + " ")
+                    +volumeIcon(handler.getPlayer().getVolume());
+            String str3 = inTopic ? "" : "\n**<"+track.getInfo().uri+">**";
+            return str+str2+str3;
         }
     }