diff --git a/pom.xml b/pom.xml index 2aa5a6d..cf4cc74 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ UTF-8 UTF-8 4.5.2 - v2.3.3.3 + v2.3.3.4 20160212 5.1.39 diff --git a/src/main/java/org/telegram/services/TransifexService.java b/src/main/java/org/telegram/services/TransifexService.java index ce701ca..71d0768 100644 --- a/src/main/java/org/telegram/services/TransifexService.java +++ b/src/main/java/org/telegram/services/TransifexService.java @@ -94,7 +94,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLiOS.replace("@language", query)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -107,7 +107,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLOSX.replace("@language", query)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -120,7 +120,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLTDesktop.replace("@language", query)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -133,7 +133,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLTemplates.replace("@language", languageCode)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-8")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-8"), "UTF-8"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -146,7 +146,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLWebogram.replace("@language", query)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -159,7 +159,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLWP.replace("@language", query)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -199,7 +199,7 @@ public class TransifexService { localFile.close(); File fileToUpload = new File(fileName); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } catch (FileNotFoundException e) { BotLogger.error(LOGTAG, e); } @@ -226,7 +226,7 @@ public class TransifexService { localFile.close(); File fileToUpload = new File(fileName); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } catch (FileNotFoundException e) { BotLogger.error(LOGTAG, e); } @@ -254,7 +254,7 @@ public class TransifexService { IOUtils.write(file, output); output.close(); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -281,7 +281,7 @@ public class TransifexService { IOUtils.write(file, output); output.close(); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -309,7 +309,7 @@ public class TransifexService { output.close(); if (fileToUpload.exists()) { sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } } catch (IOException e) { e.printStackTrace(); @@ -338,7 +338,7 @@ public class TransifexService { output.close(); if (fileToUpload.exists()) { sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } } catch (IOException e) { e.printStackTrace(); @@ -367,7 +367,7 @@ public class TransifexService { output.close(); if (fileToUpload.exists()) { sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java index 8337212..cdceb9b 100644 --- a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java @@ -115,7 +115,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setText(String.format(ERROR_MESSAGE_TEXT, message.getText().trim(), errorText.replace("\"", "\\\""))); sendMessage.enableMarkdown(true); @@ -131,11 +131,11 @@ public class ChannelHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); forceReplyKeyboard.setSelective(true); - sendMessage.setReplayMarkup(forceReplyKeyboard); + sendMessage.setReplyMarkup(forceReplyKeyboard); sendMessage.setText(WRONG_CHANNEL_TEXT); sendMessage.enableMarkdown(true); @@ -146,7 +146,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setText(AFTER_CHANNEL_TEXT); return sendMessage; @@ -156,9 +156,9 @@ public class ChannelHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId); - sendMessage.setReplayToMessageId(messageId); + sendMessage.setReplyToMessageId(messageId); if (replyKeyboardMarkup != null) { - sendMessage.setReplayMarkup(replyKeyboardMarkup); + sendMessage.setReplyMarkup(replyKeyboardMarkup); } sendMessage.setText(HELP_TEXT); diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java index 796b8ff..3908638 100644 --- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java @@ -111,8 +111,8 @@ public class DirectionsHandlers extends TelegramLongPollingBot { sendMessageRequest.setChatId(message.getChatId().toString()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); replyKeyboardHide.setSelective(true); - sendMessageRequest.setReplayMarkup(replyKeyboardHide); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyMarkup(replyKeyboardHide); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); for (String direction : directions) { sendMessageRequest.setText(direction); try { @@ -143,10 +143,10 @@ public class DirectionsHandlers extends TelegramLongPollingBot { private void onOriginReceived(Message message, String language) { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setChatId(message.getChatId().toString()); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); forceReplyKeyboard.setSelective(true); - sendMessageRequest.setReplayMarkup(forceReplyKeyboard); + sendMessageRequest.setReplyMarkup(forceReplyKeyboard); sendMessageRequest.setText(LocalisationService.getInstance().getString("sendDestination", language)); try { @@ -191,10 +191,10 @@ public class DirectionsHandlers extends TelegramLongPollingBot { private void onStartdirectionsCommand(Message message, String language) { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setChatId(message.getChatId().toString()); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); forceReplyKeyboard.setSelective(true); - sendMessageRequest.setReplayMarkup(forceReplyKeyboard); + sendMessageRequest.setReplyMarkup(forceReplyKeyboard); sendMessageRequest.setText(LocalisationService.getInstance().getString("initDirections", language)); try { @@ -237,7 +237,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setKeyboard(commands); replyKeyboardMarkup.setSelective(true); - sendMessageRequest.setReplayMarkup(replyKeyboardMarkup); + sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessageRequest.setText(LocalisationService.getInstance().getString("chooselanguage", language)); try { sendMessage(sendMessageRequest); @@ -257,10 +257,10 @@ public class DirectionsHandlers extends TelegramLongPollingBot { } else { sendMessageRequest.setText(LocalisationService.getInstance().getString("errorLanguage")); } - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); replyKeyboardHide.setSelective(true); - sendMessageRequest.setReplayMarkup(replyKeyboardHide); + sendMessageRequest.setReplyMarkup(replyKeyboardHide); try { sendMessage(sendMessageRequest); languageMessages.remove(message.getFrom().getId()); diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java index 86e1fd8..702ce81 100644 --- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java @@ -125,7 +125,7 @@ public class FilesHandlers extends TelegramLongPollingBot { } sendMessageRequest.setChatId(message.getChatId().toString()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); - sendMessageRequest.setReplayMarkup(replyKeyboardHide); + sendMessageRequest.setReplyMarkup(replyKeyboardHide); sendMessage(sendMessageRequest); } @@ -157,7 +157,7 @@ public class FilesHandlers extends TelegramLongPollingBot { replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setKeyboard(commands); } - sendMessageRequest.setReplayMarkup(replyKeyboardMarkup); + sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessage(sendMessageRequest); } @@ -233,7 +233,7 @@ public class FilesHandlers extends TelegramLongPollingBot { replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setKeyboard(commands); replyKeyboardMarkup.setSelective(true); - sendMessageRequest.setReplayMarkup(replyKeyboardMarkup); + sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessageRequest.setText(LocalisationService.getInstance().getString("chooselanguage", language)); sendMessage(sendMessageRequest); languageMessages.add(message.getFrom().getId()); @@ -249,10 +249,10 @@ public class FilesHandlers extends TelegramLongPollingBot { } else { sendMessageRequest.setText(LocalisationService.getInstance().getString("errorLanguage")); } - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); replyKeyboardHide.setSelective(true); - sendMessageRequest.setReplayMarkup(replyKeyboardHide); + sendMessageRequest.setReplyMarkup(replyKeyboardHide); sendMessage(sendMessageRequest); languageMessages.remove(message.getFrom().getId()); } diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java index c92445f..ea4d3f2 100644 --- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java @@ -3,7 +3,11 @@ package org.telegram.updateshandlers; import org.telegram.BotConfig; import org.telegram.Commands; import org.telegram.database.DatabaseManager; -import org.telegram.services.*; +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.structure.WeatherAlert; import org.telegram.telegrambots.TelegramApiException; import org.telegram.telegrambots.api.methods.send.SendMessage; @@ -123,9 +127,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.setChatId(chatId.toString()); sendMessage.enableMarkdown(true); - sendMessage.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(replyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(replyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("backToMainMenu", language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU); @@ -186,12 +189,12 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.setChatId(chatId.toString()); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(messageId); + sendMessage.setReplyToMessageId(messageId); sendMessage.setText(Emoji.WAVING_HAND_SIGN.toString()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); replyKeyboardHide.setSelective(true); - sendMessage.setReplayMarkup(replyKeyboardHide); + sendMessage.setReplyMarkup(replyKeyboardHide); sendMessage(sendMessage); DatabaseManager.getInstance().insertWeatherState(userId, chatId, STARTSTATE); @@ -242,9 +245,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { DatabaseManager.getInstance().deleteAlertCity(message.getFrom().getId(), message.getText()); SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertDeleted", language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERT); @@ -254,9 +257,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { private static SendMessage onAlertDeleteBackOptionSelected(Message message, String language) { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERT); @@ -270,8 +273,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayToMessageId(message.getMessageId()); - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERT); sendMessageRequest = sendMessage; @@ -289,8 +292,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { DatabaseManager.getInstance().createNewWeatherAlert(userId, cityId, message.getText()); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getAlertsKeyboard(language)); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyMarkup(getAlertsKeyboard(language)); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setText(getChooseNewAlertSetMessage(message.getText(), language)); sendMessageRequest.setChatId(message.getChatId().toString()); @@ -326,8 +329,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); sendMessage.setText(getSettingsMessage(language)); @@ -340,10 +343,10 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayToMessageId(message.getMessageId()); - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(getAlertListMessage(message.getFrom().getId(), language)); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); return sendMessage; } @@ -356,15 +359,15 @@ public class WeatherHandlers extends TelegramLongPollingBot { ReplyKeyboardMarkup replyKeyboardMarkup = getAlertsListKeyboard(message.getFrom().getId(), language); if (replyKeyboardMarkup != null) { - sendMessage.setReplayMarkup(replyKeyboardMarkup); + sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setText(LocalisationService.getInstance().getString("chooseNewAlertCity", language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERTDELETE); } else { - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("noAlertList", language)); } - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); return sendMessage; } @@ -373,9 +376,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getRecentsKeyboard(message.getFrom().getId(), language, false)); + sendMessage.setReplyMarkup(getRecentsKeyboard(message.getFrom().getId(), language, false)); sendMessage.setText(LocalisationService.getInstance().getString("chooseNewAlertCity", language)); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERTNEW); return sendMessage; @@ -408,9 +411,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERT); @@ -421,9 +424,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getUnitsKeyboard(language)); + sendMessage.setReplyMarkup(getUnitsKeyboard(language)); sendMessage.setText(getUnitsMessage(message.getFrom().getId(), language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), UNITS); @@ -434,9 +437,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getLanguagesKeyboard(language)); + sendMessage.setReplyMarkup(getLanguagesKeyboard(language)); sendMessage.setText(getLanguageMessage(language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), LANGUAGE); @@ -470,8 +473,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); sendMessage.setText(getSettingsMessage(language)); @@ -483,9 +486,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); sendMessageRequest.setChatId(chatId.toString()); - sendMessageRequest.setReplayMarkup(getUnitsKeyboard(language)); + sendMessageRequest.setReplyMarkup(getUnitsKeyboard(language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("errorUnitsNotFound", language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyToMessageId(messageId); return sendMessageRequest; } @@ -497,8 +500,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessageRequest.enableMarkdown(true); sendMessageRequest.setChatId(chatId.toString()); sendMessageRequest.setText(LocalisationService.getInstance().getString("unitsUpdated", language)); - sendMessageRequest.setReplayToMessageId(messageId); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU); return sendMessageRequest; @@ -528,8 +531,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); sendMessage.setText(getSettingsMessage(language)); @@ -541,9 +544,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); sendMessageRequest.setChatId(chatId.toString()); - sendMessageRequest.setReplayMarkup(getLanguagesKeyboard(language)); + sendMessageRequest.setReplyMarkup(getLanguagesKeyboard(language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("errorLanguageNotFound", language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyToMessageId(messageId); return sendMessageRequest; } @@ -556,8 +559,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessageRequest.enableMarkdown(true); sendMessageRequest.setChatId(chatId.toString()); sendMessageRequest.setText(LocalisationService.getInstance().getString("languageUpdated", languageCode)); - sendMessageRequest.setReplayToMessageId(messageId); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(languageCode)); + sendMessageRequest.setReplyToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(languageCode)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU); return sendMessageRequest; @@ -616,8 +619,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { String weather = WeatherService.getInstance().fetchWeatherForecast(cityId.toString(), userId, language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(messageId); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(chatId.toString()); @@ -634,8 +637,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId.toString()); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(forceReplyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(forceReplyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("onWeatherLocationCommand", language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, FORECASTLOCATIONWEATHER); @@ -648,8 +651,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId.toString()); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(forceReplyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(forceReplyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("onWeatherNewCommand", language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, FORECASTNEWWEATHER); @@ -718,8 +721,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { String weather = WeatherService.getInstance().fetchWeatherCurrent(cityId.toString(), userId, language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(messageId); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(chatId.toString()); DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU); @@ -735,8 +738,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId.toString()); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(forceReplyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(forceReplyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("onWeatherLocationCommand", language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, CURRENTLOCATIONWEATHER); @@ -749,8 +752,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId.toString()); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(forceReplyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(forceReplyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("onWeatherNewCommand", language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, CURRENTNEWWEATHER); @@ -797,8 +800,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); sendMessage.setText(getSettingsMessage(language)); @@ -811,8 +814,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); if (replyKeyboardMarkup.getKeyboard().size() > 3) { sendMessage.setText(LocalisationService.getInstance().getString("onForecastCommandFromHistory", language)); @@ -829,8 +832,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); if (replyKeyboardMarkup.getKeyboard().size() > 3) { sendMessage.setText(LocalisationService.getInstance().getString("onCurrentCommandFromHistory", language)); @@ -1155,8 +1158,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId.toString()); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(replyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(replyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("chooseOption", language)); return sendMessage; @@ -1166,9 +1169,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId); - sendMessage.setReplayToMessageId(messageId); + sendMessage.setReplyToMessageId(messageId); if (replyKeyboardMarkup != null) { - sendMessage.setReplayMarkup(replyKeyboardMarkup); + sendMessage.setReplyMarkup(replyKeyboardMarkup); } sendMessage.setText(getHelpMessage(language)); return sendMessage; @@ -1178,9 +1181,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId); - sendMessage.setReplayToMessageId(messageId); + sendMessage.setReplyToMessageId(messageId); if (replyKeyboardMarkup != null) { - sendMessage.setReplayMarkup(replyKeyboardMarkup); + sendMessage.setReplyMarkup(replyKeyboardMarkup); } sendMessage.setText(LocalisationService.getInstance().getString("rateMeMessage", language)); @@ -1197,8 +1200,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { message.getLocation().getLatitude(), message.getFrom().getId(), language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(message.getChatId().toString()); @@ -1211,8 +1214,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { String weather = WeatherService.getInstance().fetchWeatherForecast(text, userId, language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(messageId); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(chatId.toString()); @@ -1226,8 +1229,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { message.getLocation().getLatitude(), message.getFrom().getId(), language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(message.getChatId().toString()); @@ -1240,8 +1243,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { String weather = WeatherService.getInstance().fetchWeatherCurrent(text, userId, language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(messageId); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(chatId.toString());