Commit Graph

66 Commits

Author SHA1 Message Date
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
a75ca5f08d Version 4.0.0 2018-07-27 00:27: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
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
AzZu
ff73a43337 Update version to 3.6.2
Cause new version does not support the old methods of enabling a proxy
2018-05-06 23:32:33 +03:00
AzZu
6087b37483 remove unused imports 2018-05-06 23:32:06 +03:00
AzZu
346a9dc045 added proxy feature
So now, it's support http, socks4 and socks5 proxys
2018-05-06 23:31:48 +03:00
AzZu
95dd4e3a3f remove http proxy feature
Cause apache.http package does not provide socks proxy feature
2018-05-06 23:31:33 +03:00
Ruben Bermudez
28a9cf1fdb Version 3.6.1 2018-04-20 01:44:04 +02:00
Vyacheslav N. Boyko
28f80e1bcd reworked proxy using 2018-04-17 11:46:48 +03:00
Vyacheslav N. Boyko
b9c32c55d8 implemented authorization via http proxy 2018-04-16 18:01:00 +03:00
Vyacheslav N. Boyko
378c8aaddc implemented authorization via http proxy 2018-04-16 17:58:51 +03:00
Ruben Bermudez
6db6c4bf0d Update version 3.6 2018-02-14 20:36:22 +01:00
Ruben Bermudez
7d6fdcbf69 Merge branch 'SocketException' of https://github.com/myplacedk/TelegramBots into myplacedk-SocketException 2018-02-13 21:51:07 +01:00
Javier Cardona
a1a8c460e2 #336 Added shutdown call for execution service to default long polling bot 2017-11-21 13:14:12 -06:00
Niels Ulrik Andersen
e2aed55b11 Clean up a bit in DefaultBotSession 2017-11-19 16:59:23 +01:00
Niels Ulrik Andersen
4cf29bd75f Clean up some thread usage, seems to close #168. 2017-11-19 12:41:38 +01:00
Ruben Bermudez
49c0fef3c5 Update version 3.5 2017-11-17 15:47:22 +01:00
ng1905
0132f25178
Fix if statement
Missing ')'
2017-11-06 07:19:11 +01:00
ng1905
216e910411
Do not log stack trace when stopping bot
When stopping a LongPollingBot, no exception should be logged due to closing the socket.
2017-11-06 07:11:22 +01:00
Ruben Bermudez
babb9d8be5 Update API version 3.4 2017-10-11 19:27:12 +02:00
Ruben Bermudez
9317c6f5a9 Merge pull request #284 from vantuz-subhuman/#269
#269 Fixed update queue polling order and added `TelegramBatchLongPollingBot`
2017-10-06 18:23:10 +02:00
vantuz-subhuman
cb92eca883 #269: Deleted TelegramBatchLongPollingBot, added onUpdatesReceived method to basic LongPollingBot interface 2017-09-21 00:46:41 +03:00
Ruben Bermudez
06c55a9c74 Update API version 3.3 2017-08-23 09:06:32 +02:00
vsubhuman
0fb556518a #269 Extracted UpdatesSupplier insede DefaultBotSession and created tests 2017-08-03 13:29:02 +03:00
vsubhuman
fefe0cff05 #269 Added TelegramBatchLongPollingBotTest 2017-08-03 12:19:19 +03:00
vsubhuman
5741e4ba97 #269 Fixed update queue polling order and added TelegramBatchLongPollingBot 2017-08-03 00:30:51 +03:00
Ruben Bermudez
ffcdbd126e Update version 3.2 2017-07-21 16:17:48 +02:00
Ruben Bermudez
8183b77fce Merge remote-tracking branch 'origin/dev' into dev 2017-07-20 22:38:06 +02:00
Ruben Bermudez
c90151d1a7 Closes #270 2017-07-20 22:37:19 +02:00
Roman Golyshev
cbcfab5d1e Refactor default abs sender (#272)
* refactor-default-abs-sender: move all returns to `try` scope

- it makes clear that return would not happen if some exception has been thrown

* refactor-default-abs-sender: extract `sendHttpPostRequest` method

* refactor-default-abs-sender: inline usage of `sendHttpPostRequest` in most occurrences

* refactor-default-abs-sender: extract creation of `HttpPost` with configuration to method

* refactor-default-abs-sender: rearrange code to ease up refactoring

* refactor-default-abs-sender: extract `sendMethodRequest` method

* refactor-default-abs-sender: move temporary file names to variables

* refactor-default-abs-sender: extract files downloading to separate methods

* refactor-default-abs-sender: extract creation of `Runnable` for async file download to method

* refactor-default-abs-sender: extract `assertParamNotNull` method

* refactor-default-abs-sender: rename `tryToDownloadToTemporaryFile` method
2017-07-20 22:28:59 +02:00
Roman Gordeev
01175ed03d Explicit Contenttype for textBody (#274) 2017-07-20 18:55:02 +02:00
Ruben Bermudez
0e6e9e7e99 Closes #266 2017-07-10 02:16:21 +02:00
Ruben Bermudez
38c99cb78d Closes #264 2017-07-09 02:48:49 +02:00
Ruben Bermudez
356034f324 Merges #256 2017-06-30 14:32:34 +02:00
Ruben Bermudez
3fe39ad76a Version 3.1 2017-06-30 14:15:48 +02:00
Ruben Bermudez
0a7180fb36 Fix TODO 2017-06-18 05:38:23 +02:00
Ruben Bermudez
0ec6b55216 Version 3.0.2
Create new extensions module
2017-06-18 05:34:13 +02:00
Ruben Bermudez
2113944180 Merge branch 'dev' of https://github.com/rubenlagus/TelegramBots into dev 2017-06-18 05:01:24 +02:00
Ruben Bermudez
30f5bff40c Close #250 2017-06-18 05:00:07 +02:00
Ruben Bermudez
ad2b7e485e Merge pull request #230 from JetCoder1/dev
Create TimedSendLongPollingBot.java
2017-06-18 04:50:17 +02:00
Ruben Bermudez
0312a3bcb1 Version 3.0.1 2017-05-29 00:38:00 +02:00
Ruben Bermudez
73958b06e4 Fix bug when setting webhook 2017-05-29 00:31:24 +02:00
JetCoder1
c2c217b1ee Create TimedSendLongPollingBot.java
LongPollingBot extinsion performing time-based sends obeying basic Telegram limits (no more 30 messages per second in different chats, no more 1 message per second in any single chat).
2017-05-12 17:12:01 +05:00
Ruben Bermudez
db229bb66e Support custom api url 2017-05-11 03:02:54 +02:00
Rubenlagus
e61a52dc11 Changed method to protected to allow overriding it 2017-05-09 01:53:40 +02:00
Rubenlagus
5937a2e3a6 API 3.0 2017-05-03 01:40:55 +02:00