From 17c336b1ec18e3ad0532120b6f111701c49c32c3 Mon Sep 17 00:00:00 2001 From: timursergeevich Date: Sat, 6 Nov 2021 21:32:57 +0300 Subject: [PATCH 1/4] added clarifying message to TelegramApiException if filePath parameter is empty --- .../facilities/filedownloader/TelegramFileDownloader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/facilities/filedownloader/TelegramFileDownloader.java b/telegrambots/src/main/java/org/telegram/telegrambots/facilities/filedownloader/TelegramFileDownloader.java index 02c34c9f..10ba1bfa 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/facilities/filedownloader/TelegramFileDownloader.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/facilities/filedownloader/TelegramFileDownloader.java @@ -56,7 +56,7 @@ public class TelegramFileDownloader { public final java.io.File downloadFile(String filePath, java.io.File outputFile) throws TelegramApiException { if (filePath == null || filePath.isEmpty()) { - throw new TelegramApiException("Parameter file can not be null"); + throw new TelegramApiException("Parameter file can not be null or empty"); } String url = File.getFileUrl(botTokenSupplier.get(), filePath); return downloadToFile(url, outputFile); @@ -84,7 +84,7 @@ public class TelegramFileDownloader { public final void downloadFileAsync(String filePath, DownloadFileCallback callback) throws TelegramApiException { if (filePath == null || filePath.isEmpty()) { - throw new TelegramApiException("Parameter filePath can not be null"); + throw new TelegramApiException("Parameter filePath can not be null or empty"); } if (callback == null) { throw new TelegramApiException("Parameter callback can not be null"); From 0544429c47478c00f1d32ae640c71acd42175e60 Mon Sep 17 00:00:00 2001 From: Ruben Date: Sun, 14 Nov 2021 21:22:04 +0000 Subject: [PATCH 2/4] Fix #999 --- pom.xml | 20 +++++++++---------- telegrambots-abilities/pom.xml | 2 +- .../meta/api/objects/ChatJoinRequest.java | 2 +- telegrambots-spring-boot-starter/pom.xml | 2 +- telegrambots/pom.xml | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 8e3715c3..ecfe4a26 100644 --- a/pom.xml +++ b/pom.xml @@ -67,16 +67,16 @@ ${java.version} ${java.version} - 5.7.1 - 3.6.0 - 3.6.0 - 2.11.3 - 2.11.3 - 20180813 - 1.7.30 - 1.3.5 - 1.18.16 - 30.0-jre + 5.8.1 + 4.0.0 + 4.0.0 + 2.13.0 + 2.13.0 + 20210307 + 1.7.32 + 2.0.0 + 1.18.22 + 31.0.1-jre diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml index bf1ae158..f8fe3d8e 100644 --- a/telegrambots-abilities/pom.xml +++ b/telegrambots-abilities/pom.xml @@ -76,7 +76,7 @@ UTF-8 UTF-8 - 3.11 + 3.12.0 3.0.8 diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatJoinRequest.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatJoinRequest.java index 7eba4c79..e4e03013 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatJoinRequest.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatJoinRequest.java @@ -33,5 +33,5 @@ public class ChatJoinRequest implements BotApiObject { @JsonProperty(BIO_FIELD) private String bio; ///< Optional. Bio of the user. @JsonProperty(INVITELINK_FIELD) - private String inviteLink; ///< Optional. Chat invite link that was used by the user to send the join request + private ChatInviteLink inviteLink; ///< Optional. Chat invite link that was used by the user to send the join request } diff --git a/telegrambots-spring-boot-starter/pom.xml b/telegrambots-spring-boot-starter/pom.xml index 81cde1c6..d21cb9d9 100644 --- a/telegrambots-spring-boot-starter/pom.xml +++ b/telegrambots-spring-boot-starter/pom.xml @@ -71,7 +71,7 @@ UTF-8 5.4.0 - 2.4.5 + 2.5.5 1.6 1.6.8 diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml index 89fe45f4..0f120e07 100644 --- a/telegrambots/pom.xml +++ b/telegrambots/pom.xml @@ -70,10 +70,10 @@ UTF-8 UTF-8 - 2.32 + 3.0.3 1.19.3 4.5.13 - 2.8.0 + 2.11.0 From e5deb959333051906c1ee54b0692436f6e68a5e4 Mon Sep 17 00:00:00 2001 From: Ruben Date: Sun, 14 Nov 2021 21:25:40 +0000 Subject: [PATCH 3/4] Update Version --- README.md | 8 ++++---- TelegramBots.wiki/Changelog.md | 5 ++++- TelegramBots.wiki/Getting-Started.md | 4 ++-- TelegramBots.wiki/abilities/Simple-Example.md | 4 ++-- pom.xml | 2 +- telegrambots-abilities/README.md | 4 ++-- telegrambots-abilities/pom.xml | 4 ++-- telegrambots-chat-session-bot/README.md | 4 ++-- telegrambots-chat-session-bot/pom.xml | 4 ++-- telegrambots-extensions/README.md | 4 ++-- telegrambots-extensions/pom.xml | 4 ++-- telegrambots-meta/pom.xml | 2 +- telegrambots-spring-boot-starter/README.md | 4 ++-- telegrambots-spring-boot-starter/pom.xml | 4 ++-- telegrambots/pom.xml | 4 ++-- 15 files changed, 32 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index bd7ce472..955ab837 100644 --- a/README.md +++ b/README.md @@ -27,18 +27,18 @@ Just import add the library to your project with one of these options: org.telegram telegrambots - 5.4.0 + 5.4.0.1 ``` 2. Using Gradle: ```gradle - implementation 'org.telegram:telegrambots:5.4.0' + implementation 'org.telegram:telegrambots:5.4.0.1' ``` - 3. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/5.4.0) - 4. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/5.4.0) + 3. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/5.4.0.1) + 4. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/5.4.0.1) 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 index 42ee2cac..71f840e1 100644 --- a/TelegramBots.wiki/Changelog.md +++ b/TelegramBots.wiki/Changelog.md @@ -1,4 +1,7 @@ -### 5.3.0 ### +### 5.4.0.1 ### +1Bug fixing: #999 + +### 5.4.0 ### 1. Update Api version [5.4](https://core.telegram.org/bots/api-changelog#november-5-2021) 2. Bug fixing: #968, #958, #942 diff --git a/TelegramBots.wiki/Getting-Started.md b/TelegramBots.wiki/Getting-Started.md index 97b8333f..62e7c643 100644 --- a/TelegramBots.wiki/Getting-Started.md +++ b/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 org.telegram telegrambots - 5.4.0 + 5.4.0.1 ``` * With **Gradle**: ```gradle - implementation 'org.telegram:telegrambots:5.4.0' + implementation 'org.telegram:telegrambots:5.4.0.1' ``` 2. Don't like **Maven Central Repository**? It can also be taken from [Jitpack](https://jitpack.io/#rubenlagus/TelegramBots). diff --git a/TelegramBots.wiki/abilities/Simple-Example.md b/TelegramBots.wiki/abilities/Simple-Example.md index 7e1aa2f4..49e00389 100644 --- 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. org.telegram telegrambots-abilities - 5.4.0 + 5.4.0.1 ``` * **Gradle** ```gradle - implementation 'org.telegram:telegrambots-abilities:5.4.0' + implementation 'org.telegram:telegrambots-abilities:5.4.0.1' ``` * [JitPack](https://jitpack.io/#rubenlagus/TelegramBots) diff --git a/pom.xml b/pom.xml index ecfe4a26..d5415769 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots pom - 5.4.0 + 5.4.0.1 telegrambots diff --git a/telegrambots-abilities/README.md b/telegrambots-abilities/README.md index b869afae..4ffad518 100644 --- a/telegrambots-abilities/README.md +++ b/telegrambots-abilities/README.md @@ -18,14 +18,14 @@ Usage org.telegram telegrambots-abilities - 5.4.0 + 5.4.0.1 ``` **Gradle** ```gradle - implementation 'org.telegram:telegrambots-abilities:5.4.0' + implementation 'org.telegram:telegrambots-abilities:5.4.0.1' ``` **JitPack** - [JitPack](https://jitpack.io/#rubenlagus/TelegramBots/v5.0.1) diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml index f8fe3d8e..24327d4c 100644 --- a/telegrambots-abilities/pom.xml +++ b/telegrambots-abilities/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 5.4.0 + 5.4.0.1 telegrambots-abilities @@ -84,7 +84,7 @@ org.telegram telegrambots - 5.4.0 + 5.4.0.1 org.apache.commons diff --git a/telegrambots-chat-session-bot/README.md b/telegrambots-chat-session-bot/README.md index 07c4ad09..b164199e 100644 --- a/telegrambots-chat-session-bot/README.md +++ b/telegrambots-chat-session-bot/README.md @@ -15,14 +15,14 @@ Usage org.telegram telegrambots-chat-session-bot - 5.4.0 + 5.4.0.1 ``` **Gradle** ```gradle - implementation 'org.telegram:telegrambots-chat-session-bot:5.4.0' + implementation 'org.telegram:telegrambots-chat-session-bot:5.4.0.1' ``` Motivation diff --git a/telegrambots-chat-session-bot/pom.xml b/telegrambots-chat-session-bot/pom.xml index 36f5df43..18e776c1 100644 --- a/telegrambots-chat-session-bot/pom.xml +++ b/telegrambots-chat-session-bot/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 5.4.0 + 5.4.0.1 telegrambots-chat-session-bot @@ -84,7 +84,7 @@ org.telegram telegrambots - 5.4.0 + 5.4.0.1 diff --git a/telegrambots-extensions/README.md b/telegrambots-extensions/README.md index 8c55e16d..289fd3ab 100644 --- 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: org.telegram telegrambotsextensions - 5.4.0 + 5.4.0.1 ``` 2. Using Gradle: ```gradle - implementation 'org.telegram:telegrambotsextensions:5.4.0' + implementation 'org.telegram:telegrambotsextensions:5.4.0.1' ``` \ No newline at end of file diff --git a/telegrambots-extensions/pom.xml b/telegrambots-extensions/pom.xml index f95690e1..173fb1e2 100644 --- a/telegrambots-extensions/pom.xml +++ b/telegrambots-extensions/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 5.4.0 + 5.4.0.1 telegrambotsextensions @@ -75,7 +75,7 @@ org.telegram telegrambots - 5.4.0 + 5.4.0.1 diff --git a/telegrambots-meta/pom.xml b/telegrambots-meta/pom.xml index d753c26b..b5aefd13 100644 --- a/telegrambots-meta/pom.xml +++ b/telegrambots-meta/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 5.4.0 + 5.4.0.1 telegrambots-meta diff --git a/telegrambots-spring-boot-starter/README.md b/telegrambots-spring-boot-starter/README.md index f4ab20e7..59868916 100644 --- a/telegrambots-spring-boot-starter/README.md +++ b/telegrambots-spring-boot-starter/README.md @@ -18,14 +18,14 @@ Usage org.telegram telegrambots-spring-boot-starter - 5.4.0 + 5.4.0.1 ``` **Gradle** ```gradle - implementation 'org.telegram:telegrambots-spring-boot-starter:5.4.0' + implementation 'org.telegram:telegrambots-spring-boot-starter:5.4.0.1' ``` Motivation diff --git a/telegrambots-spring-boot-starter/pom.xml b/telegrambots-spring-boot-starter/pom.xml index d21cb9d9..8cdb289e 100644 --- a/telegrambots-spring-boot-starter/pom.xml +++ b/telegrambots-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 5.4.0 + 5.4.0.1 telegrambots-spring-boot-starter @@ -70,7 +70,7 @@ UTF-8 UTF-8 - 5.4.0 + 5.4.0.1 2.5.5 1.6 diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml index 0f120e07..26e43421 100644 --- a/telegrambots/pom.xml +++ b/telegrambots/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 5.4.0 + 5.4.0.1 telegrambots @@ -92,7 +92,7 @@ org.telegram telegrambots-meta - 5.4.0 + 5.4.0.1 org.projectlombok From a5cad1407b611da5690f33c01017be02606fbcf8 Mon Sep 17 00:00:00 2001 From: Ruben Date: Sun, 14 Nov 2021 21:37:13 +0000 Subject: [PATCH 4/4] Update Version --- pom.xml | 20 ++++++++++---------- telegrambots-abilities/pom.xml | 2 +- telegrambots-spring-boot-starter/pom.xml | 2 +- telegrambots/pom.xml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index d5415769..aa39b391 100644 --- a/pom.xml +++ b/pom.xml @@ -67,16 +67,16 @@ ${java.version} ${java.version} - 5.8.1 - 4.0.0 - 4.0.0 - 2.13.0 - 2.13.0 - 20210307 - 1.7.32 - 2.0.0 - 1.18.22 - 31.0.1-jre + 5.7.1 + 3.6.0 + 3.6.0 + 2.11.3 + 2.11.3 + 20180813 + 1.7.30 + 1.3.5 + 1.18.16 + 30.0-jre diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml index 24327d4c..c8340363 100644 --- a/telegrambots-abilities/pom.xml +++ b/telegrambots-abilities/pom.xml @@ -76,7 +76,7 @@ UTF-8 UTF-8 - 3.12.0 + 3.11 3.0.8 diff --git a/telegrambots-spring-boot-starter/pom.xml b/telegrambots-spring-boot-starter/pom.xml index 8cdb289e..32aca79a 100644 --- a/telegrambots-spring-boot-starter/pom.xml +++ b/telegrambots-spring-boot-starter/pom.xml @@ -71,7 +71,7 @@ UTF-8 5.4.0.1 - 2.5.5 + 2.4.5 1.6 1.6.8 diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml index 26e43421..dd894247 100644 --- a/telegrambots/pom.xml +++ b/telegrambots/pom.xml @@ -70,10 +70,10 @@ UTF-8 UTF-8 - 3.0.3 + 2.32 1.19.3 4.5.13 - 2.11.0 + 2.8.0