Added error messages for the PlayCommand

Commentarii-Core/pom.xml

@@ -54,7 +54,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-alpha.17</version>
+            <version>5.0.0</version>
         </dependency>
 
         <!-- Logging -->
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>32.0.0-android</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.sedmelluq/lavaplayer -->

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/Commentarii.java

@@ -21,7 +21,7 @@
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.events.ReadyEvent;
+import net.dv8tion.jda.api.events.session.ReadyEvent;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
 import org.slf4j.Logger;
@@ -88,7 +88,7 @@ private Commentarii() throws LoginException, InterruptedException, IOException {
         this.buildListeners();
         this.buildCommands();
 
-        new LogListener().onReady(new ReadyEvent(this.jda, 0));
+        new LogListener().onReady(new ReadyEvent(this.jda));
     }
 
     /**

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/ApplyChannelCommand.java

@@ -5,8 +5,8 @@
 import eu.cyzetlc.commentarii.service.command.annotation.CommandSpecification;
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
-import net.dv8tion.jda.api.entities.GuildChannel;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/ApplyCommand.java

@@ -5,7 +5,7 @@
 import eu.cyzetlc.commentarii.service.command.Command;
 import eu.cyzetlc.commentarii.service.command.annotation.CommandSpecification;
 import eu.cyzetlc.commentarii.service.entities.User;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 
 @CommandSpecification(

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/BroadcastCommand.java

@@ -6,7 +6,7 @@
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/GuildCommand.java

@@ -5,7 +5,7 @@
 import eu.cyzetlc.commentarii.service.command.annotation.CommandSpecification;
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 
 import java.awt.*;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/InfoCommand.java

@@ -7,7 +7,7 @@
 import eu.cyzetlc.commentarii.service.command.annotation.CommandSpecification;
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 
 import java.awt.*;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/LanguageCommand.java

@@ -5,7 +5,7 @@
 import eu.cyzetlc.commentarii.service.command.annotation.CommandSpecification;
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/LogChannelCommand.java

@@ -5,8 +5,8 @@
 import eu.cyzetlc.commentarii.service.command.annotation.CommandSpecification;
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
-import net.dv8tion.jda.api.entities.GuildChannel;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/PingCommand.java

@@ -1,12 +1,10 @@
 package eu.cyzetlc.commentarii.commands;
 
-import eu.cyzetlc.commentarii.buttons.InviteMeButton;
-import eu.cyzetlc.commentarii.buttons.VisiteWebsiteButton;
 import eu.cyzetlc.commentarii.service.command.Command;
 import eu.cyzetlc.commentarii.service.command.annotation.CommandSpecification;
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 
 import java.awt.*;
@@ -15,7 +13,6 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDateTime;
-import java.util.List;
 
 @CommandSpecification(
         command = "ping",

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/ResendCommand.java

@@ -6,7 +6,7 @@
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 
 import java.awt.*;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/SetupVerifyCommand.java

@@ -6,7 +6,7 @@
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/ViewLogCommand.java

@@ -4,7 +4,7 @@
 import eu.cyzetlc.commentarii.service.command.annotation.CommandSpecification;
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/music/PlayCommand.java

@@ -2,30 +2,23 @@
 
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import eu.cyzetlc.commentarii.Commentarii;
-import eu.cyzetlc.commentarii.buttons.InviteMeButton;
-import eu.cyzetlc.commentarii.buttons.VisiteWebsiteButton;
+import eu.cyzetlc.commentarii.service.audio.GuildMusicHandler;
 import eu.cyzetlc.commentarii.service.audio.PlayerHandler;
 import eu.cyzetlc.commentarii.service.command.Command;
 import eu.cyzetlc.commentarii.service.command.annotation.CommandSpecification;
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
-import eu.cyzetlc.commentarii.service.log.LogHandler;
 import net.dv8tion.jda.api.audio.SpeakingMode;
-import net.dv8tion.jda.api.entities.AudioChannel;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.managers.AudioManager;
 
 import java.awt.*;
-import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
-import java.time.LocalDateTime;
-import java.util.List;
 
 @CommandSpecification(
         command = "play",
@@ -44,6 +37,13 @@ public void onCommand(User user, SlashCommandInteractionEvent event, TextChannel
         AudioChannel connectedChannel = event.getMember().getVoiceState().getChannel();
         if (connectedChannel != null) {
             AudioManager audioManager = event.getGuild().getAudioManager();
+
+            audioManager.closeAudioConnection();
+
+            final GuildMusicHandler musicHandler = PlayerHandler.getInstance().getMusicManager(audioManager.getGuild());
+            musicHandler.scheduler.player.stopTrack();
+            musicHandler.scheduler.queue.clear();
+
             audioManager.openAudioConnection(connectedChannel);
             audioManager.setSpeakingMode(SpeakingMode.VOICE);
 
@@ -57,7 +57,8 @@ public void onCommand(User user, SlashCommandInteractionEvent event, TextChannel
                     .loadAndPlay(Commentarii.getInstance().getLogHandler().getLogChannelOfGuild(event.getGuild().getIdLong()),
                             link,
                             (AudioTrack track) -> this.sendEmbed(Embed.getEmbed(Commentarii.getInstance().getMessageHandler().getMessageForGuild(channel.getGuild().getIdLong(), "commentarii.log.music_play.title"), Commentarii.getInstance().getMessageHandler().getMessageForGuild(channel.getGuild().getIdLong(), "commentarii.log.music_play.content", track.getInfo().title, track.getInfo().author), Color.GREEN)),
-                            (playlist) -> this.sendEmbed(Embed.getEmbed(Commentarii.getInstance().getMessageHandler().getMessageForGuild(channel.getGuild().getIdLong(), "commentarii.log.music_playlist_play.title"), Commentarii.getInstance().getMessageHandler().getMessageForGuild(channel.getGuild().getIdLong(), "commentarii.log.music_playlist_play.content", playlist.getName(), playlist.getTracks().size()+""), Color.GREEN)));
+                            (playlist) -> this.sendEmbed(Embed.getEmbed(Commentarii.getInstance().getMessageHandler().getMessageForGuild(channel.getGuild().getIdLong(), "commentarii.log.music_playlist_play.title"), Commentarii.getInstance().getMessageHandler().getMessageForGuild(channel.getGuild().getIdLong(), "commentarii.log.music_playlist_play.content", playlist.getName(), playlist.getTracks().size()+""), Color.GREEN)),
+                            (message) -> this.sendEmbed(Embed.getEmbed(Commentarii.getInstance().getMessageHandler().getMessageForGuild(channel.getGuild().getIdLong(), "commentarii.log.music_failed.title"), message, Color.RED)));
         } else {
             this.sendMessage(Commentarii.getInstance().getMessageHandler().getMessageForGuild(event.getGuild().getIdLong(), "commentarii.command.play.not_in_channel"));
         }

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/music/SkipCommand.java

@@ -8,14 +8,12 @@
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
 import net.dv8tion.jda.api.audio.SpeakingMode;
-import net.dv8tion.jda.api.entities.AudioChannel;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.managers.AudioManager;
 
 import java.awt.*;
-import java.net.URI;
-import java.net.URISyntaxException;
 
 @CommandSpecification(
         command = "skip",

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/commands/music/StopCommand.java

@@ -1,16 +1,14 @@
 package eu.cyzetlc.commentarii.commands.music;
 
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import eu.cyzetlc.commentarii.Commentarii;
 import eu.cyzetlc.commentarii.service.audio.GuildMusicHandler;
 import eu.cyzetlc.commentarii.service.audio.PlayerHandler;
 import eu.cyzetlc.commentarii.service.command.Command;
 import eu.cyzetlc.commentarii.service.command.annotation.CommandSpecification;
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.entities.User;
-import net.dv8tion.jda.api.audio.SpeakingMode;
-import net.dv8tion.jda.api.entities.AudioChannel;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.managers.AudioManager;
 
@@ -27,8 +25,7 @@ public void onCommand(User user, SlashCommandInteractionEvent event, TextChannel
         AudioChannel connectedChannel = event.getMember().getVoiceState().getChannel();
         if (connectedChannel != null) {
             AudioManager audioManager = event.getGuild().getAudioManager();
-            audioManager.openAudioConnection(connectedChannel);
-            audioManager.setSpeakingMode(SpeakingMode.VOICE);
+            audioManager.closeAudioConnection();
 
             final GuildMusicHandler musicHandler = PlayerHandler.getInstance().getMusicManager(audioManager.getGuild());
             musicHandler.scheduler.player.stopTrack();

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/listener/LogListener.java

@@ -1,15 +1,11 @@
 package eu.cyzetlc.commentarii.listener;
 
 import eu.cyzetlc.commentarii.Commentarii;
-import eu.cyzetlc.commentarii.service.audio.PlayerHandler;
 import eu.cyzetlc.commentarii.service.log.LogHandler;
 import lombok.Getter;
-import net.dv8tion.jda.api.audio.SpeakingMode;
-import net.dv8tion.jda.api.entities.AudioChannel;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Invite;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.events.channel.ChannelCreateEvent;
 import net.dv8tion.jda.api.events.channel.ChannelDeleteEvent;
 import net.dv8tion.jda.api.events.channel.update.*;
@@ -20,10 +16,9 @@
 import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleRemoveEvent;
 import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateNicknameEvent;
 import net.dv8tion.jda.api.events.guild.update.GuildUpdateNameEvent;
-import net.dv8tion.jda.api.events.guild.voice.GuildVoiceJoinEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
+import net.dv8tion.jda.api.events.session.ReadyEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import net.dv8tion.jda.api.managers.AudioManager;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.LinkedHashMap;
@@ -39,12 +34,12 @@ public void onReady(@NotNull ReadyEvent event) {
         Commentarii.getInstance().getCommandHandler().updateCommands(Commentarii.getInstance().getJda().getGuilds().get(0));
 
         for (Guild guild : Commentarii.getInstance().getJda().getGuilds()) {
-            Commentarii.getInstance().getLogHandler().log(
+            /*Commentarii.getInstance().getLogHandler().log(
                     Commentarii.getInstance().getMessageHandler().getMessageForGuild(guild.getIdLong(), "commentarii.log.started.title"),
                     Commentarii.getInstance().getMessageHandler().getMessageForGuild(guild.getIdLong(), "commentarii.log.started.content", String.valueOf(Commentarii.getStated()/1000)),
                     LogHandler.LogLevel.INFO,
                     guild.getIdLong()
-            );
+            );*/
         }
     }
 

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/modals/ApplyModal.java

@@ -4,7 +4,7 @@
 import eu.cyzetlc.commentarii.service.entities.Embed;
 import eu.cyzetlc.commentarii.service.modal.Modal;
 import eu.cyzetlc.commentarii.service.modal.annotation.ModalSpecification;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.text.TextInput;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/service/apply/ApplyHandler.java

@@ -3,7 +3,7 @@
 import eu.cyzetlc.commentarii.Commentarii;
 import lombok.Getter;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 
 import javax.sql.rowset.CachedRowSet;
 import java.sql.SQLException;

Commentarii-Core/src/main/java/eu/cyzetlc/commentarii/service/audio/AudioPlayerSendHandler.java

@@ -27,7 +27,12 @@ public AudioPlayerSendHandler(AudioPlayer audioPlayer) {
     @Override
     // Checking if the audio player can provide audio.
     public boolean canProvide() {
-        return this.audioPlayer.provide(this.frame);
+        try {
+            return this.audioPlayer.provide(this.frame);
+        } catch (Exception e) {
+
+        }
+        return false;
     }
 
     @Nullable