Merge pull request #1174 from rubenlagus/dev

Dev
rubenlagus · Feb 6, 2023 · a076d22 · a076d22
2 parents 2cc5aca + 61eb857
commit a076d22
Show file tree

Hide file tree

Showing 65 changed files with 970 additions and 178 deletions.
diff --git a/README.md b/README.md
@@ -27,18 +27,18 @@ Just import add the library to your project with one of these options:
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambots</artifactId>
-        <version>6.4.0</version>
+        <version>6.5.0</version>
     </dependency>
 ```
 
   2. Using Gradle: 
 
 ```gradle
-    implementation 'org.telegram:telegrambots:6.4.0'
+    implementation 'org.telegram:telegrambots:6.5.0'
 ```
 
-  3. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/6.4.0)
-  4. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/6.4.0)
+  3. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/6.5.0)
+  4. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/6.5.0)
 
 In order to use Long Polling mode, just create your own bot extending `org.telegram.telegrambots.bots.TelegramLongPollingBot`.
 

diff --git a/TelegramBots.wiki/Changelog.md b/TelegramBots.wiki/Changelog.md
@@ -1,3 +1,6 @@
+### <a id="6.4.0"></a>6.4.0 ###
+1. Update Api version [6.5](https://core.telegram.org/bots/api-changelog#february-3-2023)
+
 ### <a id="6.4.0"></a>6.4.0 ###
 1. Update Api version [6.4](https://core.telegram.org/bots/api-changelog#december-30-2022)
 2. Bug fixing: #1159

diff --git a/TelegramBots.wiki/Getting-Started.md b/TelegramBots.wiki/Getting-Started.md
@@ -11,13 +11,13 @@ First you need to acquire the library and add it to your project. There are seve
            <dependency>
               <groupId>org.telegram</groupId>
               <artifactId>telegrambots</artifactId>
-              <version>6.4.0</version>
+              <version>6.5.0</version>
            </dependency>
         ```
     * With **Gradle**:
 
         ```gradle
-          implementation 'org.telegram:telegrambots:6.4.0'
+          implementation 'org.telegram:telegrambots:6.5.0'
         ```
 
 2. Don't like the **Maven Central Repository**? It can also be grabbed from [Jitpack](https://jitpack.io/#rubenlagus/TelegramBots).

diff --git a/TelegramBots.wiki/abilities/Simple-Example.md b/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>6.4.0</version>
+      <version>6.5.0</version>
    </dependency>
 ```
 * **Gradle**
 ```gradle
