Merge pull request rubenlagus#823 from rubenlagus/dev

Dev

README.md

@@ -1,5 +1,5 @@
 # Telegram Bot Java Library
-[![Telegram](http://trellobot.doomdns.org/telegrambadge.svg)](https://telegram.me/JavaBotsApi)
+[![Telegram](/TelegramBots.svg)](https://telegram.me/JavaBotsApi)
 
 
 [![Build Status](https://travis-ci.org/rubenlagus/TelegramBots.svg?branch=master)](https://travis-ci.org/rubenlagus/TelegramBots)
@@ -27,16 +27,16 @@ Just import add the library to your project with one of these options:
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambots</artifactId>
-        <version>4.9.1</version>
+        <version>4.9.2</version>
     </dependency>
 ```
 
 ```gradle
-    compile "org.telegram:telegrambots:4.9.1"
+    compile "org.telegram:telegrambots:4.9.2"
 ```
 
-  2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/4.9.1)
-  3. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/4.9.1)
+  2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/4.9.2)
+  3. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/4.9.2)
 
 In order to use Long Polling mode, just create your own bot extending `org.telegram.telegrambots.bots.TelegramLongPollingBot`.
 

TelegramBots.wiki/Changelog.md

@@ -1,3 +1,6 @@
+### <a id="4.9.2"></a>4.9.2 ###
+1. Bug fixing: #792, #801, #804, #810, #812, #813, #820 and #814
+
 ### <a id="4.9.1"></a>4.9.1 ###
 1. Bug fixing: #767, #766, #761, #763, #776, #772, #771, #780
 

TelegramBots.wiki/Getting-Started.md

@@ -11,13 +11,13 @@ First you need ot get the library and add it to your project. There are few poss
            <dependency>
               <groupId>org.telegram</groupId>
               <artifactId>telegrambots</artifactId>
-              <version>4.9.1</version>
+              <version>4.9.2</version>
            </dependency>
         ```
     * With **Gradle**:
 
         ```groovy
-          compile group: 'org.telegram', name: 'telegrambots', version: '4.9.1'
+          compile group: 'org.telegram', name: 'telegrambots', version: '4.9.2'
         ```
 
 2. Don't like **Maven Central Repository**? It can also be taken from [Jitpack](https://jitpack.io/#rubenlagus/TelegramBots).

TelegramBots.wiki/abilities/Ability-Extensions.md

@@ -35,6 +35,20 @@ public class MrBadGuy implements AbilityExtension {
       return new MrBadGuy();
     }
 
+    // Override creatorId
+ }
+```
+
+It's also possible to add extensions in the constructor by using the `addExtension()` or `addExtensions()` method:
+
+```java
+ public class YourAwesomeBot implements AbilityBot {
+
+    public YourAwesomeBot() {
+      super(/* pass required args ... */);
+      addExtensions(new MrGoodGuy(), new MrBadGuy());
+    }
+
     // Override creatorId
  }
 ```

TelegramBots.wiki/abilities/Advanced.md

@@ -64,4 +64,15 @@ protected boolean allowContinuousText() {
 Please note that this may cause ability overlap. If multiple abilities can match the same command, the longest match will be taken. For example, 
 if you have two abilities `do` and `do1`, the command `/do1` will trigger the `do1` ability. 
 ## Statistics
-AbilityBot can accrue basic statistics about the usage of your abilities and replies. Simply `enableStats()` on an Ability builder or `enableStats(<name>)` on replies to activate this feature. Once activated, you may call `/stats` and the bot will print a basic list of statistics. At the moment, AbilityBot only tracks hits. In the future, this will be enhanced to track more stats.
+AbilityBot can accrue basic statistics about the usage of your abilities and replies. Simply `enableStats()` on an Ability builder or `enableStats(<name>)` on replies to activate this feature. Once activated, you may call `/stats` and the bot will print a basic list of statistics. At the moment, AbilityBot only tracks hits. In the future, this will be enhanced to track more stats.
+
+## Execute code on bot registration
+If you want to execute custom logic to initialize your bot, but you can't do it in the constructor,
+you can override the `onRegister()` method:
+```
+@Override
+public void onRegister() { 
+  super.onRegister();
+  // Execute custom initialize logic here
+}
+```

TelegramBots.wiki/abilities/Bot-Testing.md

@@ -104,6 +104,8 @@ public class ExampleBotTest {
   public void setUp() {
     // Create your bot
     bot = new ExampleBot();
+    // Call onRegister() to initialize abilities etc. 
+    bot.onRegister();
     // Create a new sender as a mock
     silent = mock(SilentSender.class);
     // Set your bot silent sender to the mocked sender
@@ -156,6 +158,7 @@ public class ExampleBotTest {
     // Offline instance will get deleted at JVM shutdown
     db = MapDBContext.offlineInstance("test");
     bot = new ExampleBot(db);
+    bot.onRegister();
 
     ...
   }
@@ -180,6 +183,7 @@ public class ExampleBotTest {
   @Before
   public void setUp() {
     bot = new ExampleBot(db);
+    bot.onRegister();
     sender = mock(MessageSender.class);
     SilentSender silent = new SilentSender(sender);
     // Create setter in your bot 

TelegramBots.wiki/abilities/Simple-Example.md

@@ -9,12 +9,12 @@ As with any Java project, you will need to set your dependencies.
    <dependency>
       <groupId>org.telegram</groupId>
       <artifactId>telegrambots-abilities</artifactId>
-      <version>4.9.1</version>
+      <version>4.9.2</version>
    </dependency>
 ```
 * **Gradle**
 ```groovy
-  implementation group: 'org.telegram', name: 'telegrambots-abilities', version: '4.9.1'
+  implementation group: 'org.telegram', name: 'telegrambots-abilities', version: '4.9.2'
 ```
 * [JitPack](https://jitpack.io/#rubenlagus/TelegramBots)
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>org.telegram</groupId>
     <artifactId>Bots</artifactId>
     <packaging>pom</packaging>
-    <version>4.9.1</version>
+    <version>4.9.2</version>
 
     <modules>
         <module>telegrambots</module>
@@ -190,6 +190,7 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
+                    <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
                 </configuration>
             </plugin>
             <plugin>

telegrambots-abilities/README.md

@@ -18,19 +18,19 @@ Usage
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambots-abilities</artifactId>
-        <version>4.9.1</version>
+        <version>4.9.2</version>
     </dependency>
 ```
 
 **Gradle**
 
 ```gradle
-    compile "org.telegram:telegrambots-abilities:4.9.1"
+    compile "org.telegram:telegrambots-abilities:4.9.2"
 ```
 
-**JitPack** - [JitPack](https://jitpack.io/#rubenlagus/TelegramBots/v4.9.1)
+**JitPack** - [JitPack](https://jitpack.io/#rubenlagus/TelegramBots/v4.9.2)
 
-**Plain imports** - [Here](https://github.com/rubenlagus/TelegramBots/releases/tag/v4.9.1)
+**Plain imports** - [Here](https://github.com/rubenlagus/TelegramBots/releases/tag/v4.9.2)
 
 Motivation
 ----------

telegrambots-abilities/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>4.9.1</version>
+        <version>4.9.2</version>
     </parent>
 
     <artifactId>telegrambots-abilities</artifactId>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>4.9.1</version>
+            <version>4.9.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java

@@ -18,45 +18,45 @@
  * @author Abbas Abou Daya
  */
 public abstract class AbilityBot extends BaseAbilityBot implements LongPollingBot {
-  protected AbilityBot(String botToken, String botUsername, DBContext db, AbilityToggle toggle, DefaultBotOptions botOptions) {
-    super(botToken, botUsername, db, toggle, botOptions);
-  }
-
-  protected AbilityBot(String botToken, String botUsername, AbilityToggle toggle, DefaultBotOptions options) {
-    this(botToken, botUsername, onlineInstance(botUsername), toggle, options);
-  }
-
-  protected AbilityBot(String botToken, String botUsername, DBContext db, AbilityToggle toggle) {
-    this(botToken, botUsername, db, toggle, new DefaultBotOptions());
-  }
-
-  protected AbilityBot(String botToken, String botUsername, DBContext db, DefaultBotOptions options) {
-    this(botToken, botUsername, db, new DefaultToggle(), options);
-  }
-
-  protected AbilityBot(String botToken, String botUsername, DefaultBotOptions botOptions) {
-    this(botToken, botUsername, onlineInstance(botUsername), botOptions);
-  }
-
-  protected AbilityBot(String botToken, String botUsername, AbilityToggle toggle) {
-    this(botToken, botUsername, onlineInstance(botUsername), toggle);
-  }
-
-  protected AbilityBot(String botToken, String botUsername, DBContext db) {
-    this(botToken, botUsername, db, new DefaultToggle());
-  }
-
-  protected AbilityBot(String botToken, String botUsername) {
-    this(botToken, botUsername, onlineInstance(botUsername));
-  }
-
-  @Override
-  public void onUpdateReceived(Update update) {
-    super.onUpdateReceived(update);
-  }
-
-  @Override
-  public void clearWebhook() throws TelegramApiRequestException {
-    WebhookUtils.clearWebhook(this);
-  }
+    protected AbilityBot(String botToken, String botUsername, DBContext db, AbilityToggle toggle, DefaultBotOptions botOptions) {
+        super(botToken, botUsername, db, toggle, botOptions);
+    }
+
+    protected AbilityBot(String botToken, String botUsername, AbilityToggle toggle, DefaultBotOptions options) {
+        this(botToken, botUsername, onlineInstance(botUsername), toggle, options);
+    }
+
+    protected AbilityBot(String botToken, String botUsername, DBContext db, AbilityToggle toggle) {
+        this(botToken, botUsername, db, toggle, new DefaultBotOptions());
+    }
+
+    protected AbilityBot(String botToken, String botUsername, DBContext db, DefaultBotOptions options) {
+        this(botToken, botUsername, db, new DefaultToggle(), options);
+    }
+
+    protected AbilityBot(String botToken, String botUsername, DefaultBotOptions botOptions) {
+        this(botToken, botUsername, onlineInstance(botUsername), botOptions);
+    }
+
+    protected AbilityBot(String botToken, String botUsername, AbilityToggle toggle) {
+        this(botToken, botUsername, onlineInstance(botUsername), toggle);
+    }
+
+    protected AbilityBot(String botToken, String botUsername, DBContext db) {
+        this(botToken, botUsername, db, new DefaultToggle());
+    }
+
+    protected AbilityBot(String botToken, String botUsername) {
+        this(botToken, botUsername, onlineInstance(botUsername));
+    }
+
+    @Override
+    public void onUpdateReceived(Update update) {
+        super.onUpdateReceived(update);
+    }
+
+    @Override
+    public void clearWebhook() throws TelegramApiRequestException {
+        WebhookUtils.clearWebhook(this);
+    }
 }

telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityWebhookBot.java

@@ -21,54 +21,54 @@
 @SuppressWarnings("WeakerAccess")
 public abstract class AbilityWebhookBot extends BaseAbilityBot implements WebhookBot {
 
-  private final String botPath;
+    private final String botPath;
 
-  protected AbilityWebhookBot(String botToken, String botUsername, String botPath, DBContext db, AbilityToggle toggle, DefaultBotOptions botOptions) {
-    super(botToken, botUsername, db, toggle, botOptions);
-    this.botPath = botPath;
-  }
+    protected AbilityWebhookBot(String botToken, String botUsername, String botPath, DBContext db, AbilityToggle toggle, DefaultBotOptions botOptions) {
+        super(botToken, botUsername, db, toggle, botOptions);
+        this.botPath = botPath;
+    }
 
-  protected AbilityWebhookBot(String botToken, String botUsername, String botPath, AbilityToggle toggle, DefaultBotOptions options) {
-    this(botToken, botUsername, botPath, onlineInstance(botUsername), toggle, options);
-  }
+    protected AbilityWebhookBot(String botToken, String botUsername, String botPath, AbilityToggle toggle, DefaultBotOptions options) {
+        this(botToken, botUsername, botPath, onlineInstance(botUsername), toggle, options);
+    }
 
-  protected AbilityWebhookBot(String botToken, String botUsername, String botPath, DBContext db, AbilityToggle toggle) {
-    this(botToken, botUsername, botPath, db, toggle, new DefaultBotOptions());
-  }
+    protected AbilityWebhookBot(String botToken, String botUsername, String botPath, DBContext db, AbilityToggle toggle) {
+        this(botToken, botUsername, botPath, db, toggle, new DefaultBotOptions());
+    }
 
-  protected AbilityWebhookBot(String botToken, String botUsername, String botPath, DBContext db, DefaultBotOptions options) {
-    this(botToken, botUsername, botPath, db, new DefaultToggle(), options);
-  }
+    protected AbilityWebhookBot(String botToken, String botUsername, String botPath, DBContext db, DefaultBotOptions options) {
+        this(botToken, botUsername, botPath, db, new DefaultToggle(), options);
+    }
 
-  protected AbilityWebhookBot(String botToken, String botUsername, String botPath, DefaultBotOptions botOptions) {
-    this(botToken, botUsername, botPath, onlineInstance(botUsername), botOptions);
-  }
+    protected AbilityWebhookBot(String botToken, String botUsername, String botPath, DefaultBotOptions botOptions) {
+        this(botToken, botUsername, botPath, onlineInstance(botUsername), botOptions);
+    }
 
-  protected AbilityWebhookBot(String botToken, String botUsername, String botPath, AbilityToggle toggle) {
-    this(botToken, botUsername, botPath, onlineInstance(botUsername), toggle);
-  }
+    protected AbilityWebhookBot(String botToken, String botUsername, String botPath, AbilityToggle toggle) {
+        this(botToken, botUsername, botPath, onlineInstance(botUsername), toggle);
+    }
 
-  protected AbilityWebhookBot(String botToken, String botUsername, String botPath, DBContext db) {
-    this(botToken, botUsername, botPath, db, new DefaultToggle());
-  }
+    protected AbilityWebhookBot(String botToken, String botUsername, String botPath, DBContext db) {
+        this(botToken, botUsername, botPath, db, new DefaultToggle());
+    }
 
-  protected AbilityWebhookBot(String botToken, String botUsername, String botPath) {
-    this(botToken, botUsername, botPath, onlineInstance(botUsername));
-  }
+    protected AbilityWebhookBot(String botToken, String botUsername, String botPath) {
+        this(botToken, botUsername, botPath, onlineInstance(botUsername));
+    }
 
-  @Override
-  public BotApiMethod onWebhookUpdateReceived(Update update) {
-    super.onUpdateReceived(update);
-    return null;
-  }
+    @Override
+    public BotApiMethod onWebhookUpdateReceived(Update update) {
+        super.onUpdateReceived(update);
+        return null;
+    }
 
-  @Override
-  public void setWebhook(String url, String publicCertificatePath) throws TelegramApiRequestException {
-    WebhookUtils.setWebhook(this, url, publicCertificatePath);
-  }
+    @Override
+    public void setWebhook(String url, String publicCertificatePath) throws TelegramApiRequestException {
+        WebhookUtils.setWebhook(this, url, publicCertificatePath);
+    }
 
-  @Override
-  public String getBotPath() {
-    return botPath;
-  }
+    @Override
+    public String getBotPath() {
+        return botPath;
+    }
 }