From 749c6d3b6f1c6ea4fffbfa6ebd40d6c911281651 Mon Sep 17 00:00:00 2001 From: rubenlagus Date: Sat, 1 Aug 2020 12:49:46 +0100 Subject: [PATCH] Fixes #767, #766, #761, #763, #776, #772, #771, #780 --- README.md | 8 ++++---- TelegramBots.wiki/Changelog.md | 3 +++ TelegramBots.wiki/Getting-Started.md | 4 ++-- TelegramBots.wiki/abilities/Simple-Example.md | 4 ++-- pom.xml | 2 +- telegrambots-abilities/README.md | 8 ++++---- telegrambots-abilities/pom.xml | 4 ++-- telegrambots-chat-session-bot/README.md | 2 +- telegrambots-chat-session-bot/pom.xml | 4 ++-- .../session/TelegramLongPollingSessionBot.java | 6 ++++++ 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 ++-- 16 files changed, 38 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 77d7a7ef..46836ab8 100644 --- a/README.md +++ b/README.md @@ -27,16 +27,16 @@ Just import add the library to your project with one of these options: org.telegram telegrambots - 4.9 + 4.9.1 ``` ```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`. diff --git a/TelegramBots.wiki/Changelog.md b/TelegramBots.wiki/Changelog.md index e8efbbc5..15818304 100644 --- a/TelegramBots.wiki/Changelog.md +++ b/TelegramBots.wiki/Changelog.md @@ -1,3 +1,6 @@ +### 4.9.1 ### +1. Bug fixing: #767, #766, #761, #763, #776, #772, #771, #780 + ### 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 diff --git a/TelegramBots.wiki/Getting-Started.md b/TelegramBots.wiki/Getting-Started.md index 24e4fa58..a22d6719 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 - 4.9 + 4.9.1 ``` * 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). diff --git a/TelegramBots.wiki/abilities/Simple-Example.md b/TelegramBots.wiki/abilities/Simple-Example.md index bd234493..a6e2492f 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 - 4.9 + 4.9.1 ``` * **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) diff --git a/pom.xml b/pom.xml index e54ebacc..91026843 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots pom - 4.9 + 4.9.1 telegrambots diff --git a/telegrambots-abilities/README.md b/telegrambots-abilities/README.md index 496ba550..62f3579a 100644 --- a/telegrambots-abilities/README.md +++ b/telegrambots-abilities/README.md @@ -18,19 +18,19 @@ Usage org.telegram telegrambots-abilities - 4.9 + 4.9.1 ``` **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 ---------- diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml index ec692783..de940fed 100644 --- a/telegrambots-abilities/pom.xml +++ b/telegrambots-abilities/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 4.9 + 4.9.1 telegrambots-abilities @@ -84,7 +84,7 @@ org.telegram telegrambots - 4.9 + 4.9.1 org.apache.commons diff --git a/telegrambots-chat-session-bot/README.md b/telegrambots-chat-session-bot/README.md index 4b80eb7d..1802bdd4 100644 --- a/telegrambots-chat-session-bot/README.md +++ b/telegrambots-chat-session-bot/README.md @@ -15,7 +15,7 @@ Usage org.telegram telegrambots-chat-session-bot - 4.9 + 4.9.1 ``` diff --git a/telegrambots-chat-session-bot/pom.xml b/telegrambots-chat-session-bot/pom.xml index 715e0224..a1291c1f 100644 --- a/telegrambots-chat-session-bot/pom.xml +++ b/telegrambots-chat-session-bot/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 4.9 + 4.9.1 telegrambots-chat-session-bot @@ -84,7 +84,7 @@ org.telegram telegrambots - 4.9 + 4.9.1 diff --git a/telegrambots-chat-session-bot/src/main/java/org/telegram/telegrambots/session/TelegramLongPollingSessionBot.java b/telegrambots-chat-session-bot/src/main/java/org/telegram/telegrambots/session/TelegramLongPollingSessionBot.java index 8182578e..1cceff89 100644 --- a/telegrambots-chat-session-bot/src/main/java/org/telegram/telegrambots/session/TelegramLongPollingSessionBot.java +++ b/telegrambots-chat-session-bot/src/main/java/org/telegram/telegrambots/session/TelegramLongPollingSessionBot.java @@ -5,6 +5,8 @@ import org.apache.shiro.session.UnknownSessionException; import org.apache.shiro.session.mgt.DefaultSessionManager; 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.meta.ApiContext; import org.telegram.telegrambots.meta.api.objects.Message; import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.bots.TelegramLongPollingBot; @@ -22,6 +24,10 @@ public abstract class TelegramLongPollingSessionBot extends TelegramLongPollingB } public TelegramLongPollingSessionBot(ChatIdConverter chatIdConverter){ + this(chatIdConverter, ApiContext.getInstance(DefaultBotOptions.class)); + } + + public TelegramLongPollingSessionBot(ChatIdConverter chatIdConverter, DefaultBotOptions defaultBotOptions){ this.setSessionManager(new DefaultSessionManager()); this.setChatIdConverter(chatIdConverter); AbstractSessionDAO sessionDAO = (AbstractSessionDAO) sessionManager.getSessionDAO(); diff --git a/telegrambots-extensions/README.md b/telegrambots-extensions/README.md index 247bb691..998f63c4 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 - 4.9 + 4.9.1 ``` 2. Using Gradle: ```gradle - compile "org.telegram:telegrambotsextensions:4.9" + compile "org.telegram:telegrambotsextensions:4.9.1" ``` \ No newline at end of file diff --git a/telegrambots-extensions/pom.xml b/telegrambots-extensions/pom.xml index 7fde69c6..e0fdc053 100644 --- a/telegrambots-extensions/pom.xml +++ b/telegrambots-extensions/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 4.9 + 4.9.1 telegrambotsextensions @@ -75,7 +75,7 @@ org.telegram telegrambots - 4.9 + 4.9.1 diff --git a/telegrambots-meta/pom.xml b/telegrambots-meta/pom.xml index 6a060936..c31ab809 100644 --- a/telegrambots-meta/pom.xml +++ b/telegrambots-meta/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 4.9 + 4.9.1 telegrambots-meta diff --git a/telegrambots-spring-boot-starter/README.md b/telegrambots-spring-boot-starter/README.md index 4c5b2142..dc6b0e03 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 - 4.9 + 4.9.1 ``` **Gradle** ```gradle - compile "org.telegram:telegrambots-spring-boot-starter:4.9" + compile "org.telegram:telegrambots-spring-boot-starter:4.9.1" ``` Motivation diff --git a/telegrambots-spring-boot-starter/pom.xml b/telegrambots-spring-boot-starter/pom.xml index b9d59a0a..7155c80e 100644 --- a/telegrambots-spring-boot-starter/pom.xml +++ b/telegrambots-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 4.9 + 4.9.1 telegrambots-spring-boot-starter @@ -79,7 +79,7 @@ org.telegram telegrambots - 4.9 + 4.9.1 org.springframework.boot diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml index 03123e30..66e70503 100644 --- a/telegrambots/pom.xml +++ b/telegrambots/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 4.9 + 4.9.1 telegrambots @@ -95,7 +95,7 @@ org.telegram telegrambots-meta - 4.9 + 4.9.1 com.fasterxml.jackson.core