La123123.
/
telegram_example
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Update api version 2.4.2

master
Rubenlagus 10 years ago
parent
130fd3c7b8
commit
1480fdc7ee
10 changed files with 116 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pom.xml
  2. 4
      src/main/java/org/telegram/BotConfig.java
  3. 18
      src/main/java/org/telegram/Main.java
  4. 12
      src/main/java/org/telegram/updateshandlers/ChannelHandlers.java
  5. 4
      src/main/java/org/telegram/updateshandlers/CommandsHandler.java
  6. 31
      src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
  7. 22
      src/main/java/org/telegram/updateshandlers/FilesHandlers.java
  8. 2
      src/main/java/org/telegram/updateshandlers/RaeHandlers.java
  9. 55
      src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
  10. 44
      src/main/java/org/telegram/updateshandlers/WeatherHandlers.java

2
pom.xml
View File

@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<httpcompontents.version>4.5.2</httpcompontents.version> <httpcompontents.version>4.5.2</httpcompontents.version>
<telegrambots.version>2.4.0</telegrambots.version> <telegrambots.version>2.4.2</telegrambots.version>
<json.version>20160810</json.version> <json.version>20160810</json.version>
<mysql.version>6.0.4</mysql.version> <mysql.version>6.0.4</mysql.version>
</properties> </properties>

4
src/main/java/org/telegram/BotConfig.java
View File

@ -10,8 +10,8 @@ public class BotConfig {
public static final String WEATHER_TOKEN = "<token>"; public static final String WEATHER_TOKEN = "<token>";
public static final String WEATHER_USER = "weatherbot"; public static final String WEATHER_USER = "weatherbot";
public static final String TRANSIFEX_TOKEN = "<token>"; public static final String TRANSIFEX_TOKEN = "143603381:AAEHhhN7gDLywsdy8v53psOKGDxk14mOMn8";
public static final String TRANSIFEX_USER = "TGlanguagesbot"; public static final String TRANSIFEX_USER = "rubenlagusbot";
public static final String FILES_TOKEN = "<token>"; public static final String FILES_TOKEN = "<token>";
public static final String FILES_USER = "filesbot"; public static final String FILES_USER = "filesbot";

18
src/main/java/org/telegram/Main.java
View File

@ -4,13 +4,7 @@ import org.telegram.telegrambots.TelegramBotsApi;
import org.telegram.telegrambots.exceptions.TelegramApiException; import org.telegram.telegrambots.exceptions.TelegramApiException;
import org.telegram.telegrambots.logging.BotLogger; import org.telegram.telegrambots.logging.BotLogger;
import org.telegram.telegrambots.logging.BotsFileHandler; 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.TransifexHandlers;
import org.telegram.updateshandlers.WeatherHandlers;
import org.telegram.updateshandlers.WebHookExampleHandlers; import org.telegram.updateshandlers.WebHookExampleHandlers;
import java.io.IOException; import java.io.IOException;
@ -39,13 +33,13 @@ public class Main {
TelegramBotsApi telegramBotsApi = createTelegramBotsApi(); TelegramBotsApi telegramBotsApi = createTelegramBotsApi();
try { try {
// Register long polling bots. They work regardless type of TelegramBotsApi we are creating // Register long polling bots. They work regardless type of TelegramBotsApi we are creating
telegramBotsApi.registerBot(new ChannelHandlers()); //telegramBotsApi.registerBot(new ChannelHandlers());
telegramBotsApi.registerBot(new DirectionsHandlers()); //telegramBotsApi.registerBot(new DirectionsHandlers());
telegramBotsApi.registerBot(new RaeHandlers()); //telegramBotsApi.registerBot(new RaeHandlers());
telegramBotsApi.registerBot(new WeatherHandlers()); //telegramBotsApi.registerBot(new WeatherHandlers());
telegramBotsApi.registerBot(new TransifexHandlers()); telegramBotsApi.registerBot(new TransifexHandlers());
telegramBotsApi.registerBot(new FilesHandlers()); //telegramBotsApi.registerBot(new FilesHandlers());
telegramBotsApi.registerBot(new CommandsHandler()); //telegramBotsApi.registerBot(new CommandsHandler());
} catch (TelegramApiException e) { } catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e); BotLogger.error(LOGTAG, e);
} }

