tobby48 4 years ago
parent
commit
0466b3eed5

+ 6
- 4
src/main/java/kr/co/swh/lecture/opensource/project/discode/music/PlayerManager.java View File

@@ -1,6 +1,8 @@
1 1
 package kr.co.swh.lecture.opensource.project.discode.music; 
2 2
 
3
-import org.apache.log4j.Logger;
3
+import java.util.HashMap;
4
+import java.util.Map;
5
+
4 6
 import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
5 7
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
6 8
 import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
@@ -8,12 +10,10 @@ import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
8 10
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
9 11
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
10 12
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
13
+
11 14
 import net.dv8tion.jda.api.entities.Guild;
12 15
 import net.dv8tion.jda.api.entities.TextChannel;
13 16
 
14
-import java.util.HashMap;
15
-import java.util.Map;
16
-
17 17
 /**
18 18
  * <pre>
19 19
  * kr.co.swh.lecture.opensource.project.discode.music 
@@ -62,6 +62,8 @@ public class PlayerManager {
62 62
             @Override
63 63
             public void trackLoaded(AudioTrack track) {
64 64
 //                Main.sendMessage(Main.channel, prefix + "次の音楽を再生します:" + track.getInfo());
65
+//            	channel.sendMessage(Main.channel, prefix + "次の音楽を再生します:" + track.getInfo());
66
+
65 67
                 play(musicManager,track);
66 68
             }
67 69
 

src/main/java/kr/co/swh/lecture/opensource/project/discode/music/LayoutBot.java → src/main/java/kr/co/swh/lecture/opensource/project/discode/music/YoutubeMusicBot.java View File

@@ -6,12 +6,12 @@ import net.dv8tion.jda.api.JDA;
6 6
 import net.dv8tion.jda.api.JDABuilder;
7 7
 
8 8
 
9
-public class LayoutBot {
9
+public class YoutubeMusicBot {
10 10
 	
11 11
 	public void play() throws LoginException, InterruptedException {
12 12
 		// Note: It is important to register your ReadyListener before building
13 13
         JDA jda = JDABuilder.createDefault("NjYzMjgzODYxMTUyNTk1OTkz.XhGROw.Ps3JJIKlEXoE1eah_5OKHwViThY")
14
-            .addEventListeners(new LayoutListener())
14
+            .addEventListeners(new YoutubeMusicListener())
15 15
             .build();
16 16
 
17 17
         // optionally block until JDA is ready
@@ -19,7 +19,7 @@ public class LayoutBot {
19 19
 	}
20 20
 	public static void main(String[] args) throws LoginException, InterruptedException {
21 21
 		// TODO Auto-generated method stub
22
-		LayoutBot bot = new LayoutBot();
22
+		YoutubeMusicBot bot = new YoutubeMusicBot();
23 23
 		bot.play();
24 24
 	}
25 25
 	

src/main/java/kr/co/swh/lecture/opensource/project/discode/music/LayoutListener.java → src/main/java/kr/co/swh/lecture/opensource/project/discode/music/YoutubeMusicListener.java View File

@@ -1,13 +1,12 @@
1 1
 package kr.co.swh.lecture.opensource.project.discode.music;
2 2
 
3
-import java.awt.Color;
4
-import java.nio.ByteBuffer;
5 3
 import java.util.ArrayList;
6 4
 
7 5
 import kr.co.swh.lecture.opensource.project.youtube.Youtube;
8 6
 import net.dv8tion.jda.api.EmbedBuilder;
9 7
 import net.dv8tion.jda.api.Permission;
10 8
 import net.dv8tion.jda.api.entities.Message;
9
+import net.dv8tion.jda.api.entities.MessageEmbed;
11 10
 import net.dv8tion.jda.api.entities.TextChannel;
12 11
 import net.dv8tion.jda.api.entities.User;
13 12
 import net.dv8tion.jda.api.entities.VoiceChannel;
@@ -16,7 +15,7 @@ import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
16 15
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
17 16
 import net.dv8tion.jda.api.managers.AudioManager;
18 17
 
19
-public class LayoutListener extends ListenerAdapter{
18
+public class YoutubeMusicListener extends ListenerAdapter{
20 19
 
21 20
 	@Override
22 21
 	public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
@@ -86,11 +85,25 @@ public class LayoutListener extends ListenerAdapter{
86 85
 
87 86
 		String message = msg.getContentRaw();
88 87
 		if(message.substring(0, 3).equals("!l ")) {
88
+			AudioManager audioManager = event.getGuild().getAudioManager();
89
+			if(!audioManager.isConnected()) {
90
+				VoiceChannel connectedChannel = event.getMember().getVoiceState().getChannel();
91
+				audioManager.openAudioConnection(connectedChannel);
92
+			}
89 93
 			String title = message.substring(3);
90 94
 			
91 95
 			Youtube y = new Youtube();
92 96
 			ArrayList<String> arr = y.audio(title);
93 97
 			
98
+			MessageEmbed embed = new EmbedBuilder()
99
+                    .setDescription(arr.get(0))
100
+                    .setTitle(title)
101
+                    .setFooter("swhacademy", null).build();
102
+        	
103
+			tc.sendMessage(title).queue(response -> {
104
+				response.editMessage(embed).queue();
105
+			});;
106
+			
94 107
 			PlayerManager Playermanager = PlayerManager.getINSTANCE();
95 108
 			Playermanager.loadAndPlay(tc, arr.get(0));
96 109
 			Playermanager.getGuildMusicManager(tc.getGuild()).player.setVolume(10);