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 2025-01-04 02:01:48 +01:00
Code Issues Projects Releases Packages Wiki Activity
2194 commits 11 branches 122 tags 46 MiB
Commit graph

277 commits

Author SHA1 Message Date
Jeff
1e250f2415 add kwargs to answer* methods 2017-05-22 21:37:15 +08:00
Jeff
8f2f29c7d4 fix typo, add bot and kwargs to class init 2017-05-22 21:32:42 +08:00
Jacob Bom
48fa3d975b Merge branch 'videonote' into beta 
# Conflicts:
#	telegram/__init__.py
#	telegram/message.py
 2017-05-21 15:45:20 +02:00
Jacob Bom
2746ab77e5 Add sendVideoNote to Bot 2017-05-20 19:35:55 +02:00
Jacob Bom
76db279624 We have to send and array... that's new... 2017-05-20 18:46:39 +02:00
Jacob Bom
834c1ab3c5 Merge branch 'master' into payment 2017-05-19 20:25:46 +02:00
Evgen
c2c5452829 Updated docstring in deleteMessage methods (#618) 
* Removed "undocumented" notice

* Updated docstring according to Bot API documentation

* Removed extra line
 2017-05-19 20:21:20 +02:00
Jacob Bom
8be57198b4 New payment bot methods 
sendInvoice, answerShippingQuery, and answerPreCheckoutQuery
 2017-05-19 19:46:42 +02:00
evgfilim1
578627feca Fixed and added some type hints in docstrings 2017-05-17 21:41:08 +05:00
Jacob Bom
1b7f83625c Update copyright notice to include 2017 
Not strictly needed, but it helps show that the project is being actively
developed which I find important.
 2017-05-15 00:36:49 +03:00
Evgen
f3b75d95c4 Implemented undocumented 'deleteMessage' method (#602) 
* Implemented `Bot.delete_message()` and `Message.delete()` methods

* Added tests for `Bot.delete_message()` and `Messsage.delete()`

* Added myself to `AUTHORS.rst`

* Using `assertRaisesRegexp` instead of `assertRaisesRegex` in tests

Now tests can run on Python 2.7 without raising 'AttributeError'

* Fix docstring

Added a warning to the docstring describing that this method is undocumented and not guaranteed to work
 2017-05-12 17:40:57 +02:00
Rahiel Kasim
9f3afa5fa2 prefer snake_case for telegram.Bot methods 2017-05-07 16:09:58 +02:00
Noam Meltzer
4c8d1c9a5e Fix Bot.sendDocument 2017-03-11 23:55:26 +02:00
Noam Meltzer
2b930c221d Sane default for sending files timeout 2017-03-11 16:23:43 +02:00
Jannes Höke
a1ade408b0 🔀 Merge master into dec04 
#483
 2017-02-27 14:39:18 +01:00
Jannes Höke
2954ca2bad 🔀 Merge master into fix-460 
#494
 2017-02-27 14:33:58 +01:00
Jannes Höke
cd38bdbed5 bot.py: add delete_webhook alias 2017-01-16 00:28:26 +01:00
Jannes Höke
975d193441 Merge branch 'master' into dec04 2017-01-16 00:15:09 +01:00
Jacob Bom
27b2fd64b7 More IDE friendliness 2017-01-09 19:29:05 +01:00
Noam Meltzer
bd96771a7a Fix typo 2017-01-07 23:05:58 +02:00
Noam Meltzer
58dddfd9c3 Control the read timeout from telegram servers 
refs #495
refs #364
 2017-01-07 20:13:08 +02:00
Jannes Höke
a1a8628c75 bot.py: fix argument order, setWebhook: make 'url' and 'webhook_url' mutually exclusive 2016-12-14 17:38:06 +01:00
Jannes Höke
92dc9b81ce bot.py: implement changes of december 04 (bot api 2.3.1) 2016-12-14 00:50:34 +01:00
Noam Meltzer
acf1541395 Botapi2.3 (#471) 
* New fields channel_post and edited_channel_post for Update

refs #468

* setGameScore() changes

 - Changed behaviour: messages with high scores will be update with new
   high scores by default. (documentation fix)
 - Use (new) disable_edit_message in setGameScore to disable the above new
   behaviour.
 - The edit_message parameter from setGameScore is no longer in use. For
   backward compatibility, it will be taken into account for a while,
   unless disable_edit_message is passed explicitly.

refs #468

* New field forward_from_message_id for Message.

refs #468

* New parameter cache_time for answerCallbackQuery

refs #468

* replykeyboardhide renamed to replykeyboardremove

refs #468

* Unitests for updated setGameScore semantics

refs #468

* Backward compatibility for ReplyKeyboardHide

refs #468

* Fix docstrings of wrapper methods in Message

* Unitest new field forward_from_message_id of Message

refs #468

* Fix testMaxCaptionLength

Telegram servers changed their behaviour - now they truncate a long
caption instead of returning an error.

* MessageHandler: Added support for channel posts

* Fix flake8 complaints in a manner which yapf will like it too.

* fix rst markup
 2016-12-11 22:44:52 +01:00
Jannes Höke
aa3ca38837 Sphinx restructuring: Now builds PDF and better HTML docs (#449) 
* update sphinx source files to properly build latexpdf and improve html build

* fix docstrings and sphinx sources to get rid of warnings

* add telegram.contrib.rst
 2016-11-01 06:53:51 +01:00
Jacob Bom
960862ccb1 Merge branch 'master' into october3 
# Conflicts:
#	telegram/bot.py
#	telegram/callbackquery.py
#	telegram/chat.py
#	telegram/ext/messagehandler.py
#	telegram/inlinekeyboardbutton.py
#	telegram/inlinequeryresultcachedaudio.py
#	telegram/message.py
#	tests/test_filters.py
 2016-10-19 12:35:50 +02:00
Noam Meltzer
78088f4f6a Fix grammer: 'a object' -> 'an object' 2016-10-17 01:22:40 +03:00
Noam Meltzer
59fa717023 Documentation improvements + small style fixes 2016-10-17 01:11:20 +03:00
Noam Meltzer
31cab0d1b4 editMessageCaption & editMessageReplyMarkup: more validation on input 2016-10-17 01:09:44 +03:00
Jacob Bom
b610316667 Use explicit kwargs for all bot methods. 
This improves support for many IDEs' autocompletion.
 2016-10-16 15:54:48 +02:00
Jacob Bom
3754cdafb2 send_game has differnt kwargs. 2016-10-16 12:41:12 +02:00
Jacob Bom
305ff93018 set_game_score might return True 2016-10-16 12:41:12 +02:00
Noam Meltzer
53a574bbbb Improve unitests coverage 2016-10-13 22:52:53 +03:00
Noam Meltzer
5b8efe0c14 upgrade yapf to ver 0.12.2 2016-10-12 23:56:57 +03:00
Patrick Hofmann
8cab735342 small fix for game related parts 
* bot.py fix copy paste error in url
* callbackquery.py make data field optional
* message.py introduce optional game field
 2016-10-06 17:52:53 +02:00
Noam Meltzer
d70fc48e94 getGameHighScores(): added documentation + fixed copy-paste errors 2016-10-04 01:57:19 +03:00
Noam Meltzer
36192912c2 setGameScore: fixes 
- fix copy/paste errors
 - return Message object
 2016-10-04 01:56:05 +03:00
Noam Meltzer
d5567cd9cd sendGame(): mall fixes 2016-10-04 01:37:44 +03:00
Noam Meltzer
9b74625d4a answerCallbackQuery: fix copy/paste: show_alert -> url 2016-10-04 00:55:29 +03:00
Jacob Bom
358dd795c7 Add the rest of game_ methods to bot. 2016-10-03 20:43:02 +02:00
Jacob Bom
151a441af7 Add send_game 2016-10-03 20:40:17 +02:00
Noam Meltzer
e8a34d8eef cosmetic fixes and documentation for getWebhookInfo 2016-10-03 20:43:10 +03:00
Jacob Bom
34c62a633b Add url to answerCallbackQuery 2016-10-03 15:25:07 +02:00
Jacob Bom
868d9217bc Add WebhookInfo and getWebhookInfo 
Still needs tests though
 2016-10-03 15:16:43 +02:00
Jacob Bom
f7ede4baea Add caption fields to voice and audio 
Or at least the methods/classes for sending.
 2016-10-03 15:05:49 +02:00
Jannes Höke
5116a77221 Class methods (#362) 
* bot.py: add create_references method

* create bot reference in webhook handler, use create_references on new updates

* message.py: implement reply_text

* echobot2.py: use Message.reply_text

* fix create_references in webhook handler

* add some more instance methods

* Chat.kick_member and unban_member

* bot.py: Create bot references in outgoing messages

* add tests for everything testable

* test_updater.py: add create_references method to MockBot

* remove Bot.create_references and refactor TelegramObject.de_json to take the additional parameter bot

* List bot as named kwarg where used

* file.py: Use Bot.request property instead of Bot._request attr
 2016-09-20 06:36:55 +02:00
Noam Meltzer
e4a132c0e4 Reusable dispatcher (#402) 
* Create a Request class which maintains its own connection pool
* When creating a Bot instance a new Request instance will be created if one wasn't supplied.
* Updater is responsible for creating a Request instance if a Bot instance wasn't provided.
* Dispatcher: add method to run async functions without decorator
* Dispatcher can now run as a singleton (allowing run_async decorator to work) as it always did and as multiple instances (where run_async decorator will raise RuntimeError)
 2016-09-06 16:38:07 +03:00
Rahiel Kasim
da87d4ba78 fix yapf 2016-08-26 11:17:05 +02:00
Rahiel Kasim
00bba73673 drop Python 2.6 support (closes #245) (#386) 
* drop Python 2.6 support (closes #245)

* fix NullHandler import

* README: explicitly mention Py3 and PyPy compatibility
 2016-08-20 22:01:07 +02:00
leandrotoledo
bbbc622517 Adds @message decorator to editMessageText #320 2016-06-03 13:28:29 -04:00
Noam Meltzer
7e7acdeb23 set default network_delay to 5 seconds 
fixes #309
 2016-05-28 19:34:16 +03:00
Leandro Toledo
9a13de4a96 Merge remote-tracking branch 'origin/master' into bot2.1 
Conflicts:
	telegram/bot.py
	tests/test_bot.py
 2016-05-26 16:15:50 -03:00
Noam Meltzer
561f1c3f02 bot: validate token does not contain white spaces (#306) 
in addition move validation code from validate.py into bot.py and delete
the former file
 2016-05-26 22:09:14 +03:00
Rahiel Kasim
1abbca3324 bot.py: fix snake_case alias 2016-05-26 15:32:02 +02:00
Leandro Toledo
37c7af2e14 Add docstrings #302 2016-05-25 21:41:12 -03:00
Leandro Toledo
ab2f6e13c9 Add kwargs to API calls #302 2016-05-23 20:43:17 -03:00
Leandro Toledo
d7e226ec0f Add new Bot methods and ChatMember class #302 2016-05-23 20:22:31 -03:00
Leandro Toledo
49122d6a99 Remove \ from base code #259 2016-05-14 23:26:56 -03:00
Leandro Toledo
d445d35ceb Running yapf for codebase #259 2016-05-14 22:46:40 -03:00
Rahiel Kasim
6e9f30ca6e fix merge conflict snakes 2016-05-02 16:37:45 +02:00
Djaler
4b0be65a76 Fix Bot.getUpdates() docstring 2016-05-01 15:25:07 +03:00
Rahiel Kasim
5971cb35f8 fix merge conflict snakes with master 2016-04-30 14:56:48 +02:00
Jannes Höke
d940afa718 merge master into cr4.0 2016-04-29 18:37:41 +02:00
Rahiel Kasim
ec15e866be add snake_case aliases for CamelCase methods 2016-04-28 12:20:42 +02:00
Noam Meltzer
0c74b3cfb9 bot.py + request.py: network_delay is unique for getUpdates 2016-04-28 01:41:32 +03:00
Jannes Höke
7f463131aa re-order imports 2016-04-27 00:28:21 +02:00
Noam Meltzer
a686db2c6f bot.Bot: fix class docstring 2016-04-26 23:31:29 +03:00
leandrotoledo
1f29093027 Merge branch 'unittest-bot2.0' of https://github.com/python-telegram-bot/python-telegram-bot into unittest-bot2.0 2016-04-26 14:17:59 -03:00
Noam Meltzer
49385493f4 bot: 'if X is not None' is cleaner approach 2016-04-26 17:47:37 +03:00
Leandro Toledo
fc7c161018 Merge remote-tracking branch 'origin/master' into unittest-bot2.0 2016-04-24 14:33:17 -03:00
Andrea Giove
39ba575a4d
Missing a comma 2016-04-24 17:54:36 +02:00
Andrea Giove
87ac962805
Added caption paramenter to sendDocument method 2016-04-24 17:51:15 +02:00
Leandro Toledo
14cb13acfd Adds @message decorator to editMessageText 2016-04-24 11:19:37 -03:00
Leandro Toledo
4ecb4911db Adds @message decorator to editMessageText 2016-04-24 11:18:16 -03:00
Leandro Toledo
adc3104214 Add timeout and network_delay kwargs to all bot methods. 2016-04-24 10:06:59 -03:00
Leandro Toledo
b444cd7bce Adding new modules to docs #232 2016-04-22 11:07:44 -03:00
Leandro Toledo
0669c72fe3 Fixing little princes Python 2.6 string format arg #232 2016-04-21 12:18:51 -03:00
Leandro Toledo
5315e072cb PEP8 for Py2 #232 2016-04-21 11:59:18 -03:00
Leandro Toledo
bb36c725af More refactoring and docstrings #232 2016-04-21 09:21:12 -03:00
Leandro Toledo
ba7e1cada7 Bot class refactor and its docstrings #232 2016-04-21 08:15:38 -03:00
Leandro Toledo
9a96ad8efd Unused import #232 2016-04-19 09:12:22 -03:00
Leandro Toledo
fc277d7393 Refactor of telegram.Bot class and docstrings #232 2016-04-19 09:04:25 -03:00
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
a98919a86e fix cache_time==0 case 2016-04-19 00:08:47 +02:00
Jannes Höke
d879a0d018 convert reply_markup to json 2016-04-17 22:11:29 +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
5e80efaa54 editMessage->editMessageText 2016-04-16 20:29:43 +02:00
Leandro Toledo
85f1b1af0c Adding sendContact and sendVenue methods #232 2016-04-16 11:48:36 -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
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
736d62e20d New methods kickChatMember and unbanChatMember #232 2016-04-12 00:46:50 -03:00
Leandro Toledo
1e4ae6546f Changing INFO logs to DEBUG and minor fixes 2016-03-14 22:56:20 -03: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
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
fc618274ae bot.py: allow specifying timeout for sendVideo operations 2016-02-27 23:00:33 +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
Jannes Höke
2a01292a64 Merge branch 'master' into inlinebots 2016-02-07 22:42:12 +01: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
Jannes Höke
6d2e159d75 move 'no new updates found' message to debug (#167) 2016-01-31 10:32:34 +01:00
Jannes Höke
5c2458bfd8 merge master into inlinebots 2016-01-14 15:28:22 +01:00
leandrotoledo
dfc75cc64e Add docstring style checker and fixing some 2016-01-13 14:09:35 -02:00
Jannes Höke
c69cdfd184 Initial commit for inline bot support 2016-01-09 15:09:48 +01:00
Jannes Höke
aa8966832b release 3.2 and update copyright notice to 2015-2016 2016-01-05 14:12:03 +01:00
Noam Meltzer
17dae68654 gitignore: files generated by unitests 2016-01-04 00:32:17 +02:00
Noam Meltzer
aeca3ca174 basic token validation 
refs #134
 2016-01-04 00:31:40 +02:00
Jannes Höke
ea7c54ba07 Release v3.1.1, change author email everywhere 2015-12-21 21:18:53 +01:00
Jannes Höke
6e158042e1 API updates Oct and Nov 2015-12-16 15:31:02 +01:00
leandrotoledo
5eb4f8e5cd Minor pep8 fix 2015-11-10 20:31:51 -02: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
b79530b10c Adding File and its tests 2015-09-20 12:28:10 -03:00
Leandro Toledo
f623db06ea Revert "Feature/requests" 2015-09-16 00:21:45 -03:00
pecheny
d5a9c185f0 use requests instead of urllib if possible; add timeout and decorator to get and post 2015-09-14 19:13:22 +03:00
Leandro Toledo
a7ac4193fe PEP8, lint and TelegramError class refactor 2015-09-10 20:08:24 -03:00
ErgoZ
53c44f14bd Add Markdown support for sendMessage method. 2015-09-10 20:15:20 +03:00
ErgoZ
17b8bb4881 Code cleanup for filename. Filename uses only for sendDocument. 2015-09-10 14:46:49 +03:00
ErgoZ
714adc13ee Add ability to set custom filename 
For commands that uses InputFile class
 2015-09-08 20:42:23 +03:00
leandrotoledo
a409fc511d Improve raise of empty chat_id 2015-09-07 15:53:43 -03:00
leandrotoledo
cfd401f22b Moving _requestURL method to utils package 2015-09-05 11:55:55 -03:00
leandrotoledo
05b7fda4a1 Add certificate arg to setWebhook function 2015-09-04 17:53:39 -03:00
leandrotoledo
910959b672 Raises error when chat_id is not set 2015-09-04 17:15:44 -03:00
Leandro Toledo
b20f5af1e1 Improving the design of existing Telegram classes and adding docstrings 2015-08-28 12:19:30 -03:00
rahiel
ccdb999e37 add remaining chat actions 2015-08-25 13:45:02 +02:00
Leandro Toledo
6e2881b31b Adding support for Voice object and sendVoice method #39 2015-08-17 11:34:42 -03:00
Leandro Toledo
109439022f Minor fixes and cfg for setuptools 2015-08-14 16:30:30 -03:00
Leandro Toledo
59ff1b68b5 clearCredentians and require_authentication are now decapred, bot properties will be called when needed only #33 2015-08-14 16:25:27 -03:00
leandrotoledo
f2671ffff3 fix space trailing 2015-08-11 23:46:09 -03:00
Leandro Toledo
3974690b90 Fixes base_url when pickling object 2015-08-11 23:43:40 -03:00
Leandro Toledo
ecdf32b5f6 Apply new Telegram Bot API changes #32 2015-08-11 17:32:06 -03:00
Leandro Toledo
163b27b7dd fix license header 2015-08-11 16:58:17 -03:00
Leandro Toledo
4d59e8a663 Adding coveralls support, adding base_url to pickle rebuild 2015-08-11 14:13:02 -03:00
Leandro Toledo
5bfbaff318 Implements Bot.__reduce__ to allow dump into pickle objs #31 2015-08-11 12:41:26 -03:00
Leandro Toledo
59b247af94 Moving from GPLv2 to LGPLv3 2015-08-10 13:57:31 -03:00
Leandro Toledo
66aaaf9ec0 Disable debug and any logging calls in API to fix #21 2015-08-09 09:41:58 -03:00
Leandro Toledo
ab88afc3d3 PEP8 and minor fixes 2015-08-08 19:35:44 -03:00
Leandro Toledo
a91c158825 Merge pull request #22 from wjt/logging 
Don't call logging.basicConfig() in library code
 2015-08-08 18:59:38 -03:00
Will Thompson
98e40ee059 Bot._requestUrl: raise if method not in ('GET', 'POST') 
If this happens, there is a bug in the library. Better to raise the
error explicitly rather than return a value of a totally unexpected type
and crash later.
 2015-07-30 10:47:47 +01:00
Will Thompson
a034317c87 Don't call logging.basicConfig() in library code 
Logging should be configured by the application, not by libraries it
uses. Libraries should just get a logger and log to it.

Fixes #21
 2015-07-30 07:04:59 +01:00
leandrotoledo
6b7476c18f Updates echobot and getUpdates logging 2015-07-20 08:59:41 -03:00
leandrotoledo
cad325c874 Adding logging 2015-07-20 08:50:30 -03:00
leandrotoledo
61530aeb34 Adding logging decorator 2015-07-20 08:25:04 -03:00
leandrotoledo
92c3f48cda Removing redundant parentheses, Python3 support, user.name property 2015-07-15 10:05:31 -03:00
leandrotoledo
d8912f5290 move isFileRequest to InputFile as @staticmethod, new tests written, README updated 2015-07-14 05:25:44 -03:00
Leandro Toledo
582bb61e5b Adding echobot example and fix IOError typo 2015-07-12 09:54:03 -03:00
Leandro Toledo
5cd153c535 PEP8 and minor typos fixes 2015-07-11 19:14:37 -03:00