1
0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Commit Graph

840 Commits

Author SHA1 Message Date
Badiboy
29711e2425 Merge remote-tracking branch 'upstream/master' 2020-09-22 01:34:55 +03:00
Badiboy
75a5dd1492 Minor bugfix 2020-09-22 01:34:49 +03:00
meoww-bot
9ab906e60c
fix: simplify code
json.loads(button.to_json()) equals to button.to_dict()
2020-09-02 18:09:14 +08:00
meoww-bot
a803edd09b
fix: button in markup should be obj, not json text 2020-09-02 09:25:23 +08:00
meoww-bot
32a9e65ecc
fix: reply_markup does not change content_type 2020-09-02 09:12:49 +08:00
meoww-bot
decad450d0
feat: make InlineKeyboardMarkup JsonDeserializable
feat: make InlineKeyboardMarkup JsonDeserializable, add de_json func to InlineKeyboardMarkup object
2020-09-01 18:13:22 +08:00
meoww-bot
630a9a5b2c
feat: make InlineKeyboardButton JsonDeserializable
feat: make InlineKeyboardButton JsonDeserializable, add de_json func to InlineKeyboardButton Object
2020-09-01 18:07:45 +08:00
meoww-bot
cdae65116b
feat: make LoginUrl JsonDeserializable
feat: make LoginUrl JsonDeserializable, add de_json func
2020-09-01 18:03:21 +08:00
meoww-bot
6832c33733 feat: Added the field reply_markup to the Message
Added the field `reply_markup` to the Message object
2020-08-31 12:00:56 +00:00
Artem Frantsiian
81100f249c
Fix an error with the is_pil_image function
When I've tried to send_photo as shown in detailed_example, I got an error: "AttributeError: module 'PIL' has no attribute 'Image'". 
This error was described well here: https://stackoverflow.com/a/11911536/9092263. So in accordance to prescriptions, I've made changes and It works fine for me.

Steps to reproduce:
1. initiate bot via TeleBot constructor
2. call function bot.send_photo(call.message.chat.id, open("some_image.jpg", "rb"))

P.S.
Error Environment: 
- python==3.8.5
- pyTelegramBotAPI==3.7.3
- PIL==7.2.0
2020-08-29 21:57:41 +03:00
meoww-bot
e811163b5f
UPG: Added the field file_unique_id
Added the field file_unique_id to the objects Animation, Audio, Document, PassportFile, PhotoSize, Sticker, Video, VideoNote, Voice, File and the fields small_file_unique_id and big_file_unique_id to the object ChatPhoto. (Bot API 4.5)
2020-08-29 04:29:02 +08:00
Badiboy
2bc5c1a500
Merge pull request #960 from CrafterKolyan/patch-1
Add last_update_id parameter for constructor
2020-08-25 21:58:33 +03:00
Nikolay Korolev
5120650774
Move parameter to the end of list 2020-08-25 21:45:30 +03:00
Nikolay Korolev
c13f9a7f98
Add last_update_id parameter for constructor 2020-08-25 21:26:28 +03:00
Badiboy
bab9b4077d Bot API support checked/updated up to 4.2 2020-08-25 18:18:51 +03:00
Badiboy
cdd48c7aed Empty list optimization, Py2 arteacts removed,
Empty list optimization: None instead of [].

Py2 arteacts removed: no more six moudle used.
2020-08-24 16:02:35 +03:00
Badiboy
513a85cad9 Merge remote-tracking branch 'upstream/master' 2020-08-24 13:00:30 +03:00
Florent Gallaire
5e19965b0c Fix 'NoneType' object assignment error from #892 and #954 2020-08-22 16:11:52 +02:00
Badiboy
17f48916ad Merge remote-tracking branch 'upstream/master' 2020-08-21 17:40:56 +03:00
Badiboy
5b70980bda Resolve conflicts 2020-08-21 17:38:54 +03:00
Badiboy
73487f96c4 Custom exception handler for poll mode
Initial beta of custom exception handler for poll mode.

Use ExceptionHandler class and bot.exception_handler to proceed unhandled exceptions in poll mode.
2020-08-21 17:36:08 +03:00
rf0x1d
cab33ad0d9 fixed thumb processing 2020-08-21 14:09:38 +03:00
rf0x1d
9ca3c78c84 back version to 3.7.2 2020-08-21 11:22:24 +03:00
rf0x1d
0ab4046a4f Create version.py 2020-08-21 11:09:53 +03:00
rf0x1d
8b50dc488b added missing thumb params and more 2020-08-21 11:09:43 +03:00
Badiboy
18eb8eb605 Two None checks 2020-08-19 23:57:48 +03:00
Mr. Dog
ec79d1dc1e
Keyboard bugfix 2020-08-04 23:45:33 +05:00
Badiboy
c6f51f6c55 CopyPaste bugfix 2020-08-04 18:28:35 +03:00
Mr. Dog
ce6a21cd09
Merge branch 'master' into patch-4 2020-08-04 19:49:55 +05:00
Badiboy
a5fd407eb6 Bugfix and DISABLE_KEYLEN_ERROR
Bugfix and DISABLE_KEYLEN_ERROR to supress keyboard length errors.
2020-08-04 12:29:56 +03:00
Mr. Dog
1bb98483c2
Update apihelper.py 2020-08-04 05:34:13 +05:00
Mr. Dog
c17a2379ba
Exceptions classes redesign followup 2020-08-03 06:39:12 +05:00
Badiboy
cc36207992 Minor keyboard update followup 2020-08-02 18:58:22 +03:00
Mr. Dog
1ba093cb02
Change logger level to warning 2020-08-02 20:30:58 +05:00
Mr. Dog
4e5fb59fc0
Replace exceptions with warnings
Also further PIL support added
2020-08-02 20:20:33 +05:00
mrpes
317a490cf0
Type checking moved to utils 2020-08-01 01:30:38 +05:00
mrpes
5823ca5613
Minor keyboard code redesign 2020-08-01 01:28:56 +05:00
mrpes
97aa9637cb
Update apihelper.py 2020-07-31 10:45:58 +05:00
mrpes
0ab908705b
Support for PIL images as photo argument
Added autoconversion of PIL image to file-like object. PIL module is optional
2020-07-31 10:39:04 +05:00
mrpes
67536d4eec
Fixing backward compatibility issue
Just realized that renaming ApiException to BaseApiException will cause backward compatibility issue
2020-07-31 03:30:03 +05:00
mrpes
a14424704e
Exception classes redesign
Replacing 1 exception class with 3 more specific classes: 
HTTP Exception (server returned http code != 200), 
Invalid JSON Exception (server returned invalid json),
Telegram Expection (telegram returned ok != true)

