Skip to content

Commit 742e7e3

Browse files
committed
Added it so !queue without link will search YT automatically...
1 parent a5d1311 commit 742e7e3

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ extraJavaModuleInfo {
4949

5050
repositories {
5151
mavenCentral()
52-
mavenLocal()
52+
5353
maven {
5454
url = 'https://maven.minecraftforge.net/'
5555
}

src/main/java/org/mangorage/mangobotplugin/commands/music/MusicUtil.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
package org.mangorage.mangobotplugin.commands.music;
2424

2525
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
26+
import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
2627
import com.sedmelluq.discord.lavaplayer.source.bandcamp.BandcampAudioSourceManager;
2728
import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
2829
import com.sedmelluq.discord.lavaplayer.source.local.LocalAudioSourceManager;
@@ -93,10 +94,12 @@ public static void leaveVoiceChannel(Guild guild) {
9394
public static void registerRemoteSources(AudioPlayerManager playerManager) {
9495
playerManager.registerSourceManager(new TwitchStreamAudioSourceManager());
9596
playerManager.registerSourceManager(new VimeoAudioSourceManager());
96-
playerManager.registerSourceManager(new YoutubeAudioSourceManager());
9797
playerManager.registerSourceManager(SoundCloudAudioSourceManager.createDefault());
9898
playerManager.registerSourceManager(new BandcampAudioSourceManager());
9999

100+
playerManager.registerSourceManager(new YoutubeAudioSourceManager());
101+
102+
100103
// Not Available in my area...
101104
//playerManager.registerSourceManager(new NicoAudioSourceManager());
102105
//playerManager.registerSourceManager(new YandexMusicAudioSourceManager());

src/main/java/org/mangorage/mangobotplugin/commands/music/commands/QueueCommand.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
package org.mangorage.mangobotplugin.commands.music.commands;
2424

2525
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
26+
import dev.lavalink.youtube.YoutubeAudioSourceManager;
2627
import net.dv8tion.jda.api.entities.Guild;
2728
import net.dv8tion.jda.api.entities.Message;
2829
import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
@@ -76,13 +77,20 @@ public CommandResult execute(Message message, Arguments args) {
7677
return CommandResult.PASS;
7778
}
7879

79-
String URL = args.getFrom(0);
80+
String query = args.getFrom(0);
8081

81-
if (URL != null) {
82-
player.load(URL, e -> {
82+
if (query != null) {
83+
84+
if (!query.contains("search") && !query.startsWith("https://")) {
85+
query = YoutubeAudioSourceManager.SEARCH_PREFIX + " " + query;
86+
}
87+
88+
final String queryFinal = query;
89+
90+
player.load(query, e -> {
8391
switch (e.getReason()) {
8492
case SUCCESS -> {
85-
if (URL.startsWith("https://")) {
93+
if (queryFinal.startsWith("https://")) {
8694

8795
e.getTracks().forEach(player::add);
8896

0 commit comments

Comments
 (0)