From 7f4e16ced952be4e3e2f5179f37b18fd64cdb3a1 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Wed, 25 Apr 2018 16:40:21 +0200 Subject: [PATCH] Updating JDA --- build.gradle | 2 +- src/main/java/net/Broken/BotListener.java | 8 ++--- src/main/java/net/Broken/Commands/Flush.java | 2 +- .../net/Broken/Commands/Over18/Suicide.java | 2 +- src/main/java/net/Broken/Commands/ytTest.java | 13 ++------- src/main/java/net/Broken/Init.java | 20 +++++++------ src/main/java/net/Broken/MainBot.java | 29 ------------------- .../Tools/Command/NumberedCommande.java | 4 +-- .../java/net/Broken/Tools/Moderateur.java | 6 ++-- 9 files changed, 25 insertions(+), 61 deletions(-) diff --git a/build.gradle b/build.gradle index d58cbdc..3ed489b 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { } compile("org.springframework.boot:spring-boot-starter-log4j2") compile("com.sedmelluq:lavaplayer:1.2.49") - compile 'net.dv8tion:JDA:3.3.1_303' + compile 'net.dv8tion:JDA:3.6.0_354' compile group: 'org.json', name: 'json', version: '20160810' compile 'org.springframework.security:spring-security-web:5.0.1.RELEASE' // JPA Data (We are going to use Repositories, Entities, Hibernate, etc...) diff --git a/src/main/java/net/Broken/BotListener.java b/src/main/java/net/Broken/BotListener.java index 991ce80..32e4a8a 100644 --- a/src/main/java/net/Broken/BotListener.java +++ b/src/main/java/net/Broken/BotListener.java @@ -90,10 +90,10 @@ public class BotListener extends ListenerAdapter { try{ - if (event.getMessage().getContent().startsWith("//") && !event.getMessage().getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) { + if (event.getMessage().getContentRaw().startsWith("//") && !event.getMessage().getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) { //On a detecter que c'etait une commande //System.out.println(event.getMessage().getContent()); - MainBot.handleCommand(new CommandParser().parse(event.getMessage().getContent(), event)); + MainBot.handleCommand(new CommandParser().parse(event.getMessage().getContentRaw(), event)); } else if (!event.getMessage().getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) @@ -106,12 +106,12 @@ public class BotListener extends ListenerAdapter { Member user = event.getMember(); // appel de la methode d'analyse de message de "Moderateur" - if (!event.getAuthor().getName().equals("Aethex") && event.getMessage().getContent().length() > 0) { + if (!event.getAuthor().getName().equals("Aethex") && event.getMessage().getContentRaw().length() > 0) { if (modo.analyse(user, serveur, guildManager, event) == 1) { antispam.extermine(user, serveur, guildManager, true, event); } - } else if (event.getMessage().getContent().length() == 0) + } else if (event.getMessage().getContentRaw().length() == 0) logger.error("Image detected, ignoring it."); } diff --git a/src/main/java/net/Broken/Commands/Flush.java b/src/main/java/net/Broken/Commands/Flush.java index a081cb4..ae0377a 100644 --- a/src/main/java/net/Broken/Commands/Flush.java +++ b/src/main/java/net/Broken/Commands/Flush.java @@ -36,7 +36,7 @@ public class Flush implements Commande{ if(limit > retrieved.size()) limit = retrieved.size()-1; for(int i = 0; i textChannel.sendTyping().queue()); @@ -65,29 +68,27 @@ public class Init { //on recupere les utilisateur List utilisateurCo = serveur.getMembers(); - logger.info("Utilisatieur connecté: "+utilisateurCo.size()); + logger.info("Online users: "+utilisateurCo.size()); for (Member anUtilisateurCo : utilisateurCo) { if (anUtilisateurCo.getOnlineStatus().equals(OnlineStatus.ONLINE)) logger.debug("\t*" + anUtilisateurCo.getEffectiveName()); } - logger.debug("Utilisatieur absent: "); + logger.debug("Do not disturb users: "); for (Member anUtilisateurCo : utilisateurCo) { if (anUtilisateurCo.getOnlineStatus().equals(OnlineStatus.DO_NOT_DISTURB)) logger.debug("\t*" + anUtilisateurCo.getEffectiveName()); } - logger.debug("Utilisatieur hors ligne: "); + logger.debug("Offline users: "); for (Member anUtilisateurCo : utilisateurCo) { if (anUtilisateurCo.getOnlineStatus().equals(OnlineStatus.OFFLINE)) logger.debug("\t*" + anUtilisateurCo.getEffectiveName()); } - MainBot.ModoTimer modotimer = new MainBot.ModoTimer(); - modotimer.start(); DayListener dayListener = DayListener.getInstance(); dayListener.addListener(new ResetSpam()); @@ -99,7 +100,7 @@ public class Init { } - catch (LoginException | InterruptedException | RateLimitedException e) + catch (LoginException | InterruptedException e) { logger.catching(e); } @@ -112,7 +113,8 @@ public class Init { static void polish(JDA jda){ CommandLoader.load(); ApiCommandLoader.load(); - jda.getPresence().setGame(Game.of("bot.seb6596.ovh")); + jda.getPresence().setPresence(OnlineStatus.ONLINE, Game.playing("bot.seb6596.ovh")); + } } diff --git a/src/main/java/net/Broken/MainBot.java b/src/main/java/net/Broken/MainBot.java index f067eee..1f096bf 100644 --- a/src/main/java/net/Broken/MainBot.java +++ b/src/main/java/net/Broken/MainBot.java @@ -178,33 +178,4 @@ public class MainBot { } - - /** - * TODO Change this, better use daylistener - */ - public static class ModoTimer extends Thread{ - - - public ModoTimer(){} - - - @Override - public void run() - { - while(true) - { - try { - sleep(5000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - for (User unUser: message_compteur.keySet()) - { - MainBot.message_compteur.put(unUser, 0); - } - } - - } - } - } diff --git a/src/main/java/net/Broken/Tools/Command/NumberedCommande.java b/src/main/java/net/Broken/Tools/Command/NumberedCommande.java index 2456bc2..35ed4ec 100644 --- a/src/main/java/net/Broken/Tools/Command/NumberedCommande.java +++ b/src/main/java/net/Broken/Tools/Command/NumberedCommande.java @@ -101,12 +101,12 @@ public abstract class NumberedCommande implements Commande{ } } 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().getContentRaw() + " 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()); + logger.warn("Bad Argument: " + event.getMessage().getContentRaw() + " From " + event.getAuthor().getName()); break; } } diff --git a/src/main/java/net/Broken/Tools/Moderateur.java b/src/main/java/net/Broken/Tools/Moderateur.java index 1ef9ba9..c38cc0f 100644 --- a/src/main/java/net/Broken/Tools/Moderateur.java +++ b/src/main/java/net/Broken/Tools/Moderateur.java @@ -69,9 +69,9 @@ public class Moderateur { int equalCont = 0; String oldMessage = ""; for(Message aMessage : thisUserHistory){ - if(aMessage.getContent().equals(oldMessage)) + if(aMessage.getContentRaw().equals(oldMessage)) equalCont++; - oldMessage = aMessage.getContent(); + oldMessage = aMessage.getContentRaw(); } if(equalCont >= nbMessage){ @@ -79,7 +79,7 @@ public class Moderateur { logger.info("Detection de spam pour "+user.getEffectiveName()+"avec 3 messages identique: "); for(Message aMessage : thisUserHistory) { - logger.info("\t - "+aMessage.getContent()); + logger.info("\t - "+aMessage.getContentRaw()); } MainBot.historique.put(user.getUser(), new ArrayList()); }