All 3 classes extend BaseApiException so we can handle all API exceptions at the same time
2020-07-31 03:10:34 +05:00
mrpes
0ac64469b0
Retry on requests error
Added RETRY_ON_ERROR var. If its value is true, we'll try to get proper result MAX_RETRIES times, with RETRY_TIMEOUT delay between requests. Last request will be called outside of the try block, so it will throw an exception on failure

P.S.
I'm actually not sure if there are better ways to solve this problem, but this was my way of solving it
2020-07-30 09:34:51 +05:00
Badiboy
ce3c91b619
Merge pull request #919 from Badiboy/master
Minor updates in code
2020-07-21 01:27:32 +03:00
Badiboy
dbe9ce49df Minor updates in code 2020-07-21 01:20:01 +03:00
EskiSlav
c533a52e39 Restored necessary comment 2020-07-18 00:25:00 +03:00
EskiSlav
b50eb1bafb Added nested entities from Bot API 4.5 2020-07-17 13:43:45 +03:00
Badiboy
b38ceaaec8
Merge pull request #913 from Aragroth/master
Added ability to specify params of width and height for video
2020-07-11 22:30:53 +03:00
Aragroth
7c94eee3a2
Update apihelper.py 2020-07-11 20:09:48 +03:00
Purya Jafari
49398f5c61
Update types.py
Sending stickers everytime have different file_id, so for detecting special stickers we need a unique parameter.
2020-07-07 01:31:33 +04:30
daveusa31
0304e6507f Append default parse_mode 2020-07-04 21:07:42 +03:00
daveusa31
0f387db8d2 Fix tabs 2020-07-04 20:45:48 +03:00
Aragroth
f4d978cd98
Update apihelper.py 2020-07-02 17:51:34 +03:00
Aragroth
f83f69ed50
Update apihelper.py 2020-07-02 17:50:14 +03:00
Aragroth
a69a358ebd
Update __init__.py 2020-07-02 17:47:38 +03:00
Aragroth
4afde9f557
Update apihelper.py 2020-07-02 17:46:41 +03:00
Kwisatz Haderach
99de5490a0
Added thumb parameter to send_video 2020-06-23 20:17:21 +02:00
Kwisatz Haderach
53ccef5e5e
added thumb parameter to send_video 2020-06-23 20:14:52 +02:00
Kwisatz Haderach
29b432e65a
Added thumb to send_audio 2020-06-23 20:12:46 +02:00
Kwisatz Haderach
4f4c0891d9
Added thumb support to send_audio 2020-06-23 20:10:12 +02:00
Kwisatz Haderach
44872ce87d
Complete User Class
Added following fields:
can_join_groups
can_read_all_group_messages
supports_inline_queries
2020-06-22 13:18:13 +02:00
Badiboy
5facf7de92
Merge pull request #808 from pikss86/master
Add possibility to create and use custom session, for examle - torpy
2020-05-29 12:17:58 +03:00
Badiboy
32dc03ec44 send_chat_permissions fix 2020-05-20 11:57:41 +03:00
oleg
592dcbfedf Add PollAnswer type;
Add poll_answer_handler
2020-05-18 12:05:30 +05:00
oleg
03b02561a5 Add request_poll attribute to KeyboardButton;
Add KeyboardButtonPollType object
2020-05-18 11:48:54 +05:00
Badiboy
2368421332 Correct processing of bool parameters. Some timeouts added. 2020-05-16 17:34:56 +03:00
dr_forse
75a018e18b add PollAnswer, poll_answer_handler; make User Serializable and Dictionaryble; some pep fixes 2020-05-12 01:09:34 +01:00
Anthony Byuraev
ee00d0458d Fix some bugs 2020-05-11 22:26:03 +03:00
Anthony Byuraev
a60253bf60 UPG: Add ChatPermissions, set_chat_permissions 2020-05-11 16:38:09 +03:00
Anthony Byuraev
a80927baf9 UPG: add setChatAdministratorCustomTitle 2020-05-09 23:23:08 +03:00
Anthony Byuraev
8be9bcc8ed UPG: Add custom_title, slow_mode_delay 2020-05-09 20:28:29 +03:00
Anthony Byuraev
1824637617 UPG: Refactoring InlineKeyboardMarkup 2020-05-09 20:06:33 +03:00
Badiboy
2849e67029 Fix to_dic->to_dict refactoring 2020-05-09 00:51:18 +03:00
Anthony Byuraev
a56fb8cc54 UPG: Add BotCommand, setMyCommands 2020-05-08 21:06:39 +03:00
Badiboy
e2d70da694 Fix poll options serialization 2020-05-02 13:27:39 +03:00
Badiboy
6e1cf24946 send_poll revised to standart signature 2020-05-02 13:09:52 +03:00
Badiboy
ef81868ebc Fix Deprecation warning due to invalid escape sequences 2020-05-01 11:25:51 +03:00
bedilbek
24deb8a51d Change class from new-style class to object class 2020-04-28 00:34:52 +05:00
bedilbek
601b570b85 Fix python2.7 compatibility for class inheritance 2020-04-28 00:22:05 +05:00
bedilbek
bcc3a1afb4 Remove Type Hinting 2020-04-27 23:43:39 +05:00
dr_forse
99c63e9eba add emoji field for dice 2020-04-27 06:30:05 +01:00
Badiboy
bb4f6a7190 Polls are updated to the latest API state.
Polls are updated to the latest API state.

