Browse Source

1. Merge

master
Rubenlagu 10 years ago
committed by Rubenlagus
parent
commit
d04b510ee5
  1. 2
      README.md
  2. 1
      src/main/java/org/telegram/services/DirectionsService.java
  3. 5
      src/main/java/org/telegram/services/LocalisationService.java
  4. 4
      src/main/java/org/telegram/services/TimerExecutor.java

2
README.md

@ -12,7 +12,7 @@ Please, **DO NOT PUSH ANY TOKEN OR API KEY**, I will never accept a pull request
## Webhooks vs GetUpdates ## Webhooks vs GetUpdates
Both ways are supported (but I still didn't tested webhooks). To change between them, just go to *BuildVars.java* and change variable *useWebHook* value. Both ways are supported (but I still didn't tested webhooks). To change between them, just go to *BuildVars.java* and change variable *useWebHook* value.
I recommend using getUpdates methods. Webhooks only works using a certificated that is not self-signed I recommend using getUpdates methods. Webhooks a bit less trustful
## Example bots ## Example bots
Open them and send them */help* command to get some information about their capabilities: Open them and send them */help* command to get some information about their capabilities:

1
src/main/java/org/telegram/services/DirectionsService.java

@ -13,7 +13,6 @@ import org.json.JSONObject;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.telegram.BuildVars; import org.telegram.BuildVars;
import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;

5
src/main/java/org/telegram/services/LocalisationService.java

@ -3,7 +3,10 @@ package org.telegram.services;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.*; import java.util.HashMap;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
/** /**
* @author Ruben Bermudez * @author Ruben Bermudez

4
src/main/java/org/telegram/services/TimerExecutor.java

@ -1,6 +1,8 @@
package org.telegram.services; package org.telegram.services;
import java.time.*; import java.time.Clock;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

Loading…
Cancel
Save