From c3ff5a9ad149cfd8deb12b071335b3532c02b636 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Thu, 22 Nov 2018 15:31:26 +0200 Subject: [PATCH] Somme code refractor --- src/main/java/net/Broken/Init.java | 2 +- src/main/java/net/Broken/MainBot.java | 29 +++---------------- .../java/net/Broken/Tools/LimitChecker.java | 8 ++--- 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/src/main/java/net/Broken/Init.java b/src/main/java/net/Broken/Init.java index fc74f26..f217660 100644 --- a/src/main/java/net/Broken/Init.java +++ b/src/main/java/net/Broken/Init.java @@ -34,7 +34,7 @@ public class Init { * @param dev dev Mode or not * @return JDA object */ - static JDA initJda(String token, boolean dev){ + static JDA initJda(String token){ JDA jda = null; logger.debug("-------------------INITIALISATION-------------------"); diff --git a/src/main/java/net/Broken/MainBot.java b/src/main/java/net/Broken/MainBot.java index 1411b3b..de467b0 100644 --- a/src/main/java/net/Broken/MainBot.java +++ b/src/main/java/net/Broken/MainBot.java @@ -53,25 +53,12 @@ public class MainBot { logger.info("--------------Starting Bot-------------"); logger.info("======================================="); - - String token = null; - int i = 0; - for(String aArg: args){ - logger.debug(aArg); - if(aArg.startsWith("--") || aArg.startsWith("-")){ - aArg = aArg.replaceAll("-",""); - if(aArg.equals("dev") || aArg.equals("d")){ - dev = true; - } - } - i++; - } - token = System.getenv("TOKEN"); - jda = Init.initJda(token, dev); - if(System.getenv("dev")!= null){ - dev = true; + if(System.getenv("DEV")!= null){ + dev = Boolean.parseBoolean(System.getenv("DEV")); } + String token = System.getenv("TOKEN"); + jda = Init.initJda(token); ConfigurableApplicationContext ctx = SpringApplication.run(MainBot.class, args); @@ -85,14 +72,6 @@ public class MainBot { Init.polish(jda); ready = true; - - - - - - - - } /** diff --git a/src/main/java/net/Broken/Tools/LimitChecker.java b/src/main/java/net/Broken/Tools/LimitChecker.java index b0514df..1e58730 100644 --- a/src/main/java/net/Broken/Tools/LimitChecker.java +++ b/src/main/java/net/Broken/Tools/LimitChecker.java @@ -40,7 +40,7 @@ public class LimitChecker { } number-=400; redirected = false; - logger.trace("First pass: "+number); + logger.debug("First pass: "+number); while(!redirected ) { String origin = baseURL+number+"-2/"; @@ -53,7 +53,7 @@ public class LimitChecker { } number-=90; redirected = false; - logger.trace("Second pass: "+number); + logger.debug("Second pass: "+number); while(!redirected ) { String origin = baseURL+number+"-2/"; @@ -66,7 +66,7 @@ public class LimitChecker { } number-=9; redirected = false; - logger.trace("Third pass: "+number); + logger.debug("Third pass: "+number); while(!redirected ) { String origin = baseURL+number+"-2/"; @@ -78,7 +78,7 @@ public class LimitChecker { redirected = true; } number-=1; - logger.trace("Final pass: "+number); + logger.debug("Final pass: "+number); return number;