From 318379459977e25fb1451d67a259397f678062d4 Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Tue, 27 Feb 2018 15:17:00 +0100 Subject: [PATCH] Change NSFW command detection --- src/main/java/net/Broken/Commande.java | 1 + src/main/java/net/Broken/Commands/Cat.java | 5 + .../java/net/Broken/Commands/DayTrigger.java | 5 + src/main/java/net/Broken/Commands/Error.java | 5 + src/main/java/net/Broken/Commands/Flush.java | 5 + src/main/java/net/Broken/Commands/Help.java | 15 +-- src/main/java/net/Broken/Commands/Move.java | 5 + src/main/java/net/Broken/Commands/Music.java | 5 + .../java/net/Broken/Commands/Over18/Ass.java | 5 + .../net/Broken/Commands/Over18/Boobs.java | 5 + .../net/Broken/Commands/Over18/Madame.java | 91 ++++++-------- .../java/net/Broken/Commands/Over18/Pipe.java | 39 +----- .../java/net/Broken/Commands/Over18/SM.java | 17 +-- src/main/java/net/Broken/Commands/Ping.java | 12 +- src/main/java/net/Broken/Commands/Spam.java | 5 + .../java/net/Broken/Commands/SpamInfo.java | 5 + src/main/java/net/Broken/MainBot.java | 18 +-- .../Tools/Command/NumberedCommande.java | 113 ++++++++---------- .../net/Broken/Tools/EmbedMessageUtils.java | 4 +- .../java/net/Broken/Tools/MessageTimeOut.java | 7 ++ 20 files changed, 182 insertions(+), 185 deletions(-) diff --git a/src/main/java/net/Broken/Commande.java b/src/main/java/net/Broken/Commande.java index f77c709..e34f4be 100644 --- a/src/main/java/net/Broken/Commande.java +++ b/src/main/java/net/Broken/Commande.java @@ -12,6 +12,7 @@ public interface Commande { void executed(boolean success, MessageReceivedEvent event); boolean isPrivateUsable(); boolean isAdminCmd(); + boolean isNSFW(); } diff --git a/src/main/java/net/Broken/Commands/Cat.java b/src/main/java/net/Broken/Commands/Cat.java index f49037e..dba4a54 100644 --- a/src/main/java/net/Broken/Commands/Cat.java +++ b/src/main/java/net/Broken/Commands/Cat.java @@ -77,4 +77,9 @@ public class Cat implements Commande { public boolean isAdminCmd() { return false; } + + @Override + public boolean isNSFW() { + return false; + } } diff --git a/src/main/java/net/Broken/Commands/DayTrigger.java b/src/main/java/net/Broken/Commands/DayTrigger.java index 9133892..e9045be 100644 --- a/src/main/java/net/Broken/Commands/DayTrigger.java +++ b/src/main/java/net/Broken/Commands/DayTrigger.java @@ -44,4 +44,9 @@ public class DayTrigger implements Commande{ public boolean isAdminCmd() { return true; } + + @Override + public boolean isNSFW() { + return false; + } } diff --git a/src/main/java/net/Broken/Commands/Error.java b/src/main/java/net/Broken/Commands/Error.java index 5c5e7b7..7e07e27 100644 --- a/src/main/java/net/Broken/Commands/Error.java +++ b/src/main/java/net/Broken/Commands/Error.java @@ -38,4 +38,9 @@ public class Error implements Commande{ public boolean isAdminCmd() { return true; } + + @Override + public boolean isNSFW() { + return false; + } } diff --git a/src/main/java/net/Broken/Commands/Flush.java b/src/main/java/net/Broken/Commands/Flush.java index 5a0d8f0..054cf56 100644 --- a/src/main/java/net/Broken/Commands/Flush.java +++ b/src/main/java/net/Broken/Commands/Flush.java @@ -68,4 +68,9 @@ public class Flush implements Commande{ public boolean isAdminCmd() { return false; } + + @Override + public boolean isNSFW() { + return false; + } } diff --git a/src/main/java/net/Broken/Commands/Help.java b/src/main/java/net/Broken/Commands/Help.java index 4871874..83cada3 100644 --- a/src/main/java/net/Broken/Commands/Help.java +++ b/src/main/java/net/Broken/Commands/Help.java @@ -145,11 +145,7 @@ public class Help implements Commande { if(!event.isFromType(ChannelType.PRIVATE)){ Message rest = event.getTextChannel().sendMessage(new EmbedBuilder().setTitle("Command envoyées par message privé").setColor(Color.green).build()).complete(); - List messages = new ArrayList(){{ - add(rest); - add(event.getMessage()); - }}; - new MessageTimeOut(messages,MainBot.messageTimeOut).start(); + new MessageTimeOut(MainBot.messageTimeOut, rest, event.getMessage()).start(); } @@ -160,10 +156,10 @@ public class Help implements Commande { role = "Non Admin"; try { - PrivateMessage.send(event.getAuthor(),EmbedMessageUtils.getHelpList(role, txt),logger); + PrivateMessage.send(event.getAuthor(), EmbedMessageUtils.getHelpList(role, txt),logger); } catch (FileNotFoundException e) { logger.catching(e); - PrivateMessage.send(event.getAuthor(),EmbedMessageUtils.getInternalError(), logger); + PrivateMessage.send(event.getAuthor(), EmbedMessageUtils.getInternalError(), logger); } @@ -187,4 +183,9 @@ public class Help implements Commande { public boolean isAdminCmd() { return false; } + + @Override + public boolean isNSFW() { + return false; + } } diff --git a/src/main/java/net/Broken/Commands/Move.java b/src/main/java/net/Broken/Commands/Move.java index 78d2e2a..887312b 100644 --- a/src/main/java/net/Broken/Commands/Move.java +++ b/src/main/java/net/Broken/Commands/Move.java @@ -209,4 +209,9 @@ public class Move implements Commande { public boolean isAdminCmd() { return true; } + + @Override + public boolean isNSFW() { + return false; + } } diff --git a/src/main/java/net/Broken/Commands/Music.java b/src/main/java/net/Broken/Commands/Music.java index e9d2307..7b98f59 100644 --- a/src/main/java/net/Broken/Commands/Music.java +++ b/src/main/java/net/Broken/Commands/Music.java @@ -172,6 +172,11 @@ public class Music implements Commande { return false; } + @Override + public boolean isNSFW() { + return false; + } + public AudioM getAudioManager(){ return audio; } diff --git a/src/main/java/net/Broken/Commands/Over18/Ass.java b/src/main/java/net/Broken/Commands/Over18/Ass.java index c866a5d..3d3beb0 100644 --- a/src/main/java/net/Broken/Commands/Over18/Ass.java +++ b/src/main/java/net/Broken/Commands/Over18/Ass.java @@ -26,4 +26,9 @@ public class Ass extends NumberedCommande { public boolean isAdminCmd() { return false; } + + @Override + public boolean isNSFW() { + return true; + } } diff --git a/src/main/java/net/Broken/Commands/Over18/Boobs.java b/src/main/java/net/Broken/Commands/Over18/Boobs.java index 3f69bce..c5ecb0d 100644 --- a/src/main/java/net/Broken/Commands/Over18/Boobs.java +++ b/src/main/java/net/Broken/Commands/Over18/Boobs.java @@ -25,4 +25,9 @@ public class Boobs extends NumberedCommande { public boolean isAdminCmd() { return false; } + + @Override + public boolean isNSFW() { + return true; + } } diff --git a/src/main/java/net/Broken/Commands/Over18/Madame.java b/src/main/java/net/Broken/Commands/Over18/Madame.java index 497398b..82b69dc 100644 --- a/src/main/java/net/Broken/Commands/Over18/Madame.java +++ b/src/main/java/net/Broken/Commands/Over18/Madame.java @@ -26,50 +26,41 @@ public class Madame implements Commande{ @Override public void action(String[] args, MessageReceivedEvent event) { this.event = event; - - if(event.getTextChannel().isNSFW()) { - Redirection redirect = new Redirection(); - boolean success=false; - boolean error=false; - int errorCp=0; - while(!success && !error) - { - try { - - String url = redirect.get("http://dites.bonjourmadame.fr/random"); - logger.debug("URL: "+url); - if(scanPageForTipeee(url)){ - logger.debug("Advertisement detected! Retry! ("+url+")"); - } - else{ - event.getTextChannel().sendMessage(url).queue(); - success=true; - } - - } catch (IOException e) { - errorCp++; - logger.warn("Erreur de redirection. (Essais n°"+errorCp+")"); - if(errorCp>5) - { - logger.error("5 Erreur de redirection."); - error=true; - event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur de redirection (5 essais), Réessayez__**:warning: ").queue(); - - } - - }catch (StringIndexOutOfBoundsException e){ - logger.catching(e); - event.getTextChannel().sendMessage(EmbedMessageUtils.getInternalError()).queue(); - } - } - - } - else + Redirection redirect = new Redirection(); + boolean success=false; + boolean error=false; + int errorCp=0; + while(!success && !error) { - event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Channel règlementé! Go sur over18!__**:warning: ").queue(); + try { - logger.warn("Erreur chanel."); + String url = redirect.get("http://dites.bonjourmadame.fr/random"); + logger.debug("URL: "+url); + if(scanPageForTipeee(url)){ + logger.debug("Advertisement detected! Retry! ("+url+")"); + } + else{ + event.getTextChannel().sendMessage(url).queue(); + success=true; + } + + } catch (IOException e) { + errorCp++; + logger.warn("Erreur de redirection. (Essais n°"+errorCp+")"); + if(errorCp>5) + { + logger.error("5 Erreur de redirection."); + error=true; + event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur de redirection (5 essais), Réessayez__**:warning: ").queue(); + + } + + }catch (StringIndexOutOfBoundsException e){ + logger.catching(e); + event.getTextChannel().sendMessage(EmbedMessageUtils.getInternalError()).queue(); + } } + } @Override @@ -87,23 +78,11 @@ public class Madame implements Commande{ return false; } - - private boolean isAdvertisementUrl(String url){ - //Scan url - if(url.toLowerCase().contains("club") && (url.toLowerCase().contains("rejoindre") || url.toLowerCase().contains("rejoignez"))){ - logger.debug("Advertisement detected with \"club\" and \"rejoidre\" or \"rejoignez\""); - return true; - } - else if(url.contains("samedi") && url.contains("dimanche")){ - logger.debug("Advertisement detected with \"samedi\" and \"dimanche\""); - return true; - } - else{ - return false; - } + @Override + public boolean isNSFW() { + return true; } - private boolean scanPageForTipeee(String url) throws StringIndexOutOfBoundsException, IOException{ String content = FindContentOnWebPage.getUrlSource(url); String imgClickLink = content.substring(content.indexOf("photo post")); diff --git a/src/main/java/net/Broken/Commands/Over18/Pipe.java b/src/main/java/net/Broken/Commands/Over18/Pipe.java index 3cd69ee..accc717 100644 --- a/src/main/java/net/Broken/Commands/Over18/Pipe.java +++ b/src/main/java/net/Broken/Commands/Over18/Pipe.java @@ -11,40 +11,6 @@ public class Pipe extends NumberedCommande { super(LogManager.getLogger(), "http://feelation.com/","featured-img","img"); } - /* - System.out.println("ok"); - String pipeLine=null; - URL pipeURL = new URL(redirect.get("http://feelation.com/random")); - URLConnection cc = pipeURL.openConnection(); - BufferedReader in = new BufferedReader(new InputStreamReader(cc.getInputStream(), "UTF-8")); - String inputLine; - - - while ((inputLine = in.readLine()) != null) - { - System.out.println(inputLine); - if(inputLine.contains("class=\"post photo\"")) - { - String[] splited = inputLine.split("<"); - for(String aString:splited) - { - if(aString.startsWith(" messages = new ArrayList(){{ - add(rest); - add(event.getMessage()); - }}; - new MessageTimeOut(messages, MainBot.messageTimeOut).start(); + new MessageTimeOut(MainBot.messageTimeOut, event.getMessage(), rest).start(); } LogManager.getLogger().debug("pong"); } @@ -41,7 +37,6 @@ public class Ping implements Commande { @Override public void executed(boolean success, MessageReceivedEvent event) { - return; } @@ -54,4 +49,9 @@ public class Ping implements Commande { public boolean isAdminCmd() { return false; } + + @Override + public boolean isNSFW() { + return false; + } } diff --git a/src/main/java/net/Broken/Commands/Spam.java b/src/main/java/net/Broken/Commands/Spam.java index c4f198d..59883f7 100644 --- a/src/main/java/net/Broken/Commands/Spam.java +++ b/src/main/java/net/Broken/Commands/Spam.java @@ -92,6 +92,11 @@ public class Spam implements Commande { return true; } + @Override + public boolean isNSFW() { + return false; + } + public void pardon(MessageReceivedEvent event, String[] args){ Guild serveur = event.getGuild(); diff --git a/src/main/java/net/Broken/Commands/SpamInfo.java b/src/main/java/net/Broken/Commands/SpamInfo.java index d43f954..2e3ee82 100644 --- a/src/main/java/net/Broken/Commands/SpamInfo.java +++ b/src/main/java/net/Broken/Commands/SpamInfo.java @@ -109,6 +109,11 @@ public class SpamInfo implements Commande{ return false; } + @Override + public boolean isNSFW() { + return false; + } + public String formatSecond(int second){ long days = TimeUnit.SECONDS.toDays(second); second -= TimeUnit.DAYS.toSeconds(days); diff --git a/src/main/java/net/Broken/MainBot.java b/src/main/java/net/Broken/MainBot.java index e44286b..50d67df 100644 --- a/src/main/java/net/Broken/MainBot.java +++ b/src/main/java/net/Broken/MainBot.java @@ -101,6 +101,7 @@ public class MainBot { { Commande cmdObj = commandes.get(cmd.commande); if(!cmdObj.isAdminCmd() || cmd.event.getMember().hasPermission(Permission.ADMINISTRATOR)){ + if(cmd.event.isFromType(ChannelType.PRIVATE) && commandes.get(cmd.commande).isPrivateUsable()) { @@ -109,8 +110,15 @@ public class MainBot { } else if (!cmd.event.isFromType(ChannelType.PRIVATE)) { - commandes.get(cmd.commande).action(cmd.args, cmd.event); - commandes.get(cmd.commande).executed(true, cmd.event); + if(!cmdObj.isNSFW() || cmd.event.getTextChannel().isNSFW()){ + commandes.get(cmd.commande).action(cmd.args, cmd.event); + commandes.get(cmd.commande).executed(true, cmd.event); + } + else{ + Message msg = cmd.event.getTextChannel().sendMessage(cmd.event.getAuthor().getAsMention() + "\n:warning: **__Channel règlementé! Go sur over18!__**:warning: ").complete(); + new MessageTimeOut(messageTimeOut, msg, cmd.event.getMessage()).start(); + } + } else cmd.event.getPrivateChannel().sendMessage(EmbedMessageUtils.getNoPrivate()).queue(); @@ -121,11 +129,7 @@ public class MainBot { } else{ Message msg = cmd.event.getTextChannel().sendMessage(EmbedMessageUtils.getUnautorized()).complete(); - List messages = new ArrayList(){{ - add(msg); - add(cmd.event.getMessage()); - }}; - new MessageTimeOut(messages, messageTimeOut).start(); + new MessageTimeOut(messageTimeOut, msg, cmd.event.getMessage()).start(); } } diff --git a/src/main/java/net/Broken/Tools/Command/NumberedCommande.java b/src/main/java/net/Broken/Tools/Command/NumberedCommande.java index c932bfd..c8ab314 100644 --- a/src/main/java/net/Broken/Tools/Command/NumberedCommande.java +++ b/src/main/java/net/Broken/Tools/Command/NumberedCommande.java @@ -15,7 +15,7 @@ import java.net.URL; * Created by seb65 on 07/11/2016. */ public abstract class NumberedCommande implements Commande{ - Logger logger = LogManager.getLogger(); + private Logger logger = LogManager.getLogger(); public String HELP="T'es sérieux la?"; int minNumber = 1; int maxNumber = -1; @@ -49,76 +49,65 @@ public abstract class NumberedCommande implements Commande{ { if(args.length == 0) { - if(event.getTextChannel().getName().equals("nsfw-over18")) { - Redirection redirect= new Redirection(); - int randomResult = (int) (minNumber + (Math.random() * (maxNumber - minNumber))); - String result = FindContentOnWebPage.doYourJob(baseURL + randomResult + "-2", divClass, htmlType); - event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n"+result).queue(); - } - else - { - event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Channel règlementé! Go sur over18!__**:warning: ").queue(); + int randomResult = (int) (minNumber + (Math.random() * (maxNumber - minNumber))); + String result = FindContentOnWebPage.doYourJob(baseURL + randomResult + "-2", divClass, htmlType); + event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n"+result).queue(); - logger.warn("Erreur chanel."); - } } else { - if(args[0].toLowerCase().equals("update")) - { - logger.info("update commande from "+event.getMessage().getAuthor().getName()); - event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:arrow_right: Updating...").queue(); + switch (args[0].toLowerCase()) { + case "update": + logger.info("update commande from " + event.getMessage().getAuthor().getName()); + event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:arrow_right: Updating...").queue(); - int newNumber = maxNumber; - try { - newNumber = LimitChecker.doYourJob(baseURL,maxNumber); - } catch (IOException e) { - e.printStackTrace(); - } - if(newNumber == maxNumber) - { - event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:arrow_right: Aucune nouvelle image n'a était trouver :cry:").queue(); - } - else if(newNumber-maxNumber == 1) event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:arrow_right: "+(newNumber-maxNumber)+" nouvelle image a été trouvé :kissing_heart:").queue(); - else - event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:arrow_right: "+(newNumber-maxNumber)+" nouvelles images on été trouvé :kissing_heart:").queue(); - logger.info((newNumber-maxNumber)+" new image(s) found."); - maxNumber = newNumber; - } - else if(args[0].toLowerCase().equals("get")) { - if (args.length >= 2) - { - - int number = -1; + int newNumber = maxNumber; try { - number = Integer.parseInt(args[1]); - URL url = new URL(baseURL + number + "-2/"); - HttpURLConnection huc = (HttpURLConnection) url.openConnection(); - huc.setRequestMethod("GET"); - huc.connect(); - int result = huc.getResponseCode(); - if (result == 200) { - event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n" + baseURL + number + "-2/").queue(); - } else { - event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Page introuvable (404)").queue(); - } - - } catch (NumberFormatException e) { - event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Erreur d'argument. `//help " + this.toString().toLowerCase() + "` pour plus d'info ").queue(); + newNumber = LimitChecker.doYourJob(baseURL, maxNumber); } catch (IOException e) { - logger.catching(e); - event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Erreur interne...").queue(); + e.printStackTrace(); } - } - else{ + if (newNumber == maxNumber) { + event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:arrow_right: Aucune nouvelle image n'a était trouver :cry:").queue(); + } else if (newNumber - maxNumber == 1) + event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:arrow_right: " + (newNumber - maxNumber) + " nouvelle image a été trouvé :kissing_heart:").queue(); + else + event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:arrow_right: " + (newNumber - maxNumber) + " nouvelles images on été trouvé :kissing_heart:").queue(); + logger.info((newNumber - maxNumber) + " new image(s) found."); + maxNumber = newNumber; + break; + case "get": + if (args.length >= 2) { + + int number = -1; + try { + number = Integer.parseInt(args[1]); + URL url = new URL(baseURL + number + "-2/"); + HttpURLConnection huc = (HttpURLConnection) url.openConnection(); + huc.setRequestMethod("GET"); + huc.connect(); + int result = huc.getResponseCode(); + if (result == 200) { + event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n" + baseURL + number + "-2/").queue(); + } else { + event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Page introuvable (404)").queue(); + } + + } catch (NumberFormatException e) { + event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Erreur d'argument. `//help " + this.toString().toLowerCase() + "` pour plus d'info ").queue(); + } catch (IOException e) { + logger.catching(e); + event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Erreur interne...").queue(); + } + } else { + event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Erreur d'argument. `//help " + this.toString().toLowerCase() + "` pour plus d'info ").queue(); + logger.warn("Bad Argument: " + event.getMessage().getContent() + " From " + event.getAuthor().getName()); + } + break; + default: event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Erreur d'argument. `//help " + this.toString().toLowerCase() + "` pour plus d'info ").queue(); - logger.warn("Bad Argument: "+event.getMessage().getContent()+" From "+event.getAuthor().getName()); - } - } - else - { - event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Erreur__** :warning:\n:arrow_right: Erreur d'argument. `//help "+this.toString().toLowerCase()+"` pour plus d'info ").queue(); - logger.warn("Bad Argument: "+event.getMessage().getContent()+" From "+event.getAuthor().getName()); + logger.warn("Bad Argument: " + event.getMessage().getContent() + " From " + event.getAuthor().getName()); + break; } } } catch (IOException e) { diff --git a/src/main/java/net/Broken/Tools/EmbedMessageUtils.java b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java index ecfeaef..5bada04 100644 --- a/src/main/java/net/Broken/Tools/EmbedMessageUtils.java +++ b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java @@ -15,6 +15,7 @@ public class EmbedMessageUtils { return new EmbedBuilder().setTitle(":warning: Commande inconnue! :warning:").setDescription(":arrow_right: Utilisez `//help` pour voirs les commandes disponible.").setColor(Color.orange).setFooter("bot.seb6596.ovh", MainBot.jda.getSelfUser().getAvatarUrl()).build(); } + public static EmbedBuilder getError(String message) { EmbedBuilder temp = new EmbedBuilder().setTitle(":warning: Error! :warning:").setColor(Color.red).setDescription(message); return temp; @@ -45,7 +46,6 @@ public class EmbedMessageUtils { return new EmbedBuilder().setTitle(":mute: Spam Hunter :mute:").setDescription(autor.getAsMention() + " est de retour, fais gaffe!\nJe te surveille!").setImage("https://media.giphy.com/media/3o7TKwBctlv08kY08M/giphy.gif").setFooter("Spam info disponible via '//spaminfo' en privé", null).setColor(Color.orange).build(); } - public static MessageEmbed getHelp(String command) throws FileNotFoundException { String name = command.substring(0, 1).toUpperCase() + command.substring(1).toLowerCase(); String message = new ResourceLoader().getFile("Help/"+name+"/fr/main.md"); @@ -79,7 +79,6 @@ public class EmbedMessageUtils { return new EmbedBuilder().setTitle(":warning: Flush Error :warning: ").setDescription(message).setColor(Color.red).setFooter("'//help flush' pour plus d'info ", MainBot.jda.getSelfUser().getAvatarUrl()).build(); } - public static MessageEmbed getRegister(String message) { return new EmbedBuilder().setTitle(":pencil: Web Registration :pencil:").setDescription(message).setColor(Color.green).setFooter("bot.seb6596.ovh", MainBot.jda.getSelfUser().getAvatarUrl()).build(); } @@ -105,4 +104,5 @@ public class EmbedMessageUtils { } + } \ No newline at end of file diff --git a/src/main/java/net/Broken/Tools/MessageTimeOut.java b/src/main/java/net/Broken/Tools/MessageTimeOut.java index 3286df0..df33d1e 100644 --- a/src/main/java/net/Broken/Tools/MessageTimeOut.java +++ b/src/main/java/net/Broken/Tools/MessageTimeOut.java @@ -5,6 +5,8 @@ import net.dv8tion.jda.core.exceptions.ErrorResponseException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class MessageTimeOut extends Thread{ @@ -16,6 +18,11 @@ public class MessageTimeOut extends Thread{ this.second = second; } + public MessageTimeOut(int second, Message... messages) { + this.messages = Arrays.asList(messages); + this.second = second; + } + @Override public void run() { logger.debug("Timer for message deletion stated...");