Merge pull request #788 from rubenlagus/dev

Dev

README.md

@@ -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</version>
+        <version>4.9.1</version>
     </dependency>
 ```
 
 ```gradle
-    compile "org.telegram:telegrambots:4.9"
+    compile "org.telegram:telegrambots:4.9.1"
 ```
 
-  2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/4.9)
-  3. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/4.9)
+  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)
 
 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.1"></a>4.9.1 ###
+1. Bug fixing: #767, #766, #761, #763, #776, #772, #771, #780
+
 ### <a id="4.9"></a>4.9 ###
 1. Update Api version [4.9](https://core.telegram.org/bots/api-changelog#june-4-2020)
 2. Bug fixing: #731, #749, #752 and #753

TelegramBots.wiki/FAQ.md

@@ -243,16 +243,16 @@ This is just one way, how you can compile it (here with maven). The example belo
 Please use ```execute()``` instead. 
 Example:
 ```java
-SendMessage sn = new SendMessage();
+SendMessage message = new SendMessage();
 //add chat id and text
-execute(sn);
+execute(message);
 ```
 
 If you extend ```TelegramLongPollingCommandBot```, then use ```AbsSender.execute()``` instead.
 
 
 ## <a id="example_webhook"></a>Is there any example for WebHook? ##
-Please see the example Bot for https://telegram.me/SnowcrashBot in the [TelegramBotsExample]() repo and also an [example bot for Sping Boot](https://github.com/UnAfraid/SpringTelegramBot) from [UnAfraid](https://github.com/UnAfraid) [here](https://github.com/UnAfraid/SpringTelegramBot/blob/master/src/main/java/com/github/unafraid/spring/bot/TelegramWebhookBot.java)
+Please see the example Bot for https://telegram.me/SnowcrashBot in the [TelegramBotsExample]() repo and also an [example bot for Sping Boot](https://github.com/UnAfraid/SpringTelegramBot) from [UnAfraid](https://github.com/UnAfraid) [here](https://github.com/UnAfraid/SpringTelegramBot/blob/master/src/main/java/com/github/unafraid/spring/bot/TelegramWebHookBot.java)
 
 
 
@@ -268,7 +268,7 @@ public class YourApplicationMainClass {
 	    //Add this line to initialize bots context
 		ApiContextInitializer.init();
 
-		SpringApplication.run(MusicUploaderApplication.class, args);
+		SpringApplication.run(YourApplicationMainClass.class, args);
 	}
 }
 ```

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</version>
+              <version>4.9.1</version>
            </dependency>
         ```
     * With **Gradle**:
 
         ```groovy
-          compile group: 'org.telegram', name: 'telegrambots', version: '4.9'
+          compile group: 'org.telegram', name: 'telegrambots', version: '4.9.1'
         ```
 
 2. Don't like **Maven Central Repository**? It can also be taken from [Jitpack](https://jitpack.io/#rubenlagus/TelegramBots).

TelegramBots.wiki/abilities/Advanced.md

@@ -33,5 +33,35 @@ As an example, if you want to restrict the updates to photos only, then you may
   }
 ```
 
+## Custom Command Processing
+### Command Prefix
+Customizing the command prefix is as simple as overriding the `getCommandPrefix` method as shown below.
+```java
+@Override
+protected String getCommandPrefix() {
+  return "!";
+}
+```
+
+### Command Regex Split
+The method that the bot uses to capture command tokens is through the regex splitters. By default, it's set to `" "`. However, this can be customized. For example,
+if you'd like to split on digits and whitespaces, then you may do the following: 
+```java
+@Override
+protected String getCommandRegexSplit() {
+  return "\\s\\d";
+}
+```
+### Commands with Continuous Text
+Feeling ambitious? You may allow your bot to process tokens that are technically attached to your command. Imagine you have a command
+`/do` and you'd like users to send commands as `/do1` and still trigger the `do` ability. In order to do that, override the `allowContinuousText` function.
+```java
+@Override
+protected boolean allowContinuousText() {
+  return true;
+}
+```
+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.

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</version>
+      <version>4.9.1</version>
    </dependency>
 ```
 * **Gradle**
 ```groovy
-  implementation group: 'org.telegram', name: 'telegrambots-abilities', version: '4.9'
+  implementation group: 'org.telegram', name: 'telegrambots-abilities', version: '4.9.1'
 ```
 * [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</version>
+    <version>4.9.1</version>
 
     <modules>
         <module>telegrambots</module>

telegrambots-abilities/README.md

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

telegrambots-abilities/pom.xml

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

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

@@ -3,17 +3,17 @@
 import org.telegram.abilitybots.api.db.DBContext;
 import org.telegram.abilitybots.api.toggle.AbilityToggle;
 import org.telegram.abilitybots.api.toggle.DefaultToggle;
+import org.telegram.telegrambots.bots.DefaultAbsSender;
 import org.telegram.telegrambots.meta.api.objects.Update;
 import org.telegram.telegrambots.bots.DefaultBotOptions;
-import org.telegram.telegrambots.bots.TelegramLongPollingBot;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
 import org.telegram.telegrambots.meta.generics.LongPollingBot;
 import org.telegram.telegrambots.util.WebhookUtils;
 
 import static org.telegram.abilitybots.api.db.MapDBContext.onlineInstance;
 
 /**
- * The default AbilityBot class implements {@link LongPollingBot}. It delegates all updates to a {@link TelegramLongPollingBot} instance.
+ * The default AbilityBot class implements {@link LongPollingBot}. It delegates all updates to a {@link DefaultAbsSender} instance.
  *
  * @author Abbas Abou Daya
  */