AirDog46/MusicBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use lavaplayer fork, fix update alerts, fix special case repeat mode parse

Browse Source
This commit is contained in:
John Grosh
2021-09-27 14:19:48 -04:00
parent 7273b5bf42
commit b83028fb97
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -29,10 +29,16 @@
<artifactId>JDA</artifactId> <artifactId>JDA</artifactId>
<version>4.3.0_324</version> <version>4.3.0_324</version>
</dependency> </dependency>
<dependency> <!-- using a fork of this to fix some issues faster -->
<!-- dependency>
<groupId>com.sedmelluq</groupId> <groupId>com.sedmelluq</groupId>
<artifactId>lavaplayer</artifactId> <artifactId>lavaplayer</artifactId>
<version>1.3.78</version> <version>1.3.78</version>
</dependency -->
<dependency>
<groupId>com.github.jagrosh</groupId>
<artifactId>lavaplayer</artifactId>
<version>jmusicbot-SNAPSHOT</version>
</dependency> </dependency>
<!-- this is needed, but isn't actually hosted anywhere anymore... uh --> <!-- this is needed, but isn't actually hosted anywhere anymore... uh -->
<!--dependency> <!--dependency>

5
src/main/java/com/jagrosh/jmusicbot/Listener.java
View File

@@ -71,9 +71,9 @@ public class Listener extends ListenerAdapter
{ {
bot.getThreadpool().scheduleWithFixedDelay(() -> bot.getThreadpool().scheduleWithFixedDelay(() ->
{ {
User owner = bot.getJDA().getUserById(bot.getConfig().getOwnerId()); try
if(owner!=null)
{ {
User owner = bot.getJDA().retrieveUserById(bot.getConfig().getOwnerId()).complete();
String currentVersion = OtherUtil.getCurrentVersion(); String currentVersion = OtherUtil.getCurrentVersion();
String latestVersion = OtherUtil.getLatestVersion(); String latestVersion = OtherUtil.getLatestVersion();
if(latestVersion!=null && !currentVersion.equalsIgnoreCase(latestVersion)) if(latestVersion!=null && !currentVersion.equalsIgnoreCase(latestVersion))
@@ -82,6 +82,7 @@ public class Listener extends ListenerAdapter
owner.openPrivateChannel().queue(pc -> pc.sendMessage(msg).queue()); owner.openPrivateChannel().queue(pc -> pc.sendMessage(msg).queue());
} }
} }
catch(Exception ex) {} // ignored
}, 0, 24, TimeUnit.HOURS); }, 0, 24, TimeUnit.HOURS);
} }
} }

2
src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java
View File

@@ -43,7 +43,7 @@ public class SettingsManager implements GuildSettingsManager
JSONObject o = loadedSettings.getJSONObject(id); JSONObject o = loadedSettings.getJSONObject(id);
// Legacy version support: On versions 0.3.3 and older, the repeat mode was represented as a boolean. // Legacy version support: On versions 0.3.3 and older, the repeat mode was represented as a boolean.
if (o.has("repeat") && o.getBoolean("repeat")) if (!o.has("repeat_mode") && o.has("repeat") && o.getBoolean("repeat"))
o.put("repeat_mode", RepeatMode.ALL); o.put("repeat_mode", RepeatMode.ALL);