Minor code refactoring.
2020-04-25 22:22:08 +03:00
Pavel Ermolaev
197dd2a582 add requests session for use torpy 2020-04-24 23:30:10 +05:00
Badiboy
aac9ce45a3 Merge remote-tracking branch 'upstream/master' 2020-04-24 18:19:55 +03:00
Badiboy
24e984adf8 Minor code refactoring (naming) 2020-04-24 18:19:30 +03:00
Badiboy
1ed3bc2a53
Merge pull request #803 from noideaw/patch-2
added can_invite_users parameter to restrict_chat_member function param description
2020-04-24 18:16:25 +03:00
no_ideaw
8c7c7b31b2
Update __init__.py
added can_invite_users parameter to restrict_chat_member function
2020-04-24 19:38:23 +04:30
no_ideaw
b1b2726ef6
Update apihelper.py
added can_invite_users parameter to restrict_chat_member function
2020-04-24 00:21:05 +04:30
no_ideaw
da924dbaeb
Update __init__.py
added can_invite_users parameter to restrict_chat_member function
2020-04-23 23:59:04 +04:30
bedilbek
aab560b4ee Fix all the time invocations on typed_middleware handlers even if update did not have that update_type message 2020-04-20 11:30:03 +05:00
Badiboy
646bbb8330
Merge pull request #794 from drforse/master
Add Dice and send_dice
2020-04-16 15:56:46 +03:00
dr_forse
51b1fb7695 added Dice and send_dice 2020-04-15 06:10:05 +01:00
bedilbek
3aec66bc0d Remove class static variable 2020-04-15 01:11:43 +05:00
bedilbek
003c5db37f Add filename checking 2020-04-15 01:11:43 +05:00
bedilbek
286188f380 Add Step/Reply Handler Backend Mechanism
Implement Memory, File, Redis Backends
2020-04-15 01:11:43 +05:00
Badiboy
dab80d421b Refactoring update 2 2020-04-11 17:38:47 +03:00
Badiboy
247fe6e947 Refactoring bugfix 2020-04-11 17:06:14 +03:00
Badiboy
995814d846 Refactoring and API conformance
Refactoring.

new_chat_member is out of support.

Bugfix in html_text.

Started Bot API conformance checking.
2020-04-11 16:54:25 +03:00
Badiboy
ec86182f62 Possibility to use alternative serializer
With apihelper.CUSTOM_SERIALIZER you can replace pickle with other "dumper" like dill.
2020-04-11 13:42:34 +03:00
bedilbek
932ac9477b Add ENABLE_MIDDLEWARE=False in apihelpers to keep backward compatibility 2020-04-11 13:02:50 +05:00
bedilbek
1e242f2263 Add Middleware support 2020-04-08 23:13:19 +05:00
Alexander Tkachev
d2f9c51a5a Handle Poll update 2020-03-09 17:25:54 +07:00
Alexander Tkachev
12547efa08 Fix order for consistency in process_new_updates 2020-03-09 17:25:37 +07:00
Quantum
dfac26706e
Add is_anonymous flag to Poll type 2020-02-07 12:53:31 +03:00
Badiboy
aa02ddb573 TAB fix
TAB fix
2020-01-08 20:17:25 +03:00
Badiboy
760ea5a2f0 Design updates from #711
Significant design updated from
https://github.com/eternnoir/pyTelegramBotAPI/pull/711
2020-01-08 20:06:40 +03:00
Badiboy
7adec8bd90
Merge pull request #673 from TahaPY/master
Added Animation and is_animated for stickers
2020-01-03 17:51:53 +03:00
Badiboy
0603a0df4c
Update types.py
Animation is moved before document to save backward compatibility. content_type = 'document' should override content_type = 'animation' to save previous behaviour.
2020-01-03 17:51:05 +03:00
Badiboy
59810b5e2a
Merge pull request #620 from nev3rfail/send_animation
Added reduced version of sendAnimation (no width/height/thumb).
2020-01-03 17:12:29 +03:00
Badiboy
2efb33fc29
Merge branch 'master' into patch-1 2020-01-03 16:45:43 +03:00
Badiboy
e3b126807e
Merge pull request #713 from dtalkachou/patch-1
Correct work with empty base_url in make_request
2020-01-03 01:33:27 +03:00
Badiboy
769ff8008e
Merge pull request #599 from KanerL/KanerL-patch-shipping-option
ShippingOption.add_price returns "self" (for chaining etc.).
2020-01-03 01:28:37 +03:00
Badiboy
86644c05f7
Merge pull request #539 from Badiboy/master
"timeout" parameter for send_message
Fix kick_chat_member return type
HTML symbols not replaced
2020-01-03 00:50:24 +03:00
Badiboy
3a3bab5b92
Merge pull request #480 from SkymanOne/patch-1
create field forward_from_message_id in Message
2020-01-03 00:46:27 +03:00
Badiboy
bf844ed202 HTML symbols not replaced
HTML symbols not replaced because return is before replace.
2020-01-01 13:46:18 +03:00
Dzianis Talkachou
68db599790
Delete duplicate string 2019-11-23 21:25:29 +03:00
Dmitry Sokolov
a749acde15
Update apihelper.py #2
Merge Fixes # 684
2019-11-05 17:37:53 +03:00
FrankWang
575fb9da7f
Merge branch 'master' into patch-1 2019-10-30 21:24:43 +08:00
FrankWang
c6358f35d2
Merge pull request #688 from vryazanov/master
New content type related to Telegram Passport
2019-10-30 21:22:36 +08:00
Innokentiy Min
1a30a9a249 Fixed #578 2019-10-30 14:02:00 +03:00
Vadim Ryazanov
f241ef1eac passport_data content type added 2019-08-27 11:55:14 +03:00
Mohammad Taha
8f8276314e
Merge pull request #1 from cmd410/master
Support for animated stickers
2019-08-16 20:42:08 +00:00
Dmitry Sokolov
6fb9e18385
Update apihelper.py
Hi, to indicate a third-party api-url (reverse proxy) added conditions.
Perhaps not the most elegant solution, but this functionality is very lacking.


