OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-10-24 09:56:30 +02:00
Code Issues Projects Releases Packages Wiki Activity
1016 commits 7 branches 118 tags 35 MiB
Commit graph

514 commits

Author SHA1 Message Date
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
Juan Madurga
a6650de93d Add context parameter to dispatcher. Handlers now can updates with a context data if required 2016-01-20 19:56:41 +01:00
Noam Meltzer
dc032b349c _try_except_req(): catch httplib.HTTPException 
fixes #153
 2016-01-19 22:02:34 +02:00
Jannes Höke
5c2458bfd8 merge master into inlinebots 2016-01-14 15:28:22 +01:00
Jannes Höke
6166e7f07a Merge pull request #152 from python-telegram-bot/docstring_pep257_checker 
Add docstring style checker and fixing some
 2016-01-14 15:24:44 +01:00
Jannes Höke
da97c1741c merge 'urls' into 'inline' 2016-01-13 21:58:45 +01:00
leandrotoledo
d3a02405b2 pep8 2016-01-13 14:23:15 -02:00
leandrotoledo
dfc75cc64e Add docstring style checker and fixing some 2016-01-13 14:09:35 -02:00
Jannes Höke
332667c98b flake8 2016-01-12 13:16:43 +01:00
Jannes Höke
f71c40e0b8 use basename and check if filename has extension 2016-01-12 12:42:07 +01:00
Leandro Toledo
9f55c15cc7 Add sendPhoto tests, fix file_id casting to str instead unicode 2016-01-11 22:25:46 -02:00
Jannes Höke
831a0a31e5 flake8 2016-01-10 15:20:05 +01:00
Jannes Höke
d10b657521 enable sending by URL for all sendX methods 2016-01-10 15:12:42 +01:00
Jannes Höke
ef1012b722 enable sending by URL for all sendX methods 2016-01-10 15:11:17 +01:00
Jannes Höke
5fd7a4fe0d release v3.3b1 2016-01-09 15:50:19 +01:00
Jannes Höke
48c1673d7c fix additional args for inline queries 2016-01-09 15:30:47 +01:00
Jannes Höke
6ece89bc56 update inline query results after api change 2016-01-09 15:09:48 +01:00
Jannes Höke
c69cdfd184 Initial commit for inline bot support 2016-01-09 15:09:48 +01:00
Jannes Höke
b78ceeed10 fix race condition in dispatcher 2016-01-06 15:36:14 +01:00
Jannes Höke
aa8966832b release 3.2 and update copyright notice to 2015-2016 2016-01-05 14:12:03 +01:00
Jannes Höke
e27427676d fix jobqueue creation 2016-01-05 13:40:07 +01:00
Jannes Höke
2875bae881 Integrate JobQueue with Updater 2016-01-05 13:32:19 +01:00
Jannes Höke
c756aa1c02 remove error raising in dispatchType 2016-01-05 12:49:48 +01:00
Jannes Höke
87657bcd70 flake8 and string formatting 2016-01-04 02:05:39 +01:00
Jannes Höke
dd7d1255d1 fixes, tests and examples for job queue 2016-01-04 01:56:22 +01:00
Jannes Höke
f813d4f5ec improve docstring 2016-01-04 01:32:47 +01:00
Jannes Höke
623863cee1 fix exception logging 2016-01-04 01:32:00 +01:00
Jannes Höke
aa125e59fb Merge branch 'master' into jobqueue 2016-01-04 00:01:27 +01:00
Jannes Höke
68c844df0c implement starting jobqueue in thread and fix errors 2016-01-04 00:01:00 +01:00
Noam Meltzer
bc2679f2ae utils.request: provide HTTP error code with unknown errors 2016-01-04 00:32:17 +02:00
Noam Meltzer
17dae68654 gitignore: files generated by unitests 2016-01-04 00:32:17 +02:00
Noam Meltzer
7734c1d6a6 fix unitests to work with new token validator 2016-01-04 00:32:13 +02:00
Noam Meltzer
aeca3ca174 basic token validation 
refs #134
 2016-01-04 00:31:40 +02:00
Noam Meltzer
21fdaa4ff7 utils.request: decorate functions with general try... except... 
refs #134
 2016-01-04 00:31:40 +02:00
Noam Meltzer
79f29c4b9e properly handle utf-8 server response & identify json parsing errors 
refs #134
 2016-01-04 00:31:40 +02:00
Noam Meltzer
a2d8ca3663 some errors are prefixed with '[Error]: ' - strip that down 
use custom _lstrip_str() func instead of regex. a little performance
improvment and (IMO) a bit more readable.
 2016-01-04 00:31:40 +02:00