-  implementation 'org.telegram:telegrambots-abilities:6.4.0'
+  implementation 'org.telegram:telegrambots-abilities:6.5.0'
 ```
 * [JitPack](https://jitpack.io/#rubenlagus/TelegramBots)
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.telegram</groupId>
     <artifactId>Bots</artifactId>
     <packaging>pom</packaging>
-    <version>6.4.0</version>
+    <version>6.5.0</version>
 
     <modules>
         <module>telegrambots</module>
@@ -76,6 +76,7 @@
         <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
         <lombok.version>1.18.24</lombok.version>
         <guava.version>31.1-jre</guava.version>
+        <commons.version>3.12.0</commons.version>
     </properties>
 
     <dependencyManagement>
@@ -134,6 +135,12 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons.version}</version>
+            </dependency>
+
             <!-- Included to enforce common version-->
             <dependency>
                 <groupId>jakarta.annotation</groupId>

diff --git a/telegrambots-abilities/README.md b/telegrambots-abilities/README.md
@@ -18,14 +18,14 @@ Usage
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambots-abilities</artifactId>
-        <version>6.4.0</version>
+        <version>6.5.0</version>
     </dependency>
 ```
 
 **Gradle**
 
 ```gradle
-    implementation 'org.telegram:telegrambots-abilities:6.4.0'
+    implementation 'org.telegram:telegrambots-abilities:6.5.0'
 ```
 
 **JitPack** - [JitPack](https://jitpack.io/#rubenlagus/TelegramBots/v5.0.1)

diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>6.4.0</version>
+        <version>6.5.0</version>
     </parent>
 
     <artifactId>telegrambots-abilities</artifactId>
@@ -84,12 +84,16 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>6.4.0</version>
+            <version>6.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${commonslang.version}</version>
+        </dependency>
+         <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mapdb</groupId>

diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/BaseAbilityBot.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/BaseAbilityBot.java
@@ -127,8 +127,7 @@ public abstract class BaseAbilityBot extends DefaultAbsSender implements Ability
     // Ability toggle
     private final AbilityToggle toggle;
 
-    // Bot token and username
-    private final String botToken;
+    // Bot username
     private final String botUsername;
 
     // Ability registry
@@ -142,9 +141,8 @@ public abstract class BaseAbilityBot extends DefaultAbsSender implements Ability
     public abstract long creatorId();
 
     protected BaseAbilityBot(String botToken, String botUsername, DBContext db, AbilityToggle toggle, DefaultBotOptions botOptions) {
-        super(botOptions);
+        super(botOptions, botToken);
 
-        this.botToken = botToken;
         this.botUsername = botUsername;
         this.db = db;
         this.toggle = toggle;
@@ -264,10 +262,6 @@ public void onUpdateReceived(Update update) {
         log.info(format("[%s] Processing of update [%s] ended at %s%n---> Processing time: [%d ms] <---%n", botUsername, update.getUpdateId(), now(), processingTime));
     }
 
-    public String getBotToken() {
-        return botToken;
-    }
-
     public String getBotUsername() {
         return botUsername;
     }

diff --git a/telegrambots-chat-session-bot/README.md b/telegrambots-chat-session-bot/README.md
@@ -15,14 +15,14 @@ Usage
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambots-chat-session-bot</artifactId>
-        <version>6.4.0</version>
+        <version>6.5.0</version>
     </dependency>
 ```
 
 **Gradle**
 
 ```gradle
-    implementation 'org.telegram:telegrambots-chat-session-bot:6.4.0'
+    implementation 'org.telegram:telegrambots-chat-session-bot:6.5.0'
 ```
 
 Motivation

diff --git a/telegrambots-chat-session-bot/pom.xml b/telegrambots-chat-session-bot/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>6.4.0</version>
+        <version>6.5.0</version>
     </parent>
 
     <artifactId>telegrambots-chat-session-bot</artifactId>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>6.4.0</version>
+            <version>6.5.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.shiro/shiro-core -->

diff --git a/...on-bot/src/main/java/org/telegram/telegrambots/session/TelegramLongPollingSessionBot.java b/...on-bot/src/main/java/org/telegram/telegrambots/session/TelegramLongPollingSessionBot.java
@@ -6,9 +6,9 @@
 import org.apache.shiro.session.mgt.SessionContext;
 import org.apache.shiro.session.mgt.eis.AbstractSessionDAO;
 import org.telegram.telegrambots.bots.DefaultBotOptions;
+import org.telegram.telegrambots.bots.TelegramLongPollingBot;
 import org.telegram.telegrambots.meta.api.objects.Message;
 import org.telegram.telegrambots.meta.api.objects.Update;
-import org.telegram.telegrambots.bots.TelegramLongPollingBot;
 
 import java.util.Optional;
 
@@ -17,23 +17,50 @@ public abstract class TelegramLongPollingSessionBot extends TelegramLongPollingB
     DefaultSessionManager sessionManager;
 
     ChatIdConverter chatIdConverter;
-
+    /**
+     * If this is used getBotToken has to be overridden in order to return the bot token!
+     * @deprecated Overwriting the getBotToken() method is deprecated. Use the constructor instead
+     */
+    @Deprecated
     public TelegramLongPollingSessionBot(){
         this(new DefaultChatIdConverter());
     }
 
+    /**
+     * If this is used getBotToken has to be overridden in order to return the bot token!
+     * @deprecated Overwriting the getBotToken() method is deprecated. Use the constructor instead
+     */
+    @Deprecated
     public TelegramLongPollingSessionBot(ChatIdConverter chatIdConverter){
         this(chatIdConverter, new DefaultBotOptions());
     }
 
+    /**
+     * If this is used getBotToken has to be overridden in order to return the bot token!
+     * @deprecated Overwriting the getBotToken() method is deprecated. Use the constructor instead
+     */
+    @Deprecated
     public TelegramLongPollingSessionBot(ChatIdConverter chatIdConverter, DefaultBotOptions defaultBotOptions){
-        super(defaultBotOptions);
+        this(chatIdConverter, defaultBotOptions, null);
+    }
+
+    public TelegramLongPollingSessionBot(String botToken){
+        this(new DefaultChatIdConverter(), botToken);
+    }
+
+    public TelegramLongPollingSessionBot(ChatIdConverter chatIdConverter, String botToken){
+        this(chatIdConverter, new DefaultBotOptions(), botToken);
+    }
+
+    public TelegramLongPollingSessionBot(ChatIdConverter chatIdConverter, DefaultBotOptions defaultBotOptions, String botToken){
+        super(defaultBotOptions, botToken);
         this.setSessionManager(new DefaultSessionManager());
         this.setChatIdConverter(chatIdConverter);
         AbstractSessionDAO sessionDAO = (AbstractSessionDAO) sessionManager.getSessionDAO();
         sessionDAO.setSessionIdGenerator(chatIdConverter);
     }
 
+
     public void setSessionManager(DefaultSessionManager sessionManager) {
         this.sessionManager = sessionManager;
     }

diff --git a/telegrambots-extensions/README.md b/telegrambots-extensions/README.md
@@ -16,12 +16,12 @@ Just import add the library to your project with one of these options:
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambotsextensions</artifactId>
-        <version>6.4.0</version>
+        <version>6.5.0</version>
     </dependency>
 ```
 
    2. Using Gradle:
 
 ```gradle
-    implementation 'org.telegram:telegrambotsextensions:6.4.0'
+    implementation 'org.telegram:telegrambotsextensions:6.5.0'
 ```
diff --git a/telegrambots-extensions/pom.xml b/telegrambots-extensions/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>6.4.0</version>
+        <version>6.5.0</version>
     </parent>
 
     <artifactId>telegrambotsextensions</artifactId>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>6.4.0</version>
+            <version>6.5.0</version>
         </dependency>
     </dependencies>
 

diff --git a/.../java/org/telegram/telegrambots/extensions/bots/commandbot/TelegramWebhookCommandBot.java b/.../java/org/telegram/telegrambots/extensions/bots/commandbot/TelegramWebhookCommandBot.java
@@ -27,7 +27,9 @@ public abstract class TelegramWebhookCommandBot extends TelegramWebhookBot imple
      * Creates a TelegramWebhookCommandBot using default options
      * Use ICommandRegistry's methods on this bot to register commands
      *
+     * @deprecated Overwriting the getBotToken() method is deprecated. Use the constructor instead
      */
+    @Deprecated
     public TelegramWebhookCommandBot() {
         this(new DefaultBotOptions());
     }
@@ -37,8 +39,11 @@ public TelegramWebhookCommandBot() {
      * usernames
      * Use ICommandRegistry's methods on this bot to register commands
      *
+     * @deprecated Overwriting the getBotToken() method is deprecated. Use the constructor instead
+     *
      * @param options     Bot options
      */
+    @Deprecated
     public TelegramWebhookCommandBot(DefaultBotOptions options) {
         this(options, true);
     }
@@ -47,15 +52,54 @@ public TelegramWebhookCommandBot(DefaultBotOptions options) {
      * Creates a TelegramWebhookCommandBot
      * Use ICommandRegistry's methods on this bot to register commands
      *
+     * @deprecated Overwriting the getBotToken() method is deprecated. Use the constructor instead
+     *
      * @param options                   Bot options
      * @param allowCommandsWithUsername true to allow commands with parameters (default),
      *                                  false otherwise
      */
+    @Deprecated
     public TelegramWebhookCommandBot(DefaultBotOptions options, boolean allowCommandsWithUsername) {
         super(options);
         this.commandRegistry = new CommandRegistry(allowCommandsWithUsername, this::getBotUsername);
     }
 
+    /**
+     * Creates a TelegramWebhookCommandBot using default options
+     * Use ICommandRegistry's methods on this bot to register commands
+     *
+     * @param botToken the telegram api token
+     */
+    public TelegramWebhookCommandBot(String botToken) {
+        this(new DefaultBotOptions(), botToken);
+    }
+
+    /**
+     * Creates a TelegramWebhookCommandBot with custom options and allowing commands with
+     * usernames
+     * Use ICommandRegistry's methods on this bot to register commands
+     *
+     * @param options     Bot options
+     * @param botToken the telegram api token
+     */
+    public TelegramWebhookCommandBot(DefaultBotOptions options, String botToken) {
+        this(options, true, botToken);
+    }
+
+    /**
+     * Creates a TelegramWebhookCommandBot
+     * Use ICommandRegistry's methods on this bot to register commands
+     *
+     * @param options                   Bot options
+     * @param allowCommandsWithUsername true to allow commands with parameters (default),
+     *                                  false otherwise
+     * @param botToken the telegram api token
+     */
+    public TelegramWebhookCommandBot(DefaultBotOptions options, boolean allowCommandsWithUsername, String botToken) {
+        super(options, botToken);
+        this.commandRegistry = new CommandRegistry(allowCommandsWithUsername, this::getBotUsername);
+    }
+
     @Override
     public BotApiMethod<?> onWebhookUpdateReceived(Update update) {
         if (update.hasMessage()) {

diff --git a/...main/java/org/telegram/telegrambots/extensions/bots/timedbot/TimedSendLongPollingBot.java b/...main/java/org/telegram/telegrambots/extensions/bots/timedbot/TimedSendLongPollingBot.java
@@ -132,8 +132,20 @@ public Long getChatId()
 	}
 
 	//Constructor
+
+	/**
+	 * @deprecated Overwriting the getBotToken() method is deprecated. Use the constructor instead
+	 */
+	@Deprecated
 	protected TimedSendLongPollingBot()
 	{
+		super();
+		mSendTimer.schedule(new MessageSenderTask(), MANY_CHATS_SEND_INTERVAL, MANY_CHATS_SEND_INTERVAL);
+	}
+
+	protected TimedSendLongPollingBot(String botToken)
+	{
+		super(botToken);
 		mSendTimer.schedule(new MessageSenderTask(), MANY_CHATS_SEND_INTERVAL, MANY_CHATS_SEND_INTERVAL);
 	}