Skip to content

Commit 3558c46

Browse files
noxianwillfactory-droid[bot]
authored andcommitted
Upgrade to JDA 5.6.1 to fix Discord voice encryption
- Discord deprecated xsalsa20_poly1305 encryption modes on Nov 18, 2024 - Bot now supports aead_xchacha20_poly1305_rtpsize encryption - Updated JDA 4.4.1_353 -> 5.6.1 - Replaced jda-utilities with jda-chewtils (JDA 5 compatible) - Updated lavaplayer 2.2.1 -> 2.2.4 - Updated youtube source 1.5.2 -> 1.13.3 - Updated logback 1.2.13 -> 1.5.18 - Fixed bot status not updating to configured value on startup Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
1 parent 8a7240a commit 3558c46

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.jagrosh.jmusicbot.settings.SettingsManager;
2828
import java.util.Objects;
2929
import net.dv8tion.jda.api.JDA;
30+
import net.dv8tion.jda.api.OnlineStatus;
3031
import net.dv8tion.jda.api.entities.Activity;
3132
import net.dv8tion.jda.api.entities.Guild;
3233

@@ -121,6 +122,9 @@ public void resetGame()
121122
Activity game = config.getGame()==null || config.getGame().getName().equalsIgnoreCase("none") ? null : config.getGame();
122123
if(!Objects.equals(jda.getPresence().getActivity(), game))
123124
jda.getPresence().setActivity(game);
125+
OnlineStatus status = config.getStatus();
126+
if(status != OnlineStatus.UNKNOWN && jda.getPresence().getStatus() != status)
127+
jda.getPresence().setStatus(status);
124128
}
125129

126130
public void shutdown()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.jagrosh.jmusicbot.utils.OtherUtil;
3131
import java.awt.Color;
3232
import java.util.Arrays;
33-
import javax.security.auth.login.LoginException;
3433
import net.dv8tion.jda.api.*;
3534
import net.dv8tion.jda.api.entities.Activity;
3635
import net.dv8tion.jda.api.requests.GatewayIntent;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public void onReady(ReadyEvent event)
8585
catch(Exception ignored) {} // ignored
8686
}, 0, 24, TimeUnit.HOURS);
8787
}
88+
bot.resetGame();
8889
}
8990

9091
@Override

src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ protected void execute(CommandEvent event)
4949
{
5050
Settings s = event.getClient().getSettingsFor(event.getGuild());
5151
MessageCreateBuilder builder = new MessageCreateBuilder()
52-
.setContent(EMOJI + " **" +
53-
FormatUtil.filter(event.getSelfUser().getName()) +
54-
"** settings:");
52+
.addContent(EMOJI + " **")
53+
.addContent(FormatUtil.filter(event.getSelfUser().getName()))
54+
.addContent("** settings:");
5555
TextChannel tchan = s.getTextChannel(event.getGuild());
5656
VoiceChannel vchan = s.getVoiceChannel(event.getGuild());
5757
Role role = s.getRole(event.getGuild());

0 commit comments

Comments
 (0)