Jannes Höke
6f76bfc2de Merge branch 'master' into jobqueue 2015-12-31 15:45:19 +01:00
Jannes Höke
119743433d merge Tengah-master into master 2015-12-31 15:41:37 +01:00
Bob Pasker
b0ad07f30f remove traceback import 2015-12-31 09:29:02 -05:00
Jannes Höke
5d1ef673a3 flake8 2015-12-31 15:04:42 +01:00
Jannes Höke
3e1cb08567 flake8 2015-12-31 15:03:40 +01:00
Jannes Höke
29a4062945 properly lock updater and dispatcher start/stop methods 2015-12-31 14:58:01 +01:00
Jannes Höke
2ff6fe9901 initial commit for JobQueue by @franciscod 2015-12-31 14:56:48 +01:00
Jannes Höke
34b91f5062 properly lock updater and dispatcher start/stop methods 2015-12-31 14:52:28 +01:00
Bob Pasker
cc6c4a6eb9 Change a print statement to use logger instead 2015-12-31 08:33:42 -05:00
Jannes Höke
fc9456e1a8 release v3.1.2 2015-12-29 14:46:00 +01:00
Jannes Höke
41ba57f064 don't stop the dispatcher thread on uncaught errors 2015-12-29 14:28:39 +01:00
Jannes Höke
b205751aee change default value for poll_interval to 0 2015-12-29 14:28:39 +01:00
Eduard Gomolyako
7d7397317e Fix file.download with custom_path 2015-12-27 04:01:13 +03:00
Jannes Höke
f75e329225 fix docstring 2015-12-21 21:40:41 +01:00
Jannes Höke
ea7c54ba07 Release v3.1.1, change author email everywhere 2015-12-21 21:18:53 +01:00
Jannes Höke
3c7b037eaa add additional arguments 'groups' and 'groupdict' for regex handlers 2015-12-21 20:25:31 +01:00
Jannes Höke
c15a1bc151 fix for #123 2015-12-21 19:36:17 +01:00
Jannes Höke
9e7314134e fix docstring 2015-12-17 14:55:20 +01:00
Jannes Höke
0e78606d37 Release v3.1 2015-12-16 16:25:14 +01:00
Jannes Höke
e0233a59a0 fix docstrings for sphinx 2015-12-16 16:18:48 +01:00
Jannes Höke
6e158042e1 API updates Oct and Nov 2015-12-16 15:31:02 +01:00
leandrotoledo
5a3e142358 Updating one more ref to old repo 2015-12-14 21:51:17 -02:00
Jannes Höke
bcadfc5398 Release version 3.0.0 2015-12-07 23:49:19 +01:00
Jannes Höke
89ecb04a85 Catch URLError while getting updates 2015-12-07 23:45:21 +01:00
Jannes Höke
f5ac1ae067 debug message after processing update 2015-12-01 21:45:12 +01:00
Gerd Augsburg
9f07900d99 Added Balduro to AUTHORS.rst and fixed line length 2015-12-01 15:16:04 +01:00
Gerd Augsburg
8a4d5c5de7 Separate start_webhook and setWebhook 
I think starting and setting the webhook should be two different tasks.
Because the internal webhook and the adress you see from outside can be
quite diffrent through apache etc. It provides more flexibility.
 2015-12-01 14:11:27 +01:00
