diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 434b83a..8035028 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_2_6.xml b/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_2_6.xml
new file mode 100644
index 0000000..3c722ab
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 751365b..818cd06 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,89 +1,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
@@ -127,27 +54,17 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -156,18 +73,18 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -208,7 +125,6 @@
-
-
+
+
true
+ DEFINITION_ORDER
@@ -280,78 +198,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -494,9 +341,6 @@
-
-
-
@@ -528,10 +372,6 @@
-
-
-
-
@@ -603,12 +443,15 @@
-
+
+
+
+
@@ -903,13 +746,12 @@
-
-
-
+
+
@@ -1025,7 +867,7 @@
-
+
@@ -1112,6 +954,7 @@
+ project
@@ -1123,10 +966,12 @@
+
+ /usr/local/bin/node
$PROJECT_DIR$
true
@@ -1207,6 +1052,7 @@
1434808152627
+
1434808152627
@@ -1288,306 +1134,364 @@
-
-
- 1434921270136
-
-
- 1434921270137
-
-
- 1434922215775
-
-
- 1434922215775
-
-
- 1434926059465
-
-
- 1434926059465
+
+
+
+
+
+
+
+
+
1434927087970
+
1434927087970
1434928139587
+
1434928139587
1434932225092
+
1434932225093
1434956620075
+
1434956620075
1434956750907
+
1434956750907
1434999490285
+
1434999490285
1435015027385
+
1435015027385
1435084167629
+
1435084167629
1435108063150
+
1435108063150
1435169633681
+
1435169633681
1435253672379
+
1435253672379
1435262669527
+
1435262669527
1435279428470
+
1435279428471
1435324633695
+
1435324633695
1435326238547
+
1435326238547
1435351149105
+
1435351149105
1435352969379
+
1435352969379
1435522852368
+
1435522852368
1435524383549
+
1435524383549
1435531042174
+
1435531042174
1435612308869
+
1435612308869
1435612610051
+
1435612610051
1435612816385
+
1435612816385
1436699817668
+
1436699817668
1437345691187
+
1437345691187
1437352180849
+
1437352180849
1437412684747
+
1437412684747
1438295674986
+
1438295674986
1438624259422
+
1438624259422
1438626388907
+
1438626388907
1438671471514
+
1438671471514
1438704494358
+
1438704494358
1438714336299
+
1438714336299
1439745791759
+
1439745791759
1439748123685
+
1439748123685
1439751029730
+
1439751029730
1439752857666
+
1439752857666
1440700286055
+
1440700286055
1441719275787
+
1441719275787
1444845084283
+
1444845084283
1444855140616
+
1444855140616
1447282141578
+
1447282141579
1447284479323
+
1447284479323
1447284695900
+
1447284695901
1447967835440
+
1447967835441
1453141929947
+
1453141929950
-
+
+ 1460430348503
+
+
+
+ 1460430348503
+
+
+ 1460430570307
+
+
+
+ 1460430570307
+
+
+ 1460485200872
+
+
+
+ 1460485200873
+
+
-
+
@@ -1600,7 +1504,7 @@
-
+
@@ -1610,29 +1514,29 @@
-
+
-
+
-
+
-
-
-
+
+
+
@@ -1678,8 +1582,6 @@
-
-
@@ -1703,7 +1605,9 @@
-
+
+
+
@@ -1723,7 +1627,7 @@
file://$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java
- 323
+ 329
@@ -1734,28 +1638,40 @@
- file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java
- 40
+ jar://$MAVEN_REPOSITORY$/com/github/rubenlagus/TelegramBots/v1.0/TelegramBots-v1.0.jar!/org/telegram/telegrambots/bots/AbsSender.class
+ 343
+
+
+
+
+ file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
+ 1178
-
+
- jar://$MAVEN_REPOSITORY$/com/github/rubenlagus/TelegramBots/v0.1/TelegramBots-v0.1.jar!/org/telegram/telegrambots/TelegramBotsApi.class
- 61
+ file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
+ 1171
-
+
- file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java
- 27
+ file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java
+ 45
-
+
+
+
+ file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java
+ 47
+
+
-
+
@@ -1764,452 +1680,233 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
+
+
-
-
+
-
-
-
+
+
-
+
-
-
-
+
+
-
+
-
-
+
-
+
-
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/BotAPi.iml b/BotAPi.iml
index 00e0570..997844b 100644
--- a/BotAPi.iml
+++ b/BotAPi.iml
@@ -11,7 +11,7 @@
-
+
diff --git a/pom.xml b/pom.xml
index 0ee3e44..2648e3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
2.22.2
1.19.1
4.5.2
- v2.0.1
+ v2.2.6
20160212
5.1.38
diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
index 0e3b0f2..974572c 100644
--- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
@@ -76,15 +76,15 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
sendHelpMessage(message, language);
} else if (!message.getText().startsWith("/")) {
if (DatabaseManager.getInstance().getUserDestinationStatus(message.getFrom().getId()) == WATING_ORIGIN_STATUS &&
- message.hasReplayMessage() &&
+ message.isReply() &&
DatabaseManager.getInstance().getUserDestinationMessageId(message.getFrom().getId()) == message.getReplyToMessage().getMessageId()) {
onOriginReceived(message, language);
} else if (DatabaseManager.getInstance().getUserDestinationStatus(message.getFrom().getId()) == WATING_DESTINY_STATUS &&
- message.hasReplayMessage() &&
+ message.isReply() &&
DatabaseManager.getInstance().getUserDestinationMessageId(message.getFrom().getId()) == message.getReplyToMessage().getMessageId()) {
onDestinationReceived(message, language);
- } else if (!message.hasReplayMessage()) {
+ } else if (!message.isReply()) {
if (DatabaseManager.getInstance().getUserDestinationStatus(message.getFrom().getId()) == -1) {
sendHelpMessage(message, language);
} else {