Commit Graph

999 Commits

Author SHA1 Message Date
Ruben Bermudez
92e68b51da Merge branch 'master' of https://github.com/slavino/TelegramBots into slavino-master
# Conflicts:
#	telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TestDeserialization.java
2021-04-25 02:58:30 +01:00
Ruben Bermudez
58de20ae9f
Merge pull request #898 from slavino/patch-1
Update TelegramApiRequestException.java
2021-04-25 01:49:47 +01:00
nicetryzz
8658de9b94 Inline Model add in Wiki 2021-04-24 21:36:26 +08:00
Slavomir Hustaty
0adf90fe8c
Update pom.xml
Spring boot 2.4.5 based on SF 5.3.6 - https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/
2021-04-19 18:17:48 +02:00
Slavomir Hustaty
58822f5113 https://github.com/rubenlagus/TelegramBots/pull/898
https://github.com/rubenlagus/TelegramBots/issues/892
2021-04-19 14:09:08 +02:00
Slavomir Hustaty
00085adfd6
Update TelegramApiRequestException.java
https://github.com/rubenlagus/TelegramBots/issues/892
https://github.com/rubenlagus/TelegramBots/pull/893
2021-04-19 10:09:36 +02:00
Ruben Bermudez
d7781f23e0 Fix #888 2021-04-16 01:25:39 +01:00
Ruben Bermudez
528d5b8331
Merge pull request #883 from Chase22/patch-1
Fix some problems in the Handling-Bot-Tokens.md
2021-04-16 00:05:18 +01:00
Andy Costanza
3d924b883b
Merge pull request #19 from rubenlagus/dev
Dev
2021-03-31 17:09:17 +02:00
Chase
99899f1bd3
Fix some problems in the Handling-Bot-Tokens.md
Just some minor changes and typo fixes
2021-03-26 11:15:47 +01:00
Ruben Bermudez
4882040822
Merge pull request #876 from rubenlagus/dev
Dev
2021-03-15 01:39:14 +00:00
rubenlagus
6ce7eb1323 Update 5.1.1 2021-03-15 01:38:52 +00:00
Ruben Bermudez
bbaafbc2a4
Merge pull request #875 from dgangan/patch-1
Update Getting-Started.md
2021-03-15 01:35:22 +00:00
Ruben Bermudez
1f8b7a0f01
Merge pull request #874 from aNNiMON/typo-fix
Fix typos
2021-03-15 01:34:44 +00:00
Dmitry Gangan
87e3f23e8e
Update Getting-Started.md
In latest release of TelegramBots  SendMessage class methods setChatId(String chatId) and setText(String text) are returning void - hence cannot be chained on SendMessage constructor