Jannes Höke
14b4c1ac62 Allow starting webhook without SSL (issue #112) 2015-11-30 23:00:32 +01:00
Jannes Höke
ef569b68c6 update docs 2015-11-24 21:07:13 +01:00
Jannes Höke
8090658ab4 log warning 2015-11-24 19:33:41 +01:00
Jannes Höke
f49f592f0d log warning 2015-11-24 19:33:03 +01:00
Jannes Höke
c2853fa1ef WebhookServer: Lock serve_forever() and shutdown() 2015-11-24 15:39:00 +01:00
Jannes Höke
1005ad57ce Improve signal handling 2015-11-23 17:40:39 +01:00
Jannes Höke
0b72acc7c8 handle SIGINT, SIGTERM and SIGABRT 2015-11-23 03:45:47 +01:00
Jannes Höke
83812f3af6 rename boteventhandler.py to updater.py 2015-11-22 19:20:05 +01:00
Jannes Höke
d91f210f7c refactor BotEventHandler to Updater, improve documentation, add idle() method 2015-11-22 19:15:17 +01:00
Jannes Höke
65177e791f raise error instead of quietly exiting on bad SSL cert 2015-11-22 16:46:17 +01:00
Jannes Höke
15501e185b renamed broadcaster.py to dispatcher.py 2015-11-22 14:52:41 +01:00
Jannes Höke
1782d0d19b refactor Broadcaster to Dispatcher 2015-11-22 14:47:38 +01:00
Jannes Höke
88fbf3b5cf remove broadcaster argument from __init__ 2015-11-22 14:27:05 +01:00
Jannes Höke
3e732a0736 fix multiple additional arguments 2015-11-22 14:07:20 +01:00
Jannes Höke
e4de3f00b8 Add optional handler argument 'args' and documentation on handlers 2015-11-22 13:57:59 +01:00
Jannes Höke
32c021fdd5 Don't create new bot when broadcaster is passed 2015-11-22 13:30:23 +01:00
Jannes Höke
a6e5a71e05 Check SSL-Certificate, if possible 2015-11-22 01:03:29 +01:00
Jannes Höke
fca8aee177 improve logging 2015-11-21 23:09:19 +01:00
Jannes Höke
7c9928c58f Let shutdown return immediately if server is not running 2015-11-21 21:22:11 +01:00
Jannes Höke
0cd7aa92ae more logging 2015-11-21 21:21:09 +01:00
Jannes Höke
618df51811 flake8 2015-11-21 16:04:06 +01:00
Masoud Naservand
ed6dd76ae8 Corrected trailing whitespaces 2015-11-17 18:27:22 +03:30
Jannes Höke
9defc41774 correct docstrings 2015-11-17 00:04:28 +01:00
Jannes Höke
ee8b78aa0d pep8 and docs 2015-11-16 20:43:35 +01:00
Jannes Höke
0b8fd24771 fixed issues with python2 2015-11-16 20:35:27 +01:00
Jannes Höke
396dc6cd3c Implement webhook listener server 2015-11-16 13:05:57 +01:00
Jannes Höke
f59efe0f4b forward related update to errorhandlers 2015-11-15 19:12:42 +01:00
Jannes Höke
12201f392d graceful stopping of threads, use logging, reuse of broadcaster 2015-11-15 17:36:38 +01:00
Jannes Höke
04050ca883 Merge branch 'master' of github.com:leandrotoledo/python-telegram-bot into boteventhandler 2015-11-13 11:05:26 +01:00
Jannes Höke
10451509f1 fix for issue #79 2015-11-12 19:15:39 +01:00
Jannes Höke
45712c52f1 Merge branch 'master' of github.com:leandrotoledo/python-telegram-bot into boteventhandler 2015-11-11 14:27:58 +01:00
Jannes Höke
0b4c23f50e improve error handling on timeouts 2015-11-11 14:06:10 +01:00
Jannes Höke
63c895c0a0 run_async moved to broadcaster and uses a thread pool now 2015-11-11 13:33:03 +01:00
leandrotoledo
5eb4f8e5cd Minor pep8 fix 2015-11-10 20:31:51 -02:00
Jannes Höke
af375eb402 improved code quality 2015-11-10 23:15:37 +01:00
Jannes Höke
bf356e124f add run_async decorator 2015-11-10 23:15:37 +01:00
Jannes Höke
d7fd43ca79 Import BotEventHandler and Broadcaster 2015-11-10 23:15:37 +01:00
Jannes Höke
ef99bab435 initial commit for BotEventHandler and Broadcaster 2015-11-10 23:15:37 +01:00
Jannes Höke
93afd3eabe remove check for network_delay 2015-11-10 23:12:20 +01:00
Jannes Höke
61dac76bee don't send network_delay to telegram servers 2015-11-10 22:40:19 +01:00
Jannes Höke
4bc03ed56a Add parameter network_delay for slow connections and increase default to 2 seconds 2015-11-10 19:47:21 +01:00
Leandro Toledo
6c13762c93 Fixes PEP8 and Lint minor issues 2015-11-10 12:10:50 -02:00
Leandro Toledo
8a5ec3b2a1 Merge pull request #92 from jh0ker/emoticons 
Decode Emoji byte strings into unicode strings if using Python 3 (Alternative)
 2015-11-10 11:58:57 -02:00
Leandro Toledo
5fe1481ae9 Revert 1879cff82d 2015-11-10 11:55:42 -02:00
Leandro Toledo
1879cff82d Merge pull request #85 from jh0ker/master 
Decode Emoji byte strings into unicode strings if using Python 3
 2015-11-10 11:55:19 -02:00
Jannes Höke
cd5e805692 added documentation 2015-11-10 05:16:16 +01:00
Jannes Höke
3928e27cf4 Merge pull request #90 from rahiel/master 
raise exception if telegram times out on long-polling
 2015-11-10 04:56:18 +01:00
Jannes Höke
89015e5ecc fix for sending into a channel 2015-11-03 13:46:23 +01:00
Jannes Höke
025d4c9a75 fix emojis for python3 2015-11-03 12:24:44 +01:00