diff --git a/pom.xml b/pom.xml index f0294bc..bdd1409 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ UTF-8 UTF-8 4.5.2 - 2.4.0 + 2.4.2 20160810 6.0.4 diff --git a/src/main/java/org/telegram/BotConfig.java b/src/main/java/org/telegram/BotConfig.java index 4ee72f7..290b7c7 100644 --- a/src/main/java/org/telegram/BotConfig.java +++ b/src/main/java/org/telegram/BotConfig.java @@ -10,8 +10,8 @@ public class BotConfig { public static final String WEATHER_TOKEN = ""; public static final String WEATHER_USER = "weatherbot"; - public static final String TRANSIFEX_TOKEN = ""; - public static final String TRANSIFEX_USER = "TGlanguagesbot"; + public static final String TRANSIFEX_TOKEN = "143603381:AAEHhhN7gDLywsdy8v53psOKGDxk14mOMn8"; + public static final String TRANSIFEX_USER = "rubenlagusbot"; public static final String FILES_TOKEN = ""; public static final String FILES_USER = "filesbot"; diff --git a/src/main/java/org/telegram/Main.java b/src/main/java/org/telegram/Main.java index 17576c1..e889856 100644 --- a/src/main/java/org/telegram/Main.java +++ b/src/main/java/org/telegram/Main.java @@ -4,13 +4,7 @@ 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.FilesHandlers; -import org.telegram.updateshandlers.RaeHandlers; import org.telegram.updateshandlers.TransifexHandlers; -import org.telegram.updateshandlers.WeatherHandlers; import org.telegram.updateshandlers.WebHookExampleHandlers; import java.io.IOException; @@ -39,13 +33,13 @@ public class Main { 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 WeatherHandlers()); + //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()); + //telegramBotsApi.registerBot(new FilesHandlers()); + //telegramBotsApi.registerBot(new CommandsHandler()); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } diff --git a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java index ef14283..958b348 100644 --- a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java @@ -71,7 +71,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { onWaitingChannelMessage(message); break; default: - sendHelpMessage(message.getChatId().toString(), message.getMessageId(), null); + sendHelpMessage(message.getChatId(), message.getMessageId(), null); userState.put(message.getFrom().getId(), WAITINGCHANNEL); break; } @@ -81,7 +81,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { try { if (message.getText().equals(CANCEL_COMMAND)) { userState.remove(message.getFrom().getId()); - sendHelpMessage(message.getChatId().toString(), message.getMessageId(), null); + sendHelpMessage(message.getChatId(), message.getMessageId(), null); } else { if (message.getText().startsWith("@") && !message.getText().trim().contains(" ")) { sendMessage(getMessageToChannelSent(message)); @@ -114,7 +114,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { private void sendErrorMessage(Message message, String errorText) { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setText(String.format(ERROR_MESSAGE_TEXT, message.getText().trim(), errorText.replace("\"", "\\\""))); @@ -130,7 +130,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { private static SendMessage getWrongUsernameMessage(Message message) { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyToMessageId(message.getMessageId()); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); @@ -145,14 +145,14 @@ public class ChannelHandlers extends TelegramLongPollingBot { private static SendMessage getMessageToChannelSent(Message message) { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setText(AFTER_CHANNEL_TEXT); return sendMessage; } - private void sendHelpMessage(String chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup) { + private void sendHelpMessage(Long chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup) { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId); diff --git a/src/main/java/org/telegram/updateshandlers/CommandsHandler.java b/src/main/java/org/telegram/updateshandlers/CommandsHandler.java index dadd33a..34007b7 100644 --- a/src/main/java/org/telegram/updateshandlers/CommandsHandler.java +++ b/src/main/java/org/telegram/updateshandlers/CommandsHandler.java @@ -35,7 +35,7 @@ public class CommandsHandler extends TelegramLongPollingCommandBot { registerDefaultAction((absSender, message) -> { SendMessage commandUnknownMessage = new SendMessage(); - commandUnknownMessage.setChatId(message.getChatId().toString()); + 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); @@ -58,7 +58,7 @@ public class CommandsHandler extends TelegramLongPollingCommandBot { if (message.hasText()) { SendMessage echoMessage = new SendMessage(); - echoMessage.setChatId(message.getChatId().toString()); + echoMessage.setChatId(message.getChatId()); echoMessage.setText("Hey heres your message:\n" + message.getText()); try { diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java index 9bd4c51..5754704 100644 --- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java @@ -1,6 +1,5 @@ package org.telegram.updateshandlers; -import org.json.JSONObject; import org.telegram.BotConfig; import org.telegram.Commands; import org.telegram.database.DatabaseManager; @@ -16,6 +15,7 @@ import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; 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; @@ -90,7 +90,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { } else { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setText(LocalisationService.getInstance().getString("youNeedReplyDirections", language)); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); try { sendMessage(sendMessageRequest); } catch (TelegramApiException e) { @@ -108,7 +108,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { String destiny = message.getText(); List directions = DirectionsService.getInstance().getDirections(origin, destiny, language); SendMessage sendMessageRequest = new SendMessage(); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); replyKeyboardHide.setSelective(true); sendMessageRequest.setReplyMarkup(replyKeyboardHide); @@ -118,15 +118,14 @@ public class DirectionsHandlers extends TelegramLongPollingBot { try { sendMessageAsync(sendMessageRequest, new SentCallback() { @Override - public void onResult(BotApiMethod botApiMethod, JSONObject jsonObject) { - Message sentMessage = botApiMethod.deserializeResponse(jsonObject); + public void onResult(BotApiMethod botApiMethod, Message sentMessage) { if (sentMessage != null) { DatabaseManager.getInstance().deleteUserForDirections(message.getFrom().getId()); } } @Override - public void onError(BotApiMethod botApiMethod, JSONObject jsonObject) { + public void onError(BotApiMethod botApiMethod, TelegramApiRequestException e) { } @Override @@ -142,7 +141,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { private void onOriginReceived(Message message, String language) { SendMessage sendMessageRequest = new SendMessage(); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); sendMessageRequest.setReplyToMessageId(message.getMessageId()); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); forceReplyKeyboard.setSelective(true); @@ -152,8 +151,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { try { sendMessageAsync(sendMessageRequest, new SentCallback() { @Override - public void onResult(BotApiMethod method, JSONObject jsonObject) { - Message sentMessage = method.deserializeResponse(jsonObject); + public void onResult(BotApiMethod method, Message sentMessage) { if (sentMessage != null) { DatabaseManager.getInstance().addUserForDirection(message.getFrom().getId(), WATING_DESTINY_STATUS, sentMessage.getMessageId(), message.getText()); @@ -161,7 +159,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { } @Override - public void onError(BotApiMethod botApiMethod, JSONObject jsonObject) { + public void onError(BotApiMethod botApiMethod, TelegramApiRequestException e) { } @Override @@ -180,7 +178,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { LocalisationService.getInstance().getString("helpDirections", language), Commands.startDirectionCommand); sendMessageRequest.setText(helpDirectionsFormated); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); try { sendMessage(sendMessageRequest); } catch (TelegramApiException e) { @@ -190,7 +188,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { private void onStartdirectionsCommand(Message message, String language) { SendMessage sendMessageRequest = new SendMessage(); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); sendMessageRequest.setReplyToMessageId(message.getMessageId()); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); forceReplyKeyboard.setSelective(true); @@ -200,8 +198,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { try { sendMessageAsync(sendMessageRequest, new SentCallback() { @Override - public void onResult(BotApiMethod method, JSONObject jsonObject) { - Message sentMessage = method.deserializeResponse(jsonObject); + public void onResult(BotApiMethod method, Message sentMessage) { if (sentMessage != null) { DatabaseManager.getInstance().addUserForDirection(message.getFrom().getId(), WATING_ORIGIN_STATUS, sentMessage.getMessageId(), null); @@ -209,7 +206,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { } @Override - public void onError(BotApiMethod botApiMethod, JSONObject jsonObject) { + public void onError(BotApiMethod botApiMethod, TelegramApiRequestException e) { } @Override @@ -224,7 +221,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { private void onSetLanguageCommand(Message message, String language) throws InvalidObjectException { SendMessage sendMessageRequest = new SendMessage(); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); HashMap languages = LocalisationService.getInstance().getSupportedLanguages(); List commands = new ArrayList<>(); @@ -250,7 +247,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { private void onLanguageSelected(Message message) throws InvalidObjectException { String[] parts = message.getText().split("-->", 2); SendMessage sendMessageRequest = new SendMessage(); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); if (LocalisationService.getInstance().getSupportedLanguages().containsKey(parts[0].trim())) { DatabaseManager.getInstance().putUserLanguage(message.getFrom().getId(), parts[0].trim()); sendMessageRequest.setText(LocalisationService.getInstance().getString("languageModified", parts[0].trim())); diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java index 84e6a90..099d4cc 100644 --- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java @@ -108,7 +108,7 @@ public class FilesHandlers extends TelegramLongPollingBot { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setText(LocalisationService.getInstance().getString("fileUploaded", language) + LocalisationService.getInstance().getString("uploadedFileURL", language) + message.getDocument().getFileId()); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); sendMessage(sendMessageRequest); } } @@ -126,7 +126,7 @@ public class FilesHandlers extends TelegramLongPollingBot { } else { sendMessageRequest.setText(LocalisationService.getInstance().getString("noFiles", language)); } - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); sendMessageRequest.setReplyMarkup(replyKeyboardHide); sendMessage(sendMessageRequest); @@ -145,7 +145,7 @@ public class FilesHandlers extends TelegramLongPollingBot { DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), DELETE_UPLOADED_STATUS); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setText(LocalisationService.getInstance().getString("deleteUploadedFile", language)); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); HashMap files = DatabaseManager.getInstance().getFilesByUser(message.getFrom().getId()); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); if (files.size() > 0) { @@ -173,7 +173,7 @@ public class FilesHandlers extends TelegramLongPollingBot { } else { sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language)); } - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); sendMessage(sendMessageRequest); DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId()); @@ -184,7 +184,7 @@ public class FilesHandlers extends TelegramLongPollingBot { DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId()); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setText(LocalisationService.getInstance().getString("processFinished", language)); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); sendMessage(sendMessageRequest); } @@ -192,7 +192,7 @@ public class FilesHandlers extends TelegramLongPollingBot { DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), INITIAL_UPLOAD_STATUS); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setText(LocalisationService.getInstance().getString("sendFileToUpload", language)); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); sendMessage(sendMessageRequest); } @@ -203,7 +203,7 @@ public class FilesHandlers extends TelegramLongPollingBot { Commands.startCommand, Commands.uploadCommand, Commands.deleteCommand, Commands.listCommand); sendMessageRequest.setText(formatedString); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); sendMessage(sendMessageRequest); } @@ -211,19 +211,19 @@ public class FilesHandlers extends TelegramLongPollingBot { if (DatabaseManager.getInstance().doesFileExists(part.trim())) { SendDocument sendDocumentRequest = new SendDocument(); sendDocumentRequest.setDocument(part.trim()); - sendDocumentRequest.setChatId(message.getChatId().toString()); + sendDocumentRequest.setChatId(message.getChatId()); sendDocument(sendDocumentRequest); } else { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language)); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); sendMessage(sendMessageRequest); } } private void onSetLanguageCommand(Message message, String language) throws InvalidObjectException, TelegramApiException { SendMessage sendMessageRequest = new SendMessage(); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); HashMap languages = LocalisationService.getInstance().getSupportedLanguages(); List commands = new ArrayList<>(); @@ -245,7 +245,7 @@ public class FilesHandlers extends TelegramLongPollingBot { private void onLanguageReceived(Message message) throws InvalidObjectException, TelegramApiException { String[] parts = message.getText().split(Emoji.LEFT_RIGHT_ARROW.toString(), 2); SendMessage sendMessageRequest = new SendMessage(); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); if (LocalisationService.getInstance().getSupportedLanguages().containsKey(parts[0].trim())) { DatabaseManager.getInstance().putUserLanguage(message.getFrom().getId(), parts[0].trim()); sendMessageRequest.setText(LocalisationService.getInstance().getString("languageModified", parts[0].trim())); diff --git a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java index 1c50fc8..a9e5cb2 100644 --- a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java @@ -129,7 +129,7 @@ public class RaeHandlers extends TelegramLongPollingBot { */ private static SendMessage getHelpMessage(Message message) { SendMessage sendMessage = new SendMessage(); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.enableMarkdown(true); sendMessage.setText(helpMessage); return sendMessage; diff --git a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java index 756d612..73ddf04 100644 --- a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java @@ -8,6 +8,7 @@ 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.methods.updatingmessages.EditMessageText; import org.telegram.telegrambots.api.objects.Message; import org.telegram.telegrambots.api.objects.Update; import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; @@ -36,11 +37,55 @@ public class TransifexHandlers extends TelegramLongPollingBot { @Override public void onUpdateReceived(Update update) { - try { + BotLogger.severe("TEST", update.toString()); + if (update.hasMessage()) { + if (update.getMessage().getText().startsWith("/command")) { + SendMessage message = new SendMessage(); + message.setText("Second message after clicking >" + update.getMessage().getText() + "<"); + message.setChatId(update.getMessage().getChatId()); + try { + sendMessage(message); + } catch (Throwable e) { + e.printStackTrace(); + } + } else { + SendMessage message = new SendMessage(); + message.setText("First message without command"); + message.setChatId(update.getMessage().getChatId()); + InlineKeyboardMarkup markup = new InlineKeyboardMarkup(); + List> keyboard = new ArrayList<>(); + List row = new ArrayList<>(); + InlineKeyboardButton button = new InlineKeyboardButton(); + button.setText("Edit message"); + button.setCallbackData("EDIT"); + row.add(button); + keyboard.add(row); + markup.setKeyboard(keyboard); + message.setReplyMarkup(markup); + try { + sendMessage(message); + } catch (Throwable e) { + e.printStackTrace(); + } + } + } else if (update.hasCallbackQuery()) { + EditMessageText editMessage = new EditMessageText(); + editMessage.setChatId(update.getCallbackQuery().getMessage().getChatId()); + editMessage.setMessageId(update.getCallbackQuery().getMessage().getMessageId()); + editMessage.setText("First message with /command, /command1 and /command2"); + try { + editMessageText(editMessage); + } catch (Throwable e) { + e.printStackTrace(); + } + } + + + /*try { handleUpdate(update); } catch (Throwable e) { BotLogger.error(LOGTAG, e); - } + }*/ } private void handleUpdate(Update update) throws InvalidObjectException, TelegramApiException { @@ -87,7 +132,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { Commands.transifexTDesktop, Commands.transifexOSX, Commands.transifexWP, Commands.transifexAndroidSupportCommand); sendMessageRequest.setText(helpFormated); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); try { sendMessage(sendMessageRequest); } catch (TelegramApiException e) { @@ -96,7 +141,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { } if (sendDocument != null) { - sendDocument.setChatId(message.getChatId().toString()); + sendDocument.setChatId(message.getChatId()); try { sendDocument(sendDocument); } catch (TelegramApiException e) { @@ -112,7 +157,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { Commands.transifexTDesktop, Commands.transifexOSX, Commands.transifexWP, Commands.transifexAndroidSupportCommand); sendMessageRequest.setText(helpFormated); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); try { sendMessage(sendMessageRequest); } catch (TelegramApiException e) { @@ -124,7 +169,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { private void sendMovedToMessage(Message message) throws InvalidObjectException, TelegramApiException { String language = DatabaseManager.getInstance().getUserLanguage(message.getFrom().getId()); SendMessage answer = new SendMessage(); - answer.setChatId(message.getChatId().toString()); + answer.setChatId(message.getChatId()); answer.setReplyToMessageId(message.getMessageId()); answer.setText(LocalisationService.getInstance().getString("movedToLangBot", language)); InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup(); diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java index 6f52143..9e459e0 100644 --- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java @@ -247,7 +247,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertDeleted", language)); @@ -259,7 +259,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); @@ -273,7 +273,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { if (message.getText().equals(getCancelCommand(language))) { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); @@ -296,7 +296,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessageRequest.setReplyMarkup(getAlertsKeyboard(language)); sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setText(getChooseNewAlertSetMessage(message.getText(), language)); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); DatabaseManager.getInstance().insertWeatherState(userId, message.getChatId(), ALERT); return sendMessageRequest; @@ -332,7 +332,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setText(getSettingsMessage(language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS); @@ -343,7 +343,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(getAlertListMessage(message.getFrom().getId(), language)); @@ -356,7 +356,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); ReplyKeyboardMarkup replyKeyboardMarkup = getAlertsListKeyboard(message.getFrom().getId(), language); if (replyKeyboardMarkup != null) { @@ -376,7 +376,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyMarkup(getRecentsKeyboard(message.getFrom().getId(), language, false)); sendMessage.setText(LocalisationService.getInstance().getString("chooseNewAlertCity", language)); sendMessage.setReplyToMessageId(message.getMessageId()); @@ -413,7 +413,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); @@ -426,7 +426,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyMarkup(getUnitsKeyboard(language)); sendMessage.setText(getUnitsMessage(message.getFrom().getId(), language)); @@ -439,7 +439,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setReplyMarkup(getLanguagesKeyboard(language)); sendMessage.setText(getLanguageMessage(language)); @@ -476,7 +476,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setText(getSettingsMessage(language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS); @@ -534,7 +534,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setText(getSettingsMessage(language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS); @@ -783,7 +783,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { } else if (message.getText().equals(getSettingsCommand(language))) { sendMessageRequest = onSettingsChoosen(message, language); } else if (message.getText().equals(getRateCommand(language))) { - sendMessageRequest = sendRateMessage(message.getChatId().toString(), message.getMessageId(), null, language); + sendMessageRequest = sendRateMessage(message.getChatId(), message.getMessageId(), null, language); } else { sendMessageRequest = sendChooseOptionMessage(message.getChatId(), message.getMessageId(), getMainMenuKeyboard(language), language); @@ -803,7 +803,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); sendMessage.setText(getSettingsMessage(language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS); @@ -817,7 +817,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language); sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); if (replyKeyboardMarkup.getKeyboard().size() > 3) { sendMessage.setText(LocalisationService.getInstance().getString("onForecastCommandFromHistory", language)); } else { @@ -835,7 +835,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language); sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyToMessageId(message.getMessageId()); - sendMessage.setChatId(message.getChatId().toString()); + sendMessage.setChatId(message.getChatId()); if (replyKeyboardMarkup.getKeyboard().size() > 3) { sendMessage.setText(LocalisationService.getInstance().getString("onCurrentCommandFromHistory", language)); } else { @@ -1151,7 +1151,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { private static SendMessage sendMessageDefault(Message message, String language) { ReplyKeyboardMarkup replyKeyboardMarkup = getMainMenuKeyboard(language); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU); - return sendHelpMessage(message.getChatId().toString(), message.getMessageId(), replyKeyboardMarkup, language); + return sendHelpMessage(message.getChatId(), message.getMessageId(), replyKeyboardMarkup, language); } private static SendMessage sendChooseOptionMessage(Long chatId, Integer messageId, @@ -1166,7 +1166,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { return sendMessage; } - private static SendMessage sendHelpMessage(String chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup, String language) { + private static SendMessage sendHelpMessage(Long chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup, String language) { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId); @@ -1178,7 +1178,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { return sendMessage; } - private static SendMessage sendRateMessage(String chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup, String language) { + private static SendMessage sendRateMessage(Long chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup, String language) { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId); @@ -1204,7 +1204,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setText(weather); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU); return sendMessageRequest; @@ -1233,7 +1233,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setText(weather); - sendMessageRequest.setChatId(message.getChatId().toString()); + sendMessageRequest.setChatId(message.getChatId()); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU); return sendMessageRequest;