You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

132 lines
5.9 KiB
Java

new file: CNAME new file: pom.xml new file: scripts/run_jmusicbot.sh new file: src/main/java/com/jagrosh/jmusicbot/Bot.java new file: src/main/java/com/jagrosh/jmusicbot/BotConfig.java new file: src/main/java/com/jagrosh/jmusicbot/JMusicBot.java new file: src/main/java/com/jagrosh/jmusicbot/Listener.java new file: src/main/java/com/jagrosh/jmusicbot/audio/AloneInVoiceHandler.java new file: src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java new file: src/main/java/com/jagrosh/jmusicbot/audio/NowplayingHandler.java new file: src/main/java/com/jagrosh/jmusicbot/audio/PlayerManager.java new file: src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java new file: src/main/java/com/jagrosh/jmusicbot/audio/RequestMetadata.java new file: src/main/java/com/jagrosh/jmusicbot/audio/TransformativeAudioSourceManager.java new file: src/main/java/com/jagrosh/jmusicbot/commands/AdminCommand.java new file: src/main/java/com/jagrosh/jmusicbot/commands/DJCommand.java new file: src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java new file: src/main/java/com/jagrosh/jmusicbot/commands/OwnerCommand.java new file: src/main/java/com/jagrosh/jmusicbot/commands/admin/PrefixCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/admin/QueueTypeCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/admin/SkipratioCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java new file: src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java new file: src/main/java/com/jagrosh/jmusicbot/entities/Pair.java new file: src/main/java/com/jagrosh/jmusicbot/entities/Prompt.java new file: src/main/java/com/jagrosh/jmusicbot/gui/ConsolePanel.java new file: src/main/java/com/jagrosh/jmusicbot/gui/GUI.java new file: src/main/java/com/jagrosh/jmusicbot/gui/TextAreaOutputStream.java new file: src/main/java/com/jagrosh/jmusicbot/playlist/PlaylistLoader.java new file: src/main/java/com/jagrosh/jmusicbot/queue/AbstractQueue.java new file: src/main/java/com/jagrosh/jmusicbot/queue/FairQueue.java new file: src/main/java/com/jagrosh/jmusicbot/queue/LinearQueue.java new file: src/main/java/com/jagrosh/jmusicbot/queue/QueueSupplier.java new file: src/main/java/com/jagrosh/jmusicbot/queue/Queueable.java new file: src/main/java/com/jagrosh/jmusicbot/settings/QueueType.java new file: src/main/java/com/jagrosh/jmusicbot/settings/RepeatMode.java new file: src/main/java/com/jagrosh/jmusicbot/settings/Settings.java new file: src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java new file: src/main/java/com/jagrosh/jmusicbot/utils/FormatUtil.java new file: src/main/java/com/jagrosh/jmusicbot/utils/OtherUtil.java new file: src/main/java/com/jagrosh/jmusicbot/utils/TimeUtil.java new file: src/main/java/com/jagrosh/jmusicbot/utils/YouTubeUtil.java new file: src/main/resources/logback.xml new file: src/main/resources/natives/linux-aarch32/libconnector.so new file: src/main/resources/natives/linux-aarch64/libconnector.so new file: src/main/resources/natives/linux-arm/libconnector.so new file: src/main/resources/natives/linux-armhf/libconnector.so new file: src/main/resources/natives/linux-x86/libconnector.so new file: src/main/resources/reference.conf new file: src/test/java/com/jagrosh/jmusicbot/FairQueueTest.java new file: src/test/java/com/jagrosh/jmusicbot/TimeUtilTest.java Changes not staged for commit: modified: CNAME modified: pom.xml deleted: scripts/run_jmusicbot.sh deleted: src/main/java/com/jagrosh/jmusicbot/Bot.java deleted: src/main/java/com/jagrosh/jmusicbot/BotConfig.java deleted: src/main/java/com/jagrosh/jmusicbot/JMusicBot.java deleted: src/main/java/com/jagrosh/jmusicbot/Listener.java deleted: src/main/java/com/jagrosh/jmusicbot/audio/AloneInVoiceHandler.java deleted: src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java deleted: src/main/java/com/jagrosh/jmusicbot/audio/NowplayingHandler.java deleted: src/main/java/com/jagrosh/jmusicbot/audio/PlayerManager.java deleted: src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java deleted: src/main/java/com/jagrosh/jmusicbot/audio/RequestMetadata.java deleted: src/main/java/com/jagrosh/jmusicbot/audio/TransformativeAudioSourceManager.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/AdminCommand.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/DJCommand.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/OwnerCommand.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/admin/PrefixCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/admin/QueueTypeCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/admin/SkipratioCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java deleted: src/main/java/com/jagrosh/jmusicbot/entities/Pair.java deleted: src/main/java/com/jagrosh/jmusicbot/entities/Prompt.java deleted: src/main/java/com/jagrosh/jmusicbot/gui/ConsolePanel.java deleted: src/main/java/com/jagrosh/jmusicbot/gui/GUI.java deleted: src/main/java/com/jagrosh/jmusicbot/gui/TextAreaOutputStream.java deleted: src/main/java/com/jagrosh/jmusicbot/playlist/PlaylistLoader.java deleted: src/main/java/com/jagrosh/jmusicbot/queue/AbstractQueue.java deleted: src/main/java/com/jagrosh/jmusicbot/queue/FairQueue.java deleted: src/main/java/com/jagrosh/jmusicbot/queue/LinearQueue.java deleted: src/main/java/com/jagrosh/jmusicbot/queue/QueueSupplier.java deleted: src/main/java/com/jagrosh/jmusicbot/queue/Queueable.java deleted: src/main/java/com/jagrosh/jmusicbot/settings/QueueType.java deleted: src/main/java/com/jagrosh/jmusicbot/settings/RepeatMode.java deleted: src/main/java/com/jagrosh/jmusicbot/settings/Settings.java deleted: src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java deleted: src/main/java/com/jagrosh/jmusicbot/utils/FormatUtil.java deleted: src/main/java/com/jagrosh/jmusicbot/utils/OtherUtil.java deleted: src/main/java/com/jagrosh/jmusicbot/utils/TimeUtil.java deleted: src/main/java/com/jagrosh/jmusicbot/utils/YouTubeUtil.java deleted: src/test/java/com/jagrosh/jmusicbot/FairQueueTest.java deleted: src/test/java/com/jagrosh/jmusicbot/TimeUtilTest.java Untracked files: scripts/run_infernote.sh src/main/java/su/ src/test/java/su/
5 months ago
package com.jagrosh.jmusicbot.commands.music;
import com.jagrosh.jmusicbot.audio.RequestMetadata;
import com.jagrosh.jmusicbot.utils.TimeUtil;
import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import java.util.concurrent.TimeUnit;
import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jdautilities.menu.OrderedMenu;
import com.jagrosh.jmusicbot.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.QueuedTrack;
import com.jagrosh.jmusicbot.commands.MusicCommand;
import com.jagrosh.jmusicbot.utils.FormatUtil;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Message;
public class SearchCmd extends MusicCommand
{
protected String searchPrefix = "ytsearch:";
private final OrderedMenu.Builder builder;
private final String searchingEmoji;
public SearchCmd(Bot bot)
{
super(bot);
this.searchingEmoji = bot.getConfig().getSearching();
this.name = "search";
this.aliases = bot.getConfig().getAliases(this.name);
this.arguments = "<query>";
this.help = "searches Youtube for a provided query";
this.beListening = true;
this.bePlaying = false;
this.botPermissions = new Permission[]{Permission.MESSAGE_EMBED_LINKS};
builder = new OrderedMenu.Builder()
.allowTextInput(true)
.useNumbers()
.useCancelButton(true)
.setEventWaiter(bot.getWaiter())
.setTimeout(1, TimeUnit.MINUTES);
}
@Override
public void doCommand(CommandEvent event)
{
if(event.getArgs().isEmpty())
{
event.replyError("Please include a query.");
return;
}
event.reply(searchingEmoji+" Searching... `["+event.getArgs()+"]`",
m -> bot.getPlayerManager().loadItemOrdered(event.getGuild(), searchPrefix + event.getArgs(), new ResultHandler(m,event)));
}
private class ResultHandler implements AudioLoadResultHandler
{
private final Message m;
private final CommandEvent event;
private ResultHandler(Message m, CommandEvent event)
{
this.m = m;
this.event = event;
}
@Override
public void trackLoaded(AudioTrack track)
{
if(bot.getConfig().isTooLong(track))
{
m.editMessage(FormatUtil.filter(event.getClient().getWarning()+" This track (**"+track.getInfo().title+"**) is longer than the allowed maximum: `"
+ TimeUtil.formatTime(track.getDuration())+"` > `"+bot.getConfig().getMaxTime()+"`")).queue();
return;
}
AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
int pos = handler.addTrack(new QueuedTrack(track, RequestMetadata.fromResultHandler(track, event)))+1;
m.editMessage(FormatUtil.filter(event.getClient().getSuccess()+" Added **"+track.getInfo().title
+"** (`"+ TimeUtil.formatTime(track.getDuration())+"`) "+(pos==0 ? "to begin playing"
: " to the queue at position "+pos))).queue();
}
@Override
public void playlistLoaded(AudioPlaylist playlist)
{
builder.setColor(event.getSelfMember().getColor())
.setText(FormatUtil.filter(event.getClient().getSuccess()+" Search results for `"+event.getArgs()+"`:"))
.setChoices(new String[0])
.setSelection((msg,i) ->
{
AudioTrack track = playlist.getTracks().get(i-1);
if(bot.getConfig().isTooLong(track))
{
event.replyWarning("This track (**"+track.getInfo().title+"**) is longer than the allowed maximum: `"
+ TimeUtil.formatTime(track.getDuration())+"` > `"+bot.getConfig().getMaxTime()+"`");
return;
}
AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
int pos = handler.addTrack(new QueuedTrack(track, RequestMetadata.fromResultHandler(track, event)))+1;
event.replySuccess("Added **" + FormatUtil.filter(track.getInfo().title)
+ "** (`" + TimeUtil.formatTime(track.getDuration()) + "`) " + (pos==0 ? "to begin playing"
: " to the queue at position "+pos));
})
.setCancel((msg) -> {})
.setUsers(event.getAuthor())
;
for(int i=0; i<4 && i<playlist.getTracks().size(); i++)
{
AudioTrack track = playlist.getTracks().get(i);
builder.addChoices("`["+ TimeUtil.formatTime(track.getDuration())+"]` [**"+track.getInfo().title+"**]("+track.getInfo().uri+")");
}
builder.build().display(m);
}
@Override
public void noMatches()
{
m.editMessage(FormatUtil.filter(event.getClient().getWarning()+" No results found for `"+event.getArgs()+"`.")).queue();
}
@Override
public void loadFailed(FriendlyException throwable)
{
if(throwable.severity==Severity.COMMON)
m.editMessage(event.getClient().getError()+" Error loading: "+throwable.getMessage()).queue();
else
m.editMessage(event.getClient().getError()+" Error loading track.").queue();
}
}
}