Add new alias for delete queue and improve logic

bot.properties.example

@@ -4,9 +4,10 @@ BOT_PREFIX=
 BOT_OWNER=
 BOT_PAPISID=
 BOT_PSID=
+API_PORT=9000
 
-MYSQL_HOST=
+MYSQL_HOST=127.0.0.1
-MYSQL_USER=
+MYSQL_USER=root
 MYSQL_PASSWORD=
 MYSQL_DATABASE=
 MYSQL_PORT=3306

pom.xml

@@ -99,6 +99,12 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
@@ -118,7 +124,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
 
         <dependency>
@@ -134,7 +140,7 @@
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry</artifactId>
-            <version>5.6.3</version>
+            <version>6.0.0</version>
         </dependency>
         <dependency>
             <groupId>p6spy</groupId>
@@ -146,7 +152,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20210307</version>
+            <version>20220320</version>
         </dependency>
 
         <dependency>
@@ -158,17 +164,17 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.28</version>
+            <version>8.0.29</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.1</version>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.17.1</version>
+            <version>2.17.2</version>
         </dependency>
 
         <dependency>
@@ -176,6 +182,12 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -185,7 +197,7 @@
         <dependency>
             <groupId>org.openjdk.nashorn</groupId>
             <artifactId>nashorn-core</artifactId>
-            <version>15.3</version>
+            <version>15.4</version>
         </dependency>
 
 

sql/netneutrality_jpa.sql

@@ -1,12 +1,3 @@
--- phpMyAdmin SQL Dump
--- version 5.1.0
--- https://www.phpmyadmin.net/
---
--- Host: 127.0.0.1:3306
--- Generation Time: Mar 14, 2022 at 08:59 AM
--- Server version: 10.4.10-MariaDB
--- PHP Version: 7.4.19
-
 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
 START TRANSACTION;
 SET time_zone = "+00:00";
@@ -20,7 +11,9 @@ SET time_zone = "+00:00";
 --
 -- Database: `netneutrality`
 --
+CREATE DATABASE IF NOT EXISTS netneutrality CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
+USE netneutrality;
 -- --------------------------------------------------------
 
 --

src/main/java/netneutrality/NetNeutrality.java

