fix npe and an import (jagrosh#1567)

* fix npe and an import * stop double posting * switched stacktrace to log, changed some logs

Author: jagrosh

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

@@ -20,7 +20,6 @@
 import com.jagrosh.jmusicbot.settings.QueueType;
 import com.jagrosh.jmusicbot.utils.TimeUtil;
 import com.jagrosh.jmusicbot.settings.RepeatMode;
-import com.jagrosh.jmusicbot.utils.OtherUtil;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;

src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java

@@ -18,17 +18,22 @@
 import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
+import com.jagrosh.jmusicbot.audio.RequestMetadata;
 import com.jagrosh.jmusicbot.commands.DJCommand;
 import com.jagrosh.jmusicbot.commands.MusicCommand;
 import com.jagrosh.jmusicbot.utils.TimeUtil;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
  * @author Whew., Inc.
  */
 public class SeekCmd extends MusicCommand
 {
+ private final static Logger LOG = LoggerFactory.getLogger("Seeking");
+ 
  public SeekCmd(Bot bot)
  {
  super(bot);
@@ -52,7 +57,7 @@ public void doCommand(CommandEvent event)
  }
 
 
- if (!DJCommand.checkDJPermission(event) && playingTrack.getUserData(Long.class) != event.getAuthor().getIdLong())
+ if (!DJCommand.checkDJPermission(event) && playingTrack.getUserData(RequestMetadata.class).getOwner() != event.getAuthor().getIdLong())
  {
  event.replyError("You cannot seek **" + playingTrack.getInfo().title + "** because you didn't add it!");
  return;
@@ -73,19 +78,18 @@ public void doCommand(CommandEvent event)
  if (seekMilliseconds > trackDuration)
  {
  event.replyError("Cannot seek to `" + TimeUtil.formatTime(seekMilliseconds) + "` because the current track is `" + TimeUtil.formatTime(trackDuration) + "` long!");
+ return;
+ }
+ 
+ try
+ {
+ playingTrack.setPosition(seekMilliseconds);
  }
- else
+ catch (Exception e)
  {
- try
- {
- playingTrack.setPosition(seekMilliseconds);
- }
- catch (Exception e)
- {
- event.replyError("An error occurred while trying to seek!");
- e.printStackTrace();
- return;
- }
+ event.replyError("An error occurred while trying to seek: " + e.getMessage());
+ LOG.warn("Failed to seek track " + playingTrack.getIdentifier(), e);
+ return;
  }
  event.replySuccess("Successfully seeked to `" + TimeUtil.formatTime(playingTrack.getPosition()) + "/" + TimeUtil.formatTime(playingTrack.getDuration()) + "`!");
  }

src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java

@@ -24,6 +24,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -32,6 +33,7 @@
  */
 public class SettingsManager implements GuildSettingsManager<Settings>
 {
+ private final static Logger LOG = LoggerFactory.getLogger("Settings");
  private final static String SETTINGS_FILE = "serversettings.json";
  private final HashMap<Long,Settings> settings;
 
@@ -63,17 +65,17 @@ public SettingsManager()
  } catch (NoSuchFileException e) {
  // create an empty json file
  try {
- LoggerFactory.getLogger("Settings").info("serversettings.json will be created in " + OtherUtil.getPath("serversettings.json").toAbsolutePath());
+ LOG.info("serversettings.json will be created in " + OtherUtil.getPath("serversettings.json").toAbsolutePath());
  Files.write(OtherUtil.getPath("serversettings.json"), new JSONObject().toString(4).getBytes());
  } catch(IOException ex) {
- LoggerFactory.getLogger("Settings").warn("Failed to create new settings file: "+ex);
+ LOG.warn("Failed to create new settings file: "+ex);
  }
  return;
  } catch(IOException | JSONException e) {
- LoggerFactory.getLogger("Settings").warn("Failed to load server settings: "+e);
+ LOG.warn("Failed to load server settings: "+e);
  }
 
- LoggerFactory.getLogger("Settings").info("serversettings.json loaded from " + OtherUtil.getPath("serversettings.json").toAbsolutePath());
+ LOG.info("serversettings.json loaded from " + OtherUtil.getPath("serversettings.json").toAbsolutePath());
  }
 
  /**
@@ -127,7 +129,7 @@ protected void writeSettings()
  try {
  Files.write(OtherUtil.getPath(SETTINGS_FILE), obj.toString(4).getBytes());
  } catch(IOException ex){
- LoggerFactory.getLogger("Settings").warn("Failed to write to file: "+ex);
+ LOG.warn("Failed to write to file: "+ex);
  }
  }
 }

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

@@ -224,7 +224,9 @@ public static String getUnsupportedBotReason(JDA jda)
  ApplicationInfo info = jda.retrieveApplicationInfo().complete();
  if (info.isBotPublic())
  return "\"Public Bot\" is enabled. Using JMusicBot as a public bot is not supported. Please disable it in the "
- + "Developer Dashboard at https://discord.com/developers/applications/" + jda.getSelfUser().getId() + "/bot.";
+ + "Developer Dashboard at https://discord.com/developers/applications/" + jda.getSelfUser().getId() + "/bot ."
+ + "You may also need to disable all Installation Contexts at https://discord.com/developers/applications/" 
+ + jda.getSelfUser().getId() + "/installation .";
 
  return null;
  }