apihelper.API_URL = "http://reverseproxy.example.com/bot{0}/{1}"
2019-08-12 17:09:52 +03:00
cmd410
f0835a1a14 Support for animated stickers 2019-07-30 12:46:39 +03:00
Taha
be3b6f88e8 Added Animation 2019-07-14 18:53:59 +04:30
FrankWang
151880f391
Merge pull request #659 from OslikAi/master
Add Poll
2019-06-28 21:02:23 +08:00
FrankWang
bf91829088
Merge pull request #664 from vovawed/master
Added LoginUrl to types
2019-06-28 21:02:04 +08:00
FrankWang
56f0b0a0d4
Merge pull request #603 from nailerNAS/master
infinity_polling fix
2019-06-28 20:57:28 +08:00
FrankWang
2b8e77f749
Merge pull request #616 from painca/patch-1
edit message_handler doc
2019-06-28 20:56:47 +08:00
P0lunin
3a1bdc2899 add Poll, sendPoll, stopPoll 2019-06-27 15:07:41 +03:00
Vova Pytsyuk
600002e158 Fixed bug with LoginUrl 2019-06-15 23:09:59 +03:00
Vova Pytsyuk
3c62e9d391 Added LoginUrl to types 2019-06-15 22:59:41 +03:00
Tiger 1
9624b45314 add Poll, sendPoll, stopPoll 2019-06-06 21:47:08 +03:00
Victor Koropetskyi
1a58731fb7 Add 'method' parameter to methods that edit message 2019-02-23 16:15:20 +02:00
Artem M
99df992a66 Added the method sendAnimation, which can be used instead of sendDocument to send animations, specifying their duration. 2019-02-15 18:46:18 +00:00
Moon Princess
79e6a3166d
edit message_handler doc 2019-01-20 23:04:11 +05:00
nailer
b82ed70ec9 fix syntax errors 2018-11-17 13:19:09 +02:00
nailer
18e37f3d20 sleep time timeout time instead of 5 seconds always 2018-11-17 12:58:56 +02:00
KanerL
ceea457cf1
Update shipping option
Setting list of ShippingOptions like in payments_example.py
shipping_options = [
    ShippingOption(id='instant', title='WorldWide Teleporter').add_price(LabeledPrice('Teleporter', 1000)),
    ShippingOption(id='pickup', title='Local pickup').add_price(LabeledPrice('Pickup', 300))]
gives us [None,None],so It's better add_price to return self
2018-11-12 01:43:00 +02:00
Badiboy
ad4be5c0ae Merge branch 'master' of https://github.com/eternnoir/pyTelegramBotAPI 2018-10-19 13:40:14 +03:00
FrankWang
2d6c2a345f
Merge pull request #577 from rmed/master
Add check for parse_mode in BaseInlineQueryResultCached
2018-10-19 10:07:40 +08:00
Rafael Medina
891988be93
Added check for parse_mode in BaseInlineQueryResultCached. Should fix #571 2018-09-15 20:25:06 +02:00
Ramzan Bekbulatov
8636b282d7
Merge branch 'master' into analyzer-fixes 2018-09-07 18:07:37 +03:00
uburuntu
bab9f7bbb9 enh: reset requests.Session feature
Need for proxy changing and other reconnection stuff
2018-09-06 12:48:08 +03:00
uburuntu
36621bb22a fix: some intendation 2018-08-17 13:01:03 +03:00
uburuntu
99466017c5 enh: optimize imports 2018-08-17 12:54:26 +03:00
uburuntu
feec1dde56 fix: little style fixes 2018-08-17 12:49:37 +03:00
uburuntu
54eba946be fix: wrong arguments usage (fix fa038c2) 2018-08-17 12:48:59 +03:00
uburuntu
6a4c7e731b fix: delete doubled Sticker class (left a new one) 2018-08-17 12:46:40 +03:00
FrankWang
2b3c86b647
Merge pull request #562 from uburuntu/InputMedia
fix: python2 positional argument specifiers
2018-08-14 22:37:39 +08:00
uburuntu
e419214b49 fix: python2 positional argument specifiers 2018-08-14 17:29:35 +03:00
FrankWang
fe6959c38e
Merge pull request #561 from uburuntu/InputMedia
fix: support python2 super()
2018-08-14 21:58:48 +08:00
uburuntu
7dd53b1396 fix: support python2 super() 2018-08-14 12:23:15 +03:00
FrankWang
421118d9d8
Merge pull request #558 from uburuntu/InputMedia
v.4.0: InputMediaAnimation, InputMediaAudio, InputMediaDocument, editMessageMedia
2018-08-13 23:47:03 +08:00
uburuntu
cf69a06ab8 enh: make code better and enhance test case 2018-08-10 16:48:09 +03:00
uburuntu
8ac6e664c5 new: InputMediaAnimation, InputMediaAudio, InputMediaDocument, editMessageMedia
Added support for editing the media content of messages: added the method editMessageMedia and new types InputMediaAnimation, InputMediaAudio, and InputMediaDocument.
2018-08-09 19:16:38 +03:00
Andru1999
494b535a91
Fix issue When you use threading mode 2018-08-08 10:46:23 +10:00
eternnoir
35ea2a2b7e Fix #548 2018-08-03 08:34:48 +08:00
heyyyoyy
5035e0ce80 Added parse mode for objects in Inline mode 2018-08-02 21:15:33 +03:00
Badiboy
8634e65249 Fix kick_chat_member decription
Fix kick_chat_member return value type description (should be boolean according to API and is boolean by fact).
2018-07-25 12:44:18 +03:00
FrankWang
578a9383b2
Merge branch 'master' into patch-1 2018-07-24 10:42:04 +08:00
Badiboy
27d442fabf timeout for send_message
Add optional "timeout" parameter to send_message (the same as exists in all other send_*).