12
src/main/java/org/telegram/updateshandlers/ChannelHandlers.java
View File

@ -71,7 +71,7 @@ public class ChannelHandlers extends TelegramLongPollingBot {
onWaitingChannelMessage(message); onWaitingChannelMessage(message);
break; break;
default: default:
sendHelpMessage(message.getChatId().toString(), message.getMessageId(), null); sendHelpMessage(message.getChatId(), message.getMessageId(), null);
userState.put(message.getFrom().getId(), WAITINGCHANNEL); userState.put(message.getFrom().getId(), WAITINGCHANNEL);
break; break;
} }
@ -81,7 +81,7 @@ public class ChannelHandlers extends TelegramLongPollingBot {
try { try {
if (message.getText().equals(CANCEL_COMMAND)) { if (message.getText().equals(CANCEL_COMMAND)) {
userState.remove(message.getFrom().getId()); userState.remove(message.getFrom().getId());
sendHelpMessage(message.getChatId().toString(), message.getMessageId(), null); sendHelpMessage(message.getChatId(), message.getMessageId(), null);
} else { } else {
if (message.getText().startsWith("@") && !message.getText().trim().contains(" ")) { if (message.getText().startsWith("@") && !message.getText().trim().contains(" ")) {
sendMessage(getMessageToChannelSent(message)); sendMessage(getMessageToChannelSent(message));
@ -114,7 +114,7 @@ public class ChannelHandlers extends TelegramLongPollingBot {
private void sendErrorMessage(Message message, String errorText) { private void sendErrorMessage(Message message, String errorText) {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setText(String.format(ERROR_MESSAGE_TEXT, message.getText().trim(), errorText.replace("\"", "\\\""))); 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) { private static SendMessage getWrongUsernameMessage(Message message) {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard();
@ -145,14 +145,14 @@ public class ChannelHandlers extends TelegramLongPollingBot {
private static SendMessage getMessageToChannelSent(Message message) { private static SendMessage getMessageToChannelSent(Message message) {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setText(AFTER_CHANNEL_TEXT); sendMessage.setText(AFTER_CHANNEL_TEXT);
return sendMessage; 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 sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setChatId(chatId); sendMessage.setChatId(chatId);

4
src/main/java/org/telegram/updateshandlers/CommandsHandler.java
View File

@ -35,7 +35,7 @@ public class CommandsHandler extends TelegramLongPollingCommandBot {
registerDefaultAction((absSender, message) -> { registerDefaultAction((absSender, message) -> {
SendMessage commandUnknownMessage = new SendMessage(); 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); commandUnknownMessage.setText("The command '" + message.getText() + "' is not known by this bot. Here comes some help " + Emoji.AMBULANCE);
try { try {
absSender.sendMessage(commandUnknownMessage); absSender.sendMessage(commandUnknownMessage);
@ -58,7 +58,7 @@ public class CommandsHandler extends TelegramLongPollingCommandBot {
if (message.hasText()) { if (message.hasText()) {
SendMessage echoMessage = new SendMessage(); SendMessage echoMessage = new SendMessage();
echoMessage.setChatId(message.getChatId().toString()); echoMessage.setChatId(message.getChatId());
echoMessage.setText("Hey heres your message:\n" + message.getText()); echoMessage.setText("Hey heres your message:\n" + message.getText());
try { try {

31
src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
View File

@ -1,6 +1,5 @@
package org.telegram.updateshandlers; package org.telegram.updateshandlers;
import org.json.JSONObject;
import org.telegram.BotConfig; import org.telegram.BotConfig;
import org.telegram.Commands; import org.telegram.Commands;
import org.telegram.database.DatabaseManager; 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.api.objects.replykeyboard.buttons.KeyboardRow;
import org.telegram.telegrambots.bots.TelegramLongPollingBot; import org.telegram.telegrambots.bots.TelegramLongPollingBot;
import org.telegram.telegrambots.exceptions.TelegramApiException; import org.telegram.telegrambots.exceptions.TelegramApiException;
import org.telegram.telegrambots.exceptions.TelegramApiRequestException;
import org.telegram.telegrambots.logging.BotLogger; import org.telegram.telegrambots.logging.BotLogger;
import org.telegram.telegrambots.updateshandlers.SentCallback; import org.telegram.telegrambots.updateshandlers.SentCallback;
@ -90,7 +90,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
} else { } else {
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setText(LocalisationService.getInstance().getString("youNeedReplyDirections", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("youNeedReplyDirections", language));
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
try { try {
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
} catch (TelegramApiException e) { } catch (TelegramApiException e) {
@ -108,7 +108,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
String destiny = message.getText(); String destiny = message.getText();
List<String> directions = DirectionsService.getInstance().getDirections(origin, destiny, language); List<String> directions = DirectionsService.getInstance().getDirections(origin, destiny, language);
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide();
replyKeyboardHide.setSelective(true); replyKeyboardHide.setSelective(true);
sendMessageRequest.setReplyMarkup(replyKeyboardHide); sendMessageRequest.setReplyMarkup(replyKeyboardHide);
@ -118,15 +118,14 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
try { try {
sendMessageAsync(sendMessageRequest, new SentCallback<Message>() { sendMessageAsync(sendMessageRequest, new SentCallback<Message>() {
@Override @Override
public void onResult(BotApiMethod<Message> botApiMethod, JSONObject jsonObject) { public void onResult(BotApiMethod<Message> botApiMethod, Message sentMessage) {
Message sentMessage = botApiMethod.deserializeResponse(jsonObject);
if (sentMessage != null) { if (sentMessage != null) {
DatabaseManager.getInstance().deleteUserForDirections(message.getFrom().getId()); DatabaseManager.getInstance().deleteUserForDirections(message.getFrom().getId());
} }
} }
@Override @Override
public void onError(BotApiMethod<Message> botApiMethod, JSONObject jsonObject) { public void onError(BotApiMethod<Message> botApiMethod, TelegramApiRequestException e) {
} }
@Override @Override
@ -142,7 +141,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
private void onOriginReceived(Message message, String language) { private void onOriginReceived(Message message, String language) {
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setReplyToMessageId(message.getMessageId());
ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard();
forceReplyKeyboard.setSelective(true); forceReplyKeyboard.setSelective(true);
@ -152,8 +151,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
try { try {
sendMessageAsync(sendMessageRequest, new SentCallback<Message>() { sendMessageAsync(sendMessageRequest, new SentCallback<Message>() {
@Override @Override
public void onResult(BotApiMethod<Message> method, JSONObject jsonObject) { public void onResult(BotApiMethod<Message> method, Message sentMessage) {
Message sentMessage = method.deserializeResponse(jsonObject);
if (sentMessage != null) { if (sentMessage != null) {
DatabaseManager.getInstance().addUserForDirection(message.getFrom().getId(), WATING_DESTINY_STATUS, DatabaseManager.getInstance().addUserForDirection(message.getFrom().getId(), WATING_DESTINY_STATUS,
sentMessage.getMessageId(), message.getText()); sentMessage.getMessageId(), message.getText());
@ -161,7 +159,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
} }
@Override @Override
public void onError(BotApiMethod<Message> botApiMethod, JSONObject jsonObject) { public void onError(BotApiMethod<Message> botApiMethod, TelegramApiRequestException e) {
} }
@Override @Override
@ -180,7 +178,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
LocalisationService.getInstance().getString("helpDirections", language), LocalisationService.getInstance().getString("helpDirections", language),
Commands.startDirectionCommand); Commands.startDirectionCommand);
sendMessageRequest.setText(helpDirectionsFormated); sendMessageRequest.setText(helpDirectionsFormated);
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
try { try {
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
} catch (TelegramApiException e) { } catch (TelegramApiException e) {
@ -190,7 +188,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
private void onStartdirectionsCommand(Message message, String language) { private void onStartdirectionsCommand(Message message, String language) {
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setReplyToMessageId(message.getMessageId());
ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard();
forceReplyKeyboard.setSelective(true); forceReplyKeyboard.setSelective(true);
@ -200,8 +198,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
try { try {
sendMessageAsync(sendMessageRequest, new SentCallback<Message>() { sendMessageAsync(sendMessageRequest, new SentCallback<Message>() {
@Override @Override
public void onResult(BotApiMethod<Message> method, JSONObject jsonObject) { public void onResult(BotApiMethod<Message> method, Message sentMessage) {
Message sentMessage = method.deserializeResponse(jsonObject);
if (sentMessage != null) { if (sentMessage != null) {
DatabaseManager.getInstance().addUserForDirection(message.getFrom().getId(), WATING_ORIGIN_STATUS, DatabaseManager.getInstance().addUserForDirection(message.getFrom().getId(), WATING_ORIGIN_STATUS,
sentMessage.getMessageId(), null); sentMessage.getMessageId(), null);
@ -209,7 +206,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
} }
@Override @Override
public void onError(BotApiMethod<Message> botApiMethod, JSONObject jsonObject) { public void onError(BotApiMethod<Message> botApiMethod, TelegramApiRequestException e) {
} }
@Override @Override
@ -224,7 +221,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
private void onSetLanguageCommand(Message message, String language) throws InvalidObjectException { private void onSetLanguageCommand(Message message, String language) throws InvalidObjectException {
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
HashMap<String, String> languages = LocalisationService.getInstance().getSupportedLanguages(); HashMap<String, String> languages = LocalisationService.getInstance().getSupportedLanguages();
List<KeyboardRow> commands = new ArrayList<>(); List<KeyboardRow> commands = new ArrayList<>();
@ -250,7 +247,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
private void onLanguageSelected(Message message) throws InvalidObjectException { private void onLanguageSelected(Message message) throws InvalidObjectException {
String[] parts = message.getText().split("-->", 2); String[] parts = message.getText().split("-->", 2);
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
if (LocalisationService.getInstance().getSupportedLanguages().containsKey(parts[0].trim())) { if (LocalisationService.getInstance().getSupportedLanguages().containsKey(parts[0].trim())) {
DatabaseManager.getInstance().putUserLanguage(message.getFrom().getId(), parts[0].trim()); DatabaseManager.getInstance().putUserLanguage(message.getFrom().getId(), parts[0].trim());
sendMessageRequest.setText(LocalisationService.getInstance().getString("languageModified", parts[0].trim())); sendMessageRequest.setText(LocalisationService.getInstance().getString("languageModified", parts[0].trim()));

22
src/main/java/org/telegram/updateshandlers/FilesHandlers.java
View File

@ -108,7 +108,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setText(LocalisationService.getInstance().getString("fileUploaded", language) + sendMessageRequest.setText(LocalisationService.getInstance().getString("fileUploaded", language) +
LocalisationService.getInstance().getString("uploadedFileURL", language) + message.getDocument().getFileId()); LocalisationService.getInstance().getString("uploadedFileURL", language) + message.getDocument().getFileId());
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
} }
} }
@ -126,7 +126,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
} else { } else {
sendMessageRequest.setText(LocalisationService.getInstance().getString("noFiles", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("noFiles", language));
} }
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide();
sendMessageRequest.setReplyMarkup(replyKeyboardHide); sendMessageRequest.setReplyMarkup(replyKeyboardHide);
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
@ -145,7 +145,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), DELETE_UPLOADED_STATUS); DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), DELETE_UPLOADED_STATUS);
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setText(LocalisationService.getInstance().getString("deleteUploadedFile", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("deleteUploadedFile", language));
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
HashMap<String, String> files = DatabaseManager.getInstance().getFilesByUser(message.getFrom().getId()); HashMap<String, String> files = DatabaseManager.getInstance().getFilesByUser(message.getFrom().getId());
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
if (files.size() > 0) { if (files.size() > 0) {
@ -173,7 +173,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
} else { } else {
sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language));
} }
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId()); DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId());
@ -184,7 +184,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId()); DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId());
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setText(LocalisationService.getInstance().getString("processFinished", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("processFinished", language));
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
} }
@ -192,7 +192,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), INITIAL_UPLOAD_STATUS); DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), INITIAL_UPLOAD_STATUS);
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setText(LocalisationService.getInstance().getString("sendFileToUpload", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("sendFileToUpload", language));
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
} }
@ -203,7 +203,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
Commands.startCommand, Commands.uploadCommand, Commands.deleteCommand, Commands.startCommand, Commands.uploadCommand, Commands.deleteCommand,
Commands.listCommand); Commands.listCommand);
sendMessageRequest.setText(formatedString); sendMessageRequest.setText(formatedString);
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
} }
@ -211,19 +211,19 @@ public class FilesHandlers extends TelegramLongPollingBot {
if (DatabaseManager.getInstance().doesFileExists(part.trim())) { if (DatabaseManager.getInstance().doesFileExists(part.trim())) {
SendDocument sendDocumentRequest = new SendDocument(); SendDocument sendDocumentRequest = new SendDocument();
sendDocumentRequest.setDocument(part.trim()); sendDocumentRequest.setDocument(part.trim());
sendDocumentRequest.setChatId(message.getChatId().toString()); sendDocumentRequest.setChatId(message.getChatId());
sendDocument(sendDocumentRequest); sendDocument(sendDocumentRequest);
} else { } else {
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language));
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
} }
} }
private void onSetLanguageCommand(Message message, String language) throws InvalidObjectException, TelegramApiException { private void onSetLanguageCommand(Message message, String language) throws InvalidObjectException, TelegramApiException {
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
HashMap<String, String> languages = LocalisationService.getInstance().getSupportedLanguages(); HashMap<String, String> languages = LocalisationService.getInstance().getSupportedLanguages();
List<KeyboardRow> commands = new ArrayList<>(); List<KeyboardRow> commands = new ArrayList<>();
@ -245,7 +245,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
private void onLanguageReceived(Message message) throws InvalidObjectException, TelegramApiException { private void onLanguageReceived(Message message) throws InvalidObjectException, TelegramApiException {
String[] parts = message.getText().split(Emoji.LEFT_RIGHT_ARROW.toString(), 2); String[] parts = message.getText().split(Emoji.LEFT_RIGHT_ARROW.toString(), 2);
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
if (LocalisationService.getInstance().getSupportedLanguages().containsKey(parts[0].trim())) { if (LocalisationService.getInstance().getSupportedLanguages().containsKey(parts[0].trim())) {
DatabaseManager.getInstance().putUserLanguage(message.getFrom().getId(), parts[0].trim()); DatabaseManager.getInstance().putUserLanguage(message.getFrom().getId(), parts[0].trim());
sendMessageRequest.setText(LocalisationService.getInstance().getString("languageModified", parts[0].trim())); sendMessageRequest.setText(LocalisationService.getInstance().getString("languageModified", parts[0].trim()));

2
src/main/java/org/telegram/updateshandlers/RaeHandlers.java
View File

@ -129,7 +129,7 @@ public class RaeHandlers extends TelegramLongPollingBot {
*/ */
private static SendMessage getHelpMessage(Message message) { private static SendMessage getHelpMessage(Message message) {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setText(helpMessage); sendMessage.setText(helpMessage);
return sendMessage; return sendMessage;

55
src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
View File

@ -8,6 +8,7 @@ import org.telegram.services.LocalisationService;
import org.telegram.services.TransifexService; import org.telegram.services.TransifexService;
import org.telegram.telegrambots.api.methods.send.SendDocument; import org.telegram.telegrambots.api.methods.send.SendDocument;
import org.telegram.telegrambots.api.methods.send.SendMessage; 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.Message;
import org.telegram.telegrambots.api.objects.Update; import org.telegram.telegrambots.api.objects.Update;
import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup;
@ -36,11 +37,55 @@ public class TransifexHandlers extends TelegramLongPollingBot {
@Override @Override
public void onUpdateReceived(Update update) { public void onUpdateReceived(Update update) {
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 { 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<List<InlineKeyboardButton>> keyboard = new ArrayList<>();
List<InlineKeyboardButton> 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); handleUpdate(update);
} catch (Throwable e) { } catch (Throwable e) {
BotLogger.error(LOGTAG, e); BotLogger.error(LOGTAG, e);
} }*/
} }
private void handleUpdate(Update update) throws InvalidObjectException, TelegramApiException { private void handleUpdate(Update update) throws InvalidObjectException, TelegramApiException {
@ -87,7 +132,7 @@ public class TransifexHandlers extends TelegramLongPollingBot {
Commands.transifexTDesktop, Commands.transifexOSX, Commands.transifexWP, Commands.transifexTDesktop, Commands.transifexOSX, Commands.transifexWP,
Commands.transifexAndroidSupportCommand); Commands.transifexAndroidSupportCommand);
sendMessageRequest.setText(helpFormated); sendMessageRequest.setText(helpFormated);
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
try { try {
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
} catch (TelegramApiException e) { } catch (TelegramApiException e) {
@ -96,7 +141,7 @@ public class TransifexHandlers extends TelegramLongPollingBot {
} }
if (sendDocument != null) { if (sendDocument != null) {
sendDocument.setChatId(message.getChatId().toString()); sendDocument.setChatId(message.getChatId());
try { try {
sendDocument(sendDocument); sendDocument(sendDocument);
} catch (TelegramApiException e) { } catch (TelegramApiException e) {
@ -112,7 +157,7 @@ public class TransifexHandlers extends TelegramLongPollingBot {
Commands.transifexTDesktop, Commands.transifexOSX, Commands.transifexWP, Commands.transifexTDesktop, Commands.transifexOSX, Commands.transifexWP,
Commands.transifexAndroidSupportCommand); Commands.transifexAndroidSupportCommand);
sendMessageRequest.setText(helpFormated); sendMessageRequest.setText(helpFormated);
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
try { try {
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
} catch (TelegramApiException e) { } catch (TelegramApiException e) {
@ -124,7 +169,7 @@ public class TransifexHandlers extends TelegramLongPollingBot {
private void sendMovedToMessage(Message message) throws InvalidObjectException, TelegramApiException { private void sendMovedToMessage(Message message) throws InvalidObjectException, TelegramApiException {
String language = DatabaseManager.getInstance().getUserLanguage(message.getFrom().getId()); String language = DatabaseManager.getInstance().getUserLanguage(message.getFrom().getId());
SendMessage answer = new SendMessage(); SendMessage answer = new SendMessage();
answer.setChatId(message.getChatId().toString()); answer.setChatId(message.getChatId());
answer.setReplyToMessageId(message.getMessageId()); answer.setReplyToMessageId(message.getMessageId());
answer.setText(LocalisationService.getInstance().getString("movedToLangBot", language)); answer.setText(LocalisationService.getInstance().getString("movedToLangBot", language));
InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup(); InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup();

44
src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
View File

@ -247,7 +247,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setReplyMarkup(getAlertsKeyboard(language));
sendMessage.setText(LocalisationService.getInstance().getString("alertDeleted", language)); sendMessage.setText(LocalisationService.getInstance().getString("alertDeleted", language));
@ -259,7 +259,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setReplyMarkup(getAlertsKeyboard(language));
sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language));
@ -273,7 +273,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
if (message.getText().equals(getCancelCommand(language))) { if (message.getText().equals(getCancelCommand(language))) {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setReplyMarkup(getAlertsKeyboard(language));
sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language));
@ -296,7 +296,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
sendMessageRequest.setReplyMarkup(getAlertsKeyboard(language)); sendMessageRequest.setReplyMarkup(getAlertsKeyboard(language));
sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setReplyToMessageId(message.getMessageId());
sendMessageRequest.setText(getChooseNewAlertSetMessage(message.getText(), language)); sendMessageRequest.setText(getChooseNewAlertSetMessage(message.getText(), language));
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
DatabaseManager.getInstance().insertWeatherState(userId, message.getChatId(), ALERT); DatabaseManager.getInstance().insertWeatherState(userId, message.getChatId(), ALERT);
return sendMessageRequest; return sendMessageRequest;
@ -332,7 +332,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language);
sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyMarkup(replyKeyboardMarkup);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setText(getSettingsMessage(language)); sendMessage.setText(getSettingsMessage(language));
DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS);
@ -343,7 +343,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setReplyMarkup(getAlertsKeyboard(language));
sendMessage.setText(getAlertListMessage(message.getFrom().getId(), language)); sendMessage.setText(getAlertListMessage(message.getFrom().getId(), language));
@ -356,7 +356,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
ReplyKeyboardMarkup replyKeyboardMarkup = getAlertsListKeyboard(message.getFrom().getId(), language); ReplyKeyboardMarkup replyKeyboardMarkup = getAlertsListKeyboard(message.getFrom().getId(), language);
if (replyKeyboardMarkup != null) { if (replyKeyboardMarkup != null) {
@ -376,7 +376,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyMarkup(getRecentsKeyboard(message.getFrom().getId(), language, false)); sendMessage.setReplyMarkup(getRecentsKeyboard(message.getFrom().getId(), language, false));
sendMessage.setText(LocalisationService.getInstance().getString("chooseNewAlertCity", language)); sendMessage.setText(LocalisationService.getInstance().getString("chooseNewAlertCity", language));
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
@ -413,7 +413,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setReplyMarkup(getAlertsKeyboard(language));
sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language));
@ -426,7 +426,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyMarkup(getUnitsKeyboard(language)); sendMessage.setReplyMarkup(getUnitsKeyboard(language));
sendMessage.setText(getUnitsMessage(message.getFrom().getId(), language)); sendMessage.setText(getUnitsMessage(message.getFrom().getId(), language));
@ -439,7 +439,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setReplyMarkup(getLanguagesKeyboard(language)); sendMessage.setReplyMarkup(getLanguagesKeyboard(language));
sendMessage.setText(getLanguageMessage(language)); sendMessage.setText(getLanguageMessage(language));
@ -476,7 +476,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language);
sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyMarkup(replyKeyboardMarkup);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setText(getSettingsMessage(language)); sendMessage.setText(getSettingsMessage(language));
DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS);
@ -534,7 +534,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language);
sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyMarkup(replyKeyboardMarkup);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setText(getSettingsMessage(language)); sendMessage.setText(getSettingsMessage(language));
DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS); 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))) { } else if (message.getText().equals(getSettingsCommand(language))) {
sendMessageRequest = onSettingsChoosen(message, language); sendMessageRequest = onSettingsChoosen(message, language);
} else if (message.getText().equals(getRateCommand(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 { } else {
sendMessageRequest = sendChooseOptionMessage(message.getChatId(), message.getMessageId(), sendMessageRequest = sendChooseOptionMessage(message.getChatId(), message.getMessageId(),
getMainMenuKeyboard(language), language); getMainMenuKeyboard(language), language);
@ -803,7 +803,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language);
sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyMarkup(replyKeyboardMarkup);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
sendMessage.setText(getSettingsMessage(language)); sendMessage.setText(getSettingsMessage(language));
DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS); 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); ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language);
sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyMarkup(replyKeyboardMarkup);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
if (replyKeyboardMarkup.getKeyboard().size() > 3) { if (replyKeyboardMarkup.getKeyboard().size() > 3) {
sendMessage.setText(LocalisationService.getInstance().getString("onForecastCommandFromHistory", language)); sendMessage.setText(LocalisationService.getInstance().getString("onForecastCommandFromHistory", language));
} else { } else {
@ -835,7 +835,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language); ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language);
sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setReplyMarkup(replyKeyboardMarkup);
sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setReplyToMessageId(message.getMessageId());
sendMessage.setChatId(message.getChatId().toString()); sendMessage.setChatId(message.getChatId());
if (replyKeyboardMarkup.getKeyboard().size() > 3) { if (replyKeyboardMarkup.getKeyboard().size() > 3) {
sendMessage.setText(LocalisationService.getInstance().getString("onCurrentCommandFromHistory", language)); sendMessage.setText(LocalisationService.getInstance().getString("onCurrentCommandFromHistory", language));
} else { } else {
@ -1151,7 +1151,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
private static SendMessage sendMessageDefault(Message message, String language) { private static SendMessage sendMessageDefault(Message message, String language) {
ReplyKeyboardMarkup replyKeyboardMarkup = getMainMenuKeyboard(language); ReplyKeyboardMarkup replyKeyboardMarkup = getMainMenuKeyboard(language);
DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU); 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, private static SendMessage sendChooseOptionMessage(Long chatId, Integer messageId,
@ -1166,7 +1166,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
return sendMessage; 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 sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setChatId(chatId); sendMessage.setChatId(chatId);
@ -1178,7 +1178,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
return sendMessage; 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 sendMessage = new SendMessage();
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
sendMessage.setChatId(chatId); sendMessage.setChatId(chatId);
@ -1204,7 +1204,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language));
sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setReplyToMessageId(message.getMessageId());
sendMessageRequest.setText(weather); sendMessageRequest.setText(weather);
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU);
return sendMessageRequest; return sendMessageRequest;
@ -1233,7 +1233,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language));
sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setReplyToMessageId(message.getMessageId());
sendMessageRequest.setText(weather); sendMessageRequest.setText(weather);
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId());
DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU);
return sendMessageRequest; return sendMessageRequest;

Write Preview
Loading…
Cancel
Save