diff --git a/pom.xml b/pom.xml index 3f9f473..22e44ed 100644 --- a/pom.xml +++ b/pom.xml @@ -11,14 +11,24 @@ UTF-8 UTF-8 - 4.5.3 - 4.0.1 - 20160810 - 1.10.2 - 6.0.6 - 2.5 + 4.5.9 + 4.4.0.1 + 20180813 + 1.12.1 + 8.0.17 + 2.6 + + + + com.fasterxml.jackson.core + jackson-annotations + 2.9.9 + + + + org.telegram diff --git a/src/main/java/org/telegram/Commands.java b/src/main/java/org/telegram/Commands.java index ded6096..870c148 100644 --- a/src/main/java/org/telegram/Commands.java +++ b/src/main/java/org/telegram/Commands.java @@ -26,6 +26,8 @@ public class Commands { public static final String help = commandInitChar + "help"; /// Upload command public static final String uploadCommand = commandInitChar + "upload"; + /// Report command + public static final String reportCommand = commandInitChar + "report"; /// Start command public static final String startCommand = commandInitChar + "start"; /// Cancel command diff --git a/src/main/java/org/telegram/Main.java b/src/main/java/org/telegram/Main.java index 7fe44cf..54f41d5 100644 --- a/src/main/java/org/telegram/Main.java +++ b/src/main/java/org/telegram/Main.java @@ -1,15 +1,12 @@ package org.telegram; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.telegrambots.ApiContextInitializer; import org.telegram.telegrambots.meta.TelegramBotsApi; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.logging.BotLogger; -import org.telegram.telegrambots.meta.logging.BotsFileHandler; -import org.telegram.updateshandlers.*; - -import java.io.IOException; -import java.util.logging.ConsoleHandler; -import java.util.logging.Level; +import org.telegram.updateshandlers.WeatherHandlers; +import org.telegram.updateshandlers.WebHookExampleHandlers; /** * @author Ruben Bermudez @@ -18,35 +15,27 @@ import java.util.logging.Level; * @date 20 of June of 2015 */ public class Main { - private static final String LOGTAG = "MAIN"; + private static final Logger log = LogManager.getLogger(Main.class); public static void main(String[] args) { - BotLogger.setLevel(Level.ALL); - BotLogger.registerLogger(new ConsoleHandler()); - try { - BotLogger.registerLogger(new BotsFileHandler()); - } catch (IOException e) { - BotLogger.severe(LOGTAG, e); - } - try { ApiContextInitializer.init(); TelegramBotsApi telegramBotsApi = createTelegramBotsApi(); try { // Register long polling bots. They work regardless type of TelegramBotsApi we are creating - telegramBotsApi.registerBot(new ChannelHandlers()); - telegramBotsApi.registerBot(new DirectionsHandlers()); - telegramBotsApi.registerBot(new RaeHandlers()); + // telegramBotsApi.registerBot(new ChannelHandlers()); + // telegramBotsApi.registerBot(new DirectionsHandlers()); + // telegramBotsApi.registerBot(new RaeHandlers()); telegramBotsApi.registerBot(new WeatherHandlers()); - telegramBotsApi.registerBot(new TransifexHandlers()); - telegramBotsApi.registerBot(new FilesHandlers()); - telegramBotsApi.registerBot(new CommandsHandler(BotConfig.COMMANDS_USER)); - telegramBotsApi.registerBot(new ElektrollArtFanHandler()); + // telegramBotsApi.registerBot(new TransifexHandlers()); + // telegramBotsApi.registerBot(new FilesHandlers()); + // telegramBotsApi.registerBot(new CommandsHandler(BotConfig.COMMANDS_USER)); + // telegramBotsApi.registerBot(new ElektrollArtFanHandler()); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } diff --git a/src/main/java/org/telegram/commands/HelloCommand.java b/src/main/java/org/telegram/commands/HelloCommand.java index 508a678..3006880 100644 --- a/src/main/java/org/telegram/commands/HelloCommand.java +++ b/src/main/java/org/telegram/commands/HelloCommand.java @@ -1,5 +1,7 @@ package org.telegram.commands; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.database.DatabaseManager; import org.telegram.telegrambots.extensions.bots.commandbot.commands.BotCommand; import org.telegram.telegrambots.meta.api.methods.send.SendMessage; @@ -7,7 +9,6 @@ import org.telegram.telegrambots.meta.api.objects.Chat; import org.telegram.telegrambots.meta.api.objects.User; import org.telegram.telegrambots.meta.bots.AbsSender; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.logging.BotLogger; /** * This command simply replies with a hello to the users command and @@ -16,8 +17,7 @@ import org.telegram.telegrambots.meta.logging.BotLogger; * @author Timo Schulz (Mit0x2) */ public class HelloCommand extends BotCommand { - - private static final String LOGTAG = "HELLOCOMMAND"; + private static final Logger log = LogManager.getLogger(HelloCommand.class); public HelloCommand() { super("hello", "Say hallo to this bot"); @@ -49,7 +49,7 @@ public class HelloCommand extends BotCommand { try { absSender.execute(answer); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } \ No newline at end of file diff --git a/src/main/java/org/telegram/commands/HelpCommand.java b/src/main/java/org/telegram/commands/HelpCommand.java index eb99f77..8870bc9 100644 --- a/src/main/java/org/telegram/commands/HelpCommand.java +++ b/src/main/java/org/telegram/commands/HelpCommand.java @@ -1,6 +1,9 @@ package org.telegram.commands; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.database.DatabaseManager; +import org.telegram.services.RaeService; import org.telegram.telegrambots.extensions.bots.commandbot.commands.BotCommand; import org.telegram.telegrambots.extensions.bots.commandbot.commands.IBotCommand; import org.telegram.telegrambots.extensions.bots.commandbot.commands.ICommandRegistry; @@ -9,7 +12,6 @@ import org.telegram.telegrambots.meta.api.objects.Chat; import org.telegram.telegrambots.meta.api.objects.User; import org.telegram.telegrambots.meta.bots.AbsSender; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.logging.BotLogger; /** * This command helps the user to find the command they need @@ -17,8 +19,7 @@ import org.telegram.telegrambots.meta.logging.BotLogger; * @author Timo Schulz (Mit0x2) */ public class HelpCommand extends BotCommand { - - private static final String LOGTAG = "HELPCOMMAND"; + private static final Logger log = LogManager.getLogger(RaeService.class); private final ICommandRegistry commandRegistry; @@ -49,7 +50,7 @@ public class HelpCommand extends BotCommand { try { absSender.execute(helpMessage); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } diff --git a/src/main/java/org/telegram/commands/StartCommand.java b/src/main/java/org/telegram/commands/StartCommand.java index 450d96f..123ae81 100644 --- a/src/main/java/org/telegram/commands/StartCommand.java +++ b/src/main/java/org/telegram/commands/StartCommand.java @@ -1,5 +1,7 @@ package org.telegram.commands; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.database.DatabaseManager; import org.telegram.telegrambots.extensions.bots.commandbot.commands.BotCommand; import org.telegram.telegrambots.meta.api.methods.send.SendMessage; @@ -7,7 +9,6 @@ import org.telegram.telegrambots.meta.api.objects.Chat; import org.telegram.telegrambots.meta.api.objects.User; import org.telegram.telegrambots.meta.bots.AbsSender; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.logging.BotLogger; /** * This commands starts the conversation with the bot @@ -15,8 +16,7 @@ import org.telegram.telegrambots.meta.logging.BotLogger; * @author Timo Schulz (Mit0x2) */ public class StartCommand extends BotCommand { - - public static final String LOGTAG = "STARTCOMMAND"; + private static final Logger log = LogManager.getLogger(StartCommand.class); public StartCommand() { super("start", "With this command you can start the Bot"); @@ -45,7 +45,7 @@ public class StartCommand extends BotCommand { try { absSender.execute(answer); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } \ No newline at end of file diff --git a/src/main/java/org/telegram/commands/StopCommand.java b/src/main/java/org/telegram/commands/StopCommand.java index 9079825..177f1dc 100644 --- a/src/main/java/org/telegram/commands/StopCommand.java +++ b/src/main/java/org/telegram/commands/StopCommand.java @@ -1,5 +1,7 @@ package org.telegram.commands; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.database.DatabaseManager; import org.telegram.telegrambots.extensions.bots.commandbot.commands.BotCommand; import org.telegram.telegrambots.meta.api.methods.send.SendMessage; @@ -7,7 +9,6 @@ import org.telegram.telegrambots.meta.api.objects.Chat; import org.telegram.telegrambots.meta.api.objects.User; import org.telegram.telegrambots.meta.bots.AbsSender; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.logging.BotLogger; /** * This commands stops the conversation with the bot. @@ -16,8 +17,7 @@ import org.telegram.telegrambots.meta.logging.BotLogger; * @author Timo Schulz (Mit0x2) */ public class StopCommand extends BotCommand { - - public static final String LOGTAG = "STOPCOMMAND"; + private static final Logger log = LogManager.getLogger(StopCommand.class); /** * Construct @@ -41,7 +41,7 @@ public class StopCommand extends BotCommand { try { absSender.execute(answer); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } diff --git a/src/main/java/org/telegram/database/ConectionDB.java b/src/main/java/org/telegram/database/ConectionDB.java index c429628..e662efc 100644 --- a/src/main/java/org/telegram/database/ConectionDB.java +++ b/src/main/java/org/telegram/database/ConectionDB.java @@ -7,10 +7,17 @@ */ package org.telegram.database; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.BuildVars; -import org.telegram.telegrambots.meta.logging.BotLogger; -import java.sql.*; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; /** * @author Ruben Bermudez @@ -18,7 +25,8 @@ import java.sql.*; * Connector to database */ public class ConectionDB { - private static final String LOGTAG = "CONNECTIONDB"; + private static final Logger log = LogManager.getLogger(ConectionDB.class); + private Connection currentConection; public ConectionDB() { @@ -31,7 +39,7 @@ public class ConectionDB { Class.forName(BuildVars.controllerDB).newInstance(); connection = DriverManager.getConnection(BuildVars.linkDB, BuildVars.userDB, BuildVars.password); } catch (SQLException | ClassNotFoundException | IllegalAccessException | InstantiationException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return connection; @@ -41,7 +49,7 @@ public class ConectionDB { try { this.currentConection.close(); } catch (SQLException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -80,7 +88,7 @@ public class ConectionDB { } } } catch (SQLException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return max; } diff --git a/src/main/java/org/telegram/database/DatabaseManager.java b/src/main/java/org/telegram/database/DatabaseManager.java index 2c56f9e..142590e 100644 --- a/src/main/java/org/telegram/database/DatabaseManager.java +++ b/src/main/java/org/telegram/database/DatabaseManager.java @@ -7,8 +7,9 @@ */ package org.telegram.database; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.structure.WeatherAlert; -import org.telegram.telegrambots.meta.logging.BotLogger; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -25,7 +26,7 @@ import java.util.List; * @date 3/12/14 */ public class DatabaseManager { - private static final String LOGTAG = "DATABASEMANAGER"; + private static final Logger log = LogManager.getLogger(DatabaseManager.class); private static volatile DatabaseManager instance; private static volatile ConectionDB connetion; @@ -36,7 +37,7 @@ public class DatabaseManager { private DatabaseManager() { connetion = new ConectionDB(); final int currentVersion = connetion.checkVersion(); - BotLogger.info(LOGTAG, "Current db version: " + currentVersion); + log.info("Current db version: " + currentVersion); if (currentVersion < CreationStrings.version) { recreateTable(currentVersion); } @@ -94,7 +95,7 @@ public class DatabaseManager { } connetion.commitTransaction(); } catch (SQLException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } diff --git a/src/main/java/org/telegram/services/DirectionsService.java b/src/main/java/org/telegram/services/DirectionsService.java index 6e67f30..d25c7f7 100644 --- a/src/main/java/org/telegram/services/DirectionsService.java +++ b/src/main/java/org/telegram/services/DirectionsService.java @@ -8,11 +8,12 @@ import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Jsoup; import org.telegram.BuildVars; -import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -27,7 +28,7 @@ import java.util.List; * @date 20 of June of 2015 */ public class DirectionsService { - private static final String LOGTAG = "DIRECTIONSSERVICE"; + private static final Logger log = LogManager.getLogger(DirectionsService.class); private static final String BASEURL = "https://maps.googleapis.com/maps/api/directions/json"; ///< Base url for REST private static final String APIIDEND = "&key=" + BuildVars.DirectionsApiKey; @@ -98,7 +99,7 @@ public class DirectionsService { responseToUser.add(LocalisationService.getString("directionsNotFound", language)); } } catch (Exception e) { - BotLogger.warn(LOGTAG, e); + log.warn(e.getLocalizedMessage(), e); responseToUser.add(LocalisationService.getString("errorFetchingDirections", language)); } return responseToUser; diff --git a/src/main/java/org/telegram/services/RaeService.java b/src/main/java/org/telegram/services/RaeService.java index 1d22ba4..f77c4ca 100644 --- a/src/main/java/org/telegram/services/RaeService.java +++ b/src/main/java/org/telegram/services/RaeService.java @@ -8,11 +8,12 @@ import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.IOException; import java.net.URLEncoder; @@ -28,7 +29,7 @@ import java.util.Map; * @date 20 of June of 2015 */ public class RaeService { - private static final String LOGTAG = "RAESERVICE"; + private static final Logger log = LogManager.getLogger(RaeService.class); private static final String BASEURL = "http://dle.rae.es/srv/"; ///< Base url for REST private static final String SEARCHEXACTURL = "search?m=30&w="; @@ -66,7 +67,7 @@ public class RaeService { results = getResultsFromExactMatch(elements, query, articleId); } } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return results; @@ -103,7 +104,7 @@ public class RaeService { } } } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return results; @@ -137,7 +138,7 @@ public class RaeService { results = getResultsFromExactMatch(elements, word, articleId); } } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return results; diff --git a/src/main/java/org/telegram/services/TimerExecutor.java b/src/main/java/org/telegram/services/TimerExecutor.java index 4b3ce73..2295573 100644 --- a/src/main/java/org/telegram/services/TimerExecutor.java +++ b/src/main/java/org/telegram/services/TimerExecutor.java @@ -1,6 +1,7 @@ package org.telegram.services; -import org.telegram.telegrambots.meta.logging.BotLogger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.time.Clock; import java.time.Duration; @@ -15,7 +16,7 @@ import java.util.concurrent.TimeUnit; * Execute a task periodically */ public class TimerExecutor { - private static final String LOGTAG = "TIMEREXECUTOR"; + private static final Logger log = LogManager.getLogger(TimerExecutor.class); private static volatile TimerExecutor instance; ///< Instance private static final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1); ///< Thread to execute operations @@ -55,14 +56,14 @@ public class TimerExecutor { * @param targetSec Second to execute it */ public void startExecutionEveryDayAt(CustomTimerTask task, int targetHour, int targetMin, int targetSec) { - BotLogger.warn(LOGTAG, "Posting new task" + task.getTaskName()); + log.warn("Posting new task" + task.getTaskName()); final Runnable taskWrapper = () -> { try { task.execute(); task.reduceTimes(); startExecutionEveryDayAt(task, targetHour, targetMin, targetSec); } catch (Exception e) { - BotLogger.severe(LOGTAG, "Bot threw an unexpected exception at TimerExecutor", e); + log.fatal("Bot threw an unexpected exception at TimerExecutor", e); } }; if (task.getTimes() != 0) { @@ -103,9 +104,9 @@ public class TimerExecutor { try { executorService.awaitTermination(1, TimeUnit.DAYS); } catch (InterruptedException ex) { - BotLogger.severe(LOGTAG, ex); + log.fatal(ex.getLocalizedMessage(), ex); } catch (Exception e) { - BotLogger.severe(LOGTAG, "Bot threw an unexpected exception at TimerExecutor", e); + log.fatal(e.getLocalizedMessage(), "Bot threw an unexpected exception at TimerExecutor", e); } } } diff --git a/src/main/java/org/telegram/services/TransifexService.java b/src/main/java/org/telegram/services/TransifexService.java index 7d834a3..7abe2e6 100644 --- a/src/main/java/org/telegram/services/TransifexService.java +++ b/src/main/java/org/telegram/services/TransifexService.java @@ -7,9 +7,10 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.BuildVars; import org.telegram.telegrambots.meta.api.methods.send.SendDocument; -import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.*; @@ -20,7 +21,7 @@ import java.io.*; * @date 21 of June of 2015 */ public class TransifexService { - private static final String LOGTAG = "TRANSIFEXSERVICE"; + private static final Logger log = LogManager.getLogger(TransifexService.class); private static final String BASEURLAndroid = "http://" + BuildVars.TRANSIFEXUSER + ":" + BuildVars.TRANSIFEXPASSWORD + "@www.transifex.com/api/2/project/telegram/resource/stringsxml-48/translation/@language?file"; ///< Base url for REST private static final String BASEURLiOS = "http://" + BuildVars.TRANSIFEXUSER + ":" + BuildVars.TRANSIFEXPASSWORD + "@www.transifex.com/api/2/project/iphone-1/resource/localizablestrings/translation/@language?file"; ///< Base url for REST @@ -77,7 +78,7 @@ public class TransifexService { result = responseString; } } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return result; } @@ -90,7 +91,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return result; } @@ -103,7 +104,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return result; } @@ -116,7 +117,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return result; } @@ -129,7 +130,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-8"), "UTF-8"); } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return result; } @@ -142,7 +143,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return result; } @@ -155,7 +156,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return result; } @@ -195,11 +196,11 @@ public class TransifexService { sendDocument = new SendDocument(); sendDocument.setDocument(fileToUpload); } catch (FileNotFoundException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return sendDocument; } @@ -222,11 +223,11 @@ public class TransifexService { sendDocument = new SendDocument(); sendDocument.setDocument(fileToUpload); } catch (FileNotFoundException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return sendDocument; } @@ -250,11 +251,11 @@ public class TransifexService { sendDocument = new SendDocument(); sendDocument.setDocument(fileToUpload); } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return sendDocument; } @@ -277,11 +278,11 @@ public class TransifexService { sendDocument = new SendDocument(); sendDocument.setDocument(fileToUpload); } catch (IOException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } return sendDocument; } diff --git a/src/main/java/org/telegram/services/WeatherService.java b/src/main/java/org/telegram/services/WeatherService.java index b7df256..61a8340 100644 --- a/src/main/java/org/telegram/services/WeatherService.java +++ b/src/main/java/org/telegram/services/WeatherService.java @@ -8,10 +8,11 @@ import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.json.JSONObject; import org.telegram.BuildVars; import org.telegram.database.DatabaseManager; -import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -27,7 +28,7 @@ import java.time.format.DateTimeFormatter; * @date 20 of June of 2015 */ public class WeatherService { - private static final String LOGTAG = "WEATHERSERVICE"; + private static final Logger log = LogManager.getLogger(WeatherService.class); public static final String METRICSYSTEM = "metric"; public static final String IMPERIALSYSTEM = "imperial"; @@ -91,7 +92,7 @@ public class WeatherService { String responseString = EntityUtils.toString(buf, "UTF-8"); JSONObject jsonObject = new JSONObject(responseString); - BotLogger.info(LOGTAG, jsonObject.toString()); + log.info(jsonObject.toString()); if (jsonObject.getInt("cod") == 200) { cityFound = jsonObject.getJSONObject("city").getString("name") + " (" + jsonObject.getJSONObject("city").getString("country") + ")"; @@ -99,11 +100,11 @@ public class WeatherService { responseToUser = String.format(LocalisationService.getString("weatherAlert", language), cityFound, convertListOfForecastToString(jsonObject, language, units, false)); } else { - BotLogger.warn(LOGTAG, jsonObject.toString()); + log.warn(jsonObject.toString()); responseToUser = LocalisationService.getString("cityNotFound", language); } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); responseToUser = LocalisationService.getString("errorFetchingWeather", language); } return responseToUser; @@ -132,7 +133,7 @@ public class WeatherService { String responseString = EntityUtils.toString(buf, "UTF-8"); JSONObject jsonObject = new JSONObject(responseString); - BotLogger.info(LOGTAG, jsonObject.toString()); + log.info(jsonObject.toString()); if (jsonObject.getInt("cod") == 200) { cityFound = jsonObject.getJSONObject("city").getString("name") + " (" + jsonObject.getJSONObject("city").getString("country") + ")"; @@ -140,11 +141,11 @@ public class WeatherService { responseToUser = String.format(LocalisationService.getString("weatherForcast", language), cityFound, convertListOfForecastToString(jsonObject, language, units, true)); } else { - BotLogger.warn(LOGTAG, jsonObject.toString()); + log.warn(jsonObject.toString()); responseToUser = LocalisationService.getString("cityNotFound", language); } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); responseToUser = LocalisationService.getString("errorFetchingWeather", language); } return responseToUser; @@ -179,11 +180,11 @@ public class WeatherService { responseToUser = String.format(LocalisationService.getString("weatherForcast", language), cityFound, convertListOfForecastToString(jsonObject, language, units, true)); } else { - BotLogger.warn(LOGTAG, jsonObject.toString()); + log.warn(jsonObject.toString()); responseToUser = LocalisationService.getString("cityNotFound", language); } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); responseToUser = LocalisationService.getString("errorFetchingWeather", language); } return responseToUser; @@ -220,11 +221,11 @@ public class WeatherService { responseToUser = String.format(LocalisationService.getString("weatherCurrent", language), cityFound, convertCurrentWeatherToString(jsonObject, language, units, emoji)); } else { - BotLogger.warn(LOGTAG, jsonObject.toString()); + log.warn(jsonObject.toString()); responseToUser = LocalisationService.getString("cityNotFound", language); } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); responseToUser = LocalisationService.getString("errorFetchingWeather", language); } return responseToUser; @@ -259,11 +260,11 @@ public class WeatherService { responseToUser = String.format(LocalisationService.getString("weatherCurrent", language), cityFound, convertCurrentWeatherToString(jsonObject, language, units, null)); } else { - BotLogger.warn(LOGTAG, jsonObject.toString()); + log.warn(jsonObject.toString()); responseToUser = LocalisationService.getString("cityNotFound", language); } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); responseToUser = LocalisationService.getString("errorFetchingWeather", language); } return responseToUser; diff --git a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java index e1d5611..e237b2d 100644 --- a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java @@ -1,5 +1,7 @@ package org.telegram.updateshandlers; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.BotConfig; import org.telegram.telegrambots.bots.TelegramLongPollingBot; import org.telegram.telegrambots.meta.api.methods.send.SendMessage; @@ -8,7 +10,6 @@ import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.meta.api.objects.replykeyboard.ForceReplyKeyboard; import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.InvalidObjectException; import java.util.concurrent.ConcurrentHashMap; @@ -21,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; * @date 24 of June of 2015 */ public class ChannelHandlers extends TelegramLongPollingBot { - private static final String LOGTAG = "CHANNELHANDLERS"; + private static final Logger log = LogManager.getLogger(ChannelHandlers.class); private static final int WAITINGCHANNEL = 1; @@ -42,11 +43,11 @@ public class ChannelHandlers extends TelegramLongPollingBot { try { handleIncomingMessage(message); } catch (InvalidObjectException e) { - BotLogger.severe(LOGTAG, e); + log.fatal(e.getLocalizedMessage(), e); } } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -92,7 +93,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { } } } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -123,7 +124,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { try { execute(sendMessage); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -165,7 +166,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { try { execute(sendMessage); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } diff --git a/src/main/java/org/telegram/updateshandlers/CommandsHandler.java b/src/main/java/org/telegram/updateshandlers/CommandsHandler.java index 584772f..59565d9 100644 --- a/src/main/java/org/telegram/updateshandlers/CommandsHandler.java +++ b/src/main/java/org/telegram/updateshandlers/CommandsHandler.java @@ -1,5 +1,7 @@ package org.telegram.updateshandlers; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.BotConfig; import org.telegram.commands.HelloCommand; import org.telegram.commands.HelpCommand; @@ -12,7 +14,6 @@ import org.telegram.telegrambots.meta.api.methods.send.SendMessage; import org.telegram.telegrambots.meta.api.objects.Message; import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.logging.BotLogger; /** * This handler mainly works with commands to demonstrate the Commands feature of the API @@ -21,8 +22,7 @@ import org.telegram.telegrambots.meta.logging.BotLogger; */ public class CommandsHandler extends TelegramLongPollingCommandBot { - public static final String LOGTAG = "COMMANDSHANDLER"; - + private static final Logger log = LogManager.getLogger(CommandsHandler.class); /** * Constructor. */ @@ -42,7 +42,7 @@ public class CommandsHandler extends TelegramLongPollingCommandBot { try { absSender.execute(commandUnknownMessage); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } helpCommand.execute(absSender, message.getFrom(), message.getChat(), new String[] {}); }); @@ -66,7 +66,7 @@ public class CommandsHandler extends TelegramLongPollingCommandBot { try { execute(echoMessage); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java index 63cd6dc..5888494 100644 --- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java @@ -1,5 +1,7 @@ package org.telegram.updateshandlers; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.BotConfig; import org.telegram.Commands; import org.telegram.database.DatabaseManager; @@ -16,7 +18,6 @@ import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardRem import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.meta.logging.BotLogger; import org.telegram.telegrambots.meta.updateshandlers.SentCallback; import java.io.InvalidObjectException; @@ -31,7 +32,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; * @date 24 of June of 2015 */ public class DirectionsHandlers extends TelegramLongPollingBot { - private static final String LOGTAG = "DIRECTIONSHANDLERS"; + private static final Logger log = LogManager.getLogger(DirectionsHandlers.class); private static final int WATING_ORIGIN_STATUS = 0; private static final int WATING_DESTINY_STATUS = 1; @@ -48,7 +49,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { try { handleDirections(update); } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -92,7 +93,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { try { execute(sendMessageRequest); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } @@ -131,7 +132,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { } }); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -165,7 +166,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { } }); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -180,7 +181,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { try { execute(sendMessageRequest); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -212,7 +213,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { } }); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -238,7 +239,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { execute(sendMessageRequest); languageMessages.add(message.getFrom().getId()); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -260,7 +261,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { execute(sendMessageRequest); languageMessages.remove(message.getFrom().getId()); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java index e164916..e7ca0cd 100644 --- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java @@ -1,5 +1,7 @@ package org.telegram.updateshandlers; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.BotConfig; import org.telegram.Commands; import org.telegram.database.DatabaseManager; @@ -15,7 +17,6 @@ import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardRem import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.InvalidObjectException; import java.util.ArrayList; @@ -32,7 +33,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; * @date 24 of June of 2015 */ public class FilesHandlers extends TelegramLongPollingBot { - private static final String LOGTAG = "FILESHANDLERS"; + private static final Logger log = LogManager.getLogger(FilesHandlers.class); private static final int INITIAL_UPLOAD_STATUS = 0; private static final int DELETE_UPLOADED_STATUS = 1; @@ -48,7 +49,12 @@ public class FilesHandlers extends TelegramLongPollingBot { try { if (update.hasMessage()) { try { - handleFileUpdate(update); + SendMessage sendMessageRequest = new SendMessage(); + sendMessageRequest.setText("Since this bot was used to spread copyrighted content, we had to disable its functionality until further announcement.\n\nSorry for the troubles, just blame those that used the bot for illegal purposes."); + sendMessageRequest.setChatId(update.getMessage().getChatId()); + execute(sendMessageRequest); + + //handleFileUpdate(update); } catch (TelegramApiRequestException e) { if (e.getApiResponse().contains("Bot was blocked by the user")) { if (update.getMessage().getFrom() != null) { @@ -56,11 +62,11 @@ public class FilesHandlers extends TelegramLongPollingBot { } } } catch (Exception e) { - BotLogger.severe(LOGTAG, e); + log.fatal(e.getLocalizedMessage(), e); } } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } diff --git a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java index 822af0c..17383d8 100644 --- a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java @@ -1,5 +1,7 @@ package org.telegram.updateshandlers; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.BotConfig; import org.telegram.services.RaeService; import org.telegram.telegrambots.bots.TelegramLongPollingBot; @@ -12,7 +14,6 @@ import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessageconten import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResultArticle; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.logging.BotLogger; import java.util.ArrayList; import java.util.List; @@ -24,7 +25,7 @@ import java.util.List; * @date 24 of June of 2015 */ public class RaeHandlers extends TelegramLongPollingBot { - private static final String LOGTAG = "RAEHANDLERS"; + private static final Logger log = LogManager.getLogger(RaeHandlers.class); private static final Integer CACHETIME = 86400; private final RaeService raeService = new RaeService(); @@ -50,11 +51,11 @@ public class RaeHandlers extends TelegramLongPollingBot { try { execute(getHelpMessage(update.getMessage())); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -69,7 +70,7 @@ public class RaeHandlers extends TelegramLongPollingBot { */ private void handleIncomingInlineQuery(InlineQuery inlineQuery) { String query = inlineQuery.getQuery(); - BotLogger.debug(LOGTAG, "Searching: " + query); + log.debug("Searching: " + query); try { if (!query.isEmpty()) { List results = raeService.getResults(query); @@ -78,7 +79,7 @@ public class RaeHandlers extends TelegramLongPollingBot { execute(converteResultsToResponse(inlineQuery, new ArrayList<>())); } } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } diff --git a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java index 1b6d263..318ea72 100644 --- a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java @@ -1,5 +1,7 @@ package org.telegram.updateshandlers; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.BotConfig; import org.telegram.BuildVars; import org.telegram.Commands; @@ -14,7 +16,6 @@ import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.InvalidObjectException; import java.util.ArrayList; @@ -27,7 +28,7 @@ import java.util.List; * @date 24 of June of 2015 */ public class TransifexHandlers extends TelegramLongPollingBot { - private static final String LOGTAG = "TRANSIFEXHANDLERS"; + private static final Logger log = LogManager.getLogger(TransifexHandlers.class); @Override public String getBotToken() { @@ -39,7 +40,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { try { handleUpdate(update); } catch (Throwable e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -91,7 +92,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { try { execute(sendMessageRequest); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -100,7 +101,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { try { execute(sendDocument); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } else if (parts[0].startsWith(Commands.help) || @@ -116,7 +117,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { try { execute(sendMessageRequest); } catch (TelegramApiException e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } } diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java index 38eb781..7a398be 100644 --- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java @@ -1,5 +1,7 @@ package org.telegram.updateshandlers; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.telegram.BotConfig; import org.telegram.Commands; import org.telegram.database.DatabaseManager; @@ -16,7 +18,6 @@ import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardRem import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.meta.logging.BotLogger; import java.util.ArrayList; import java.util.List; @@ -29,8 +30,7 @@ import java.util.stream.Collectors; * @date 24 of June of 2015 */ public class WeatherHandlers extends TelegramLongPollingBot { - private static final String LOGTAG = "WEATHERHANDLERS"; - + private static final Logger log = LogManager.getLogger(WeatherHandlers.class); private static final int STARTSTATE = 0; private static final int MAINMENU = 1; private static final int CURRENTWEATHER = 2; @@ -66,7 +66,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { } } } catch (Exception e) { - BotLogger.error(LOGTAG, e); + log.error(e.getLocalizedMessage(), e); } } @@ -98,7 +98,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { try { Thread.currentThread().wait(35); } catch (InterruptedException e) { - BotLogger.severe(LOGTAG, e); + log.fatal(e.getLocalizedMessage(), e); } } String[] userOptions = DatabaseManager.getInstance().getUserWeatherOptions(weatherAlert.getUserId()); @@ -111,12 +111,12 @@ public class WeatherHandlers extends TelegramLongPollingBot { try { execute(sendMessage); } catch (TelegramApiRequestException e) { - BotLogger.warn(LOGTAG, e); + log.warn(e.getLocalizedMessage(), e); if (e.getApiResponse().contains("Can't access the chat") || e.getApiResponse().contains("Bot was blocked by the user")) { DatabaseManager.getInstance().deleteAlertsForUser(weatherAlert.getUserId()); } } catch (Exception e) { - BotLogger.severe(LOGTAG, e); + log.fatal(e.getLocalizedMessage(), e); } } }