Also, getChatId() is returning Long, rather than String, hence it should be converted to String while used in setChatId(String chatId)
2021-03-12 22:08:18 +02:00
Victor
93106c8cfa Fix typos 2021-03-12 11:28:40 +02:00
Andy Costanza
608581ce67
Merge pull request #18 from rubenlagus/dev
Dev
2021-03-09 13:20:58 +01:00
Ruben Bermudez
60c1927c34
Merge pull request #871 from rubenlagus/dev
Dev
2021-03-09 11:16:07 +00:00
rubenlagus
cea06afcef Update wiki 2021-03-09 11:10:09 +00:00
rubenlagus
6653ffe937 API 5.1 2021-03-09 10:59:28 +00:00
rubenlagus
ecca28cedc Fix #857 2021-03-07 03:29:40 +00:00
rubenlagus
c7728fbc8a Fix webhook version and validate username and token is present 2021-03-07 03:28:24 +00:00
rubenlagus
272be4a79c Fix enforcer rule 2021-03-07 02:40:17 +00:00
Ruben Bermudez
e994bbe263 Merge branch 'costalfy-master' into dev 2021-03-07 00:21:42 +00:00
Ruben Bermudez
5877f1b5ae Merge branch 'master' of https://github.com/costalfy/TelegramBots into costalfy-master 2021-03-07 00:21:27 +00:00
Ruben Bermudez
7287c38444
Merge pull request #859 from Narryel/dev
add multiple reply declaration support
2021-03-06 11:15:38 +00:00
Ruben Bermudez
4ae315eb09
Merge pull request #843 from Dhina17/dev
wiki: fix code in ability extension example
2021-03-06 11:15:27 +00:00
Ruben Bermudez
f724181daf
Merge pull request #835 from Chase22/ability-reply-inject-bot
Inject bot instance into the reply update consumer
2021-03-06 11:15:11 +00:00
Andy Costanza
aa4e0d85f1
Merge pull request #17 from rubenlagus/dev
Dev
2021-02-22 13:15:50 +01:00
Andy Costanza
74dd1c8505
upgrade spring boot to v2.4.3 2021-02-22 13:13:52 +01:00
Ruben Bermudez
af9a0e308e
Merge pull request #787 from Borumer/Borumer-lib-1
Add CommandMessage class
2021-02-14 21:56:41 +00:00
Ruben Bermudez
c2ea41520b
Merge pull request #861 from costalfy/master
Upgrade to Spring boot 2.4.2
2021-02-14 21:54:19 +00:00
Ruben Bermudez
93043c4c98
Merge pull request #862 from ekiauhce/dev
Fix Gradle 7.0 compatibility
2021-02-14 21:53:41 +00:00
Valentin Afanasiev
39a5678543 add comments to BaseAbilityBot.java and static construction method to ReplyCollection.java 2021-01-31 22:05:52 +03:00
ekiauhce
97b427d9fa Change "groovy" to "gradle" (language identifier) 2021-01-30 10:25:40 +03:00
ekiauhce
9ae03e511f Add Gradle to Usage block 2021-01-30 10:25:08 +03:00
ekiauhce
37171fa94a Change "compile" to "implementation" (Gradle dependency) 2021-01-30 10:24:00 +03:00
ekiauhce
e09c13cf0e Change "compile" to "implementation" (Gradle dependency) and "groovy" to "gradle" (language identifier) 2021-01-30 10:20:50 +03:00
Andy Costanza
537a4c1f82 feat(spring boot): Upgrade spring boot dependency to 2.4.2
- replace spring-boot-test by spring-boot-starter-test to avoid NoClassDefFoundError with AopTestUtils on all unit tests
- remove assertj-core because it's include on spring-boot-starter-test
2021-01-29 12:14:47 +01:00
Andy Costanza
b1a7db4590 feat(spring boot): Upgrade spring boot dependency to 2.3.8.RELEASE 2021-01-29 11:37:39 +01:00
Andy Costanza
fe464e0092
Merge pull request #15 from rubenlagus/dev
Dev
2021-01-29 11:23:35 +01:00
Valentin Afanasiev
ec4f81b94a revert indentation changes 2021-01-26 13:39:41 +03:00
Valentin Afanasiev
eea4c3adc1 revert indentation changes 2021-01-26 13:33:01 +03:00
Valentin Afanasiev
aac8afe209 add multiple reply declaration support 2021-01-25 19:57:48 +03:00
rubenlagus
6342d1ff4e Fix #844 2021-01-02 18:06:05 +01:00
rubenlagus
451bdce90b Fix #841 2021-01-02 17:51:25 +01:00
Dhina17
adb765d739 wiki: fix code in ability extension example 2020-12-09 15:31:51 +05:30
Chase22
e7cb0e6ced Inject bot instance into the reply update consumer
Also added deprecated methods to still allow the old behaviour, discarding the bot reference in that case.

The condition could have a bot instance injected as well, which would require rewriting the Flag register though.
2020-11-24 17:07:55 +01:00
Ruben Bermudez
b03fe98798
Merge pull request #831 from rubenlagus/dev
Dev
2020-11-08 18:00:40 +00:00
rubenlagus
415d31eaec Updage 5.0.1 2020-11-08 16:19:38 +00:00