Commit Graph

82 Commits

Author SHA1 Message Date
UnAfraid
2d27f9e60f Post merge fixes 2019-10-14 20:08:16 +03:00
Ruben Bermudez
15fe637998
Merge branch 'dev' into slf4j 2019-10-12 01:02:15 +01:00
Ruben Bermudez
1ebbc68485
Merge branch 'dev' into add-ability-toggle 2019-10-12 01:00:28 +01:00
Ruben Bermudez
d1f060fb04
Merge pull request #668 from addo37/add-replyflow
Add state machine capability to AbilityBot via ReplyFlow
2019-10-08 23:08:48 +01:00
Ruben Bermudez
51df90464e
Merge pull request #666 from addo37/fix-execute-async
Fix executeAsync in SilentSender to properly call sender.executeAsync
2019-10-08 23:07:25 +01:00
Ruben Bermudez
2b07b87fdf
Merge pull request #664 from addo37/fix-db-var
Support backup and recovery of db vars
2019-10-08 23:06:30 +01:00
Ruben Bermudez
4c5a25302b
Merge pull request #633 from bernikr/dev
AbilityBots: prevent nullPointerExceptions when using message flags
2019-10-08 23:05:58 +01:00
Abbas Abou Daya
861b7f24f9 Add Abillity toggles and export default abilities to their own class 2019-09-29 23:00:16 -07:00
Abbas Abou Daya
0ff63149f7 Add ReplyFlow implementation, tests, and wiki
This commit also has a some minor test refactoring.
2019-09-25 23:25:11 -07:00
Bernhard
837b4d2360
requested syntax changes 2019-09-17 10:51:14 +03:00
Abbas Abou Daya
ed7333a21e Fix executeAsync in SilentSender to properly call sender.executeAsync 2019-09-16 23:40:20 -07:00
Abbas Abou Daya
aa3448544e Support backup and recovery of db vars 2019-09-16 22:37:16 -07:00
UnAfraid
ef1bd09a6a Replacing log4j with slf4j 2019-09-09 20:10:26 +03:00
rubenlagus
87bd7aefd2 Update version in poms 2019-07-28 21:27:12 +01:00
rubenlagus
830b873776 Remove BotLogger 2019-07-27 13:19:54 +01:00
Bernhard Kralofsky
727f5a7a3e prevent nullPointerExceptions when using message flags without a MESSAGE flag first 2019-07-09 21:39:02 +02:00
Abbas Abou Daya
c633f1fcc2 Modified tests to accommodate JUnit5 and Mockito API changes 2019-07-08 23:18:08 -07:00
rubenlagus
04248e64a7 Update pom to support earlier versions as well 2019-07-08 20:42:42 +01:00
rubenlagus
7b5acf0987 Update travis yalm 2019-07-08 20:37:04 +01:00
rubenlagus
679ad618b9 Java 11, initial version 2019-07-08 20:22:51 +01:00
Ruben Bermudez
7c64bf5f1b Update version 2019-06-08 20:39:08 +01:00
Rubenlagus
b3914c5e76 Api version 4.3 2019-06-01 12:50:17 +01:00
Ruben Bermudez
b76d4da5bf
Merge pull request #599 from bernikr/dev
Back up maps in the database as a collection of key value pairs
2019-04-16 00:12:06 +01:00
Ruben Bermudez
20f45bd604 Api version 4.2 2019-04-16 00:11:11 +01:00
Bernhard
506329e51a apply the minor changes requested in the pull request 2019-04-07 15:54:43 +02:00
Ruben Bermudez
d78acbdda0 Update poms and fix guava 2019-04-05 00:52:35 +01:00
Bernhard
a80ee81ba4 back up maps in the database as a collection of key value pairs
this allows all objects to be used as keys and not only strings
2019-03-29 15:58:35 +01:00
Rubenlagus
1883320445 Update versions 2019-01-27 23:37:46 +00:00
Ruben Bermudez
18412d9c98
Merge pull request #545 from romangraef/dev
Extensions for AbilityBots
2019-01-27 22:54:54 +00:00
Abbas Abou Daya
2f05976d0a Consolidated ExtensionTest objects and minor refactoring 2019-01-03 05:46:09 +02:00
Rubenlagus
f998cc2509 Update versions 2019-01-02 16:19:43 +01:00
Rubenlagus
e203abfab5 Update versions 2019-01-02 16:12:05 +01:00
Rubenlagus
880c8a2087 Fix guava dependency 2019-01-02 14:57:27 +01:00
Erik-Berndt Scheper
28740da0df Update dependencies to fix https://github.com/rubenlagus/TelegramBots/issues/547 2018-11-14 07:09:41 +01:00
romangraef
159de38b29
added tests for ability extension functionality 2018-11-10 22:07:41 +01:00
romangraef
d515d8e44f
Added the extensions to abilities 2018-11-10 00:51:00 +01:00
Ruben Bermudez
7f8df47f0b Update version 4.1 2018-08-21 20:59:55 +01:00
Ruben Bermudez
e52b7c48a7 Update version 2018-08-09 02:50:04 +02:00
Ruben Bermudez
4ea716cfea Merge branch 'webhook' of https://github.com/addo37/TelegramBots into addo37-webhook
# Conflicts:
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/DBContext.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java
2018-07-27 01:06:23 +02:00
Ruben Bermudez
7daebe1318 Merge branch 'webhook' of https://github.com/addo37/TelegramBots into addo37-webhook
# Conflicts:
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/DBContext.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java
2018-07-27 01:04:51 +02:00
Ruben Bermudez
904dc39a97 Fix docs 2018-07-27 00:51:45 +02:00
Ruben Bermudez
a75ca5f08d Version 4.0.0 2018-07-27 00:27:26 +02:00
chmilevfa
753d1d2ed8 Fixes after merge 2018-07-16 19:54:26 +02:00
chmilevfa
0357fdb137 Properly update version to 3.6.2 2018-07-16 19:43:45 +02:00
chmilevfa
ad3dbfdd58 Merge branch 'dev' into java9-support
# Conflicts:
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/EndUser.java
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/MessageContext.java
#	telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/TelegramBotStarterConfiguration.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java
2018-07-16 19:37:30 +02:00
Ruben Bermudez
dd5d14df6c
Merge pull request #451 from AzZureman/proxy-feature
Socks proxy feature
2018-07-16 13:28:44 +03:00
chmilevfa
db9ae4f586 telegrambots-meta java 9 supported 2018-07-08 01:41:21 +02:00
Abbas Abou Daya
e1e829151b Remove anonymous bot instantiation in ABs, refactor webhook functions 2018-06-04 04:47:21 -04:00
Abbas Abou Daya
b5bfaced7e Separate AbilityBot logic and implement Webhook 2018-05-28 18:12:31 -04:00
Abbas Abou Daya
afebcaeb76 Fix javadoc 2018-05-27 04:20:04 -04:00