greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge pull request #246 from BigBotNetwork/greg-dev

Browse source 
Merged!
This commit is contained in:
Skidder 2019-12-24 13:31:21 +01:00 • committed by GitHub
commit 29d16437af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/bbn/hadder/Hadder.java
View file

@ -93,6 +93,7 @@ public class Hadder {
new StarBoardCommand(),
new QueueCommand(),
new InfoCommand(),
new SkipCommand(),
new StopCommand()), config, helpCommand);
builder.addEventListeners(

2
src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
View file

@ -96,7 +96,7 @@ public class RulesCommand implements Command {
}, event.getJDA(), event.getAuthor());
}, event.getJDA(), event.getAuthor());
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION)
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION)
.build()).queue();
}
} else {

13
src/main/java/com/bbn/hadder/commands/music/InfoCommand.java
View file

@ -13,15 +13,18 @@ public class InfoCommand implements Command {
private static final String CD = "\uD83D\uDCBF";
private static final String MIC = "\uD83C\uDFA4";
private static final String QUEUE_TITLE = "__%s has added %d new track%s to the Queue:__";
private static final String QUEUE_DESCRIPTION = "%s **|>** %s\n%s\n%s %s\n%s";
private static final String QUEUE_INFO = "Info about the Queue: (Size - %d)";
private static final String ERROR = "Error while loading \"%s\"";
@Override
public void executed(String[] args, CommandEvent event) {
if (new AudioManager().hasPlayer(event.getGuild())) {
event.getTextChannel().sendMessage("Ja Player is auch wieder da");
}
if (new AudioManager().getPlayer(event.getGuild()).getPlayingTrack() == null) {
event.getTextChannel().sendMessage("Joo playing track net anwesend^^").queue();
}
if (!new AudioManager().hasPlayer(event.getGuild()) || new AudioManager().getPlayer(event.getGuild()).getPlayingTrack() == null) {
event.getTextChannel().sendMessage("No song is being played at the moment! *It's your time to shine..*").queue();
event.getTextChannel().sendMessage("Shut up eyyyy du kek").queue();
} else {
AudioTrack track = new AudioManager().getPlayer(event.getGuild()).getPlayingTrack();
event.getTextChannel().sendMessage("Track Info" + String.format(QUEUE_DESCRIPTION, CD, new AudioManager().getOrNull(track.getInfo().title),

33
src/main/java/com/bbn/hadder/commands/music/SkipCommand.java Normal file
View file

@ -0,0 +1,33 @@
package com.bbn.hadder.commands.music;
import com.bbn.hadder.audio.AudioInfo;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
/**
* @author Skidder / GregTCLTK
*/
public class SkipCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
}
@Override
public String[] labels() {
return new String[]{"skip"};
}
@Override
public String description() {
return "Skips the song";
}
@Override
public String usage() {
return "";
}
}