Equal rights for all send functions! :)
2018-07-24 00:33:13 +03:00
WaffleWafflerov
f251def304
Merge branch 'master' into master 2018-07-22 04:43:53 +03:00
Andru1999
2b822f782d
Update __init__.py
I find bug when I use your library without threading. If call bot.register_next_step_handler in function that register next_handler in next_step_handlers but in function _notify_next_handlers this delete and bot don`t have handler, but in threading mode function self.next_step_handlers.pop(chat_id, None) has time to eval self.next_step_handlers.pop(chat_id, None) and bug disappear. Sorry for my English
2018-07-22 00:31:02 +10:00
users
c8b2b14157 rename async -> async_dec 2018-07-02 18:13:11 +03:00
Badiboy
776a699a8d _notify_next_handlers skips sequential messages
Is there are several sequential messages and next_step_handlers are set, the _notify_next_handlers will process only every even message dew to execute both .pop(i) and i+=1
2018-05-29 18:55:41 +03:00
Badiboy
78afd045d8 _notify_next_handlers drops messages if empty handler list
After calling
clear_step_handler(...)
code:
self.next_step_handlers[chat_id] = []
left the key in next_step_handlers.
When a next message arrives, the old handler executes nothing (no handlers), but still remove message from message queue:
new_messages.pop(i).

Updated to pop message only when there are real handlers in the list.
2018-05-27 23:24:37 +03:00
Waffle
bc855f7610 Fix register_for_reply_by_message_id and register_for_reply doc strings. 2018-05-27 17:05:01 +03:00
Waffle
893d5386c5 Fix register_for_reply_by_message_id doc strings. 2018-05-27 17:02:04 +03:00
Waffle
909d570dca Add warning about lambda functions in callbacks 2018-05-27 17:01:07 +03:00
Waffle
424c77fd2c Remove type hint for 2.x and PyPy python compatibility 2018-05-27 16:54:56 +03:00
Waffle
333949683f Add doc strings to new TeleBot methods
Update telebot/__init__.py
2018-05-27 01:37:06 +03:00
Waffle
fa038c2e42 Move del_file_after_loading param to right methods :face_palm:
Update: telebot/__init__.py
2018-05-27 01:30:14 +03:00
Waffle
d61de35a32 Remove rudiment json things, again!
Update: telebot/__init__.py
2018-05-27 01:23:20 +03:00
Waffle
1de356dcc3 Change default save directory to "./.handler-saves/".
Add del_file_after_loading param to load methods.

Update: telebot/__init__.py
2018-05-26 17:10:00 +03:00
Waffle
47e6dfd6bc Remove rudiment json things
Update: telebot/__init__.py
2018-05-26 16:52:30 +03:00
Waffle
3c890a7846 Remove 2 spaces up to TeleBot class.
Update: telebot/__init__.py
2018-05-26 16:37:25 +03:00
Waffle
17971ff48b Move from json to pickle.
Update: relebot/__init__.py
2018-05-26 12:19:01 +03:00
Waffle
b989b7601b Add new class: Handler
Change type of (next step|reply) handlers from dict to Handler [WIP]

update: telebot/__init__.py
2018-05-25 20:57:22 +03:00
Waffle
8c574a786a Merge branch 'master' of https://github.com/WaffleWafflerov/pyTelegramBotAPI-1 2018-05-25 20:37:36 +03:00
Waffle
7e5f51e4ab Remove old thing.
Update telebot/__init__.py
2018-05-25 09:44:43 +03:00
Waffle
018e4597a2 Add del_file_after_loading param to Saver.return_load_handlers and Saver.load_handlers methods.
Update telebot/__init__.py
2018-05-25 09:40:29 +03:00
Waffle
7df6b3d4c9 Fix situation where delay <= 0.
Update telebot/__init__.py
2018-05-25 09:35:39 +03:00
Waffle
4facc5f7d7 fix unenabled saving handlers.
Updated telebot/__init__.py
2018-05-25 09:30:10 +03:00
Waffle
4bcfc34a50 Update _notify_next_handlers and _notify_reply_handlers methods:
Now if there wasn't any handler updates, timer willn't start.
2018-05-25 09:07:59 +03:00
Waffle
b1d5cb2129 Rewrite.
Add class 'Saver' that provides methods for saving (next step|reply) handlers.
Add methods
enable_save_next_step_handlers,
enable_save_reply_handlers,
disable_save_next_step_handlers,
disable_save_reply_handlers,
load_next_step_handlers,
load_reply_handlers
to Telebot and AsyncTelebot.

update telebot/__init__.py
2018-05-25 08:57:48 +03:00
Waffle
00c8dcc19b Add async methods 2018-05-25 03:10:40 +03:00
Waffle
ed7e33b4c6 Fix loadings funcs 2018-05-25 02:48:46 +03:00
Waffle
74a952846c Merge branch 'master' of https://github.com/CoconutWaffle/pyTelegramBotAPI-1 2018-05-24 18:32:25 +03:00
Waffle
e99fb8f84f Add methods to save (reply|next step) handlers [WIP] 2018-05-20 23:40:25 +03:00
Waffle
49aee14fca Make _test_filter method static and a bit clear doc strings 2018-05-19 00:42:06 +03:00
Badiboy
9c79ba2f87 html_text fix and html_caption
html_text now works with text_link
html_caption now works for caption/caption_entities
2018-05-14 13:29:34 +03:00
FrankWang
42343c3a7f
Merge pull request #490 from CoconutWaffle/master
Fixing and upgrading next step and reply handlers. + minor fixes
2018-05-04 07:20:18 +08:00
FrankWang
5a102ed8fa
Merge pull request #492 from sviat9440/master
Bugfixes (message.html_text offset)
2018-05-04 07:19:28 +08:00
Waffle
3ba9799b98 Renaming back pytelegrambotapi module to telebot 2018-04-28 13:50:59 +03:00
eternnoir
91f213ff34 Fix #501 2018-04-27 15:47:03 +08:00
eternnoir
8f55460924 Fix cache time is zero. 2018-04-26 09:53:55 +08:00
khabibr
99ff104a3f
Update apihelper.py
Correct files downloading when proxy used.
2018-04-24 16:48:39 +06:00
Benny
5dd88f8223
fix issue #403: UnicodeEncodeError when sending a non-ASCII file in Python 2.7 2018-04-18 15:00:05 +08:00
sviat9440
ffe3a0c3d7 Update types.py
-- Fix encoding bug (emoji shifted offset)
2018-04-15 19:19:29 +03:00
Waffle
7957bc45a8 Fixing and upgrading next step and reply handlers. + minor fixes
Rename telebot package to pytelegrambotapi becouse lib named telebot exists and it raising many errors

Add methods:
|     register_for_reply_by_message_id,
|     register_next_step_handler_by_chat_id,
|     clear_reply_handlers,
|     clear_reply_handlers_by_message_id
2018-04-12 13:45:32 +03:00
sviat9440
36d088dfbf Bugfixes and minor improvements 2018-04-04 10:47:37 +03:00
FrankWang
9ae20b4815
Merge pull request #482 from sviat9440/master
Minor improvements
2018-03-25 21:39:27 +08:00
sviat9440
e761e1e1d9
Update apihelper.py 2018-03-25 14:54:28 +03:00
sviat9440
cb0256b37d
Update __init__.py 2018-03-25 13:22:35 +03:00
sviat9440
ff3cbaf45b
Update apihelper.py 2018-03-25 13:21:55 +03:00
eternnoir
7f47f11444 Fix #481 2018-03-23 19:58:43 +08:00
sviat9440
0422e62f65
Update types.py
Fix
2018-03-21 10:45:34 +03:00
sviat9440
82e252ec46
Update types.py
Fix
2018-03-21 10:44:37 +03:00
sviat9440
c11a9f810c
Update types.py
Added 'json' property to class 'Message', to quickly save a message to the database
2018-03-21 07:35:42 +03:00
German
d17d28a144
create field forward_from_message_id in Message
https://core.telegram.org/bots/api#message
2018-03-20 23:36:29 +03:00
eternnoir
48e6757686 Fix import logger problem. 2018-03-10 14:41:34 +08:00
heyyyoyy
518c49f23a fixing formatting of caption in the method send_document 2018-02-16 18:29:29 +03:00
heyyyoyy
903b1dfd50 added parse_mode in edit_message_caption 2018-02-16 14:19:35 +00:00
heyyyoyy
2e199a5684 Bot Api 3.6 2018-02-14 20:27:55 +00:00
FrankWang
55302cb972
Merge pull request #445 from heyyyoyy/update_send_media_group
Added support for local files in the sendMediaGroup method
2018-02-01 19:24:50 +08:00
eternnoir
afac177d7d Fix missing media_group_id in message. 2018-01-24 19:05:38 +08:00
heyyyoyy
2637e29dbe Updated sendMediaGroup method 2018-01-15 16:08:50 +03:00
FrankWang
e2ed4cf065
Merge pull request #387 from fumycat/patch-1
Fix optional parameter
2018-01-15 10:23:26 +08:00
JekaFST
60596a95b8
Edit and stop live location fixes
.token was missed in apihelper's methods calls
2017-12-05 01:31:47 +03:00
JekaFST
8aa8fa5986
Fix for SendLocation with live period
Fix for payload['live_perion'] typo -> payload['live_period']
2017-12-05 00:21:05 +03:00
eternnoir
b2f376a906 Remove debug message. Add content_type 2017-11-30 23:34:07 +08:00
eternnoir
c300195b49 Add provider_data . 2017-11-29 13:59:47 +08:00
eternnoir
2493b200a4 Add provider_data to sendInvoice. 2017-11-29 13:53:39 +08:00
eternnoir
8528ca9e4e Add some message content type. Fix #426 2017-11-29 13:48:34 +08:00
eternnoir
e1a3ccadb7 Add sendMediaGroup method. 2017-11-29 13:45:25 +08:00
eternnoir
7ac246b801 Fix inline_query_handler not work. 2017-11-15 00:42:27 +08:00
eternnoir
8bdbc24014 Fix ShippingOption to_json. #414 2017-11-13 10:25:39 +08:00
eternnoir
46c803bf55 Fix shipping_options bug. #414
Update version.
2017-11-13 10:14:10 +08:00
eternnoir
3986f33d3a Fix caption_entities without default value. 2017-11-06 08:42:57 +08:00
Vitaliy
d8587419e1 Fixed bug when message has next step handler and exec command handlers. 2017-11-04 15:09:29 +02:00
Evgeny Petrov
8e71a612a6 Added missing methods definitions to __init__.py and Async Telebot 2017-10-22 20:07:51 +03:00
Evgeny Petrov
5f8d99664e Bot API 3.4: new methods for live locations, new objects. 2017-10-22 19:50:51 +03:00
Evgeny Petrov
600c014515 Added missing author_signature field to Message object
`author_signature` field was checked, but never added to `Message` object.
2017-09-22 01:08:54 +03:00
Evgeny Petrov
211f1c607d Bot API 3.3:
- Added the new field pinned_message to the Chat object.
- Added the new fields author_signature and forward_signature to the Message object.
- Added the new field is_bot to the User object.
2017-08-23 10:30:32 +03:00
mostafaqanbaryan
15d287919d Update __init__.py
Add clear_step_handler() for resetting bot
2017-08-21 14:40:47 +04:30
Fumycat
af991ea76e Fix optional parameter 2017-08-20 01:36:08 +07:00
eternnoir
dcddedcd24 Fix file dic. 2017-08-06 15:35:43 +08:00
eternnoir
2e743b4b86 Add v3.2 method. 2017-08-06 15:22:23 +08:00
eternnoir
af70313721 New method for v3.2 2017-08-06 14:25:25 +08:00
eternnoir
aefd666062 Update sticker set. 2017-08-06 12:00:26 +08:00
FrankWang
c91ce6036b Merge pull request #372 from Kylmakalle/master
Async Methods for API v3.1
2017-07-23 15:50:02 +08:00
the31k
96569cbdac Fix typo 2017-07-19 15:44:10 +03:00
the31k
feec19b7f4 Use per-thread requests sessions
Reason is requests.Session is not thread-safe
See: https://github.com/requests/requests/issues/2766
2017-07-19 01:50:12 +03:00
the31k
1a80fc5a0e Per-thread singletons 2017-07-19 01:50:04 +03:00
FrankWang
488fb745b7 Merge pull request #359 from Yolley/master
Informative exception message for better exception handling
2017-07-07 10:45:23 +08:00
Kylmakalle
08d6ab549d Aync Methods for v3.1 2017-07-07 00:54:18 +03:00
eternnoir
0632cfb9b0 Fix new chat members. 2017-07-02 21:24:19 +08:00
eternnoir
4979589faf Fix not require args. #369 2017-07-02 21:08:36 +08:00
eternnoir
5f8ed347a1 Add missing arg until_date for kickChatMember. 2017-07-01 11:11:25 +08:00
eternnoir
514880fe22 Merge remote-tracking branch 'origin/proxySupport' 2017-07-01 11:06:05 +08:00
eternnoir
f97bb2f615 FIx missing declare 2017-07-01 11:05:14 +08:00
Evgeny Petrov
662a834138 Added missing arguments to restrict_chat_member method 2017-06-30 20:16:51 +03:00
Evgeny Petrov
25a37db2bb Bot API v3.1 2017-06-30 19:47:09 +03:00
eternnoir
6af3067a12 Add proxy to readme. 2017-06-28 17:44:07 +08:00
Ihor Polyakov
3713b093b6 json.dumps(allowed_updates) before sending request 2017-06-22 10:35:13 +07:00
Yolley
242456d92b Update util.py 2017-06-20 15:45:18 +03:00
Yolley
328cabead6 Update util.py 2017-06-20 15:45:01 +03:00
Evgeny Petrov
cb4521f497 Fixed wrong method call
Should be called `apihelper.answer_shipping_query` instead of `apihelper.answer_shippingQuery`
2017-06-02 11:07:35 +03:00
eternnoir
777a3afaaa Fix #314 2017-05-30 17:18:03 +08:00
eternnoir
639218b3bf New fields gif_duration in InlineQueryResultGif and mpeg4_duration in
InlineQueryResultMpeg4Gif.
2017-05-25 13:27:13 +08:00
eternnoir
b2449e64c2 Add pay in inline keyboard btn, 2017-05-25 11:48:16 +08:00
eternnoir
708635e420 Fix handler. 2017-05-25 11:45:44 +08:00
eternnoir
84b1aca939 Fix method name. 2017-05-25 11:23:37 +08:00
eternnoir
9025be0ef2 Add handlers. 2017-05-25 11:22:40 +08:00
eternnoir
a8e60b28e0 Fix requirement params. 2017-05-25 11:14:08 +08:00
eternnoir
cf287af549 Add payment method. PEP8. Refactor. 2017-05-25 10:56:58 +08:00
Kylmakalle
3a10c90799 Payments methods 2017-05-24 01:23:52 +03:00
eternnoir
12791e1366 Add payments type to update and message. 2017-05-21 21:52:56 +08:00
eternnoir
5ed333492b All payment type done. 2017-05-21 21:45:12 +08:00
Kylmakalle
3f5596ddce new_chat_members content type and new send_action actions 2017-05-21 14:27:31 +03:00
Kylmakalle
443d81d4db FIX: Can't edit file bytes 2017-05-19 18:08:07 +03:00
Kylmakalle
6cda8d052c VideoNote support
Send and recieve round video messages.
Support for send_video_note metod and video_note content type.
2017-05-19 17:19:15 +03:00
i32ropie
35214b1270 Added language code for users 2017-05-18 23:40:10 +02:00
Kurbanov Bulat
34047c0121 Add methods to AsyncTeleBot 2017-05-18 13:55:55 +04:00
FrankWang
1a70c2d613 Merge pull request #319 from Artom-Kozincev/master
Add more accurate control over threads count
2017-05-17 14:48:18 +08:00
Kylmakalle
89f515b120 deleteMessage returns Ok on success, not Message type 2017-05-12 01:13:40 +03:00
Kylmakalle
f7cfb98b60 Added option to delete messages.
Added option to delete messages.

Some bots do not support this method now, waiting for an official api
release.
2017-05-07 17:37:03 +03:00
eternnoir
450ef42a83 Fix typo. 2017-04-30 19:40:27 +08:00
Artom-Kozincev
e138d2e1ef Add more accurate control over threads count 2017-04-06 22:12:17 +03:00
FrankWang
d29c816b79 Merge pull request #318 from ihoru/master
RecursionError fix during sending files
2017-04-05 14:13:22 +08:00
Ihor Polyakov
662c69e09c RecursionError fix during sending files 2017-04-02 14:56:53 +07:00
Andrew Developer
43f026dc64 Added IGNORECASE flag to message_handler
Added re.IGNORECASE flag to message_handler, so it matches without chars case.
2017-03-28 16:24:28 +03:00
eternnoir
76a48ffe82 Bug fix for edited_channel_post_handler. 2017-03-04 21:30:07 +08:00
Alex Kuznitsin
f7fc538bd8 Non-ASCII chars for filename. Telegram doesn't accept rfc2231 styled filename. Using utf-8 directly. 2017-01-30 17:40:18 +03:00
Nicholas Guriev
9fe8565d53 Use session to ensure persistent connection to api.telegram.org 2016-12-17 09:03:00 +03:00
FrankWang
1058822f85 Merge pull request #266 from Yolley/patch-1
Added isinstance for bytes to function 'add' in ReplyKeyboardMarkup
2016-12-13 10:02:58 +08:00
Evgeny Petrov
12e7879325 Added max_connections and allowed updates to WebhookInfo 2016-12-12 19:29:57 +03:00
Yolley
d14bd9a36b Add isinstance for bytes to function 'add' in ReplyKeyboardMarkup
All explanation is here https://github.com/eternnoir/pyTelegramBotAPI/issues/265
2016-12-06 17:12:28 +03:00
eternnoir
a06551daaf Add delete webhook. 2016-12-06 11:52:16 +08:00
eternnoir
eadff07f79 Add allowed_updates to get_updates. 2016-12-06 11:44:30 +08:00
eternnoir
b5e27d0fea Add max_connections and allowed_updates to set_webhook. 2016-12-06 11:42:15 +08:00
eternnoir
509fae6792 Bug fix. 2016-12-03 15:17:06 +08:00
eternnoir
e555da86dd Add cache_time to answerCallbackQuery 2016-12-03 13:38:30 +08:00
eternnoir
9a5e8302be Add force params in setGameScore method. 2016-12-03 13:31:55 +08:00
eternnoir
30ed6e37d3 Add channel_post, edited_channel_post support. 2016-12-03 13:28:22 +08:00
Evgeny Petrov
c99bb16619 Updated set_game_score
• New field `force`
• Changed `edit_message` to `disable_edit_message`
2016-11-21 09:28:32 +03:00
Evgeny Petrov
856af72599 Added cache_time to answer_callback_query 2016-11-21 09:19:59 +03:00
Evgeny Petrov
8c8be81bb9 Added optional forward_from_message_id
And changed `forward_date` to optional (as it should be)
2016-11-21 09:10:51 +03:00
Evgeny Petrov
b2cd3c9716 Added channel_post and edited_channel_post to Update object 2016-11-21 09:06:36 +03:00
Evgeny Petrov
1c9a9b9622 hide_keyboard -> remove_keyboard 2016-11-21 08:57:38 +03:00
Evgeny Petrov
1691e84d01 ReplyKeyboardHide -> ReplyKeyboardRemove
Since Telegram changed object name in API docs: https://core.telegram.org/bots/api#replykeyboardremove
2016-11-16 14:18:39 +03:00
eternnoir
7a6bb4dcc8 Remove type in InlineQueryResultGame. 2016-11-01 01:14:28 +08:00
eternnoir
e342b9fa6b Fix InlineQueryResultGame replymarkup do not to_dic. 2016-11-01 01:10:06 +08:00
Evgeny Petrov
2af9209005 Fixed KeyError when data field is None in CallbackQuery
obj['data'] raises KeyError when `data` is None, while obj.get('data') returns None
2016-10-30 18:23:57 +08:00
Evgeny Petrov
d2e1acde6a Fixed API object type mismatch 2016-10-29 23:23:39 +03:00
eternnoir
54ed2038aa New methods setGameScore and getGameHighScores. 2016-10-29 21:22:46 +08:00
Evgeny Petrov
6f8ebbae89 Added setGameScore and getGameHighScores
1. https://core.telegram.org/bots/api#setgamescore
2. https://core.telegram.org/bots/api#getgamehighscores
2016-10-26 16:19:04 +03:00
eternnoir
d1498979d4 Merge branch 'JrooTJunior-master' into feature-20161003update 2016-10-20 20:09:07 +08:00
Alex Root Junior
702763edd6 Get webhook info
https://core.telegram.org/bots/api#getwebhookinfo
2016-10-20 10:52:38 +03:00
eternnoir
ffa0ea449b Fix test case. 2016-10-12 15:52:34 +08:00
FrankWang
d53a881ac4 Merge pull request #238 from Kondra007/patch-6
Added "all_members_are_administrators" field to Chat object
2016-10-12 12:01:46 +08:00
FrankWang
67583d3639 Merge pull request #240 from Kondra007/patch-9
Added caption field to several objects
2016-10-12 12:00:32 +08:00
Evgeny Petrov
08dd7d1593 Added caption field to several objects
InlineQueryResultAudio, InlineQueryResultVoice, InlineQueryResultCachedAudio, InlineQueryResultCachedVoice
2016-10-11 22:57:16 +03:00
Evgeny Petrov
7e94810ece Added Caption field to sendAudio & sendVoice 2016-10-11 22:51:20 +03:00
Evgeny Petrov
11aa5fcb85 Added "all_members_are_administrators" field to Chat object 2016-10-11 22:43:44 +03:00
eternnoir
8d65856dec New field callback_game in InlineKeyboardButton, new fields
game_short_name and chat_instance in CallbackQuery.
2016-10-08 22:04:44 +08:00
eternnoir
740d7f44cf Add url param in answer inline query. 2016-10-08 21:55:28 +08:00
eternnoir
b8e5c43598 Add send game method. 2016-10-08 20:36:48 +08:00
eternnoir
795a00f92c Add game in Message. InlineQueryResultGame 2016-10-08 20:06:08 +08:00
eternnoir
de740be506 Add class Game,Animation,GameHighScore. For Game feature. 2016-10-08 19:50:29 +08:00
Ihor Polyakov
1b0a872619 return statement added to callback_query_handler in decorator 2016-09-28 20:07:15 +08:00
eternnoir
a5ed76018d Fix venue Loacation dejson. 2016-09-17 07:38:18 +08:00
eternnoir
590b27ca8a Add ujson support. 2016-09-12 16:38:54 +08:00
eternnoir
89cf2658ae Fix edit reply markup return bool. 2016-08-29 20:50:27 +08:00
eternnoir
6da88c9751 FIx #225 2016-08-29 20:21:56 +08:00
eternnoir
4205e46608 Fix missing location object in InlineQuery. 2016-07-06 10:13:42 +08:00
eternnoir
29ef0e74af Fix typo. 2016-06-17 17:50:06 +08:00
Max
b9a0c3e511 + More flexibility for different handlers(callback_query_handler and
etc.): now they are not limited in input arguments so can be easily
extended by subclassing

arguments
2016-06-16 11:49:51 +03:00
Max
527351385b + Don't check filters against NoneType values;
+ More flexibility for subclassing:
	- __exec_task is protected now(was private)
	- _test_message_handler and _test_filter are class members
	  now(used to be static methods)
+ More flexibility on extention of message_handler(**kwargs for
additional parameters)
2016-06-13 16:47:15 +03:00
Max
1b47e5cc62 code duplication lessened 2016-06-13 14:24:27 +03:00
Max
eb4d58bec1 little optimization on handler dictionary building: code duplication lessened 2016-06-13 14:15:15 +03:00
eternnoir
cdb6d6760d Add some comment. 2016-06-07 19:44:30 +08:00
eternnoir
d701fd6e1d Merge remote-tracking branch 'origin/feature-changes20160522' into api2.1 2016-06-07 19:30:01 +08:00
eternnoir
8e3c9d8d24 Add edited message handler. 2016-06-07 19:29:12 +08:00
eternnoir
468a535257 Fix de_json. 2016-06-07 19:08:52 +08:00
eternnoir
d2e7f4d8f2 Add 2.1 new method. 2016-06-07 19:00:44 +08:00
Pavel K
2f20d70e89 unicode strings for check_json 2016-06-04 21:18:09 +05:00
eternnoir
ce24aa25f2 Fix #179. 2016-06-02 13:25:50 +08:00
eternnoir
8c20f63022 Add user to MessageEntity. 2016-05-23 11:12:20 +08:00
eternnoir
f9c7497c5c Merge branch 'Kondra007-patch-3' into feature-changes20160522 2016-05-23 11:05:14 +08:00
Diego Muñoz Callejo
3413669a23 Added optional connection (aka sending) timeouts to methods that may upload big chunks of data: send_audio, send_voice, send_document, send_sticker and send_video. 2016-05-22 18:35:20 +02:00
Kondra007
1a45b4844a Fixed Travis build (again)
Yeah, I'm really sorry for all this errors, maybe tired a little bit.
2016-05-22 15:47:44 +03:00
Kondra007
8a9d89591b Fixed Travis build errors 2016-05-22 15:44:04 +03:00
Kondra007
234dd8cf9f Edited edit_date field
It's integer, not `Message`
2016-05-22 13:55:54 +03:00
Kondra007
6a98d27f1a Added edited_message to Update object
As of Bot API update 2.1, Update object now has optional edited_message field.
2016-05-22 13:35:21 +03:00
Kondra007
04df139efb Added edit_date to Message object
As of Bot API update 2.1, `Message` object now has optional `edit_date` field.
2016-05-22 13:32:53 +03:00
eternnoir
fbaf88c237 Update version. 2016-05-20 14:41:00 +08:00
eternnoir
3ebc47de8b Add missing title in InlineQueryResultVenue. #165 2016-05-20 14:39:34 +08:00
Pieter van den Ham
8017c8d919 Fix failing build for python 3.3, 3.4 and pypy3 2016-05-19 10:18:00 +02:00
Pieter van den Ham
2545724a6f Fix #164 2016-05-19 10:02:59 +02:00