Merge pull request #72 from nano-devs/development

Development: Update LyricCommand and Minor fixes

build.gradle

@@ -15,6 +15,7 @@ repositories {
     mavenCentral()
     jcenter()
     maven { url 'https://jitpack.io' }
+    maven { url 'https://dl.bintray.com/sedmelluq/com.sedmelluq' }
 }
 
 dependencies {
@@ -24,6 +25,7 @@ dependencies {
     compile group: 'commons-validator', name: 'commons-validator', version: '1.4.0'
     compile 'joda-time:joda-time:2.10.6'
     implementation 'com.sedmelluq:lavaplayer:1.3.61'
+    implementation("com.sedmelluq:lavaplayer-ext-youtube-rotator:0.2.1")
     compile 'com.github.natanbc:lavadsp:0.7.4'
     implementation 'com.github.Shiroechi:YoutubeSearchApi-Java:1.2.6'
     implementation 'mysql:mysql-connector-java:8.0.21'

scripts/global_reset.sh

@@ -0,0 +1 @@
+python3 global_reset.py

scripts/run_bot.sh

@@ -0,0 +1 @@
+nohup java -jar discordbot/Nano.Jda_2020-11-23.jar &

scripts/run_mysql_server.sh

@@ -0,0 +1 @@
+ sudo mysqld --skip-grant-tables --lower-case-table-names=1  &

src/main/java/client/NanoClient.java

@@ -5,18 +5,25 @@
 import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
+import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.lava.extensions.youtuberotator.YoutubeIpRotatorSetup;
+import com.sedmelluq.lava.extensions.youtuberotator.planner.NanoIpRoutePlanner;
+import com.sedmelluq.lava.extensions.youtuberotator.tools.ip.Ipv6Block;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.TextChannel;
+import org.apache.http.client.config.RequestConfig;
 import org.jetbrains.annotations.Nullable;
 import service.music.*;
 
 import java.sql.SQLException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -36,6 +43,16 @@ public NanoClient(MusicService musicService, EventWaiter waiter) {
         this.playerManager = new DefaultAudioPlayerManager();
         AudioSourceManagers.registerRemoteSources(playerManager);
         AudioSourceManagers.registerLocalSource(playerManager);
+        this.playerManager.setHttpRequestConfigurator((config) ->
+                RequestConfig.copy(config).setConnectTimeout(10000).build());
+
+        YoutubeAudioSourceManager youtubeSource = new YoutubeAudioSourceManager();
+
+        String ipv6Block = System.getenv("ipv6block") + "/64";
+        new YoutubeIpRotatorSetup(
+                new NanoIpRoutePlanner(Collections.singletonList(new Ipv6Block(ipv6Block)), true))
+                .forSource(youtubeSource)
+                .setup();
 
         this.waiter = waiter;
     }

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

@@ -43,15 +43,15 @@ protected void execute(CommandEvent event) {
         }
         event.getGuild().getAudioManager().openAudioConnection(channel);
 
-        if (!event.getSelfMember().hasPermission(Permission.VOICE_DEAF_OTHERS) &&
-            !event.getSelfMember().getVoiceState().isDeafened()) {
-            CustomEmbedBuilder embedBuilder = new CustomEmbedBuilder();
-            embedBuilder.addField(":warning: Missing Permission: `Deafen Members`!",
-                    "Please don't undeafen me! I work better by being deafened because: " +
-                            "Less lag, more clear, better quality, and doesn't randomly disconnect",
-                    true);
-            event.reply(embedBuilder.build());
-        }
+//        if (!event.getSelfMember().hasPermission(Permission.VOICE_DEAF_OTHERS) &&
+//            !event.getSelfMember().getVoiceState().isDeafened()) {
+//            CustomEmbedBuilder embedBuilder = new CustomEmbedBuilder();
+//            embedBuilder.addField(":warning: Missing Permission: `Deafen Members`!",
+//                    "Please don't undeafen me! I work better by being deafened because: " +
+//                            "Less lag, more clear, better quality, and doesn't randomly disconnect",
+//                    true);
+//            event.reply(embedBuilder.build());
+//        }
 
         event.reply(":white_check_mark: | Connected to :loud_sound: `" + channel.getName() + "`");
     }

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

@@ -46,8 +46,9 @@ protected void execute(CommandEvent event) {
             }
         }
 
-        musicManager.player.destroy();
+        musicManager.scheduler.setInLoopState(false);
         musicManager.scheduler.getQueue().clear();
+        musicManager.player.destroy();
         nanoClient.getMusicManagers().remove(guild.getIdLong());
 
         event.getMessage().addReaction("\u23F9").queue();

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

@@ -26,6 +26,7 @@ public LyricCommand(NanoClient client)
         this.arguments = "<song-title>";
         this.help = "Get lyric for music.\n" +
                     "If `song-title` is empty, the title of the currently playing music will be used.\n";
+        this.aliases = new String[]{"lyrics"};
         this.guildOnly = true;
         this.cooldown = 2;
         this.category = new Category("Music");

src/main/java/listener/MemberVoiceListener.java

@@ -120,17 +120,17 @@ public void onGuildVoiceJoin(@NotNull GuildVoiceJoinEvent event) {
             if (event.getGuild().getSelfMember().hasPermission(Permission.VOICE_DEAF_OTHERS)) {
                 event.getMember().deafen(true).queue();
             }
-//            else {
-//                TextChannel textChannel = nanoClient.getGuildAudioPlayer(event.getGuild()).scheduler.textChannel;
-//
-//                CustomEmbedBuilder embedBuilder = new CustomEmbedBuilder();
-//                embedBuilder.addField(":warning: Missing Permission: `Deafen Members`!",
-//                        "Please don't undeafen me! I work better by being deafened because: " +
-//                                "Less lag, more clear, better quality, and doesn't randomly disconnect",
-//                        true);
-//
-//                textChannel.sendMessage(embedBuilder.build()).queue();
-//            }
+            else {
+                TextChannel textChannel = nanoClient.getGuildAudioPlayer(event.getGuild()).scheduler.textChannel;
+
+                CustomEmbedBuilder embedBuilder = new CustomEmbedBuilder();
+                embedBuilder.addField(":warning: Missing Permission: `Deafen Members`!",
+                        "Please don't undeafen me! I work better by being deafened because: " +
+                                "Less lag, more clear, better quality.",
+                        true);
+
+                textChannel.sendMessage(embedBuilder.build()).queue();
+            }
             return;
         }
 

src/main/java/service/music/MusicService.java

@@ -94,8 +94,9 @@ public void leaveVoiceChannel(Guild guild, GuildMusicManager musicManager){
         AudioManager audioManager = guild.getAudioManager();
         audioManager.closeAudioConnection();
 
-        musicManager.player.destroy();
+        musicManager.scheduler.setInLoopState(false);
         musicManager.scheduler.getQueue().clear();
+        musicManager.player.destroy();
     }
 
     public boolean isMemberInVoiceState(Member member) {