From 5bb78e232eed8c0f33346b644dc5b1f2370b731d Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Thu, 18 Jan 2018 10:28:54 +0100 Subject: [PATCH] Reorganization of packages --- src/main/java/net/Broken/BotListener.java | 4 ++-- src/main/java/net/Broken/Commands/Cat.java | 2 +- src/main/java/net/Broken/Commands/Flush.java | 2 +- src/main/java/net/Broken/Commands/Help.java | 6 +++--- src/main/java/net/Broken/Commands/Move.java | 4 ++-- src/main/java/net/Broken/Commands/Music.java | 5 ++--- .../java/net/Broken/Commands/Over18/Ass.java | 2 +- .../java/net/Broken/Commands/Over18/Boobs.java | 2 +- .../net/Broken/Commands/Over18/Madame.java | 2 +- .../java/net/Broken/Commands/Over18/Pipe.java | 2 +- .../java/net/Broken/Commands/Over18/SM.java | 2 +- src/main/java/net/Broken/Commands/Ping.java | 2 +- src/main/java/net/Broken/Commands/Spam.java | 8 ++++---- .../java/net/Broken/Commands/SpamInfo.java | 8 ++++---- src/main/java/net/Broken/Init.java | 4 ++-- src/main/java/net/Broken/MainBot.java | 8 +++++--- .../net/Broken/{Outils => Tools}/AntiSpam.java | 5 +---- .../Command/CommandLoader.java | 2 +- .../Command/CommandParser.java | 2 +- .../Command/NumberedCommande.java | 8 ++++---- .../Broken/{Outils => Tools}/DayListener.java | 2 +- .../{Outils => Tools}/EmbedMessageUtils.java | 4 +--- .../FindContentOnWebPage.java | 3 +-- .../Broken/{Outils => Tools}/LimitChecker.java | 2 +- .../{Outils => Tools}/MessageTimeOut.java | 2 +- .../Broken/{Outils => Tools}/Moderateur.java | 2 +- .../{Outils => Tools}/PrivateMessage.java | 4 +--- .../Broken/{Outils => Tools}/Redirection.java | 2 +- .../Broken/Tools/UserManager/UserRegister.java | 14 ++++++++++++++ .../{Outils => Tools}/UserSpamUtils.java | 2 +- src/main/java/net/Broken/audio/AudioM.java | 6 ++---- src/main/resources/log4j2.xml | 18 ++++++++++++++---- 32 files changed, 78 insertions(+), 63 deletions(-) rename src/main/java/net/Broken/{Outils => Tools}/AntiSpam.java (97%) rename src/main/java/net/Broken/{Outils => Tools}/Command/CommandLoader.java (97%) rename src/main/java/net/Broken/{Outils => Tools}/Command/CommandParser.java (98%) rename src/main/java/net/Broken/{Outils => Tools}/Command/NumberedCommande.java (97%) rename src/main/java/net/Broken/{Outils => Tools}/DayListener.java (97%) rename src/main/java/net/Broken/{Outils => Tools}/EmbedMessageUtils.java (96%) rename src/main/java/net/Broken/{Outils => Tools}/FindContentOnWebPage.java (95%) rename src/main/java/net/Broken/{Outils => Tools}/LimitChecker.java (98%) rename src/main/java/net/Broken/{Outils => Tools}/MessageTimeOut.java (97%) rename src/main/java/net/Broken/{Outils => Tools}/Moderateur.java (99%) rename src/main/java/net/Broken/{Outils => Tools}/PrivateMessage.java (80%) rename src/main/java/net/Broken/{Outils => Tools}/Redirection.java (96%) create mode 100644 src/main/java/net/Broken/Tools/UserManager/UserRegister.java rename src/main/java/net/Broken/{Outils => Tools}/UserSpamUtils.java (97%) diff --git a/src/main/java/net/Broken/BotListener.java b/src/main/java/net/Broken/BotListener.java index 48f2afd..b0187e8 100644 --- a/src/main/java/net/Broken/BotListener.java +++ b/src/main/java/net/Broken/BotListener.java @@ -2,8 +2,8 @@ package net.Broken; import net.Broken.Commands.Move; import net.Broken.Commands.Music; -import net.Broken.Outils.AntiSpam; -import net.Broken.Outils.Moderateur; +import net.Broken.Tools.AntiSpam; +import net.Broken.Tools.Moderateur; import net.dv8tion.jda.core.entities.ChannelType; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Member; diff --git a/src/main/java/net/Broken/Commands/Cat.java b/src/main/java/net/Broken/Commands/Cat.java index d8edce5..d8c4b57 100644 --- a/src/main/java/net/Broken/Commands/Cat.java +++ b/src/main/java/net/Broken/Commands/Cat.java @@ -2,7 +2,7 @@ package net.Broken.Commands; import net.Broken.Commande; -import net.Broken.Outils.Redirection; +import net.Broken.Tools.Redirection; import net.dv8tion.jda.core.entities.ChannelType; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; diff --git a/src/main/java/net/Broken/Commands/Flush.java b/src/main/java/net/Broken/Commands/Flush.java index 072554a..9336deb 100644 --- a/src/main/java/net/Broken/Commands/Flush.java +++ b/src/main/java/net/Broken/Commands/Flush.java @@ -1,7 +1,7 @@ package net.Broken.Commands; import net.Broken.Commande; -import net.Broken.Outils.EmbedMessageUtils; +import net.Broken.Tools.EmbedMessageUtils; import net.dv8tion.jda.core.Permission; import net.dv8tion.jda.core.entities.Message; import net.dv8tion.jda.core.entities.MessageChannel; diff --git a/src/main/java/net/Broken/Commands/Help.java b/src/main/java/net/Broken/Commands/Help.java index b29f8ea..6890891 100644 --- a/src/main/java/net/Broken/Commands/Help.java +++ b/src/main/java/net/Broken/Commands/Help.java @@ -2,9 +2,9 @@ package net.Broken.Commands; import net.Broken.Commande; import net.Broken.MainBot; -import net.Broken.Outils.EmbedMessageUtils; -import net.Broken.Outils.MessageTimeOut; -import net.Broken.Outils.PrivateMessage; +import net.Broken.Tools.EmbedMessageUtils; +import net.Broken.Tools.MessageTimeOut; +import net.Broken.Tools.PrivateMessage; import net.dv8tion.jda.core.EmbedBuilder; import net.dv8tion.jda.core.entities.ChannelType; import net.dv8tion.jda.core.entities.Message; diff --git a/src/main/java/net/Broken/Commands/Move.java b/src/main/java/net/Broken/Commands/Move.java index befab13..7852569 100644 --- a/src/main/java/net/Broken/Commands/Move.java +++ b/src/main/java/net/Broken/Commands/Move.java @@ -2,8 +2,8 @@ package net.Broken.Commands; import net.Broken.Commande; import net.Broken.MainBot; -import net.Broken.Outils.EmbedMessageUtils; -import net.Broken.Outils.MessageTimeOut; +import net.Broken.Tools.EmbedMessageUtils; +import net.Broken.Tools.MessageTimeOut; import net.dv8tion.jda.core.Permission; import net.dv8tion.jda.core.entities.*; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; diff --git a/src/main/java/net/Broken/Commands/Music.java b/src/main/java/net/Broken/Commands/Music.java index 6db5a62..42d640c 100644 --- a/src/main/java/net/Broken/Commands/Music.java +++ b/src/main/java/net/Broken/Commands/Music.java @@ -2,10 +2,9 @@ package net.Broken.Commands; import net.Broken.Commande; import net.Broken.MainBot; -import net.Broken.Outils.EmbedMessageUtils; -import net.Broken.Outils.MessageTimeOut; +import net.Broken.Tools.EmbedMessageUtils; +import net.Broken.Tools.MessageTimeOut; import net.Broken.audio.AudioM; -import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Message; import net.dv8tion.jda.core.entities.VoiceChannel; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; diff --git a/src/main/java/net/Broken/Commands/Over18/Ass.java b/src/main/java/net/Broken/Commands/Over18/Ass.java index eabf658..a3ede7a 100644 --- a/src/main/java/net/Broken/Commands/Over18/Ass.java +++ b/src/main/java/net/Broken/Commands/Over18/Ass.java @@ -1,6 +1,6 @@ package net.Broken.Commands.Over18; -import net.Broken.Outils.Command.NumberedCommande; +import net.Broken.Tools.Command.NumberedCommande; import org.apache.logging.log4j.LogManager; /** diff --git a/src/main/java/net/Broken/Commands/Over18/Boobs.java b/src/main/java/net/Broken/Commands/Over18/Boobs.java index c7bf203..d2bafd1 100644 --- a/src/main/java/net/Broken/Commands/Over18/Boobs.java +++ b/src/main/java/net/Broken/Commands/Over18/Boobs.java @@ -1,6 +1,6 @@ package net.Broken.Commands.Over18; -import net.Broken.Outils.Command.NumberedCommande; +import net.Broken.Tools.Command.NumberedCommande; import org.apache.logging.log4j.LogManager; /** diff --git a/src/main/java/net/Broken/Commands/Over18/Madame.java b/src/main/java/net/Broken/Commands/Over18/Madame.java index 4e0f5c9..90cd87c 100644 --- a/src/main/java/net/Broken/Commands/Over18/Madame.java +++ b/src/main/java/net/Broken/Commands/Over18/Madame.java @@ -1,7 +1,7 @@ package net.Broken.Commands.Over18; import net.Broken.Commande; -import net.Broken.Outils.Redirection; +import net.Broken.Tools.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/net/Broken/Commands/Over18/Pipe.java b/src/main/java/net/Broken/Commands/Over18/Pipe.java index c83b5bd..009d826 100644 --- a/src/main/java/net/Broken/Commands/Over18/Pipe.java +++ b/src/main/java/net/Broken/Commands/Over18/Pipe.java @@ -1,6 +1,6 @@ package net.Broken.Commands.Over18; -import net.Broken.Outils.Command.NumberedCommande; +import net.Broken.Tools.Command.NumberedCommande; import org.apache.logging.log4j.LogManager; /** diff --git a/src/main/java/net/Broken/Commands/Over18/SM.java b/src/main/java/net/Broken/Commands/Over18/SM.java index 44fac7c..98982b6 100644 --- a/src/main/java/net/Broken/Commands/Over18/SM.java +++ b/src/main/java/net/Broken/Commands/Over18/SM.java @@ -1,7 +1,7 @@ package net.Broken.Commands.Over18; import net.Broken.Commande; -import net.Broken.Outils.Redirection; +import net.Broken.Tools.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/net/Broken/Commands/Ping.java b/src/main/java/net/Broken/Commands/Ping.java index 549ebae..cab02e5 100644 --- a/src/main/java/net/Broken/Commands/Ping.java +++ b/src/main/java/net/Broken/Commands/Ping.java @@ -2,7 +2,7 @@ package net.Broken.Commands; import net.Broken.Commande; import net.Broken.MainBot; -import net.Broken.Outils.MessageTimeOut; +import net.Broken.Tools.MessageTimeOut; import net.dv8tion.jda.core.entities.ChannelType; import net.dv8tion.jda.core.entities.Message; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; diff --git a/src/main/java/net/Broken/Commands/Spam.java b/src/main/java/net/Broken/Commands/Spam.java index e0f1c4a..4d4fa6a 100644 --- a/src/main/java/net/Broken/Commands/Spam.java +++ b/src/main/java/net/Broken/Commands/Spam.java @@ -2,10 +2,10 @@ package net.Broken.Commands; import net.Broken.Commande; import net.Broken.MainBot; -import net.Broken.Outils.AntiSpam; -import net.Broken.Outils.EmbedMessageUtils; -import net.Broken.Outils.MessageTimeOut; -import net.Broken.Outils.UserSpamUtils; +import net.Broken.Tools.AntiSpam; +import net.Broken.Tools.EmbedMessageUtils; +import net.Broken.Tools.MessageTimeOut; +import net.Broken.Tools.UserSpamUtils; import net.dv8tion.jda.core.Permission; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Member; diff --git a/src/main/java/net/Broken/Commands/SpamInfo.java b/src/main/java/net/Broken/Commands/SpamInfo.java index 1f64797..9755702 100644 --- a/src/main/java/net/Broken/Commands/SpamInfo.java +++ b/src/main/java/net/Broken/Commands/SpamInfo.java @@ -2,10 +2,10 @@ package net.Broken.Commands; import net.Broken.Commande; import net.Broken.MainBot; -import net.Broken.Outils.EmbedMessageUtils; -import net.Broken.Outils.MessageTimeOut; -import net.Broken.Outils.PrivateMessage; -import net.Broken.Outils.UserSpamUtils; +import net.Broken.Tools.EmbedMessageUtils; +import net.Broken.Tools.MessageTimeOut; +import net.Broken.Tools.PrivateMessage; +import net.Broken.Tools.UserSpamUtils; import net.dv8tion.jda.core.EmbedBuilder; import net.dv8tion.jda.core.entities.ChannelType; import net.dv8tion.jda.core.entities.Message; diff --git a/src/main/java/net/Broken/Init.java b/src/main/java/net/Broken/Init.java index 58eaa2b..6e1f14f 100644 --- a/src/main/java/net/Broken/Init.java +++ b/src/main/java/net/Broken/Init.java @@ -1,7 +1,7 @@ package net.Broken; -import net.Broken.Outils.Command.CommandLoader; -import net.Broken.Outils.DayListener; +import net.Broken.Tools.Command.CommandLoader; +import net.Broken.Tools.DayListener; import net.dv8tion.jda.core.AccountType; import net.dv8tion.jda.core.JDA; import net.dv8tion.jda.core.JDABuilder; diff --git a/src/main/java/net/Broken/MainBot.java b/src/main/java/net/Broken/MainBot.java index b047837..175ec5f 100644 --- a/src/main/java/net/Broken/MainBot.java +++ b/src/main/java/net/Broken/MainBot.java @@ -1,8 +1,8 @@ package net.Broken; -import net.Broken.Outils.Command.CommandParser; -import net.Broken.Outils.EmbedMessageUtils; -import net.Broken.Outils.UserSpamUtils; +import net.Broken.Tools.Command.CommandParser; +import net.Broken.Tools.EmbedMessageUtils; +import net.Broken.Tools.UserSpamUtils; import net.Broken.RestApi.ApiCommandLoader; import net.dv8tion.jda.core.JDA; import net.dv8tion.jda.core.entities.ChannelType; @@ -17,6 +17,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.stereotype.Controller; +import java.security.SecureRandom; import java.util.ArrayList; import java.util.HashMap; @@ -74,6 +75,7 @@ public class MainBot { })); } + ApiCommandLoader.load(); diff --git a/src/main/java/net/Broken/Outils/AntiSpam.java b/src/main/java/net/Broken/Tools/AntiSpam.java similarity index 97% rename from src/main/java/net/Broken/Outils/AntiSpam.java rename to src/main/java/net/Broken/Tools/AntiSpam.java index a8d89d4..00d3355 100644 --- a/src/main/java/net/Broken/Outils/AntiSpam.java +++ b/src/main/java/net/Broken/Tools/AntiSpam.java @@ -1,10 +1,7 @@ -package net.Broken.Outils; +package net.Broken.Tools; import net.Broken.MainBot; import net.Broken.Commands.Move; -import net.Broken.Outils.EmbedMessageUtils; -import net.Broken.Outils.MessageTimeOut; -import net.Broken.Outils.UserSpamUtils; import net.dv8tion.jda.core.entities.*; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import net.dv8tion.jda.core.exceptions.HierarchyException; diff --git a/src/main/java/net/Broken/Outils/Command/CommandLoader.java b/src/main/java/net/Broken/Tools/Command/CommandLoader.java similarity index 97% rename from src/main/java/net/Broken/Outils/Command/CommandLoader.java rename to src/main/java/net/Broken/Tools/Command/CommandLoader.java index cd6ece5..9bc7131 100644 --- a/src/main/java/net/Broken/Outils/Command/CommandLoader.java +++ b/src/main/java/net/Broken/Tools/Command/CommandLoader.java @@ -1,4 +1,4 @@ -package net.Broken.Outils.Command; +package net.Broken.Tools.Command; import net.Broken.Commande; import net.Broken.MainBot; diff --git a/src/main/java/net/Broken/Outils/Command/CommandParser.java b/src/main/java/net/Broken/Tools/Command/CommandParser.java similarity index 98% rename from src/main/java/net/Broken/Outils/Command/CommandParser.java rename to src/main/java/net/Broken/Tools/Command/CommandParser.java index 632070a..3160f12 100644 --- a/src/main/java/net/Broken/Outils/Command/CommandParser.java +++ b/src/main/java/net/Broken/Tools/Command/CommandParser.java @@ -1,4 +1,4 @@ -package net.Broken.Outils.Command; +package net.Broken.Tools.Command; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/net/Broken/Outils/Command/NumberedCommande.java b/src/main/java/net/Broken/Tools/Command/NumberedCommande.java similarity index 97% rename from src/main/java/net/Broken/Outils/Command/NumberedCommande.java rename to src/main/java/net/Broken/Tools/Command/NumberedCommande.java index e3900da..cd65172 100644 --- a/src/main/java/net/Broken/Outils/Command/NumberedCommande.java +++ b/src/main/java/net/Broken/Tools/Command/NumberedCommande.java @@ -1,8 +1,8 @@ -package net.Broken.Outils.Command; +package net.Broken.Tools.Command; import net.Broken.Commande; -import net.Broken.Outils.FindContentOnWebPage; -import net.Broken.Outils.LimitChecker; -import net.Broken.Outils.Redirection; +import net.Broken.Tools.FindContentOnWebPage; +import net.Broken.Tools.LimitChecker; +import net.Broken.Tools.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/net/Broken/Outils/DayListener.java b/src/main/java/net/Broken/Tools/DayListener.java similarity index 97% rename from src/main/java/net/Broken/Outils/DayListener.java rename to src/main/java/net/Broken/Tools/DayListener.java index 7f4edf1..b4c77b2 100644 --- a/src/main/java/net/Broken/Outils/DayListener.java +++ b/src/main/java/net/Broken/Tools/DayListener.java @@ -1,4 +1,4 @@ -package net.Broken.Outils; +package net.Broken.Tools; import net.Broken.Commands.Spam; import net.dv8tion.jda.core.exceptions.RateLimitedException; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/net/Broken/Outils/EmbedMessageUtils.java b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java similarity index 96% rename from src/main/java/net/Broken/Outils/EmbedMessageUtils.java rename to src/main/java/net/Broken/Tools/EmbedMessageUtils.java index 4dd380c..db95c30 100644 --- a/src/main/java/net/Broken/Outils/EmbedMessageUtils.java +++ b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java @@ -1,10 +1,8 @@ -package net.Broken.Outils; +package net.Broken.Tools; import net.dv8tion.jda.core.EmbedBuilder; import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Message; import net.dv8tion.jda.core.entities.MessageEmbed; -import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import java.awt.*; diff --git a/src/main/java/net/Broken/Outils/FindContentOnWebPage.java b/src/main/java/net/Broken/Tools/FindContentOnWebPage.java similarity index 95% rename from src/main/java/net/Broken/Outils/FindContentOnWebPage.java rename to src/main/java/net/Broken/Tools/FindContentOnWebPage.java index 6d13a34..e9a0edc 100644 --- a/src/main/java/net/Broken/Outils/FindContentOnWebPage.java +++ b/src/main/java/net/Broken/Tools/FindContentOnWebPage.java @@ -1,9 +1,8 @@ -package net.Broken.Outils; +package net.Broken.Tools; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; diff --git a/src/main/java/net/Broken/Outils/LimitChecker.java b/src/main/java/net/Broken/Tools/LimitChecker.java similarity index 98% rename from src/main/java/net/Broken/Outils/LimitChecker.java rename to src/main/java/net/Broken/Tools/LimitChecker.java index 89e17ef..fff834c 100644 --- a/src/main/java/net/Broken/Outils/LimitChecker.java +++ b/src/main/java/net/Broken/Tools/LimitChecker.java @@ -1,4 +1,4 @@ -package net.Broken.Outils; +package net.Broken.Tools; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/net/Broken/Outils/MessageTimeOut.java b/src/main/java/net/Broken/Tools/MessageTimeOut.java similarity index 97% rename from src/main/java/net/Broken/Outils/MessageTimeOut.java rename to src/main/java/net/Broken/Tools/MessageTimeOut.java index 01984a3..aa100eb 100644 --- a/src/main/java/net/Broken/Outils/MessageTimeOut.java +++ b/src/main/java/net/Broken/Tools/MessageTimeOut.java @@ -1,4 +1,4 @@ -package net.Broken.Outils; +package net.Broken.Tools; import net.dv8tion.jda.core.entities.Message; import net.dv8tion.jda.core.exceptions.ErrorResponseException; diff --git a/src/main/java/net/Broken/Outils/Moderateur.java b/src/main/java/net/Broken/Tools/Moderateur.java similarity index 99% rename from src/main/java/net/Broken/Outils/Moderateur.java rename to src/main/java/net/Broken/Tools/Moderateur.java index 2bb33dc..c8fc8de 100644 --- a/src/main/java/net/Broken/Outils/Moderateur.java +++ b/src/main/java/net/Broken/Tools/Moderateur.java @@ -1,5 +1,5 @@ -package net.Broken.Outils; +package net.Broken.Tools; import net.Broken.MainBot; diff --git a/src/main/java/net/Broken/Outils/PrivateMessage.java b/src/main/java/net/Broken/Tools/PrivateMessage.java similarity index 80% rename from src/main/java/net/Broken/Outils/PrivateMessage.java rename to src/main/java/net/Broken/Tools/PrivateMessage.java index 9ac7c56..9b05c35 100644 --- a/src/main/java/net/Broken/Outils/PrivateMessage.java +++ b/src/main/java/net/Broken/Tools/PrivateMessage.java @@ -1,10 +1,8 @@ -package net.Broken.Outils; +package net.Broken.Tools; import net.dv8tion.jda.core.entities.Message; import net.dv8tion.jda.core.entities.MessageEmbed; -import net.dv8tion.jda.core.entities.PrivateChannel; import net.dv8tion.jda.core.entities.User; -import net.dv8tion.jda.core.exceptions.RateLimitedException; import org.apache.logging.log4j.Logger; /** diff --git a/src/main/java/net/Broken/Outils/Redirection.java b/src/main/java/net/Broken/Tools/Redirection.java similarity index 96% rename from src/main/java/net/Broken/Outils/Redirection.java rename to src/main/java/net/Broken/Tools/Redirection.java index 011971b..50b8243 100644 --- a/src/main/java/net/Broken/Outils/Redirection.java +++ b/src/main/java/net/Broken/Tools/Redirection.java @@ -1,4 +1,4 @@ -package net.Broken.Outils; +package net.Broken.Tools; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/net/Broken/Tools/UserManager/UserRegister.java b/src/main/java/net/Broken/Tools/UserManager/UserRegister.java new file mode 100644 index 0000000..c128820 --- /dev/null +++ b/src/main/java/net/Broken/Tools/UserManager/UserRegister.java @@ -0,0 +1,14 @@ +package net.Broken.Tools.UserManager; + +import java.security.SecureRandom; + +public class UserRegister { + + + public String generateToken(){ + SecureRandom random = new SecureRandom(); + long longToken = Math.abs( random.nextLong() ); + String randomStr = Long.toString( longToken, 16 ); + return randomStr; + } +} diff --git a/src/main/java/net/Broken/Outils/UserSpamUtils.java b/src/main/java/net/Broken/Tools/UserSpamUtils.java similarity index 97% rename from src/main/java/net/Broken/Outils/UserSpamUtils.java rename to src/main/java/net/Broken/Tools/UserSpamUtils.java index f99fb1c..e7e63d1 100644 --- a/src/main/java/net/Broken/Outils/UserSpamUtils.java +++ b/src/main/java/net/Broken/Tools/UserSpamUtils.java @@ -1,4 +1,4 @@ -package net.Broken.Outils; +package net.Broken.Tools; import net.dv8tion.jda.core.entities.Member; import net.dv8tion.jda.core.entities.Message; diff --git a/src/main/java/net/Broken/audio/AudioM.java b/src/main/java/net/Broken/audio/AudioM.java index c51d971..d608d67 100644 --- a/src/main/java/net/Broken/audio/AudioM.java +++ b/src/main/java/net/Broken/audio/AudioM.java @@ -9,15 +9,13 @@ import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo; import net.Broken.MainBot; -import net.Broken.Outils.EmbedMessageUtils; -import net.Broken.Outils.MessageTimeOut; +import net.Broken.Tools.EmbedMessageUtils; +import net.Broken.Tools.MessageTimeOut; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Message; -import net.dv8tion.jda.core.entities.TextChannel; import net.dv8tion.jda.core.entities.VoiceChannel; import net.dv8tion.jda.core.events.guild.voice.GuildVoiceLeaveEvent; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -import net.dv8tion.jda.core.managers.AudioManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 22bb966..413893a 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -2,24 +2,34 @@ - + + + [%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan} + - + [%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan} - + + + + + [%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan} + + +