@@ -38,6 +38,7 @@ public class NetNeutrality {
             options.setEnvironment(env);
             options.setTracesSampleRate(1.0);
             options.setDebug(env.equals("dev"));
+            options.setRelease("[email protected]");
         });
 
         if ("dev".equals(env)) {
@@ -49,7 +50,7 @@ public class NetNeutrality {
         CommandManager.init();
         MusicManager.initPlayerManager();
         jda.addEventListener(new MessageReceivedHandler(), new EditHandler(), new ServerJoinHandler());
-        new WebApi(9000);
+        new WebApi(Integer.parseInt(Settings.getInstance().get("API_PORT", "9000")));
         jda.getPresence().setActivity(Activity.watching("you"));
 
         Runtime.getRuntime().addShutdownHook(new BaseThreadFactory("shutdown").newThread(new ShutdownThread()));

src/main/java/netneutrality/command/music/DeleteQueueCommand.java

@@ -34,7 +34,7 @@ public class DeleteQueueCommand extends AbstractMusicCommand {
 
     @Override
     public String[] getAlias() {
-        return new String[] {"delq", "delqueue"};
+        return new String[] {"delq", "delqueue", "clear"};
     }
 
     @Override
@@ -67,8 +67,7 @@ public class DeleteQueueCommand extends AbstractMusicCommand {
             if (context.getArg(0).equals("all")) {
 
                 if (queueSize > 0) {
-                    player.leave();
+                    player.getScheduler().getQueueManager().clearQueue();
-                    player.getScheduler().getQueueManager().getQueue().clear();
                     context.reply(String.format("Removed %d track%s from the queue", queueSize--, (queueSize > 1 ? "s" : "")));
                 } else {
                     context.reply("Queue is empty!");

src/main/java/netneutrality/music/MusicManager.java

@@ -47,13 +47,14 @@ public class MusicManager {
     private final Guild guild;
     private final AudioPlayer player;
     private final TrackScheduler scheduler;
+    private TrackLoadingHandler lastLoadingHandler;
     private ScheduledFuture<?> autoDisconnectThread;
     private final int baseVolume;
 
     private MusicManager(Guild guild) {
         this.guild = guild;
         this.player = playerManager.createPlayer();
-        this.scheduler = new TrackScheduler(player, guild);
+        this.scheduler = new TrackScheduler(this);
         this.baseVolume = Integer.parseInt(GuildManager.getManager(guild).getSetting(GuildManager.Settings.MUSIC_VOLUME));
 
         guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(player));
@@ -117,10 +118,18 @@ public class MusicManager {
         return info.getRequester();
     }
 
+    protected AudioPlayer getPlayer() {
+        return player;
+    }
+
     public Guild getGuild() {
         return guild;
     }
 
+    public TrackLoadingHandler getLastLoadingHandler() {
+        return lastLoadingHandler;
+    }
+
     public synchronized void leave() {
         if (isConnected()) {
             logger.debug("Guild {}: leaving voice channel {}", guild.getId(), guild.getAudioManager().getConnectedChannel().getId());
@@ -183,64 +192,8 @@ public class MusicManager {
         scheduler.getTopicManager().attachTextChannel(channel);
 
         if (identifier != null) {
-            playerManager.loadItemOrdered(this, identifier, new AudioLoadResultHandler() {
+            lastLoadingHandler = new TrackLoadingHandler(identifier, silent, this, context);
-
+            playerManager.loadItemOrdered(this, identifier, lastLoadingHandler);
-                @Override
-                public void trackLoaded(AudioTrack audioTrack) {
-                    logger.debug("Guild {}: track loaded: {}", guild.getId(), identifier);
-                    context.deleteMessage();
-
-                    scheduler.getQueueManager().queue(audioTrack, member);
-
-                    if (!silent) {
-                        //context.replyToMessage("Added track to queue");
-                        context.reply(MessageFunction.buildAddingTrackMessage(audioTrack, member, identifier));
-                    }
-                }
-
-                @Override
-                public void playlistLoaded(AudioPlaylist audioPlaylist) {
-                    logger.debug("Guild {}: playlist loaded: {}", guild.getId(), identifier);
-                    context.deleteMessage();
-
-                    if (audioPlaylist.isSearchResult()) {
-                        AudioTrack track = audioPlaylist.getTracks().get(0);
-                        scheduler.getQueueManager().queue(track, member);
-
-                        if (!silent) {
-                            //context.replyToMessage(new MessageBuilder("Added track to queue: ").append(String.format("https://youtu.be/%s", track.getIdentifier())).build());
-                            context.reply(MessageFunction.buildAddingTrackMessage(track, member, String.format("https://youtu.be/%s", track.getIdentifier())));
-                        }
-
-                    } else {
-                        if (!silent) {
-                            //context.replyToMessage("Added playlist to queue");
-                            context.reply(MessageFunction.buildAddingPlaylistMessage(audioPlaylist, member, identifier));
-                        }
-
-                        for (AudioTrack track : audioPlaylist.getTracks()) {
-                            synchronized (scheduler.getQueueManager().getQueue()) {
-                                scheduler.getQueueManager().queue(track, member);
-                            }
-                        }
-                    }
-
-
-                }
-
-                @Override
-                public void noMatches() {
-                    logger.debug("Guild {}: no matches for identifier {}", guild.getId(), identifier);
-                    context.replyToMessage("No matches found");
-                }
-
-                @Override
-                public void loadFailed(FriendlyException e) {
-                    logger.debug("Guild {}: load failed for identifier {}", guild.getId(), identifier, e);
-                    context.replyToMessage("Failed to load track: " + e.getMessage());
-                }
-
-            });
         } else {
             context.replyToMessage("No source found to play the given url");
         }

src/main/java/netneutrality/music/QueueManager.java

@@ -87,13 +87,16 @@ public class QueueManager {
     }
 
     private final Logger logger = LoggerFactory.getLogger(QueueManager.class);
+
+    private final TrackScheduler scheduler;
     private final AudioPlayer player;
     private final Guild guild;
     private final Deque<TrackInfo> queue;
 
-    public QueueManager(AudioPlayer player, Guild guild) {
+    public QueueManager(TrackScheduler scheduler) {
-        this.player = player;
+        this.scheduler = scheduler;
-        this.guild = guild;
+        this.player = scheduler.getPlayer();
+        this.guild = scheduler.getGuild();
 
         this.queue = new LinkedBlockingDeque<>();
     }
@@ -104,10 +107,23 @@ public class QueueManager {
         }
     }
 
+    public TrackScheduler getScheduler() {
+        return scheduler;
+    }
+
     public Guild getGuild() {
         return guild;
     }
 
+    public void clearQueue() {
+        scheduler.getMusicManager().leave();
+        scheduler.getMusicManager().getLastLoadingHandler().stopLoading();
+
+        synchronized (queue) {
+            queue.clear();
+        }
+    }
+
     public ArrayList<AudioTrack> getAllQueuedTrack() {
         synchronized (queue) {
             ArrayList<AudioTrack> tracks = new ArrayList<>();

src/main/java/netneutrality/music/TopicManager.java

@@ -15,12 +15,18 @@ import java.util.concurrent.TimeUnit;
 
 public class TopicManager {
 
+    private final TrackScheduler scheduler;
     private final Guild guild;
     private TextChannel channel;
     private String originalTopic;
 
-    public TopicManager(Guild guild) {
+    public TopicManager(TrackScheduler scheduler) {
-        this.guild = guild;
+        this.scheduler = scheduler;
+        this.guild = scheduler.getGuild();
+    }
+
+    public TrackScheduler getScheduler() {
+        return scheduler;
     }
 
     public Guild getGuild() {

src/main/java/netneutrality/music/TrackLoadingHandler.java

@@ -0,0 +1,105 @@
+package netneutrality.music;
+/*
+ * Copyright (c) anthorob
+ *
+ * https://xtremcommunity.com/
+ * https://discord.gg/CdFcyQ
+ */
+
+
+import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import net.dv8tion.jda.api.entities.Guild;
+import netneutrality.core.context.CommandContext;
+import netneutrality.utils.MessageFunction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TrackLoadingHandler implements AudioLoadResultHandler {
+    private final Logger logger = LoggerFactory.getLogger(TrackLoadingHandler.class);
+
+    private final String identifier;
+    private final boolean silent;
+    private boolean loadingDisabled = false;
+    private final Guild guild;
+    private final TrackScheduler scheduler;
+    private final CommandContext  context;
+
+    public TrackLoadingHandler(String identifier, boolean silent, MusicManager manager, CommandContext context) {
+        this.identifier = identifier;
+        this.silent = silent;
+        this.guild = manager.getGuild();
+        this.scheduler = manager.getScheduler();
+        this.context = context;
+    }
+
+    public synchronized void stopLoading() {
+        logger.debug("Guild {}: stopped loading of new tracks", guild.getId());
+        loadingDisabled = true;
+    }
+
+    @Override
+    public void trackLoaded(AudioTrack audioTrack) {
+        if (loadingDisabled) {
+            return;
+        }
+
+        logger.debug("Guild {}: track loaded: {}", guild.getId(), identifier);
+        context.deleteMessage();
+
+        scheduler.getQueueManager().queue(audioTrack, context.getGuildUser());
+
+        if (!silent) {
+            //context.replyToMessage("Added track to queue");
+            context.reply(MessageFunction.buildAddingTrackMessage(audioTrack, context.getGuildUser(), identifier));
+        }
+    }
+
+    @Override
+    public void playlistLoaded(AudioPlaylist audioPlaylist) {
+        if (loadingDisabled) {
+            return;
+        }
+
+        logger.debug("Guild {}: playlist loaded: {}", guild.getId(), identifier);
+        context.deleteMessage();
+
+        if (audioPlaylist.isSearchResult()) {
+            AudioTrack track = audioPlaylist.getTracks().get(0);
+            scheduler.getQueueManager().queue(track, context.getGuildUser());
+
+            if (!silent) {
+                //context.replyToMessage(new MessageBuilder("Added track to queue: ").append(String.format("https://youtu.be/%s", track.getIdentifier())).build());
+                context.reply(MessageFunction.buildAddingTrackMessage(track, context.getGuildUser(), String.format("https://youtu.be/%s", track.getIdentifier())));
+            }
+
+        } else {
+            if (!silent) {
+                //context.replyToMessage("Added playlist to queue");
+                context.reply(MessageFunction.buildAddingPlaylistMessage(audioPlaylist, context.getGuildUser(), identifier));
+            }
+
+            for (AudioTrack track : audioPlaylist.getTracks()) {
+                synchronized (scheduler.getQueueManager().getQueue()) {
+                    scheduler.getQueueManager().queue(track, context.getGuildUser());
+                }
+            }
+        }
+
+
+    }
+
+    @Override
+    public void noMatches() {
+        logger.debug("Guild {}: no matches for identifier {}", guild.getId(), identifier);
+        context.replyToMessage("No matches found");
+    }
+
+    @Override
+    public void loadFailed(FriendlyException e) {
+        logger.debug("Guild {}: load failed for identifier {}", guild.getId(), identifier, e);
+        context.replyToMessage("Failed to load track: " + e.getMessage());
+    }
+}

src/main/java/netneutrality/music/TrackScheduler.java

@@ -17,18 +17,20 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TrackScheduler extends AudioEventAdapter {
-
     private final static Logger logger = LoggerFactory.getLogger(TrackScheduler.class);
+
     private final QueueManager queueManager;
     private final TopicManager topicManager;
+    private final MusicManager manager;
     private final AudioPlayer player;
     private final Guild guild;
 
-    public TrackScheduler(AudioPlayer player, Guild guild) {
+    public TrackScheduler(MusicManager manager) {
-        this.player = player;
+        this.manager = manager;
-        this.guild = guild;
+        this.player = manager.getPlayer();
-        this.queueManager = new QueueManager(player, guild);
+        this.guild = manager.getGuild();
-        this.topicManager = new TopicManager(guild);
+        this.queueManager = new QueueManager(this);
+        this.topicManager = new TopicManager(this);
     }
 
     public QueueManager getQueueManager() {
@@ -39,10 +41,18 @@ public class TrackScheduler extends AudioEventAdapter {
         return topicManager;
     }
 
+    public MusicManager getMusicManager() {
+        return manager;
+    }
+
     public AudioPlayer getPlayer() {
         return player;
     }
 
+    public Guild getGuild() {
+        return guild;
+    }
+
     @Override
     public void onPlayerPause(AudioPlayer player) {
         // Player was paused

src/main/resources/log4j2.properties

@@ -30,6 +30,14 @@ logger.jda.additivity = false
 logger.jda.appenderRef.rolling.ref = LogToRollingFile
 logger.jda.appenderRef.console.ref = consoleLogger
 
+logger.lavaplayer.name = com.sedmelluq.discord
+logger.lavaplayer.level = info
+logger.lavaplayer.additivity = false
+logger.lavaplayer.appenderRef.rolling.ref = LogToRollingFile
+logger.lavaplayer.appenderRef.console.ref = consoleLogger
+
+
+
 logger.app.name = netneutrality
 logger.app.level = debug
 logger.app.additivity = false

src/test/java/netneutrality/music/LoadableSourceTest.java

@@ -23,9 +23,6 @@ public class LoadableSourceTest {
         LoadableSourceManager loadableSourceManager = new LoadableSourceManager();
         CachedSource cachedSource = loadableSourceManager.get(new AppleMostPlayed());
 
-        System.out.println(cachedSource.getLastAccess());
-        System.out.println(cachedSource.getSongs());
-
         assertTrue(cachedSource.getSongs().size() > 0);
     }
 }