Adding permanant help message, updating JDA
This commit is contained in:
parent
9a5507fc1b
commit
8ce41f88f8
8
pom.xml
8
pom.xml
@ -52,7 +52,13 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.dv8tion</groupId>
|
<groupId>net.dv8tion</groupId>
|
||||||
<artifactId>JDA</artifactId>
|
<artifactId>JDA</artifactId>
|
||||||
<version>3.3.0_260</version>
|
<!--<version>3.3.0_260</version>-->
|
||||||
|
<version>3.3.1_303</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
|
<artifactId>log4j-slf4j-impl</artifactId>
|
||||||
|
<version>2.9.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -33,7 +33,6 @@ public class Flush implements Commande{
|
|||||||
int limit = Integer.parseInt(args[0]);
|
int limit = Integer.parseInt(args[0]);
|
||||||
MessageChannel chanel = event.getChannel();
|
MessageChannel chanel = event.getChannel();
|
||||||
MessageHistory history = chanel.getHistoryAround(chanel.getLatestMessageIdLong(), 100).complete();
|
MessageHistory history = chanel.getHistoryAround(chanel.getLatestMessageIdLong(), 100).complete();
|
||||||
logger.debug(history.getRetrievedHistory().size());
|
|
||||||
List<Message> retrieved = history.getRetrievedHistory();
|
List<Message> retrieved = history.getRetrievedHistory();
|
||||||
if(limit > retrieved.size())
|
if(limit > retrieved.size())
|
||||||
limit = retrieved.size()-1;
|
limit = retrieved.size()-1;
|
||||||
|
@ -39,11 +39,22 @@ public class Help implements Commande {
|
|||||||
logger.info("Aide demmander pour la cmd "+argsString+" par "+event.getAuthor().getName());
|
logger.info("Aide demmander pour la cmd "+argsString+" par "+event.getAuthor().getName());
|
||||||
if(!event.isFromType(ChannelType.PRIVATE)) {
|
if(!event.isFromType(ChannelType.PRIVATE)) {
|
||||||
Message rest = event.getTextChannel().sendMessage(EmbedMessageUtils.getHelp(argsString, MainBot.commandes.get(argsString).help(args))).complete();
|
Message rest = event.getTextChannel().sendMessage(EmbedMessageUtils.getHelp(argsString, MainBot.commandes.get(argsString).help(args))).complete();
|
||||||
|
if(args.length<=1)
|
||||||
|
{
|
||||||
List<Message> messages = new ArrayList<Message>(){{
|
List<Message> messages = new ArrayList<Message>(){{
|
||||||
add(rest);
|
add(rest);
|
||||||
add(event.getMessage());
|
add(event.getMessage());
|
||||||
}};
|
}};
|
||||||
new MessageTimeOut(messages,MainBot.messageTimeOut).start();
|
new MessageTimeOut(messages,MainBot.messageTimeOut).start();
|
||||||
|
}
|
||||||
|
else if(!args[1].toLowerCase().equals("true")){
|
||||||
|
List<Message> messages = new ArrayList<Message>(){{
|
||||||
|
add(rest);
|
||||||
|
add(event.getMessage());
|
||||||
|
}};
|
||||||
|
new MessageTimeOut(messages,MainBot.messageTimeOut).start();
|
||||||
|
}
|
||||||
|
|
||||||
} else{
|
} else{
|
||||||
PrivateMessage.send(event.getAuthor(), EmbedMessageUtils.getHelp(argsString, MainBot.commandes.get(argsString).help(args)),logger);
|
PrivateMessage.send(event.getAuthor(), EmbedMessageUtils.getHelp(argsString, MainBot.commandes.get(argsString).help(args)),logger);
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,8 @@ import net.dv8tion.jda.core.entities.VoiceChannel;
|
|||||||
import net.dv8tion.jda.core.events.guild.voice.GuildVoiceLeaveEvent;
|
import net.dv8tion.jda.core.events.guild.voice.GuildVoiceLeaveEvent;
|
||||||
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
|
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
|
||||||
import net.dv8tion.jda.core.managers.AudioManager;
|
import net.dv8tion.jda.core.managers.AudioManager;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -28,6 +30,7 @@ public class AudioM {
|
|||||||
private VoiceChannel playedChanel;
|
private VoiceChannel playedChanel;
|
||||||
private int listTimeOut = 30;
|
private int listTimeOut = 30;
|
||||||
private int listExtremLimit = 300;
|
private int listExtremLimit = 300;
|
||||||
|
private Logger logger = LogManager.getLogger();
|
||||||
|
|
||||||
public AudioM() {
|
public AudioM() {
|
||||||
this.playerManager = new DefaultAudioPlayerManager();
|
this.playerManager = new DefaultAudioPlayerManager();
|
||||||
@ -42,6 +45,7 @@ public class AudioM {
|
|||||||
playerManager.loadItemOrdered(musicManager, trackUrl, new AudioLoadResultHandler() {
|
playerManager.loadItemOrdered(musicManager, trackUrl, new AudioLoadResultHandler() {
|
||||||
@Override
|
@Override
|
||||||
public void trackLoaded(AudioTrack track) {
|
public void trackLoaded(AudioTrack track) {
|
||||||
|
logger.info("Single Track detected!");
|
||||||
Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicOk("Ajout de "+track.getInfo().title+" à la file d'attente!")).complete();
|
Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicOk("Ajout de "+track.getInfo().title+" à la file d'attente!")).complete();
|
||||||
List<Message> messages = new ArrayList<Message>(){{
|
List<Message> messages = new ArrayList<Message>(){{
|
||||||
add(message);
|
add(message);
|
||||||
@ -53,6 +57,7 @@ public class AudioM {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void playlistLoaded(AudioPlaylist playlist) {
|
public void playlistLoaded(AudioPlaylist playlist) {
|
||||||
|
logger.info("Playlist detected! Limit: "+playlistLimit);
|
||||||
AudioTrack firstTrack = playlist.getSelectedTrack();
|
AudioTrack firstTrack = playlist.getSelectedTrack();
|
||||||
|
|
||||||
Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicOk("Ajout de "+firstTrack.getInfo().title+" et les 30 premiers titres à la file d'attente!")).complete();
|
Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicOk("Ajout de "+firstTrack.getInfo().title+" et les 30 premiers titres à la file d'attente!")).complete();
|
||||||
@ -73,6 +78,7 @@ public class AudioM {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void noMatches() {
|
public void noMatches() {
|
||||||
|
logger.warn("Cant find media!");
|
||||||
Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicError("Musique introuvable!")).complete();
|
Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicError("Musique introuvable!")).complete();
|
||||||
List<Message> messages = new ArrayList<Message>(){{
|
List<Message> messages = new ArrayList<Message>(){{
|
||||||
add(message);
|
add(message);
|
||||||
@ -83,6 +89,8 @@ public class AudioM {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void loadFailed(FriendlyException exception) {
|
public void loadFailed(FriendlyException exception) {
|
||||||
|
logger.error("Cant load media!");
|
||||||
|
logger.error(exception.getMessage());
|
||||||
Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicError("Erreur de lecture!")).complete();
|
Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicError("Erreur de lecture!")).complete();
|
||||||
List<Message> messages = new ArrayList<Message>(){{
|
List<Message> messages = new ArrayList<Message>(){{
|
||||||
add(message);
|
add(message);
|
||||||
|
Loading…
Reference in New Issue
Block a user