Some code cleaning
This commit is contained in:
parent
3522e31481
commit
a95aaa536f
@ -3,6 +3,7 @@ package net.Broken;
|
|||||||
import net.Broken.Commands.Move;
|
import net.Broken.Commands.Move;
|
||||||
import net.Broken.Commands.Music;
|
import net.Broken.Commands.Music;
|
||||||
import net.Broken.Tools.AntiSpam;
|
import net.Broken.Tools.AntiSpam;
|
||||||
|
import net.Broken.Tools.Command.CommandParser;
|
||||||
import net.Broken.Tools.Moderateur;
|
import net.Broken.Tools.Moderateur;
|
||||||
import net.dv8tion.jda.core.entities.ChannelType;
|
import net.dv8tion.jda.core.entities.ChannelType;
|
||||||
import net.dv8tion.jda.core.entities.Guild;
|
import net.dv8tion.jda.core.entities.Guild;
|
||||||
@ -87,7 +88,7 @@ public class BotListener extends ListenerAdapter {
|
|||||||
if (event.getMessage().getContent().startsWith("//") && !event.getMessage().getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) {
|
if (event.getMessage().getContent().startsWith("//") && !event.getMessage().getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) {
|
||||||
//On a detecter que c'etait une commande
|
//On a detecter que c'etait une commande
|
||||||
//System.out.println(event.getMessage().getContent());
|
//System.out.println(event.getMessage().getContent());
|
||||||
MainBot.handleCommand(MainBot.parser.parse(event.getMessage().getContent(), event));
|
MainBot.handleCommand(new CommandParser().parse(event.getMessage().getContent(), event));
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (!event.getMessage().getAuthor().getId().equals(event.getJDA().getSelfUser().getId()))
|
else if (!event.getMessage().getAuthor().getId().equals(event.getJDA().getSelfUser().getId()))
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
package net.Broken;
|
package net.Broken;
|
||||||
|
|
||||||
import net.Broken.Tools.Command.CommandLoader;
|
import net.Broken.Tools.Command.CommandLoader;
|
||||||
import net.Broken.Tools.DayListener;
|
import net.Broken.Tools.DayListener.DayListener;
|
||||||
|
import net.Broken.Tools.DayListener.Listeners.ResetSpam;
|
||||||
import net.dv8tion.jda.core.AccountType;
|
import net.dv8tion.jda.core.AccountType;
|
||||||
import net.dv8tion.jda.core.JDA;
|
import net.dv8tion.jda.core.JDA;
|
||||||
import net.dv8tion.jda.core.JDABuilder;
|
import net.dv8tion.jda.core.JDABuilder;
|
||||||
@ -79,8 +80,11 @@ public class Init {
|
|||||||
|
|
||||||
MainBot.ModoTimer modotimer = new MainBot.ModoTimer();
|
MainBot.ModoTimer modotimer = new MainBot.ModoTimer();
|
||||||
modotimer.start();
|
modotimer.start();
|
||||||
DayListener dayListener = new DayListener();
|
|
||||||
|
DayListener dayListener = DayListener.getInstance();
|
||||||
|
dayListener.addListener(new ResetSpam());
|
||||||
dayListener.start();
|
dayListener.start();
|
||||||
|
|
||||||
logger.debug("-----------------FIN INITIALISATION-----------------");
|
logger.debug("-----------------FIN INITIALISATION-----------------");
|
||||||
|
|
||||||
jda.getPresence().setGame(Game.of("Statut: Ok!"));
|
jda.getPresence().setGame(Game.of("Statut: Ok!"));
|
||||||
|
@ -28,13 +28,11 @@ import java.util.HashMap;
|
|||||||
@Controller
|
@Controller
|
||||||
public class MainBot {
|
public class MainBot {
|
||||||
|
|
||||||
public static final CommandParser parser =new CommandParser();
|
|
||||||
public static HashMap<String, Commande> commandes = new HashMap<>();
|
public static HashMap<String, Commande> commandes = new HashMap<>();
|
||||||
public static HashMap<User, ArrayList<Message>> historique =new HashMap<>();
|
public static HashMap<User, ArrayList<Message>> historique =new HashMap<>();
|
||||||
public static HashMap<User, Integer> message_compteur =new HashMap<>();
|
public static HashMap<User, Integer> message_compteur =new HashMap<>();
|
||||||
public static boolean roleFlag = false;
|
public static boolean roleFlag = false;
|
||||||
public static HashMap<User, UserSpamUtils> spamUtils = new HashMap<>();
|
public static HashMap<User, UserSpamUtils> spamUtils = new HashMap<>();
|
||||||
public static UserRegister userRegister = new UserRegister();
|
|
||||||
public static JDA jda;
|
public static JDA jda;
|
||||||
|
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ import net.Broken.RestApi.Data.UserManager.CheckResposeData;
|
|||||||
import net.Broken.RestApi.Data.UserManager.UserInfoData;
|
import net.Broken.RestApi.Data.UserManager.UserInfoData;
|
||||||
import net.Broken.Tools.UserManager.Exceptions.UnknownTokenException;
|
import net.Broken.Tools.UserManager.Exceptions.UnknownTokenException;
|
||||||
import net.Broken.Tools.UserManager.Exceptions.UserNotFoundException;
|
import net.Broken.Tools.UserManager.Exceptions.UserNotFoundException;
|
||||||
|
import net.Broken.Tools.UserManager.UserRegister;
|
||||||
import net.Broken.audio.NotConectedException;
|
import net.Broken.audio.NotConectedException;
|
||||||
import net.Broken.audio.NullMusicManager;
|
import net.Broken.audio.NullMusicManager;
|
||||||
import net.dv8tion.jda.core.entities.VoiceChannel;
|
import net.dv8tion.jda.core.entities.VoiceChannel;
|
||||||
@ -41,6 +42,8 @@ public class MusicWebAPIController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
UserRepository userRepository;
|
UserRepository userRepository;
|
||||||
|
|
||||||
|
UserRegister userRegister = UserRegister.getInstance();
|
||||||
|
|
||||||
|
|
||||||
@RequestMapping("/currentMusicInfo")
|
@RequestMapping("/currentMusicInfo")
|
||||||
public CurrentMusicData getCurrentM(){
|
public CurrentMusicData getCurrentM(){
|
||||||
@ -82,7 +85,7 @@ public class MusicWebAPIController {
|
|||||||
if(data.command != null) {
|
if(data.command != null) {
|
||||||
if(data.token != null) {
|
if(data.token != null) {
|
||||||
try {
|
try {
|
||||||
UserEntity user = MainBot.userRegister.getUserWithApiToken(userRepository, data.token);
|
UserEntity user = userRegister.getUserWithApiToken(userRepository, data.token);
|
||||||
logger.info("receive command " + data.command + " from " + request.getRemoteAddr() + " USER: " + user.getName());
|
logger.info("receive command " + data.command + " from " + request.getRemoteAddr() + " USER: " + user.getName());
|
||||||
Music musicCommande = (Music) MainBot.commandes.get("music");
|
Music musicCommande = (Music) MainBot.commandes.get("music");
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@ import net.Broken.Tools.UserManager.Exceptions.PasswordNotMatchException;
|
|||||||
import net.Broken.Tools.UserManager.Exceptions.TokenNotMatch;
|
import net.Broken.Tools.UserManager.Exceptions.TokenNotMatch;
|
||||||
import net.Broken.Tools.UserManager.Exceptions.UserAlreadyRegistered;
|
import net.Broken.Tools.UserManager.Exceptions.UserAlreadyRegistered;
|
||||||
import net.Broken.Tools.UserManager.Exceptions.UserNotFoundException;
|
import net.Broken.Tools.UserManager.Exceptions.UserNotFoundException;
|
||||||
|
import net.Broken.Tools.UserManager.UserRegister;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -37,12 +38,14 @@ public class UserManagerAPIController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private PasswordEncoder passwordEncoder;
|
private PasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
|
UserRegister userRegister = UserRegister.getInstance();
|
||||||
|
|
||||||
|
|
||||||
@RequestMapping(value = "/preRegister", method = RequestMethod.POST)
|
@RequestMapping(value = "/preRegister", method = RequestMethod.POST)
|
||||||
public ResponseEntity<CheckResposeData> command(@RequestBody UserInfoData data){
|
public ResponseEntity<CheckResposeData> command(@RequestBody UserInfoData data){
|
||||||
if(data != null && data.name != null) {
|
if(data != null && data.name != null) {
|
||||||
try {
|
try {
|
||||||
String id = MainBot.userRegister.sendCheckToken(pendingUserRepository, userRepository, passwordEncoder, data);
|
String id = userRegister.sendCheckToken(pendingUserRepository, userRepository, passwordEncoder, data);
|
||||||
return new ResponseEntity<>(new CheckResposeData(true, data.name, "Message sent", id), HttpStatus.OK);
|
return new ResponseEntity<>(new CheckResposeData(true, data.name, "Message sent", id), HttpStatus.OK);
|
||||||
} catch (UserNotFoundException e) {
|
} catch (UserNotFoundException e) {
|
||||||
logger.warn("User \"" + data.name + "\" not found!");
|
logger.warn("User \"" + data.name + "\" not found!");
|
||||||
@ -63,8 +66,8 @@ public class UserManagerAPIController {
|
|||||||
public ResponseEntity<UserConnectionData> confirAccount(@RequestBody ConfirmData data){
|
public ResponseEntity<UserConnectionData> confirAccount(@RequestBody ConfirmData data){
|
||||||
//TODO move pending user to accepted and return right things
|
//TODO move pending user to accepted and return right things
|
||||||
try {
|
try {
|
||||||
PendingUserEntity pUser = MainBot.userRegister.confirmCheckToken(pendingUserRepository, Integer.parseInt(data.id), data.checkToken);
|
PendingUserEntity pUser = userRegister.confirmCheckToken(pendingUserRepository, Integer.parseInt(data.id), data.checkToken);
|
||||||
UserEntity user = new UserEntity(pUser, MainBot.userRegister.generateApiToken());
|
UserEntity user = new UserEntity(pUser, userRegister.generateApiToken());
|
||||||
userRepository.save(user);
|
userRepository.save(user);
|
||||||
pendingUserRepository.delete(pUser);
|
pendingUserRepository.delete(pUser);
|
||||||
|
|
||||||
@ -81,7 +84,7 @@ public class UserManagerAPIController {
|
|||||||
@RequestMapping(value = "/requestToken", method = RequestMethod.POST)
|
@RequestMapping(value = "/requestToken", method = RequestMethod.POST)
|
||||||
public ResponseEntity<UserConnectionData> requestToken(@RequestBody UserInfoData data){
|
public ResponseEntity<UserConnectionData> requestToken(@RequestBody UserInfoData data){
|
||||||
try {
|
try {
|
||||||
UserEntity user = MainBot.userRegister.getUser(userRepository, passwordEncoder, data);
|
UserEntity user = userRegister.getUser(userRepository, passwordEncoder, data);
|
||||||
return new ResponseEntity<>(new UserConnectionData(true, user.getName(), user.getApiToken(), ""), HttpStatus.OK);
|
return new ResponseEntity<>(new UserConnectionData(true, user.getName(), user.getApiToken(), ""), HttpStatus.OK);
|
||||||
|
|
||||||
} catch (UserNotFoundException e) {
|
} catch (UserNotFoundException e) {
|
||||||
|
@ -1,42 +0,0 @@
|
|||||||
package net.Broken.Tools;
|
|
||||||
import net.Broken.Commands.Spam;
|
|
||||||
import net.dv8tion.jda.core.exceptions.RateLimitedException;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
|
|
||||||
import java.util.GregorianCalendar;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by seb65 on 09/11/2016.
|
|
||||||
*/
|
|
||||||
public class DayListener extends Thread {
|
|
||||||
GregorianCalendar calendrier;
|
|
||||||
int datePrecedente;
|
|
||||||
|
|
||||||
public DayListener() {
|
|
||||||
calendrier = new GregorianCalendar();
|
|
||||||
datePrecedente=0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
while(true)
|
|
||||||
{
|
|
||||||
if(calendrier.get(GregorianCalendar.DAY_OF_MONTH)!=datePrecedente)
|
|
||||||
{
|
|
||||||
Spam spam=new Spam();
|
|
||||||
String str[]={"all"};
|
|
||||||
datePrecedente=calendrier.get(GregorianCalendar.DAY_OF_MONTH);
|
|
||||||
try {
|
|
||||||
spam.reset(null,str);
|
|
||||||
} catch (RateLimitedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
sleep(7200000);
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
LogManager.getLogger().catching(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
53
src/main/java/net/Broken/Tools/DayListener/DayListener.java
Normal file
53
src/main/java/net/Broken/Tools/DayListener/DayListener.java
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
package net.Broken.Tools.DayListener;
|
||||||
|
import net.Broken.Commands.Spam;
|
||||||
|
import net.dv8tion.jda.core.exceptions.RateLimitedException;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.GregorianCalendar;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by seb65 on 09/11/2016.
|
||||||
|
*/
|
||||||
|
public class DayListener extends Thread {
|
||||||
|
private GregorianCalendar calendar;
|
||||||
|
private int previousDay;
|
||||||
|
private ArrayList<NewDayListener> listeners = new ArrayList<>();
|
||||||
|
|
||||||
|
private DayListener() {
|
||||||
|
calendar = new GregorianCalendar();
|
||||||
|
previousDay = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static DayListener INSTANCE = new DayListener();
|
||||||
|
|
||||||
|
public static DayListener getInstance()
|
||||||
|
{
|
||||||
|
return INSTANCE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addListener(NewDayListener listener){
|
||||||
|
listeners.add(listener);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
while(true)
|
||||||
|
{
|
||||||
|
if(calendar.get(GregorianCalendar.DAY_OF_MONTH) != previousDay)
|
||||||
|
{
|
||||||
|
LogManager.getLogger().info("New day triggered!");
|
||||||
|
for(NewDayListener listener : listeners){
|
||||||
|
listener.onNewDay();
|
||||||
|
}
|
||||||
|
previousDay = calendar.get(GregorianCalendar.DAY_OF_MONTH);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
sleep(7200000);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
LogManager.getLogger().catching(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,21 @@
|
|||||||
|
package net.Broken.Tools.DayListener.Listeners;
|
||||||
|
|
||||||
|
import net.Broken.Commands.Spam;
|
||||||
|
import net.Broken.Tools.DayListener.NewDayListener;
|
||||||
|
import net.dv8tion.jda.core.exceptions.RateLimitedException;
|
||||||
|
|
||||||
|
import java.util.GregorianCalendar;
|
||||||
|
|
||||||
|
public class ResetSpam implements NewDayListener {
|
||||||
|
@Override
|
||||||
|
public void onNewDay() {
|
||||||
|
Spam spam = new Spam();
|
||||||
|
String str[] = {"all"};
|
||||||
|
|
||||||
|
try {
|
||||||
|
spam.reset(null,str);
|
||||||
|
} catch (RateLimitedException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,5 @@
|
|||||||
|
package net.Broken.Tools.DayListener;
|
||||||
|
|
||||||
|
public interface NewDayListener {
|
||||||
|
void onNewDay();
|
||||||
|
}
|
@ -24,7 +24,17 @@ import java.util.UUID;
|
|||||||
|
|
||||||
public class UserRegister {
|
public class UserRegister {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private Logger logger = LogManager.getLogger();
|
private Logger logger = LogManager.getLogger();
|
||||||
|
private static UserRegister INSTANCE = new UserRegister();
|
||||||
|
|
||||||
|
private UserRegister(){}
|
||||||
|
|
||||||
|
public static UserRegister getInstance(){
|
||||||
|
return INSTANCE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public String sendCheckToken(PendingUserRepository pendingUserRepository, UserRepository userRepository, PasswordEncoder passwordEncoder, UserInfoData userInfo) throws UserNotFoundException, PasswordNotMatchException, UserAlreadyRegistered {
|
public String sendCheckToken(PendingUserRepository pendingUserRepository, UserRepository userRepository, PasswordEncoder passwordEncoder, UserInfoData userInfo) throws UserNotFoundException, PasswordNotMatchException, UserAlreadyRegistered {
|
||||||
|
Loading…
Reference in New Issue
Block a user