diff --git a/Libraries/JDA-3.0/JDA-3.0.BETA_98-sources.jar b/Libraries/JDA-3.0/JDA-3.0.BETA_98-sources.jar new file mode 100644 index 0000000..caf48d5 Binary files /dev/null and b/Libraries/JDA-3.0/JDA-3.0.BETA_98-sources.jar differ diff --git a/Libraries/Log4j-2.7/log4j-api-2.7-javadoc.jar b/Libraries/Log4j-2.7/log4j-api-2.7-javadoc.jar new file mode 100644 index 0000000..7f82e18 Binary files /dev/null and b/Libraries/Log4j-2.7/log4j-api-2.7-javadoc.jar differ diff --git a/Libraries/Log4j-2.7/log4j-api-2.7-sources.jar b/Libraries/Log4j-2.7/log4j-api-2.7-sources.jar new file mode 100644 index 0000000..79f4398 Binary files /dev/null and b/Libraries/Log4j-2.7/log4j-api-2.7-sources.jar differ diff --git a/Libraries/Log4j-2.7/log4j-api-2.7.jar b/Libraries/Log4j-2.7/log4j-api-2.7.jar new file mode 100644 index 0000000..b921631 Binary files /dev/null and b/Libraries/Log4j-2.7/log4j-api-2.7.jar differ diff --git a/Libraries/Log4j-2.7/log4j-core-2.7-javadoc.jar b/Libraries/Log4j-2.7/log4j-core-2.7-javadoc.jar new file mode 100644 index 0000000..7304878 Binary files /dev/null and b/Libraries/Log4j-2.7/log4j-core-2.7-javadoc.jar differ diff --git a/Libraries/Log4j-2.7/log4j-core-2.7-sources.jar b/Libraries/Log4j-2.7/log4j-core-2.7-sources.jar new file mode 100644 index 0000000..2359b6b Binary files /dev/null and b/Libraries/Log4j-2.7/log4j-core-2.7-sources.jar differ diff --git a/Libraries/Log4j-2.7/log4j-core-2.7.jar b/Libraries/Log4j-2.7/log4j-core-2.7.jar new file mode 100644 index 0000000..c0feb23 Binary files /dev/null and b/Libraries/Log4j-2.7/log4j-core-2.7.jar differ diff --git a/log4j2.xml b/log4j2.xml new file mode 100644 index 0000000..efdbd28 --- /dev/null +++ b/log4j2.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/META-INF/desktop.ini b/src/META-INF/desktop.ini deleted file mode 100644 index 2e164ce..0000000 --- a/src/META-INF/desktop.ini +++ /dev/null @@ -1,5 +0,0 @@ -[.ShellClassInfo] -InfoTip=Ce dossier est partagé en ligne. -IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe -IconIndex=16 - \ No newline at end of file diff --git a/src/net/borken/BotListener.java b/src/net/borken/BotListener.java index 71292d4..c52b6d1 100644 --- a/src/net/borken/BotListener.java +++ b/src/net/borken/BotListener.java @@ -5,9 +5,15 @@ import net.borken.Outils.Moderateur; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Member; import net.dv8tion.jda.core.entities.User; +import net.dv8tion.jda.core.events.DisconnectEvent; +import net.dv8tion.jda.core.events.ReadyEvent; +import net.dv8tion.jda.core.events.ReconnectedEvent; +import net.dv8tion.jda.core.events.StatusChangeEvent; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import net.dv8tion.jda.core.hooks.ListenerAdapter; import net.dv8tion.jda.core.managers.GuildManager; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** @@ -17,6 +23,16 @@ import net.dv8tion.jda.core.managers.GuildManager; public class BotListener extends ListenerAdapter { AntiSpam antispam=new AntiSpam(); Moderateur modo = new Moderateur(); + Logger logger = LogManager.getLogger(); + + + @Override + public void onReady(ReadyEvent event) { + logger.info("Connection succees"); + } + + + @Override public void onMessageReceived(MessageReceivedEvent event) { // ----------------------Test pour eviter eco de commande------------------------- @@ -52,9 +68,9 @@ public class BotListener extends ListenerAdapter { }catch (Exception e) { if (e.getMessage()==null) { - System.out.println(MainBot.entete.get("ERREUR", "BotListener") +"NullPointerException"); + logger.error("NullPointerException"); } else { - System.out.println(MainBot.entete.get("ERREUR", "BotListener") + e.getMessage()); + logger.error(e.getMessage()); } } diff --git a/src/net/borken/MainBot.java b/src/net/borken/MainBot.java index d9ff6be..641bcd6 100644 --- a/src/net/borken/MainBot.java +++ b/src/net/borken/MainBot.java @@ -1,30 +1,31 @@ package net.borken; -import enigma.console.Console; -import enigma.console.TextAttributes; -import enigma.core.Enigma; import net.borken.Outils.CommandParser; import net.borken.Outils.DayListener; -import net.borken.Outils.Entete; import net.borken.Outils.Redirection; -import net.borken.commandes.*; +import net.borken.commandes.Help; +import net.borken.commandes.Move; import net.borken.commandes.Over18.*; - - -import net.dv8tion.jda.core.*; +import net.borken.commandes.PingCommande; +import net.borken.commandes.Spam; +import net.dv8tion.jda.core.AccountType; +import net.dv8tion.jda.core.JDA; +import net.dv8tion.jda.core.JDABuilder; +import net.dv8tion.jda.core.OnlineStatus; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.User; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import net.dv8tion.jda.core.exceptions.RateLimitedException; import net.dv8tion.jda.core.managers.GuildManager; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import javax.security.auth.login.LoginException; -import java.awt.*; -import java.io.*; +import java.io.IOException; import java.util.HashMap; import java.util.Hashtable; import java.util.List; +import java.util.Scanner; /** * Created by seb65 on 19/10/2016. @@ -35,36 +36,29 @@ public class MainBot { public static final CommandParser parser =new CommandParser(); public static HashMap commandes = new HashMap<>(); public static boolean okInit=false; - public static Entete entete=new Entete(); public static HashMap historique =new HashMap<>(); public static HashMap message_compteur =new HashMap<>(); public static Hashtable userMulti = new Hashtable(); public static Hashtable minuteurStatut = new Hashtable<>(); - public static TextAttributes txtColor; + static Logger logger = LogManager.getLogger(); public static void main(String[] args) throws IOException { - + logger.trace("trace"); + logger.debug("debug"); + logger.info("info"); + logger.warn("warn"); + logger.error("error"); Stop stopTh=new Stop(); stopTh.start(); - txtColor = new TextAttributes(Color.green, Color.black); - s_console.setTextAttributes(txtColor); - System.out.println(); - System.out.println(); - System.out.println(); - System.out.println(); - System.out.println(); /**************************** * Initialisation * ****************************/ - System.out.println("-------------------INITIALISATION-------------------"); - txtColor = new TextAttributes(Color.blue, Color.black); - s_console.setTextAttributes(txtColor); + logger.info("-------------------INITIALISATION-------------------"); //Bot dĂ©marrer sans token if (args.length < 1) { - System.out.println(); - System.err.println(entete.get("ERREUR","INIT")+"Veuilliez indiquer le token du bot en argument..."); + logger.fatal("Veuilliez indiquer le token du bot en argument..."); okInit=false; } else @@ -72,18 +66,20 @@ public class MainBot { //Token prĂ©sent try { - System.out.println(); - System.out.println(entete.get("Info","INIT")+"Connection au serveur..."); + + logger.info("Connection au serveur..."); //connection au bot jda = new JDABuilder(AccountType.BOT).addListener(new BotListener()).setToken(args[0]).setBulkDeleteSplittingEnabled(false).buildBlocking(); jda.setAutoReconnect(true); + jda.addEventListener(); + jda.addEventListener(); + okInit=true; } catch (LoginException | InterruptedException | RateLimitedException e) { - System.out.println(); - System.err.println(entete.get("ERREUR","INIT")+e.getMessage()); + logger.catching(e); okInit=false; } } @@ -112,36 +108,30 @@ public class MainBot { //on recupere les utilisateur conecter List utilisateurCo = serveur.getMembers(); - System.out.println(); - System.out.println(entete.get("Info","INIT")+"Utilisatieur connectĂ©: "); + + logger.info("Utilisatieur connectĂ©: "); for (Member anUtilisateurCo : utilisateurCo) //= for(int i=0; i userAction = serveur.getUsersByName("Broken_Fire"); new Move().exc(userAction.get(0),"Big Daddy",true,serveur,serveur.getManager());*/ @@ -167,7 +157,7 @@ public class MainBot { { MessageReceivedEvent event = cmd.event; event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Commande inconnue!__** :warning:\n:arrow_right: Utilisez `//help` pour voirs les commandes disponible. ").queue(); - + logger.info("Commande inconnue"); } } @@ -203,40 +193,28 @@ public class MainBot { } } - public static final Console s_console; - static - { - s_console = Enigma.getConsole("Bot Discord"); - } - public static class Stop extends Thread { @Override public void run() { + Scanner scanner = new Scanner(System.in); String txtEntrĂ© = ""; while(!txtEntrĂ©.equals("o")&&!txtEntrĂ©.equals("O")) { while (!txtEntrĂ©.equals("stop")) { - txtEntrĂ© = s_console.readLine(); + txtEntrĂ© = scanner.nextLine(); } - txtColor = new TextAttributes(Color.orange, Color.black); - s_console.setTextAttributes(txtColor); - System.out.println("Etes-vous sur de vouloir arrĂ©ter le Bot? (o/n)"); - txtColor = new TextAttributes(Color.blue, Color.black); - s_console.setTextAttributes(txtColor); - txtEntrĂ© = s_console.readLine(); + + logger.warn("Etes-vous sur de vouloir arrĂ©ter le Bot? (o/n)"); + txtEntrĂ© = scanner.nextLine(); if(txtEntrĂ©.equals("n")||txtEntrĂ©.equals("N")) { - txtColor = new TextAttributes(Color.green, Color.black); - s_console.setTextAttributes(txtColor); - System.out.println("Arret du Bot annulĂ©."); - txtColor = new TextAttributes(Color.blue, Color.black); - s_console.setTextAttributes(txtColor); + logger.info("Arret du Bot annulĂ©."); } } Runtime.getRuntime().exit(0); diff --git a/src/net/borken/Outils/AntiSpam.java b/src/net/borken/Outils/AntiSpam.java index 5249d9d..ae9488c 100644 --- a/src/net/borken/Outils/AntiSpam.java +++ b/src/net/borken/Outils/AntiSpam.java @@ -9,6 +9,8 @@ import net.dv8tion.jda.core.entities.TextChannel; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import net.dv8tion.jda.core.exceptions.RateLimitedException; import net.dv8tion.jda.core.managers.GuildManager; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.List; @@ -21,8 +23,7 @@ import static java.lang.Thread.sleep; */ public class AntiSpam { public Move move = new Move(); - - public Entete entete=new Entete(); + Logger logger = LogManager.getLogger(); public AntiSpam() { @@ -59,8 +60,7 @@ public class AntiSpam { else MainBot.userMulti.put(user,1); - System.out.println(); - System.out.println(entete.get("Info","ANTISPAM")+"Punition de "+user.getEffectiveName()+" avec un multiplicateur de "+MainBot.userMulti.get(user)); + logger.info("Punition de "+user.getEffectiveName()+" avec un multiplicateur de "+MainBot.userMulti.get(user)); event.getTextChannel().sendMessage(user.getAsMention()+"\n```markdown\n#-----------------SPAM DETECTEUR----------------#\n# #\n# La prochaine fois tu fermeras ta gueule! #\n# #\n# On te revoit dans "+MainBot.userMulti.get(user)+"min connard ! #\n# #\n#-----------------------------------------------#```\n https://cdn.meme.am/instances/64726692.jpg ").queue(); @@ -104,8 +104,7 @@ public class AntiSpam { @Override public void run() { int cSeg=0; - System.out.println(); - System.out.println(entete.get("Info","MINUTEUR")+"["+user.getEffectiveName()+"] DĂ©marage pour "+multip+"min"); + logger.info("["+user.getEffectiveName()+"] DĂ©marage pour "+multip+"min"); while (MainBot.minuteurStatut.get(user)) { try { @@ -119,11 +118,9 @@ public class AntiSpam { } cSeg++; } - System.out.println(); - System.out.println(entete.get("Info","MINUTEUR")+ "["+user.getEffectiveName()+"] Fin de spam pour "+user.getEffectiveName()+" apres "+multip+"min."); + logger.info("["+user.getEffectiveName()+"] Fin de spam pour "+user.getEffectiveName()+" apres "+multip+"min."); move.exc(user, saveRoleUser.get(0), true, serveur, serveurManager); //aSaveroleUser=saveRoleUser.get(i) - System.out.println(); - System.out.println(entete.get("Info","MINUTEUR")+"["+user.getEffectiveName()+"] Fin des "+multip+"min"); + logger.info("["+user.getEffectiveName()+"] Fin des "+multip+"min"); chanel.sendMessage(user.getAsMention()+"\n```markdown\n#-----------------SPAM DETECTEUR----------------#\n# #\n# Un spammeur est de retour, fais gaffe! #\n# Je te surveille! #\n# #\n#-----------------------------------------------#```\n http://67.media.tumblr.com/tumblr_lvrf58vBkL1qibz0jo1_r1_500.png").queue(); diff --git a/src/net/borken/Outils/CommandParser.java b/src/net/borken/Outils/CommandParser.java index 5c73c3c..e63527c 100644 --- a/src/net/borken/Outils/CommandParser.java +++ b/src/net/borken/Outils/CommandParser.java @@ -2,6 +2,8 @@ package net.borken.Outils; import net.dv8tion.jda.*; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.ArrayList; import java.util.Arrays; @@ -11,7 +13,7 @@ import java.util.Arrays; */ public class CommandParser { - public static Entete entete=new Entete(); + Logger logger = LogManager.getLogger(); public CommandContainer parse(String brt, MessageReceivedEvent e) { ArrayList split =new ArrayList(); @@ -30,7 +32,7 @@ public class CommandParser { } - System.out.println(entete.get("Info","CMD")+"Auteur: "+e.getMember().getEffectiveName()+", Commande: "+commande+", args: "+ Arrays.toString(args)); + logger.info("Auteur: "+e.getMember().getEffectiveName()+", Commande: "+commande+", args: "+ Arrays.toString(args)); return new CommandContainer(brut, sansTete, splitSansTete, commande, args, e); //On Save toute les info dans le container } diff --git a/src/net/borken/Outils/DayListener.java b/src/net/borken/Outils/DayListener.java index dfdccf0..e7a7cbc 100644 --- a/src/net/borken/Outils/DayListener.java +++ b/src/net/borken/Outils/DayListener.java @@ -1,6 +1,7 @@ package net.borken.Outils; import net.borken.commandes.Spam; import net.dv8tion.jda.core.exceptions.RateLimitedException; +import org.apache.logging.log4j.LogManager; import java.util.GregorianCalendar; @@ -34,7 +35,7 @@ public class DayListener extends Thread { try { sleep(7200000); } catch (InterruptedException e) { - System.err.println(new Entete().get("ERREUR","AutoReset")+e.getCause()); + LogManager.getLogger().catching(e); } } } diff --git a/src/net/borken/Outils/Entete.java b/src/net/borken/Outils/Entete.java deleted file mode 100644 index d6ef6cb..0000000 --- a/src/net/borken/Outils/Entete.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.borken.Outils; - -import enigma.console.TextAttributes; -import net.borken.MainBot; - -import java.awt.*; - -/** - * Created by seb65 on 24/10/2016. - */ -public class Entete { - public String get(String type,String fonction){ - if (type.equals("ERREUR")) - { - MainBot.txtColor = new TextAttributes(Color.red, Color.black); - MainBot.s_console.setTextAttributes(MainBot.txtColor); - } - else - { - MainBot.txtColor = new TextAttributes(Color.blue, Color.black); - MainBot.s_console.setTextAttributes(MainBot.txtColor); - } - return "["+new Heure().getString()+"] ["+type+"] ["+fonction+"]: "; - - } -} diff --git a/src/net/borken/Outils/Heure.java b/src/net/borken/Outils/Heure.java deleted file mode 100644 index b8086df..0000000 --- a/src/net/borken/Outils/Heure.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.borken.Outils; - -import java.util.GregorianCalendar; - -/** - * Created by seb65 on 21/10/2016. - */ -public class Heure { - - - public int getHeure() - { - GregorianCalendar calendrier = new GregorianCalendar(); - return calendrier.get(GregorianCalendar.HOUR_OF_DAY); - } - public int getMin(){ - GregorianCalendar calendrier = new GregorianCalendar(); - return calendrier.get(GregorianCalendar.MINUTE); - } - public int getSeg(){ - GregorianCalendar calendrier = new GregorianCalendar(); - return calendrier.get(GregorianCalendar.SECOND); - - } - public String getString(){ - String str=String.format("%02d",this.getHeure())+":"+String.format("%02d",this.getMin())+":"+String.format("%02d",this.getSeg()); - return str; - } - -} diff --git a/src/net/borken/Outils/Moderateur.java b/src/net/borken/Outils/Moderateur.java index 7f041a5..1a2ace9 100644 --- a/src/net/borken/Outils/Moderateur.java +++ b/src/net/borken/Outils/Moderateur.java @@ -9,6 +9,8 @@ import net.dv8tion.jda.core.entities.Member; import net.dv8tion.jda.core.entities.User; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import net.dv8tion.jda.core.managers.GuildManager; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import static net.borken.MainBot.historique; @@ -17,9 +19,8 @@ import static net.borken.MainBot.historique; */ public class Moderateur { - + Logger logger = LogManager.getLogger(); private String[] tabMessages; - private Entete entete=new Entete(); public Moderateur() {} @@ -58,10 +59,10 @@ public class Moderateur { if(toi[3].equals(toi[2])&&toi[2].equals(toi[1]) && toi[1].equals(toi[0]) ){ spam = 1; - System.out.println(entete.get("Info","MODERATEUR")+"Detection de spam pour "+user.getEffectiveName()+"avec 3 messages identique: "); + logger.info("Detection de spam pour "+user.getEffectiveName()+"avec 3 messages identique: "); for(int j=0;MainBot.historique.get(user).length-1>j;j++) { - System.out.println(entete.get("Info","MODERATEUR")+"\t"+j+". "+MainBot.historique.get(user)[j]); + logger.info("\t"+j+". "+MainBot.historique.get(user)[j]); } toi[0] = ""; toi[1] = ""; @@ -101,11 +102,11 @@ public class Moderateur { if(cpt > 5){ MainBot.message_compteur.put(user,0); spam = 1; - System.out.println(entete.get("Info","MODERATEUR")+"Detection de spam pour "+user.getEffectiveName()+"avec 5 message en 5seg: "); + logger.info("Detection de spam pour "+user.getEffectiveName()+"avec 5 message en 5seg: "); String[] histo = MainBot.historique.get(user); for (String unMessage:histo ) //=for(int i=0; i saveRoleUser; public Member user; public Guild serveur; public GuildManager serveurManager; public GuildController guildController; - public static Entete entete=new Entete(); /** * @@ -51,14 +47,14 @@ public class Move implements Commande { guildController = new GuildController(serveur); boolean erreur = false; List allRoll = serveur.getRoles(); - System.out.println(); + //On recupere les roles de l'utilisateur List roleUserList = user.getRoles(); - System.out.println(); - System.out.println(entete.get("Info","MOVER")+"Roles de " + user.getEffectiveName() + ":"); + + logger.info("Roles de " + user.getEffectiveName() + ":"); //On les save saveRoleUser = roleUserList; @@ -72,7 +68,7 @@ public class Move implements Commande { //on fait ensuite les modif guildController.modifyMemberRoles(user,temp,saveRoleUser).queue(); - System.out.println(entete.get("Info","MOVER")+"Role " + cible + " attribuer a " + user.getEffectiveName()); + logger.info("Role " + cible + " attribuer a " + user.getEffectiveName()); this.user=user; this.serveur=serveur; @@ -101,21 +97,20 @@ public class Move implements Commande { if(userL.size()<1 ||roleL.size()<1) { - System.out.println(entete.get("ERREUR","MOVE")+"Mentionnement Incorect."); + logger.info("Mentionnement Incorect."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Erreur de dĂ©placement__** :warning:\n:arrow_right: Erreur, Utilisateur ou Role mal mentioner. `//help move` pour plus d'info ").queue(); } else { - System.out.println(userL.get(0)); user = serveur.getMember(userL.get(0)); Role roleCible = roleL.get(0); serveur=event.getGuild(); - System.out.println(entete.get("Info","CMD")+"Tentative de dĂ©placement de "+user.getEffectiveName()+" vers "+roleCible.getName()+" par l'utilisateur "+event.getAuthor().getName()); + logger.info("Tentative de dĂ©placement de "+user.getEffectiveName()+" vers "+roleCible.getName()+" par l'utilisateur "+event.getAuthor().getName()); if(event.getMember().getRoles().contains(serveur.getRolesByName("Big_Daddy",false).get(0))) { - System.out.println(entete.get("Info","MOVE")+"Autorisation suffisante, deplacement autorisĂ©"); - System.out.println(entete.get("Info","MOVE")+"Utilisateur trouvĂ©e"); + logger.info("Autorisation suffisante, deplacement autorisĂ©"); + logger.info("Utilisateur trouvĂ©e"); boolean erreur=this.exc(user,roleCible,true,serveur,serveur.getManager()); if(erreur) { @@ -128,7 +123,7 @@ public class Move implements Commande { } else { - System.out.println(entete.get("Info","MOVE")+"Autorisation insuffisante, deplacement refusĂ©"); + logger.info("Autorisation insuffisante, deplacement refusĂ©"); event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Vous n'avez pas l'autorisation de faire ca!__**:warning: ").queue(); } @@ -137,7 +132,7 @@ public class Move implements Commande { } else { - System.out.println(entete.get("ERREUR","MOVE")+"Arguments maquant."); + logger.warn("Arguments maquant."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Erreur de dĂ©placement__** :warning:\n:arrow_right: Arguments manquant. `//help move` pour plus d'info ").queue(); } diff --git a/src/net/borken/commandes/Over18/Ass.java b/src/net/borken/commandes/Over18/Ass.java index 1d57a28..29fae07 100644 --- a/src/net/borken/commandes/Over18/Ass.java +++ b/src/net/borken/commandes/Over18/Ass.java @@ -1,20 +1,19 @@ package net.borken.commandes.Over18; import net.borken.Commande; -import net.borken.Outils.Entete; import net.borken.Outils.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -import net.dv8tion.jda.core.exceptions.RateLimitedException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; -import java.awt.*; import java.io.IOException; /** * Created by seb65 on 07/11/2016. */ public class Ass implements Commande{ + Logger logger = LogManager.getLogger(); public String HELP="T'es sĂ©rieux la?"; - Entete entete= new Entete(); @Override public boolean called(String[] args, MessageReceivedEvent event) { @@ -27,7 +26,7 @@ public class Ass implements Commande{ Redirection redirect= new Redirection(); try { event.getTextChannel().sendMessage(redirect.get("http://les400culs.com/random")).queue(); - System.out.println(entete.get("ERREUR","Ass")+"Erreur de redirection."); + logger.warn("Erreur de redirection."); } catch (IOException e) { e.printStackTrace(); } @@ -36,7 +35,7 @@ public class Ass implements Commande{ { event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Channel règlementĂ©! Go sur over18!__**:warning: ").queue(); - System.out.println(entete.get("ERREUR","Ass")+"Erreur chanel."); + logger.warn("Erreur chanel."); } } diff --git a/src/net/borken/commandes/Over18/Boobs.java b/src/net/borken/commandes/Over18/Boobs.java index fb1184b..78d6487 100644 --- a/src/net/borken/commandes/Over18/Boobs.java +++ b/src/net/borken/commandes/Over18/Boobs.java @@ -1,10 +1,10 @@ package net.borken.commandes.Over18; import net.borken.Commande; -import net.borken.Outils.Entete; import net.borken.Outils.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -import net.dv8tion.jda.core.exceptions.RateLimitedException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.IOException; @@ -12,8 +12,8 @@ import java.io.IOException; * Created by seb65 on 07/11/2016. */ public class Boobs implements Commande { + Logger logger = LogManager.getLogger(); public String HELP="T'es sĂ©rieux la?"; - Entete entete=new Entete(); @Override public boolean called(String[] args, MessageReceivedEvent event) { @@ -27,13 +27,13 @@ public class Boobs implements Commande { try { event.getTextChannel().sendMessage(redirect.get("http://lesaintdesseins.fr/random")).queue(); } catch (IOException e) { - System.out.println(entete.get("ERREUR", "Boobs") + "Erreur de redirection."); + logger.warn("Erreur de redirection."); } } else { event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Channel règlementĂ©! Go sur over18!__**:warning: ").queue(); - System.out.println(entete.get("ERREUR","Boobs")+"Erreur chanel."); + logger.warn("Erreur chanel."); } } diff --git a/src/net/borken/commandes/Over18/Madame.java b/src/net/borken/commandes/Over18/Madame.java index f4767ce..d8ecb7f 100644 --- a/src/net/borken/commandes/Over18/Madame.java +++ b/src/net/borken/commandes/Over18/Madame.java @@ -4,6 +4,8 @@ import net.borken.Commande; import net.borken.Outils.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import net.dv8tion.jda.core.exceptions.RateLimitedException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.IOException; @@ -13,6 +15,7 @@ import static net.borken.MainBot.entete; * Created by seb65 on 11/11/2016. */ public class Madame implements Commande{ + Logger logger = LogManager.getLogger(); public String HELP="T'es sĂ©rieux la?"; @Override public boolean called(String[] args, MessageReceivedEvent event) { @@ -33,10 +36,10 @@ public class Madame implements Commande{ success=true; } catch (IOException e) { errorCp++; - System.out.println(entete.get("WARN", "Madame") + "Erreur de redirection. (Essais n°"+errorCp+")"); + logger.warn("Erreur de redirection. (Essais n°"+errorCp+")"); if(errorCp>5) { - System.out.println(entete.get("WARN", "Madame") + "5 Erreur de redirection."); + 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(); @@ -50,7 +53,7 @@ public class Madame implements Commande{ { event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Channel règlementĂ©!__**:warning: ").queue(); - System.out.println(entete.get("ERREUR","Madame")+"Erreur chanel."); + logger.warn("Erreur chanel."); } } diff --git a/src/net/borken/commandes/Over18/Pipe.java b/src/net/borken/commandes/Over18/Pipe.java index 7f5f6d2..073b4d4 100644 --- a/src/net/borken/commandes/Over18/Pipe.java +++ b/src/net/borken/commandes/Over18/Pipe.java @@ -1,10 +1,10 @@ package net.borken.commandes.Over18; import net.borken.Commande; -import net.borken.Outils.Entete; import net.borken.Outils.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -import net.dv8tion.jda.core.exceptions.RateLimitedException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.IOException; @@ -12,8 +12,8 @@ import java.io.IOException; * Created by seb65 on 07/11/2016. */ public class Pipe implements Commande { + Logger logger = LogManager.getLogger(); public String HELP="T'es sĂ©rieux la?"; - Entete entete = new Entete(); @Override public boolean called(String[] args, MessageReceivedEvent event) { return false; @@ -28,14 +28,14 @@ public class Pipe implements Commande { try { event.getTextChannel().sendMessage(redirect.get("http://feelation.com/random")).queue(); } catch (IOException e) { - System.out.println(entete.get("ERREUR", "Pipe") + "Erreur de redirection."); + logger.warn("Erreur de redirection."); } } else { event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Channel règlementĂ©! Go sur over18!__**:warning: ").queue(); - System.out.println(entete.get("ERREUR","Pipe")+"Erreur chanel."); + logger.warn("Erreur chanel."); } diff --git a/src/net/borken/commandes/Over18/SM.java b/src/net/borken/commandes/Over18/SM.java index acfa273..5a58152 100644 --- a/src/net/borken/commandes/Over18/SM.java +++ b/src/net/borken/commandes/Over18/SM.java @@ -1,10 +1,10 @@ package net.borken.commandes.Over18; import net.borken.Commande; -import net.borken.Outils.Entete; import net.borken.Outils.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -import net.dv8tion.jda.core.exceptions.RateLimitedException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.IOException; @@ -12,8 +12,8 @@ import java.io.IOException; * Created by seb65 on 10/11/2016. */ public class SM implements Commande { + Logger logger = LogManager.getLogger(); public String HELP="T'es sĂ©rieux la?"; - Entete entete = new Entete(); @Override public boolean called(String[] args, MessageReceivedEvent event) { return false; @@ -27,14 +27,14 @@ public class SM implements Commande { try { event.getTextChannel().sendMessage(redirect.get("https://bonjourfetish.tumblr.com/random")).queue(); } catch (IOException e) { - System.out.println(entete.get("ERREUR","SM")+"Erreur de redirection."); + logger.warn("Erreur de redirection."); } } else { event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Channel règlementĂ©! Go sur over18!__**:warning: ").queue(); - System.out.println(entete.get("ERREUR","SM")+"Erreur chanel."); + logger.warn("Erreur chanel."); } diff --git a/src/net/borken/commandes/PingCommande.java b/src/net/borken/commandes/PingCommande.java index f77bd3b..125ba2c 100644 --- a/src/net/borken/commandes/PingCommande.java +++ b/src/net/borken/commandes/PingCommande.java @@ -1,9 +1,9 @@ package net.borken.commandes; import net.borken.Commande; -import net.borken.Outils.Entete; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -import net.dv8tion.jda.core.exceptions.RateLimitedException; +import org.apache.logging.log4j.LogManager; + /** * Created by seb65 on 19/10/2016. @@ -21,7 +21,7 @@ public class PingCommande implements Commande { public void action(String[] args, MessageReceivedEvent event) { event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+" Pong!").queue(); - System.out.println("pong"); + LogManager.getLogger().info("pong"); } @Override diff --git a/src/net/borken/commandes/Spam.java b/src/net/borken/commandes/Spam.java index b384cbf..66cb948 100644 --- a/src/net/borken/commandes/Spam.java +++ b/src/net/borken/commandes/Spam.java @@ -3,13 +3,13 @@ package net.borken.commandes; import net.borken.Commande; import net.borken.MainBot; import net.borken.Outils.AntiSpam; -import net.borken.Outils.Entete; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Role; import net.dv8tion.jda.core.entities.User; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import net.dv8tion.jda.core.exceptions.RateLimitedException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.List; @@ -20,7 +20,7 @@ import java.util.Objects; * Created by seb65 on 27/10/2016. */ public class Spam implements Commande { - Entete entete =new Entete(); + Logger logger = LogManager.getLogger(); @Override public boolean called(String[] args, MessageReceivedEvent event) { return false; @@ -103,18 +103,18 @@ public class Spam implements Commande { ****************************/ if(userL.size()<1) { - System.out.println(entete.get("ERREUR", "CMD") + "Utilisateur introuvable."); + logger.error("Utilisateur introuvable."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Utilisateur introuvable. "); } else { Member user = serveur.getMember(userL.get(0)); - System.out.println(entete.get("Info", "CMD") + "Tentative de pardon de " + user.getEffectiveName() + " par l'utilisateur " + event.getMember().getEffectiveName()); + logger.info("Tentative de pardon de " + user.getEffectiveName() + " par l'utilisateur " + event.getMember().getEffectiveName()); /**************************** * c'est un big dady * ****************************/ if (event.getMember().getRoles().get(0)==serveur.getRolesByName("Big_Daddy",false).get(0)) { - System.out.println(entete.get("Info", "CMD") + "Autorisation suffisante, pardon autorisĂ©"); + logger.info("Autorisation suffisante, pardon autorisĂ©"); /**************************** * virif si en spammer * @@ -123,25 +123,25 @@ public class Spam implements Commande { if (MainBot.minuteurStatut.get(user)) { MainBot.minuteurStatut.put(user, false); } else { - System.out.println(entete.get("ERREUR", "CMD") + "Utilisateur pas en spam."); + logger.warn("Utilisateur pas en spam."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Utilisateur non spammeur. "); } } else { - System.out.println(entete.get("ERREUR", "CMD") + "Utilisateur pas en spam."); + logger.warn("Utilisateur pas en spam."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Utilisateur non spammeur. "); } } else { - System.out.println(entete.get("Info", "CMD") + "Autorisation insuffisante, pardon refusĂ©"); + logger.warn("Autorisation insuffisante, pardon refusĂ©"); event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:no_entry_sign: **__Vous n'avez pas l'autorisation de faire sa!__** :no_entry_sign: "); } } } else { - System.out.println(entete.get("Info","ERREUR")+"Argument manquant."); + logger.warn("Argument manquant."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Argument manquant__**:warning: \n:arrow_right: Utilisation: `//spam pardon <@utilisateur>`."); } @@ -165,7 +165,7 @@ public class Spam implements Commande { ****************************/ if(userL.size()<1) { - System.out.println(entete.get("ERREUR","CMD")+"Mentionnement Incorect (Spam)."); + logger.warn("Mentionnement Incorect (Spam)."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Erreur__** :warning:\n:arrow_right: Erreur, Utilisateur mal mentioner. `//help spam extermine` pour plus d'info ").queue(); } else{ @@ -173,14 +173,14 @@ public class Spam implements Commande { Guild serveur = event.getGuild(); Member user = serveur.getMember(userL.get(0)); - System.out.println(entete.get("Info","CMD")+"Tentative d'extermination de "+user.getEffectiveName()+" par l'utilisateur "+event.getAuthor().getName()); + logger.info("Tentative d'extermination de "+user.getEffectiveName()+" par l'utilisateur "+event.getAuthor().getName()); /**************************** * c'est un big dady * ****************************/ if(event.getMember().getRoles().get(0)==serveur.getRolesByName("Big_Daddy",false).get(0)) { - System.out.println(entete.get("Info","CMD")+"Autorisation suffisante, extermination autorisĂ©"); + logger.info("Autorisation suffisante, extermination autorisĂ©"); String multiStr =args[2]; @@ -195,7 +195,7 @@ public class Spam implements Commande { } else { - System.out.println(entete.get("ERREUR","CMD")+"Utilisateur deja en spam."); + logger.warn("Utilisateur deja en spam."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Erreur__** :warning:\n:arrow_right: Utilisateur dĂ©jĂ  spammeur. ").queue(); } @@ -209,7 +209,7 @@ public class Spam implements Commande { } else { - System.out.println(entete.get("Info","CMD")+"Autorisation insuffisante, extermination refusĂ©"); + logger.warn("Autorisation insuffisante, extermination refusĂ©"); event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:no_entry_sign: **__Vous n'avez pas l'autorisation de faire sa!__** :no_entry_sign: ").queue(); } @@ -219,7 +219,7 @@ public class Spam implements Commande { } else { - System.out.println(entete.get("Info","ERREUR")+"Argument manquant."); + logger.warn("Argument manquant."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Argument manquant__**:warning: \n:arrow_right: Utilisation: `//spam extermine `.").queue(); } } @@ -242,30 +242,30 @@ public class Spam implements Commande { ****************************/ if(userL.size()<1) { - System.out.println(entete.get("ERREUR", "CMD") + "Utilisateur introuvable."); + logger.warn("Utilisateur introuvable."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:warning: **__Erreur__** :warning:\n:arrow_right: Utilisateur introuvable. ").queue(); } else { Member user = serveur.getMember(userL.get(0)); - System.out.println(entete.get("Info", "CMD") + "Tentative de reset de " + user.getEffectiveName() + " par l'utilisateur " + event.getMember().getEffectiveName()); + logger.info("Tentative de reset de " + user.getEffectiveName() + " par l'utilisateur " + event.getMember().getEffectiveName()); /**************************** * c'est un big dady * ****************************/ if ( event.getMember().getRoles().get(0) == serveur.getRolesByName("Big_Daddy", false).get(0)) { - System.out.println(entete.get("Info", "CMD") + "Autorisation suffisante, pardon autorisĂ©"); + logger.info("Autorisation suffisante, pardon autorisĂ©"); /**************************** * verif utilisteur trouver * ****************************/ if (MainBot.userMulti.containsKey(user)) { - System.out.println(entete.get("Info", "CMD") + "Reset du multiplicateur de " + user.getEffectiveName() + " rĂ©ussi"); + logger.info("Reset du multiplicateur de " + user.getEffectiveName() + " rĂ©ussi"); event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n *Le multiplcicateur de " + user.getEffectiveName() + " a Ă©tĂ© remit a zĂ©ro.*").queue(); MainBot.userMulti.remove(user); } } else { - System.out.println(entete.get("Info", "CMD") + "Autorisation insuffisante, reset refusĂ©"); + logger.warn("Autorisation insuffisante, reset refusĂ©"); event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + "\n:no_entry_sign: **__Vous n'avez pas l'autorisation de faire ca!__** :no_entry_sign: ").queue(); } @@ -273,7 +273,7 @@ public class Spam implements Commande { } else { - System.out.println(entete.get("Info","ERREUR")+"Argument manquant."); + logger.warn("Argument manquant."); event.getTextChannel().sendMessage(event.getAuthor().getAsMention()+"\n:warning: **__Argument manquant__**:warning: \n:arrow_right: Utilisation: `//spam reset `.").queue(); } } @@ -281,7 +281,7 @@ public class Spam implements Commande { { if (args[0].equals("all")) { - System.out.println(entete.get("Info","AutoReset")+"Reset automatique des multiplicateur."); + logger.info("Reset automatique des multiplicateur."); for (Member unUser: MainBot.userMulti.keySet() ) //=for(int i=0; i