Merge pull request #64 from nano-devs/development

SaveQueue Development

src/main/java/Main.java

@@ -3,14 +3,17 @@
 import com.jagrosh.jdautilities.command.CommandClient;
 import com.jagrosh.jdautilities.command.CommandClientBuilder;
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
-import command.*;
-import command.UserPlaylistCommand.CreatePlaylistCommand;
 import command.general.CustomPrefixCommand;
 import command.general.HelpCommand;
 import command.general.InviteCommand;
 import command.general.VoteCommand;
 import command.history.UserHistoryCommand;
+import command.music.*;
 import command.owner.ChangePresenceCommand;
+import command.owner.NotifyMaintenanceCommand;
+import command.owner.PremiumUserCommand;
+import command.owner.ShutdownCommand;
+import listener.GuildEventListener;
 import listener.MemberVoiceListener;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
@@ -38,7 +41,7 @@ public static void main(String[] args) {
         int coreThreadPoolSize =  availableProcessors - 1 > 0 ? availableProcessors - 1 : 1;
         String botToken = System.getenv("SAN_TOKEN");
         String ytToken = System.getenv("DEVELOPER_KEY");
-        String dblToken = System.getenv("DBL_TOKEN");
+        String dblToken = System.getenv("DBL_TOKEN_2");
         String prefix = "m$";
 
         // Initialize Dependencies
@@ -60,9 +63,12 @@ public static void main(String[] args) {
         commandClientBuilder.setActivity(Activity.listening("m$help"));
         commandClientBuilder.useHelpBuilder(false);
         commandClientBuilder.setGuildSettingsManager(nano);
+        commandClientBuilder.setScheduleExecutor(exec);
 
         // Add Command & Inject Dependencies.
         // Free Commands
+        commandClientBuilder.addCommand(new NotifyMaintenanceCommand());
+        commandClientBuilder.addCommand(new ShutdownCommand());
         commandClientBuilder.addCommand(new VoteCommand(nano));
         commandClientBuilder.addCommand(new InviteCommand());
         commandClientBuilder.addCommand(new CustomPrefixCommand());
@@ -83,28 +89,29 @@ public static void main(String[] args) {
         commandClientBuilder.addCommand(new ShuffleCommand(nano));
         commandClientBuilder.addCommand(new RecommendationCommand(nano, youtubeClient));
         commandClientBuilder.addCommand(new LyricCommand(nano));
+        commandClientBuilder.addCommand(new SaveQueueToPlaylistCommand());
         commandClientBuilder.addCommand(new PremiumUserCommand());
         commandClientBuilder.addCommand(new UserHistoryCommand());
-        commandClientBuilder.addCommand(new CreatePlaylistCommand());
-        commandClientBuilder.addCommand(new command.UserPlaylistCommand.RenamePlaylistCommand());
-        commandClientBuilder.addCommand(new command.UserPlaylistCommand.DeletePlaylistCommand());
-        commandClientBuilder.addCommand(new command.UserPlaylistCommand.ShowPlaylistCommand());
-        commandClientBuilder.addCommand(new command.UserPlaylistCommand.AddTrackToPlaylistCommand(youtubeClient));
-        commandClientBuilder.addCommand(new command.UserPlaylistCommand.DeleteTrackFromPlaylistCommand());
-        commandClientBuilder.addCommand(new command.UserPlaylistCommand.ShowPlaylistTrackCommand());
-        commandClientBuilder.addCommand(new command.UserPlaylistCommand.PlayPlaylistCommand(nano));
+        commandClientBuilder.addCommand(new command.playlist.user.CreatePlaylistCommand());
+        commandClientBuilder.addCommand(new command.playlist.user.RenamePlaylistCommand());
+        commandClientBuilder.addCommand(new command.playlist.user.DeletePlaylistCommand());
+        commandClientBuilder.addCommand(new command.playlist.user.ShowPlaylistCommand());
+        commandClientBuilder.addCommand(new command.playlist.user.AddTrackToPlaylistCommand(youtubeClient));
+        commandClientBuilder.addCommand(new command.playlist.user.DeleteTrackFromPlaylistCommand());
+        commandClientBuilder.addCommand(new command.playlist.user.ShowPlaylistTrackCommand());
+        commandClientBuilder.addCommand(new command.playlist.user.PlayPlaylistCommand(nano));
 
         // Premium Guild Commands
 //        commandClientBuilder.addCommand(new PremiumGuildCommand());
 //        commandClientBuilder.addCommand(new GuildHistoryCommand(nano));
-//        commandClientBuilder.addCommand(new command.GuildPlaylistCommand.CreatePlaylistCommand());
-//        commandClientBuilder.addCommand(new command.GuildPlaylistCommand.RenamePlaylistCommand());
-//        commandClientBuilder.addCommand(new command.GuildPlaylistCommand.DeletePlaylistCommand());
-//        commandClientBuilder.addCommand(new command.GuildPlaylistCommand.ShowPlaylistCommand());
-//        commandClientBuilder.addCommand(new command.GuildPlaylistCommand.AddTrackToPlaylistCommand());
-//        commandClientBuilder.addCommand(new command.GuildPlaylistCommand.DeleteTrackFromPlaylistCommand());
-//        commandClientBuilder.addCommand(new command.GuildPlaylistCommand.ShowPlaylistTrackCommand());
-//        commandClientBuilder.addCommand(new command.GuildPlaylistCommand.PlayPlaylistCommand(nano));
+//        commandClientBuilder.addCommand(new command.playlist.guild.CreatePlaylistCommand());
+//        commandClientBuilder.addCommand(new command.playlist.guild.RenamePlaylistCommand());
+//        commandClientBuilder.addCommand(new command.playlist.guild.DeletePlaylistCommand());
+//        commandClientBuilder.addCommand(new command.playlist.guild.ShowPlaylistCommand());
+//        commandClientBuilder.addCommand(new command.playlist.guild.AddTrackToPlaylistCommand());
+//        commandClientBuilder.addCommand(new command.playlist.guild.DeleteTrackFromPlaylistCommand());
+//        commandClientBuilder.addCommand(new command.playlist.guild.ShowPlaylistTrackCommand());
+//        commandClientBuilder.addCommand(new command.playlist.guild.PlayPlaylistCommand(nano));
 
         // Owner's commands
         commandClientBuilder.addCommand(new ChangePresenceCommand());
@@ -124,7 +131,7 @@ public static void main(String[] args) {
         builder.addEventListeners(commandClient);
         builder.addEventListeners(nano.getWaiter());
         builder.addEventListeners(new MemberVoiceListener(nano, exec));
-//        builder.addEventListeners(new GuildEventListener(dblApi, commandClient));
+        builder.addEventListeners(new GuildEventListener(dblApi, commandClient));
 
         try {
             JDA jda = builder.build();
@@ -133,14 +140,14 @@ public static void main(String[] args) {
             e.printStackTrace();
         }
 
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            @Override
-            public void run() {
-                System.out.println("Shutting down scheduled thread pool executor!");
-                exec.shutdown();
-                super.run();
-            }
-        });
+//        Runtime.getRuntime().addShutdownHook(new Thread() {
+//            @Override
+//            public void run() {
+////                System.out.println("Shutting down scheduled thread pool executor!");
+////                exec.shutdown();
+//                super.run();
+//            }
+//        });
     }
 
     private static void configureMemoryUsage(JDABuilder builder) {

src/main/java/command/general/HelpCommand.java

@@ -66,7 +66,7 @@ private CustomEmbedBuilder getHelpEmbedBuilder(CommandClient commandClient, JDA
             String categoryValue = "`" + command.getName() + "`, ";
 
             // Use the temporary memory for Main Embed
-            if (currentCategoryName.equals("Owner"))
+            if (currentCategoryName.equals("**Owner**"))
                 continue;
 
             if (!dictionary.containsKey(currentCategoryName)) {

src/main/java/command/general/InviteCommand.java

@@ -18,7 +18,7 @@ public InviteCommand() {
 
     @Override
     protected void execute(CommandEvent event) {
-        String inviteLink = "https://discord.com/api/oauth2/authorize?client_id=473023109666963467&permissions=36793408&scope=bot";
+        String inviteLink = "[invite link](https://discord.com/api/oauth2/authorize?client_id=473023109666963467&permissions=36793408&scope=bot)";
         CustomEmbedBuilder embedBuilder = new CustomEmbedBuilder();
         embedBuilder.setAuthor("Invite " + event.getSelfUser().getName(),
                 event.getAuthor().getEffectiveAvatarUrl(),
@@ -27,7 +27,6 @@ protected void execute(CommandEvent event) {
         embedBuilder.setFooter("Have a nice dayy~");
         embedBuilder.addField("Here is the invite link!", inviteLink, true);
         embedBuilder.setThumbnail(event.getSelfUser().getAvatarUrl());
-        embedBuilder.setColor(event.getMember().getColor());
         event.reply(embedBuilder.build());
     }
 }

src/main/java/command/general/VoteCommand.java

@@ -3,6 +3,7 @@
 import client.NanoClient;
 import com.jagrosh.jdautilities.command.Command;
 import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jdautilities.command.impl.CommandClientImpl;
 import database.Entity.ClassicUser;
 import database.UserModel;
 import service.music.CustomEmbedBuilder;
@@ -13,7 +14,7 @@
 import java.util.concurrent.CompletableFuture;
 
 public class VoteCommand extends Command {
-
+    CommandClientImpl impl;
     NanoClient nanoClient;
 
     public VoteCommand(NanoClient nanoClient) {
@@ -40,6 +41,7 @@ protected void execute(CommandEvent event) {
         }
 
         if (classicUser == null) {
+            classicUser = new ClassicUser(event.getAuthor().getIdLong(), 1, 3);
             CompletableFuture.runAsync(() -> {
                 try {
                     userModel.create(event.getAuthor().getIdLong(), 3, 1);

src/main/java/command/DjModeCommand.java → src/main/java/command/music/DjModeCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import client.NanoClient;
 import com.jagrosh.jdautilities.command.Command;

src/main/java/command/JoinCommand.java → src/main/java/command/music/JoinCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import client.NanoClient;
 import com.jagrosh.jdautilities.command.Command;

src/main/java/command/LeaveCommand.java → src/main/java/command/music/LeaveCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import client.NanoClient;
 import com.jagrosh.jdautilities.command.Command;

src/main/java/command/LyricCommand.java → src/main/java/command/music/LyricCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import YouTubeSearchApi.utility.Utils;
 import client.NanoClient;

src/main/java/command/NowPlayCommand.java → src/main/java/command/music/NowPlayCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import client.NanoClient;
 import com.jagrosh.jdautilities.command.Command;

src/main/java/command/PauseCommand.java → src/main/java/command/music/PauseCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import client.NanoClient;
 import com.jagrosh.jdautilities.command.Command;

src/main/java/command/PlayCommand.java → src/main/java/command/music/PlayCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import client.NanoClient;
 import com.jagrosh.jdautilities.command.Command;

src/main/java/command/PlayUrlCommand.java → src/main/java/command/music/PlayUrlCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import client.NanoClient;
 import com.jagrosh.jdautilities.command.Command;

src/main/java/command/RecommendationCommand.java → src/main/java/command/music/RecommendationCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import YouTubeSearchApi.YoutubeClient;
 import YouTubeSearchApi.entity.YoutubePlaylist;

src/main/java/command/RepeatCommand.java → src/main/java/command/music/RepeatCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import client.NanoClient;
 import com.jagrosh.jdautilities.command.Command;

src/main/java/command/ResumeCommand.java → src/main/java/command/music/ResumeCommand.java

@@ -1,4 +1,4 @@
-package command;
+package command.music;
 
 import client.NanoClient;
 import com.jagrosh.jdautilities.command.Command;