AirDog46/MusicBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stuff I missed

Browse Source
This commit is contained in:
John Grosh
2016-10-17 03:02:25 -04:00
parent 2c75c051a7
commit 4dc60784c1
5 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/spectramusic/Bot.java
View File

@@ -247,7 +247,7 @@ public class Bot extends ListenerAdapter {
player.play();
Sender.sendReply(SpConst.SUCCESS+"Added **"+info.getTitle()
+"** (`"+(info.isLive() ? "LIVE" : info.getDuration().getTimestamp())+"`) to the queue "
+(position==0 ? "and will begin playing" :"at position "+(position+1)), event);
+(position==0 ? "and will play next!" :"at position "+(position+1)), event);
}
else
{

4
src/spectramusic/Sender.java
View File

@@ -46,7 +46,7 @@ public class Sender {
? m -> executor.schedule(() -> {
event.getMessage().deleteMessage();
m.deleteMessage();
}, m.getRawContent().split("\n").length*10+5, TimeUnit.SECONDS)
}, m.getRawContent().split("\n").length*15+10, TimeUnit.SECONDS)
: null;
if(edit==null)
event.getChannel().sendMessageAsync(cleanMessage(message), cleanup);
@@ -67,7 +67,7 @@ public class Sender {
{
message = cleanMessage(message);
event.getChannel().sendMessageAsync(message, m -> {
executor.schedule(()-> m.deleteMessage(), m.getRawContent().split("\n").length*30, TimeUnit.SECONDS);
executor.schedule(()-> m.deleteMessage(), m.getRawContent().split("\n").length*90, TimeUnit.SECONDS);
});
}

4
src/spectramusic/commands/PlayCmd.java
View File

@@ -24,8 +24,8 @@ public class PlayCmd extends Command {
{
this.bot = bot;
this.command = "play";
this.arguments = "<URL>";
this.help = "plays the song at the specified URL (or youtube video ID)";
this.arguments = "<URL or song title>";
this.help = "plays the song at the specified URL (or youtube video ID/search)";
this.userMustBeInVC = true;
}

2
src/spectramusic/commands/SetavatarCmd.java
View File

@@ -24,7 +24,7 @@ public class SetavatarCmd extends Command {
{
this.command = "setavatar";
this.help = "sets the bot's avatar";
this.arguments = "<url or NONE>";
this.arguments = "<url>";
this.level = PermLevel.OWNER;
}

2
src/spectramusic/util/FormatUtil.java
View File

@@ -48,7 +48,7 @@ public class FormatUtil {
if(inTopic && title.length()>40)
title = title.substring(0,37)+"...";
double progress = info.getError()==null && !info.isLive() ? (double)currentTime.getTotalSeconds() / info.getDuration().getTotalSeconds() : 0;
String str = "**"+title+"** {"+(user==null ? "???" : user.getUsername())+"}\n\u25B6 "+progressBar(progress)
String str = "**"+title+"** ["+(user==null ? "???" : user.getUsername())+"]\n\u25B6 "+progressBar(progress)
+" "+(inTopic ? "" : "`")+"["+currentTime.getTimestamp() + "/"
+ (info.getError()==null ? info.getDuration().getTimestamp() : "???")+"]"+(inTopic ? "" : "`")+" "
+volumeIcon(player.getVolume());