Browse Source

v2.2.6

master
Rubenlagus 10 years ago
parent
commit
d4a8f3e993
  1. 2
      .idea/compiler.xml
  2. 13
      .idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_2_6.xml
  3. 815
      .idea/workspace.xml
  4. 2
      BotAPi.iml
  5. 2
      pom.xml
  6. 6
      src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java

2
.idea/compiler.xml

@ -17,7 +17,7 @@
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
<profile default="false" name="Annotation profile for BotAPi" enabled="true">
<profile default="false" name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />

13
.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_2_6.xml

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.github.rubenlagus:TelegramBots:v2.2.6">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/github/rubenlagus/TelegramBots/v2.2.6/TelegramBots-v2.2.6.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/github/rubenlagus/TelegramBots/v2.2.6/TelegramBots-v2.2.6-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/github/rubenlagus/TelegramBots/v2.2.6/TelegramBots-v2.2.6-sources.jar!/" />
</SOURCES>
</library>
</component>

815
.idea/workspace.xml

File diff suppressed because it is too large

2
BotAPi.iml

@ -11,7 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.github.rubenlagus:TelegramBots:v2.0.1" level="project" />
<orderEntry type="library" name="Maven: com.github.rubenlagus:TelegramBots:v2.2.6" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.22.2" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.hk2.external:javax.inject:2.4.0-b34" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.grizzly:grizzly-http-server:2.3.23" level="project" />

2
pom.xml

@ -27,7 +27,7 @@
<jersey.version>2.22.2</jersey.version>
<jerseyengine.version>1.19.1</jerseyengine.version>
<httpcompontents.version>4.5.2</httpcompontents.version>
<telegrambots.version>v2.0.1</telegrambots.version>
<telegrambots.version>v2.2.6</telegrambots.version>
<json.version>20160212</json.version>
<mysql.version>5.1.38</mysql.version>
</properties>

6
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 {

Loading…
Cancel
Save