diff --git a/pom.xml b/pom.xml index 99df7a5..058e058 100644 --- a/pom.xml +++ b/pom.xml @@ -28,15 +28,23 @@ net.dv8tion JDA - 3.5.0_327 + 3.8.1_437 com.squareup.okhttp3 okhttp - 3.9.1 + 3.11.0 + + + org.json + json + 20180813 + + + org.reflections reflections @@ -72,7 +80,7 @@ com.sedmelluq lavaplayer - 1.2.51 + 1.3.10 junit diff --git a/src/main/java/netneutrality/MusicBot.java b/src/main/java/netneutrality/MusicBot.java index ab30ea3..34e9221 100644 --- a/src/main/java/netneutrality/MusicBot.java +++ b/src/main/java/netneutrality/MusicBot.java @@ -12,7 +12,6 @@ import netneutrality.handler.LogHandler; import netneutrality.handler.NewCommandListener; import netneutrality.http.server.WebApi; import netneutrality.music.MusicManager; -import netneutrality.utils.Settings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/netneutrality/http/WebModule.java b/src/main/java/netneutrality/http/WebModule.java index 22d6bb5..28d0ca9 100644 --- a/src/main/java/netneutrality/http/WebModule.java +++ b/src/main/java/netneutrality/http/WebModule.java @@ -5,6 +5,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; + import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/src/main/java/netneutrality/music/AudioPlayerSendHandler.java b/src/main/java/netneutrality/music/AudioPlayerSendHandler.java index 0db92a7..6af2974 100644 --- a/src/main/java/netneutrality/music/AudioPlayerSendHandler.java +++ b/src/main/java/netneutrality/music/AudioPlayerSendHandler.java @@ -41,7 +41,7 @@ public class AudioPlayerSendHandler implements AudioSendHandler { lastFrame = audioPlayer.provide(); } - byte[] data = lastFrame != null ? lastFrame.data : null; + byte[] data = lastFrame != null ? lastFrame.getData() : null; lastFrame = null; return data; diff --git a/src/main/java/netneutrality/utils/MessageFunction.java b/src/main/java/netneutrality/utils/MessageFunction.java index e2abd35..0bdd585 100644 --- a/src/main/java/netneutrality/utils/MessageFunction.java +++ b/src/main/java/netneutrality/utils/MessageFunction.java @@ -48,7 +48,7 @@ public class MessageFunction { message.setTitle("Adding track to queue.."); message.setColor(Color.BLUE); message.addField("Track title :", track.getInfo().title, false); - message.setFooter("Requested by " + user.getUser().getName(), ""); + message.setFooter("Requested by " + user.getUser().getName(), user.getUser().getAvatarUrl()); message.setTimestamp(OffsetDateTime.now()); return message.build();