diff --git a/pom.xml b/pom.xml index 46ea1c3..3f9f473 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ UTF-8 UTF-8 4.5.3 - 3.0 + 4.0.1 20160810 1.10.2 6.0.6 @@ -25,6 +25,11 @@ telegrambots ${telegrambots.version} + + org.telegram + telegrambotsextensions + ${telegrambots.version} + org.json json diff --git a/src/main/java/org/telegram/Main.java b/src/main/java/org/telegram/Main.java index 5937011..7fe44cf 100644 --- a/src/main/java/org/telegram/Main.java +++ b/src/main/java/org/telegram/Main.java @@ -1,19 +1,11 @@ package org.telegram; import org.telegram.telegrambots.ApiContextInitializer; -import org.telegram.telegrambots.TelegramBotsApi; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; -import org.telegram.telegrambots.logging.BotsFileHandler; -import org.telegram.updateshandlers.ChannelHandlers; -import org.telegram.updateshandlers.CommandsHandler; -import org.telegram.updateshandlers.DirectionsHandlers; -import org.telegram.updateshandlers.ElektrollArtFanHandler; -import org.telegram.updateshandlers.FilesHandlers; -import org.telegram.updateshandlers.RaeHandlers; -import org.telegram.updateshandlers.TransifexHandlers; -import org.telegram.updateshandlers.WeatherHandlers; -import org.telegram.updateshandlers.WebHookExampleHandlers; +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; @@ -48,7 +40,7 @@ public class Main { telegramBotsApi.registerBot(new WeatherHandlers()); telegramBotsApi.registerBot(new TransifexHandlers()); telegramBotsApi.registerBot(new FilesHandlers()); - telegramBotsApi.registerBot(new CommandsHandler()); + telegramBotsApi.registerBot(new CommandsHandler(BotConfig.COMMANDS_USER)); telegramBotsApi.registerBot(new ElektrollArtFanHandler()); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); diff --git a/src/main/java/org/telegram/commands/HelloCommand.java b/src/main/java/org/telegram/commands/HelloCommand.java index 41f3d94..508a678 100644 --- a/src/main/java/org/telegram/commands/HelloCommand.java +++ b/src/main/java/org/telegram/commands/HelloCommand.java @@ -1,13 +1,13 @@ package org.telegram.commands; import org.telegram.database.DatabaseManager; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Chat; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.bots.AbsSender; -import org.telegram.telegrambots.bots.commands.BotCommand; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.extensions.bots.commandbot.commands.BotCommand; +import org.telegram.telegrambots.meta.api.methods.send.SendMessage; +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 @@ -47,7 +47,7 @@ public class HelloCommand extends BotCommand { answer.setText(messageTextBuilder.toString()); try { - absSender.sendMessage(answer); + absSender.execute(answer); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } diff --git a/src/main/java/org/telegram/commands/HelpCommand.java b/src/main/java/org/telegram/commands/HelpCommand.java index 129a583..eb99f77 100644 --- a/src/main/java/org/telegram/commands/HelpCommand.java +++ b/src/main/java/org/telegram/commands/HelpCommand.java @@ -1,14 +1,15 @@ package org.telegram.commands; import org.telegram.database.DatabaseManager; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Chat; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.bots.AbsSender; -import org.telegram.telegrambots.bots.commands.BotCommand; -import org.telegram.telegrambots.bots.commands.ICommandRegistry; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; +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; +import org.telegram.telegrambots.meta.api.methods.send.SendMessage; +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 @@ -36,7 +37,7 @@ public class HelpCommand extends BotCommand { StringBuilder helpMessageBuilder = new StringBuilder("Help\n"); helpMessageBuilder.append("These are the registered commands for this Bot:\n\n"); - for (BotCommand botCommand : commandRegistry.getRegisteredCommands()) { + for (IBotCommand botCommand : commandRegistry.getRegisteredCommands()) { helpMessageBuilder.append(botCommand.toString()).append("\n\n"); } @@ -46,7 +47,7 @@ public class HelpCommand extends BotCommand { helpMessage.setText(helpMessageBuilder.toString()); try { - absSender.sendMessage(helpMessage); + absSender.execute(helpMessage); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } diff --git a/src/main/java/org/telegram/commands/StartCommand.java b/src/main/java/org/telegram/commands/StartCommand.java index 1b1ffc6..450d96f 100644 --- a/src/main/java/org/telegram/commands/StartCommand.java +++ b/src/main/java/org/telegram/commands/StartCommand.java @@ -1,13 +1,13 @@ package org.telegram.commands; import org.telegram.database.DatabaseManager; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Chat; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.bots.AbsSender; -import org.telegram.telegrambots.bots.commands.BotCommand; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.extensions.bots.commandbot.commands.BotCommand; +import org.telegram.telegrambots.meta.api.methods.send.SendMessage; +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 @@ -43,7 +43,7 @@ public class StartCommand extends BotCommand { answer.setText(messageBuilder.toString()); try { - absSender.sendMessage(answer); + absSender.execute(answer); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } diff --git a/src/main/java/org/telegram/commands/StopCommand.java b/src/main/java/org/telegram/commands/StopCommand.java index 826c8c5..9079825 100644 --- a/src/main/java/org/telegram/commands/StopCommand.java +++ b/src/main/java/org/telegram/commands/StopCommand.java @@ -1,13 +1,13 @@ package org.telegram.commands; import org.telegram.database.DatabaseManager; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Chat; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.bots.AbsSender; -import org.telegram.telegrambots.bots.commands.BotCommand; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.extensions.bots.commandbot.commands.BotCommand; +import org.telegram.telegrambots.meta.api.methods.send.SendMessage; +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. @@ -39,7 +39,7 @@ public class StopCommand extends BotCommand { answer.setText("Good bye " + userName + "\n" + "Hope to see you soon!"); try { - absSender.sendMessage(answer); + absSender.execute(answer); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } diff --git a/src/main/java/org/telegram/database/ConectionDB.java b/src/main/java/org/telegram/database/ConectionDB.java index d29ac35..c429628 100644 --- a/src/main/java/org/telegram/database/ConectionDB.java +++ b/src/main/java/org/telegram/database/ConectionDB.java @@ -8,21 +8,14 @@ package org.telegram.database; import org.telegram.BuildVars; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.logging.BotLogger; -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; +import java.sql.*; /** * @author Ruben Bermudez * @version 2.0 - * @brief Connector to database - * @date 3/12/14 + * Connector to database */ public class ConectionDB { private static final String LOGTAG = "CONNECTIONDB"; diff --git a/src/main/java/org/telegram/database/DatabaseManager.java b/src/main/java/org/telegram/database/DatabaseManager.java index cfa49f3..1600f84 100644 --- a/src/main/java/org/telegram/database/DatabaseManager.java +++ b/src/main/java/org/telegram/database/DatabaseManager.java @@ -8,7 +8,7 @@ package org.telegram.database; import org.telegram.structure.WeatherAlert; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/src/main/java/org/telegram/services/DirectionsService.java b/src/main/java/org/telegram/services/DirectionsService.java index d3aaca5..6e67f30 100644 --- a/src/main/java/org/telegram/services/DirectionsService.java +++ b/src/main/java/org/telegram/services/DirectionsService.java @@ -12,7 +12,7 @@ import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Jsoup; import org.telegram.BuildVars; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/src/main/java/org/telegram/services/RaeService.java b/src/main/java/org/telegram/services/RaeService.java index 505fb63..1d22ba4 100644 --- a/src/main/java/org/telegram/services/RaeService.java +++ b/src/main/java/org/telegram/services/RaeService.java @@ -12,7 +12,7 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.IOException; import java.net.URLEncoder; diff --git a/src/main/java/org/telegram/services/TimerExecutor.java b/src/main/java/org/telegram/services/TimerExecutor.java index 68387f6..4b3ce73 100644 --- a/src/main/java/org/telegram/services/TimerExecutor.java +++ b/src/main/java/org/telegram/services/TimerExecutor.java @@ -1,6 +1,6 @@ package org.telegram.services; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.time.Clock; import java.time.Duration; @@ -12,8 +12,7 @@ import java.util.concurrent.TimeUnit; /** * @author Ruben Bermudez * @version 2.0 - * @brief Exectue a task periodically - * @date 27/01/25 + * Execute a task periodically */ public class TimerExecutor { private static final String LOGTAG = "TIMEREXECUTOR"; @@ -83,7 +82,7 @@ public class TimerExecutor { private long computNextDilay(int targetHour, int targetMin, int targetSec) { final LocalDateTime localNow = LocalDateTime.now(Clock.systemUTC()); LocalDateTime localNextTarget = localNow.withHour(targetHour).withMinute(targetMin).withSecond(targetSec); - while (localNow.compareTo(localNextTarget) > 0) { + while (localNow.compareTo(localNextTarget.minusSeconds(1)) > 0) { localNextTarget = localNextTarget.plusDays(1); } @@ -99,7 +98,7 @@ public class TimerExecutor { /** * Stop the thread */ - public void stop() { + private void stop() { executorService.shutdown(); try { executorService.awaitTermination(1, TimeUnit.DAYS); diff --git a/src/main/java/org/telegram/services/TransifexService.java b/src/main/java/org/telegram/services/TransifexService.java index 71d0768..7d834a3 100644 --- a/src/main/java/org/telegram/services/TransifexService.java +++ b/src/main/java/org/telegram/services/TransifexService.java @@ -8,16 +8,10 @@ import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.telegram.BuildVars; -import org.telegram.telegrambots.api.methods.send.SendDocument; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.api.methods.send.SendDocument; +import org.telegram.telegrambots.meta.logging.BotLogger; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.PrintWriter; +import java.io.*; /** * @author Ruben Bermudez @@ -199,7 +193,7 @@ public class TransifexService { localFile.close(); File fileToUpload = new File(fileName); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); + sendDocument.setDocument(fileToUpload); } catch (FileNotFoundException e) { BotLogger.error(LOGTAG, e); } @@ -226,7 +220,7 @@ public class TransifexService { localFile.close(); File fileToUpload = new File(fileName); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); + sendDocument.setDocument(fileToUpload); } catch (FileNotFoundException e) { BotLogger.error(LOGTAG, e); } @@ -254,7 +248,7 @@ public class TransifexService { IOUtils.write(file, output); output.close(); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); + sendDocument.setDocument(fileToUpload); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -281,7 +275,7 @@ public class TransifexService { IOUtils.write(file, output); output.close(); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); + sendDocument.setDocument(fileToUpload); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -309,7 +303,7 @@ public class TransifexService { output.close(); if (fileToUpload.exists()) { sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); + sendDocument.setDocument(fileToUpload); } } catch (IOException e) { e.printStackTrace(); @@ -338,7 +332,7 @@ public class TransifexService { output.close(); if (fileToUpload.exists()) { sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); + sendDocument.setDocument(fileToUpload); } } catch (IOException e) { e.printStackTrace(); @@ -367,7 +361,7 @@ public class TransifexService { output.close(); if (fileToUpload.exists()) { sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); + sendDocument.setDocument(fileToUpload); } } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/org/telegram/services/WeatherService.java b/src/main/java/org/telegram/services/WeatherService.java index 421ac60..b7df256 100644 --- a/src/main/java/org/telegram/services/WeatherService.java +++ b/src/main/java/org/telegram/services/WeatherService.java @@ -11,7 +11,7 @@ import org.apache.http.util.EntityUtils; import org.json.JSONObject; import org.telegram.BuildVars; import org.telegram.database.DatabaseManager; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -162,7 +162,7 @@ public class WeatherService { try { String completURL = BASEURL + FORECASTPATH + "?lat=" + URLEncoder.encode(latitude + "", "UTF-8") + "&lon=" + URLEncoder.encode(longitude + "", "UTF-8") + - FORECASTPARAMS.replace("@language@", language).replace("@units@", units) + APIIDEND;; + FORECASTPARAMS.replace("@language@", language).replace("@units@", units) + APIIDEND; CloseableHttpClient client = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build(); HttpGet request = new HttpGet(completURL); CloseableHttpResponse response = client.execute(request); @@ -242,7 +242,7 @@ public class WeatherService { try { String completURL = BASEURL + CURRENTPATH + "?lat=" + URLEncoder.encode(latitude + "", "UTF-8") + "&lon=" + URLEncoder.encode(longitude + "", "UTF-8") + - CURRENTPARAMS.replace("@language@", language).replace("@units@", units) + APIIDEND;; + CURRENTPARAMS.replace("@language@", language).replace("@units@", units) + APIIDEND; CloseableHttpClient client = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build(); HttpGet request = new HttpGet(completURL); CloseableHttpResponse response = client.execute(request); diff --git a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java index 958b348..e1d5611 100644 --- a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java @@ -1,14 +1,14 @@ package org.telegram.updateshandlers; import org.telegram.BotConfig; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.replykeyboard.ForceReplyKeyboard; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; import org.telegram.telegrambots.bots.TelegramLongPollingBot; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; +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.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; @@ -84,11 +84,11 @@ public class ChannelHandlers extends TelegramLongPollingBot { sendHelpMessage(message.getChatId(), message.getMessageId(), null); } else { if (message.getText().startsWith("@") && !message.getText().trim().contains(" ")) { - sendMessage(getMessageToChannelSent(message)); + execute(getMessageToChannelSent(message)); sendMessageToChannel(message.getText(), message); userState.remove(message.getFrom().getId()); } else { - sendMessage(getWrongUsernameMessage(message)); + execute(getWrongUsernameMessage(message)); } } } catch (TelegramApiException e) { @@ -105,7 +105,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); try { - sendMessage(sendMessage); + execute(sendMessage); } catch (TelegramApiException e) { sendErrorMessage(message, e.getMessage()); } @@ -121,7 +121,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); try { - sendMessage(sendMessage); + execute(sendMessage); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } @@ -163,7 +163,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { sendMessage.setText(HELP_TEXT); try { - sendMessage(sendMessage); + execute(sendMessage); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } diff --git a/src/main/java/org/telegram/updateshandlers/CommandsHandler.java b/src/main/java/org/telegram/updateshandlers/CommandsHandler.java index 34007b7..584772f 100644 --- a/src/main/java/org/telegram/updateshandlers/CommandsHandler.java +++ b/src/main/java/org/telegram/updateshandlers/CommandsHandler.java @@ -7,12 +7,12 @@ import org.telegram.commands.StartCommand; import org.telegram.commands.StopCommand; import org.telegram.database.DatabaseManager; import org.telegram.services.Emoji; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.bots.TelegramLongPollingCommandBot; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.extensions.bots.commandbot.TelegramLongPollingCommandBot; +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 @@ -26,7 +26,9 @@ public class CommandsHandler extends TelegramLongPollingCommandBot { /** * Constructor. */ - public CommandsHandler() { + public CommandsHandler(String botUsername) { + super(botUsername); + register(new HelloCommand()); register(new StartCommand()); register(new StopCommand()); @@ -38,7 +40,7 @@ public class CommandsHandler extends TelegramLongPollingCommandBot { commandUnknownMessage.setChatId(message.getChatId()); commandUnknownMessage.setText("The command '" + message.getText() + "' is not known by this bot. Here comes some help " + Emoji.AMBULANCE); try { - absSender.sendMessage(commandUnknownMessage); + absSender.execute(commandUnknownMessage); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } @@ -62,7 +64,7 @@ public class CommandsHandler extends TelegramLongPollingCommandBot { echoMessage.setText("Hey heres your message:\n" + message.getText()); try { - sendMessage(echoMessage); + execute(echoMessage); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } @@ -70,11 +72,6 @@ public class CommandsHandler extends TelegramLongPollingCommandBot { } } - @Override - public String getBotUsername() { - return BotConfig.COMMANDS_USER; - } - @Override public String getBotToken() { return BotConfig.COMMANDS_TOKEN; diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java index e91e8b9..63cd6dc 100644 --- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java @@ -5,19 +5,19 @@ import org.telegram.Commands; import org.telegram.database.DatabaseManager; import org.telegram.services.DirectionsService; import org.telegram.services.LocalisationService; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.replykeyboard.ForceReplyKeyboard; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardRemove; -import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.bots.TelegramLongPollingBot; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.logging.BotLogger; -import org.telegram.telegrambots.updateshandlers.SentCallback; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +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.api.objects.replykeyboard.ForceReplyKeyboard; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardRemove; +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; import java.util.ArrayList; @@ -90,7 +90,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { sendMessageRequest.setText(LocalisationService.getString("youNeedReplyDirections", language)); sendMessageRequest.setChatId(message.getChatId()); try { - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } @@ -114,7 +114,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { for (String direction : directions) { sendMessageRequest.setText(direction); try { - sendMessageAsync(sendMessageRequest, new SentCallback() { + executeAsync(sendMessageRequest, new SentCallback() { @Override public void onResult(BotApiMethod botApiMethod, Message sentMessage) { if (sentMessage != null) { @@ -147,7 +147,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { sendMessageRequest.setText(LocalisationService.getString("sendDestination", language)); try { - sendMessageAsync(sendMessageRequest, new SentCallback() { + executeAsync(sendMessageRequest, new SentCallback() { @Override public void onResult(BotApiMethod method, Message sentMessage) { if (sentMessage != null) { @@ -178,7 +178,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { sendMessageRequest.setText(helpDirectionsFormated); sendMessageRequest.setChatId(message.getChatId()); try { - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } @@ -194,7 +194,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { sendMessageRequest.setText(LocalisationService.getString("initDirections", language)); try { - sendMessageAsync(sendMessageRequest, new SentCallback() { + executeAsync(sendMessageRequest, new SentCallback() { @Override public void onResult(BotApiMethod method, Message sentMessage) { if (sentMessage != null) { @@ -235,7 +235,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessageRequest.setText(LocalisationService.getString("chooselanguage", language)); try { - sendMessage(sendMessageRequest); + execute(sendMessageRequest); languageMessages.add(message.getFrom().getId()); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); @@ -257,7 +257,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { replyKeyboardRemove.setSelective(true); sendMessageRequest.setReplyMarkup(replyKeyboardRemove); try { - sendMessage(sendMessageRequest); + execute(sendMessageRequest); languageMessages.remove(message.getFrom().getId()); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); diff --git a/src/main/java/org/telegram/updateshandlers/ElektrollArtFanHandler.java b/src/main/java/org/telegram/updateshandlers/ElektrollArtFanHandler.java index a352af8..7d5af90 100644 --- a/src/main/java/org/telegram/updateshandlers/ElektrollArtFanHandler.java +++ b/src/main/java/org/telegram/updateshandlers/ElektrollArtFanHandler.java @@ -1,20 +1,20 @@ package org.telegram.updateshandlers; -import java.util.ArrayList; -import java.util.List; - import org.telegram.BotConfig; -import org.telegram.telegrambots.api.methods.AnswerCallbackQuery; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageText; -import org.telegram.telegrambots.api.objects.CallbackQuery; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.api.objects.replykeyboard.buttons.InlineKeyboardButton; import org.telegram.telegrambots.bots.TelegramLongPollingBot; -import org.telegram.telegrambots.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.api.methods.AnswerCallbackQuery; +import org.telegram.telegrambots.meta.api.methods.send.SendMessage; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageText; +import org.telegram.telegrambots.meta.api.objects.CallbackQuery; +import org.telegram.telegrambots.meta.api.objects.Message; +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 java.util.ArrayList; +import java.util.List; /** @@ -90,7 +90,7 @@ public class ElektrollArtFanHandler extends TelegramLongPollingBot { try { - sendMessage(sendMessagerequest); + execute(sendMessagerequest); } catch (TelegramApiException e) { e.printStackTrace(); } @@ -140,7 +140,7 @@ public class ElektrollArtFanHandler extends TelegramLongPollingBot { editMarkup.setMessageId(callbackquery.getMessage().getMessageId()); editMarkup.setReplyMarkup(markup); try { - editMessageText(editMarkup); + execute(editMarkup); } catch (TelegramApiException e) { e.printStackTrace(); } @@ -164,7 +164,7 @@ public class ElektrollArtFanHandler extends TelegramLongPollingBot { answerCallbackQuery.setCallbackQueryId(callbackquery.getId()); answerCallbackQuery.setShowAlert(alert); answerCallbackQuery.setText(text); - answerCallbackQuery(answerCallbackQuery); + execute(answerCallbackQuery); } /** diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java index 2ffe5ce..e164916 100644 --- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java @@ -5,17 +5,17 @@ import org.telegram.Commands; import org.telegram.database.DatabaseManager; import org.telegram.services.Emoji; import org.telegram.services.LocalisationService; -import org.telegram.telegrambots.api.methods.send.SendDocument; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardRemove; -import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.bots.TelegramLongPollingBot; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.api.methods.send.SendDocument; +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.api.objects.replykeyboard.ReplyKeyboardMarkup; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardRemove; +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; @@ -109,7 +109,7 @@ public class FilesHandlers extends TelegramLongPollingBot { sendMessageRequest.setText(LocalisationService.getString("fileUploaded", language) + LocalisationService.getString("uploadedFileURL", language) + message.getDocument().getFileId()); sendMessageRequest.setChatId(message.getChatId()); - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } } @@ -128,7 +128,7 @@ public class FilesHandlers extends TelegramLongPollingBot { } sendMessageRequest.setChatId(message.getChatId()); sendMessageRequest.setReplyMarkup(new ReplyKeyboardRemove()); - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } private void onDeleteCommand(Message message, String language, String[] parts) throws InvalidObjectException, TelegramApiException { @@ -160,7 +160,7 @@ public class FilesHandlers extends TelegramLongPollingBot { replyKeyboardMarkup.setKeyboard(commands); } sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } private void onDeleteCommandWithParameters(Message message, String language, String part) throws InvalidObjectException, TelegramApiException { @@ -174,7 +174,7 @@ public class FilesHandlers extends TelegramLongPollingBot { } sendMessageRequest.setChatId(message.getChatId()); - sendMessage(sendMessageRequest); + execute(sendMessageRequest); DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId()); } @@ -184,7 +184,7 @@ public class FilesHandlers extends TelegramLongPollingBot { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setText(LocalisationService.getString("processFinished", language)); sendMessageRequest.setChatId(message.getChatId()); - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } private void onUploadCommand(Message message, String language) throws InvalidObjectException, TelegramApiException { @@ -192,7 +192,7 @@ public class FilesHandlers extends TelegramLongPollingBot { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setText(LocalisationService.getString("sendFileToUpload", language)); sendMessageRequest.setChatId(message.getChatId()); - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } private void sendHelpMessage(Message message, String language) throws InvalidObjectException, TelegramApiException { @@ -203,7 +203,7 @@ public class FilesHandlers extends TelegramLongPollingBot { Commands.listCommand); sendMessageRequest.setText(formatedString); sendMessageRequest.setChatId(message.getChatId()); - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } private void onStartWithParameters(Message message, String language, String part) throws InvalidObjectException, TelegramApiException { @@ -211,12 +211,12 @@ public class FilesHandlers extends TelegramLongPollingBot { SendDocument sendDocumentRequest = new SendDocument(); sendDocumentRequest.setDocument(part.trim()); sendDocumentRequest.setChatId(message.getChatId()); - sendDocument(sendDocumentRequest); + execute(sendDocumentRequest); } else { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setText(LocalisationService.getString("wrongFileId", language)); sendMessageRequest.setChatId(message.getChatId()); - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } } @@ -237,7 +237,7 @@ public class FilesHandlers extends TelegramLongPollingBot { replyKeyboardMarkup.setSelective(true); sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessageRequest.setText(LocalisationService.getString("chooselanguage", language)); - sendMessage(sendMessageRequest); + execute(sendMessageRequest); languageMessages.add(message.getFrom().getId()); } @@ -255,7 +255,7 @@ public class FilesHandlers extends TelegramLongPollingBot { ReplyKeyboardRemove replyKeyboardRemove = new ReplyKeyboardRemove(); replyKeyboardRemove.setSelective(true); sendMessageRequest.setReplyMarkup(replyKeyboardRemove); - sendMessage(sendMessageRequest); + execute(sendMessageRequest); languageMessages.remove(message.getFrom().getId()); } } diff --git a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java index a9e5cb2..822af0c 100644 --- a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java @@ -2,17 +2,17 @@ package org.telegram.updateshandlers; import org.telegram.BotConfig; import org.telegram.services.RaeService; -import org.telegram.telegrambots.api.methods.AnswerInlineQuery; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.inlinequery.InlineQuery; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputTextMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResultArticle; import org.telegram.telegrambots.bots.TelegramLongPollingBot; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.api.methods.AnswerInlineQuery; +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.api.objects.inlinequery.InlineQuery; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputTextMessageContent; +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; @@ -48,7 +48,7 @@ public class RaeHandlers extends TelegramLongPollingBot { handleIncomingInlineQuery(update.getInlineQuery()); } else if (update.hasMessage() && update.getMessage().isUserMessage()) { try { - sendMessage(getHelpMessage(update.getMessage())); + execute(getHelpMessage(update.getMessage())); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } @@ -73,9 +73,9 @@ public class RaeHandlers extends TelegramLongPollingBot { try { if (!query.isEmpty()) { List results = raeService.getResults(query); - answerInlineQuery(converteResultsToResponse(inlineQuery, results)); + execute(converteResultsToResponse(inlineQuery, results)); } else { - answerInlineQuery(converteResultsToResponse(inlineQuery, new ArrayList<>())); + execute(converteResultsToResponse(inlineQuery, new ArrayList<>())); } } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); diff --git a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java index 6c1b289..1b6d263 100644 --- a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java @@ -6,15 +6,15 @@ import org.telegram.Commands; import org.telegram.database.DatabaseManager; import org.telegram.services.LocalisationService; import org.telegram.services.TransifexService; -import org.telegram.telegrambots.api.methods.send.SendDocument; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.api.objects.replykeyboard.buttons.InlineKeyboardButton; import org.telegram.telegrambots.bots.TelegramLongPollingBot; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.api.methods.send.SendDocument; +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.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; @@ -89,7 +89,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { sendMessageRequest.setText(helpFormated); sendMessageRequest.setChatId(message.getChatId()); try { - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } @@ -98,7 +98,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { if (sendDocument != null) { sendDocument.setChatId(message.getChatId()); try { - sendDocument(sendDocument); + execute(sendDocument); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } @@ -114,7 +114,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { sendMessageRequest.setText(helpFormated); sendMessageRequest.setChatId(message.getChatId()); try { - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } @@ -137,6 +137,6 @@ public class TransifexHandlers extends TelegramLongPollingBot { rows.add(row); inlineKeyboardMarkup.setKeyboard(rows); answer.setReplyMarkup(inlineKeyboardMarkup); - sendMessage(answer); + execute(answer); } } diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java index 48e5f83..38eb781 100644 --- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java @@ -3,24 +3,20 @@ package org.telegram.updateshandlers; import org.telegram.BotConfig; import org.telegram.Commands; import org.telegram.database.DatabaseManager; -import org.telegram.services.CustomTimerTask; -import org.telegram.services.Emoji; -import org.telegram.services.LocalisationService; -import org.telegram.services.TimerExecutor; -import org.telegram.services.WeatherService; +import org.telegram.services.*; import org.telegram.structure.WeatherAlert; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.replykeyboard.ForceReplyKeyboard; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardRemove; -import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.bots.TelegramLongPollingBot; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.logging.BotLogger; +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.api.objects.replykeyboard.ForceReplyKeyboard; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardRemove; +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; @@ -113,7 +109,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.setChatId(String.valueOf(weatherAlert.getUserId())); sendMessage.setText(weather); try { - sendMessage(sendMessage); + execute(sendMessage); } catch (TelegramApiRequestException e) { BotLogger.warn(LOGTAG, e); if (e.getApiResponse().contains("Can't access the chat") || e.getApiResponse().contains("Bot was blocked by the user")) { @@ -184,7 +180,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { break; } - sendMessage(sendMessageRequest); + execute(sendMessageRequest); } private void sendHideKeyboard(Integer userId, Long chatId, Integer messageId) throws TelegramApiException { @@ -198,7 +194,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { replyKeyboardRemove.setSelective(true); sendMessage.setReplyMarkup(replyKeyboardRemove); - sendMessage(sendMessage); + execute(sendMessage); DatabaseManager.getInstance().insertWeatherState(userId, chatId, STARTSTATE); } diff --git a/src/main/java/org/telegram/updateshandlers/WebHookExampleHandlers.java b/src/main/java/org/telegram/updateshandlers/WebHookExampleHandlers.java index 9fda18a..2c211f7 100644 --- a/src/main/java/org/telegram/updateshandlers/WebHookExampleHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/WebHookExampleHandlers.java @@ -1,16 +1,15 @@ package org.telegram.updateshandlers; import org.telegram.BotConfig; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Update; import org.telegram.telegrambots.bots.TelegramWebhookBot; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.send.SendMessage; +import org.telegram.telegrambots.meta.api.objects.Update; /** * @author pithera * @version 1.0 - * @brief Simple Webhook example - * @date 31 of May of 2016 + * Simple Webhook example */ public class WebHookExampleHandlers extends TelegramWebhookBot { @Override