Leandro Toledo
9a340d2ea9
Endorsing if empty or 0 or empty string and minor typo fix #232
2016-04-18 20:18:32 -03:00
Jannes Höke
693df6dc2c
Merge branch 'bot-api-2.0' into dispatcher-rework
2016-04-19 00:08:59 +02:00
Jannes Höke
a98919a86e
fix cache_time==0 case
2016-04-19 00:08:47 +02:00
Jannes Höke
9790d6d8dc
Merge branch 'bot-api-2.0' into dispatcher-rework
2016-04-18 21:35:50 +02:00
Jannes Höke
7913d09295
fix message.to_dict
2016-04-18 21:35:39 +02:00
Jannes Höke
1db337fe2b
Merge branch 'master' into dispatcher-rework
2016-04-18 21:23:14 +02:00
Jannes Höke
0d9d5032ef
exit immediately if receiving second interrupt #224
2016-04-18 19:21:57 +02:00
Jannes Höke
b6fceefc80
documentation
2016-04-18 18:13:54 +02:00
Jannes Höke
687a3b0ba1
dispatcher: also break on errors in checkHandler
2016-04-18 17:15:41 +02:00
Jannes Höke
bf5ba9a369
Merge branch 'bot-api-2.0' into dispatcher-rework
2016-04-17 22:22:52 +02:00
Jannes Höke
d879a0d018
convert reply_markup to json
2016-04-17 22:11:29 +02:00
Jannes Höke
ad211655ea
Merge branch 'master' into dispatcher-rework
...
Conflicts:
README.rst
2016-04-17 12:45:31 +02:00
Jannes Höke
3a0eb588cb
Merge branch 'bot-api-2.0' into dispatcher-rework
2016-04-17 12:43:59 +02:00
Jannes Höke
c9bfa71ff9
decode new message fields
2016-04-17 12:43:34 +02:00
Jannes Höke
5f19452dd7
implement de_list
2016-04-17 12:43:09 +02:00
Jannes Höke
5cccf2603b
reorder imports
2016-04-17 12:42:41 +02:00
Jannes Höke
185b080daa
fix de_json
2016-04-17 12:42:30 +02:00
Jannes Höke
a846c8fd86
Merge branch 'bot-api-2.0' into dispatcher-rework
2016-04-16 20:58:08 +02:00
Jannes Höke
0e5129e59f
fix method names and parameters for new methods
2016-04-16 20:57:50 +02:00
Jannes Höke
79ca07f839
Merge branch 'bot-api-2.0' into dispatcher-rework
2016-04-16 20:33:36 +02:00
Jannes Höke
5e80efaa54
editMessage->editMessageText
2016-04-16 20:29:43 +02:00
Jannes Höke
a114f70249
fix callback query condition
2016-04-16 20:29:08 +02:00
Jannes Höke
31fba47829
fix super calls and module docs
2016-04-16 19:25:38 +02:00
Jannes Höke
f2a92ccf46
Merge branch 'bot-api-2.0' into dispatcher-rework
2016-04-16 19:00:01 +02:00
Leandro Toledo
79228b0655
Adds kwargs for InlineQueryResult objects #232
2016-04-16 13:49:16 -03:00
Jannes Höke
b2045717d6
Merge branch 'bot-api-2.0' into dispatcher-rework
2016-04-16 18:18:37 +02:00
Leandro Toledo
15cc410c10
Merge remote-tracking branch 'upstream/master' into bot-api-2.0
2016-04-16 13:16:49 -03:00
Leandro Toledo
f6524b0207
Adding InlineQueryResultCachedVoice #232
2016-04-16 13:10:30 -03:00
Noam Meltzer
ecc86d4bcd
request: catch socket.error
...
socket.error is another exception which is thrown by the underlying
infrastacture and not handled by the urllib2 or httplib layers
fixes #236
2016-04-16 19:09:45 +03:00
Leandro Toledo
56b17f2a17
Adding InlineQueryResultVoice #232
2016-04-16 13:05:55 -03:00
Leandro Toledo
8bf4a6fdda
Refactoring InlineQueryResultVideo #232
2016-04-16 13:01:26 -03:00
Leandro Toledo
109af62425
Adding InlineQueryResultVenue #232
2016-04-16 12:58:36 -03:00
Leandro Toledo
ec27edef58
Refactoring InlineQueryResultPhoto #232
2016-04-16 12:55:05 -03:00
Leandro Toledo
7231eaa349
Refactoring InlineQueryResultMpeg4Gif #232
2016-04-16 12:52:21 -03:00
Leandro Toledo
1876867ec7
Adding InlineQueryResultLocation #232
2016-04-16 12:49:07 -03:00
Leandro Toledo
17509fc24f
Refactoring InlineQueryResultGif #232
2016-04-16 12:46:24 -03:00
Leandro Toledo
2d2b269932
Adding InlineQueryResultDocument #232
2016-04-16 12:39:53 -03:00
Leandro Toledo
802a74c606
Adding InlineQueryResultContact #232
2016-04-16 12:35:23 -03:00
Leandro Toledo
c4074f740e
Refactoring InlineQueryResultAudio #232
2016-04-16 12:32:40 -03:00
Leandro Toledo
1e0ee0694f
Refactoring InlineQueryResultArticle #232
2016-04-16 12:30:18 -03:00
Leandro Toledo
6a7c0bb584
Adding InlineQueryResultCachedVideo #232
2016-04-16 12:22:29 -03:00
Leandro Toledo
fb2fc3842b
Adding InlineQueryResultCachedSticker #232
2016-04-16 12:20:15 -03:00
Leandro Toledo
c794c3520b
Adding InlineQueryResultCachedPhoto #232
2016-04-16 12:18:50 -03:00
Leandro Toledo
0fd013feec
Adding InlineQueryResultCachedMpeg4Gif #232
2016-04-16 12:16:45 -03:00
Leandro Toledo
1834d6c754
Adding InlineQueryResultCachedGif #232
2016-04-16 12:14:43 -03:00
Leandro Toledo
f51564f7cd
Adding InlineQueryResultCachedDocument #232
2016-04-16 12:12:37 -03:00
Leandro Toledo
624160e1db
Adding InlineQueryResultCachedAudio #232
2016-04-16 12:09:26 -03:00
Jannes Höke
d2f2b74bdb
imports and classname fix
2016-04-16 16:54:07 +02:00
Leandro Toledo
85f1b1af0c
Adding sendContact and sendVenue methods #232
2016-04-16 11:48:36 -03:00
Jannes Höke
b5cbf17ef5
Merge branch 'bot-api-2.0' into dispatcher-rework
2016-04-16 16:41:39 +02:00
Jannes Höke
0d0ad1334c
add documentation and minor stuff
2016-04-16 16:36:12 +02:00
Leandro Toledo
b9305ca7ac
Adding MessageEntity and Venue classes #232
2016-04-16 11:33:58 -03:00
Leandro Toledo
0e21609382
Adding InputMessageContent classes #232
2016-04-16 11:23:25 -03:00
Jannes Höke
95fde0c6c4
create missing handler types and minor fixes
2016-04-16 15:21:19 +02:00
kiddick
a9b305edd0
Fix class declaration according to consistency. ( #235 )
2016-04-15 17:20:37 +03:00
Jannes Höke
1e19084a0d
initial commit for dispatcher rework. deleted updatequeue.py as it is not needed. added handler base class, messagehandler, commandhandler, regexhandler. adjusted dispatcher for new system
2016-04-14 23:57:40 +02:00
Noam Meltzer
e179b27f57
dispatcher: fix wrong variable ( #233 )
2016-04-14 23:23:02 +03:00
Leandro Toledo
8b95f9cbeb
PEP 8 - lemme sleep Traviszzzzz #232
2016-04-14 03:59:33 -03:00
Leandro Toledo
086fa1251c
Minor fixes #232
2016-04-14 03:40:26 -03:00
Leandro Toledo
60f9aede07
Minor fix on answerInlineQuery #232
2016-04-14 02:38:51 -03:00
Leandro Toledo
c411ef7822
Adding switch_pm_text and switch_pm_parameter to answerInlineQuery #232
2016-04-14 02:34:29 -03:00
Leandro Toledo
e1de7220df
Adding ChosenInlineResult #232
2016-04-14 02:21:00 -03:00
Leandro Toledo
429ea92254
Adding KeyboardButton #232
2016-04-14 02:01:05 -03:00
Leandro Toledo
751402a0d3
Adding new Bot methods editMessageText, editMessageCaption, editMessageReplyMarkup #232
2016-04-14 00:28:06 -03:00
Leandro Toledo
2af15cadd6
New method answerCallbackQuery #232
2016-04-13 21:25:26 -03:00
Leandro Toledo
93e19dc2ae
Adding CallbackQuery #232
2016-04-13 21:10:04 -03:00
Leandro Toledo
c2f5309cbf
Adding InlineKeyboardMarkup #232
2016-04-13 20:41:26 -03:00
Leandro Toledo
1657e43904
Adding InlineKeyboardMarkup #232
2016-04-13 20:38:45 -03:00
Leandro Toledo
23eba8a24e
Adding InlineKeyboardButton #232
2016-04-13 20:26:38 -03:00
Leandro Toledo
ed170e1595
Bootstrapping InputMessageContent classes #232
2016-04-13 20:01:36 -03:00
Leandro Toledo
46ca28f01c
Bootstrapping InlineQueryResult classes #232
2016-04-13 09:59:48 -03:00
Leandro Toledo
b99518e8b8
3 more classes #232
2016-04-12 01:23:52 -03:00
Leandro Toledo
62045316fe
Adding 27 new classes #232
2016-04-12 01:12:35 -03:00
Leandro Toledo
736d62e20d
New methods kickChatMember and unbanChatMember #232
2016-04-12 00:46:50 -03:00
Leandro Toledo
68dca31f15
Renamed fields new_chat_participant and left_chat_participant #232
2016-04-12 00:33:42 -03:00
Rahiel Kasim
01b90e7ede
small improvements
2016-04-02 23:13:49 +02:00
Noam Meltzer
eb6bafc003
Merge pull request #217 from python-telegram-bot/fix_webhook
...
Only set webhook if using SSL and also send certificate
2016-03-23 20:26:23 +02:00
jools
b41e1ab127
Fix annoying grammar error
2016-03-23 16:23:38 +02:00
Jannes Höke
5c71ebce52
ensure url_path is string
2016-03-23 11:04:38 +01:00
Jannes Höke
6db377d56d
Only set webhook if using SSL and also send certificate
2016-03-23 10:11:10 +01:00
Jannes Höke
808945b623
prepare release of v3.4
2016-03-22 03:02:13 +01:00
Jannes Höke
63a83d4cc2
fix imports of updatequeue
2016-03-22 02:48:56 +01:00
Jannes Höke
c43b348117
lazily load all of telegram.ext
2016-03-22 02:42:40 +01:00
Jannes Höke
45a47d54bd
move updatequeue to telegram.utils
2016-03-22 02:42:19 +01:00
Noam Meltzer
0ddcb16889
start_webhook(): call bot.setWebhook() as a bootstrap step
2016-03-15 22:02:34 +02:00
Noam Meltzer
594b81e463
start_polling(): new argument - bootstrap_retries
...
refs #196
2016-03-15 22:02:16 +02:00
Leandro Toledo
1e4ae6546f
Changing INFO logs to DEBUG and minor fixes
2016-03-14 22:56:20 -03:00
Rahiel Kasim
d1516f66ac
deprecation warning for telegram.Updater
2016-03-14 19:43:38 +01:00
Rahiel Kasim
739e218eb7
PEP8
2016-03-14 15:26:22 +01:00
Rahiel Kasim
dcea2c8015
Merge branch 'master' of https://github.com/leandrotoledo/python-telegram-bot
2016-03-14 15:07:16 +01:00
Rahiel Kasim
98112d3987
move Updater and friends to ext submodule
2016-03-14 14:50:12 +01:00
Jannes Höke
45a4689fd0
update docstrings of Message regarding supergroup conversion
2016-03-14 09:54:33 +01:00
Jannes Höke
82030c4109
Merge pull request #199 from python-telegram-bot/send-inputfile-from-bytesio
...
Fix InputFile attribute check when from a BufferedReader object
2016-03-14 01:17:27 +01:00
Dmitriy
00e2b4815a
Processing commands without casting to UTF-8
2016-03-13 12:32:27 +03:00
Shelomentsev Dmitriy
3d89f6b284
dispatchTelegramCommand no-break space fix.
2016-03-13 02:15:48 +03:00
Leandro Toledo
8ad34fc3c0
Fix InputFile attribute check when from a BufferedReader object
2016-03-12 19:40:56 -03:00
Rahiel Kasim
8b196ce71f
load Updater class only when used
2016-03-12 15:29:54 +01:00
Aydar Biktimirov
dc9b77e02c
Merge remote-tracking branch 'upstream/master'
2016-03-11 23:03:13 +03:00
Rahiel Kasim
5958da0031
bot.sendMessage: update documentation
2016-03-11 20:32:10 +01:00
Aydar Biktimirov
433110abe9
Added disable_notification parameter for silent messages
2016-03-09 18:47:33 +03:00
Noam Meltzer
a0a040a9c2
updater: allow cleaning updates from Telegram servers before start
2016-03-01 22:12:12 +02:00
Noam Meltzer
f0e7a3316c
jobqueue: fix docstring
2016-03-01 20:20:51 +02:00
Jannes Höke
218e22631c
Prepare to release v3.3
2016-02-28 02:33:49 +01:00
Jannes Höke
cd42524fd4
Merge pull request #174 from python-telegram-bot/inlinebots
...
Implement Inlinebots
2016-02-28 02:10:21 +01:00
Jannes Höke
4aca4d1d1f
Merge pull request #187 from python-telegram-bot/flaky-tests
...
Flaky tests
2016-02-28 01:02:11 +01:00
Noam Meltzer
ccb24d1288
request.py: fix for python2.7
2016-02-27 23:13:29 +02:00
Noam Meltzer
fc618274ae
bot.py: allow specifying timeout for sendVideo operations
2016-02-27 23:00:33 +02:00
Noam Meltzer
ec8cd37345
test_video.py: adapt to latest changes in the API
2016-02-27 22:50:28 +02:00
Jannes Höke
efd10507d0
remove kwargs in favor of named keyword arguments, validate argument types
2016-02-21 11:33:34 +01:00
Noam Meltzer
2338377eda
request: better parsing of URLError exception
2016-02-20 15:20:00 +02:00
Jannes Höke
ca526fba73
improve unit tests according to comments
2016-02-20 12:14:34 +01:00
Jannes Höke
e2cc8db992
Merge branch 'master' into inlinebots
2016-02-20 11:17:34 +01:00
Noam Meltzer
d415a60ebf
join() threads instead of guessing if they're running
...
- new book keeping of dispatcher's async threads so they can be joined
when stopping
- updater, webhook & dispatcher threads are now kept on
Updater.__threads so they can be joined at the end
refs #175
2016-02-19 18:00:57 +02:00
Noam Meltzer
fd7baa2236
updater.py: use _init_thread for webhook as well
2016-02-19 18:00:57 +02:00
Noam Meltzer
4945d99de6
webhookhandler: better handling of invalid POST data
2016-02-19 18:00:57 +02:00
Noam Meltzer
c103c05679
updater.py: fix log of thread name
2016-02-19 18:00:57 +02:00
Rahiel Kasim
d02e656700
raise NetworkError for HTTP 502 (Bad Gateway)
2016-02-09 15:26:59 +01:00
Jannes Höke
edf4e8abbe
fix docstring
2016-02-07 23:34:26 +01:00
Jannes Höke
c55c5408b1
tests and corrections for inlinequery
2016-02-07 23:34:15 +01:00
Jannes Höke
d1dc32d849
tests and corrections for choseninlineresult
2016-02-07 23:26:38 +01:00
Jannes Höke
2a01292a64
Merge branch 'master' into inlinebots
2016-02-07 22:42:12 +01:00
Jannes Höke
5b9ec7ff40
catch errors in error handlers
2016-02-07 22:40:55 +01:00
Jannes Höke
bec81b5c3b
Merge pull request #161 from tsnoam/master
...
better exception handling
2016-02-07 22:34:49 +01:00
Jannes Höke
eac3d8842d
remove json import
2016-02-07 15:09:41 +01:00
Jannes Höke
17ac73c3c4
fix message to json
2016-02-07 14:46:36 +01:00
Noam Meltzer
4a5001668d
updater/dispatcher: on exception stop all threads
2016-02-07 00:56:30 +02:00
Noam Meltzer
7ebbc60694
Unauthorized is HTTP code 401
...
I am not certain where the older 403 came from, but for now going to
leave it as is
2016-02-07 00:56:30 +02:00
Noam Meltzer
e82ae432f7
dispatcher is now stopped using a threading.Event
2016-02-07 00:56:30 +02:00
Noam Meltzer
d4beb94059
Add specific exceptions types for important errors
...
maintain backward compatibility with the 'old' exception by inherting
from TelegramError and using the same message
2016-02-06 18:48:55 +02:00
Noam Meltzer
029705e0af
updater: catch TelegramError instead of URLError
...
- URLError is now being caught by telegram.request.
- simplify the code now that we don't need to catch URLError
2016-02-06 18:48:55 +02:00
Noam Meltzer
2859a8873f
utils.request: catch URLError in _try_except_req decorator
2016-02-06 18:48:55 +02:00
Jannes Höke
6d2e159d75
move 'no new updates found' message to debug ( #167 )
2016-01-31 10:32:34 +01:00
Jannes Höke
8d94c14504
Merge branch 'master' into inlinebots
2016-01-29 23:55:34 +01:00
Juan Madurga
c13af4d61d
parse mode for HTML added
2016-01-27 11:20:32 +01:00
Jannes Hoeke
a383cee558
merge master into inlinebots
2016-01-25 18:05:27 +01:00
Jannes Höke
44645d2cc6
Merge pull request #157 from jlmadurga/context-for-handlers
...
Add context to dispatcher
2016-01-25 17:46:14 +01:00
Oleg Shlyazhko
c3bca9af48
remove checking for non 200 http codes, exceptions already handle it
2016-01-24 18:28:27 +03:00
Oleg Shlyazhko
9eec34edd1
pep8 fix
2016-01-23 20:13:48 +03:00
Oleg Shlyazhko
383a2d3742
fix httperror error output
2016-01-23 20:03:29 +03:00
Oleg Shlyazhko
d1e4eeaf30
fix urlopen data format
2016-01-23 19:49:55 +03:00
Oleg Shlyazhko
80b53f1ab7
fix urlopen call
2016-01-23 19:44:40 +03:00
Oleg Shlyazhko
0faa38b8af
fix httperror logging
2016-01-23 19:29:01 +03:00
Oleg Shlyazhko
7508c2f8bf
add detailed comment in class and src key to tracking url
2016-01-23 16:59:53 +03:00
Oleg Shlyazhko
2c12bd6775
replace print with logging
2016-01-23 16:58:01 +03:00
Oleg Shlyazhko
5b05bcc8f2
add http error exception handling
2016-01-23 15:21:13 +03:00
Oleg Shlyazhko
adb446abf6
fix pep8 styling
2016-01-23 15:14:17 +03:00
Oleg Shlyazhko
17c2857622
add module for botan analytics
2016-01-23 14:24:34 +03:00
Juan Madurga
cbcbfab45f
fix pep8
2016-01-22 16:42:39 +01:00
Juan Madurga
1dc9907a70
fix code comments by jh0ker
2016-01-22 16:30:55 +01:00
Juan Madurga
b8c9992eff
Merge branch 'master' into context-for-handlers
2016-01-22 09:46:05 +01:00