Fix import logger problem.

Update version 3.6.0
Merge pull request #462 from heyyyoyy/Bot_Api_3.6
2023-08-10 21:12:57 +03:00 · 2018-03-10 14:41:34 +08:00 · 2018-03-02 19:28:34 +08:00 · 2018-02-22 22:11:46 +08:00 · 2018-02-22 20:52:53 +08:00 · 2018-02-16 17:52:37 +02:00
18 changed files with 2108 additions and 124 deletions
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # <p align="center">pyTelegramBotAPI

-<p align="center">A simple, but extensible Python implementation for the [Telegram Bot API](https://core.telegram.org/bots/api).
+<p align="center">A simple, but extensible Python implementation for the <a href="https://core.telegram.org/bots/api">Telegram Bot API</a>.

 [![Download Month](https://img.shields.io/pypi/v/pyTelegramBotAPI.svg)](https://pypi.python.org/pypi/pyTelegramBotAPI)
 [![Build Status](https://travis-ci.org/eternnoir/pyTelegramBotAPI.svg?branch=master)](https://travis-ci.org/eternnoir/pyTelegramBotAPI)
@ -25,6 +25,7 @@
    * [The listener mechanism](#the-listener-mechanism)
    * [Using web hooks](#using-web-hooks)
    * [Logging](#logging)
+    * [Proxy](#proxy)
  * [F.A.Q.](#faq)
    * [Bot 2.0](#bot-20)
    * [How can I distinguish a User and a GroupChat in message.chat?](#how-can-i-distinguish-a-user-and-a-groupchat-in-messagechat)
@ -123,7 +124,11 @@ To start the bot, simply open up a terminal and enter `python echo_bot.py` to ru
 All types are defined in types.py. They are all completely in line with the [Telegram API's definition of the types](https://core.telegram.org/bots/api#available-types), except for the Message's `from` field, which is renamed to `from_user` (because `from` is a Python reserved token). Thus, attributes such as `message_id` can be accessed directly with `message.message_id`. Note that `message.chat` can be either an instance of `User` or `GroupChat` (see [How can I distinguish a User and a GroupChat in message.chat?](#how-can-i-distinguish-a-user-and-a-groupchat-in-messagechat)).

 The Message object also has a `content_type`attribute, which defines the type of the Message. `content_type` can be one of the following strings:
-`text`, `audio`, `document`, `photo`, `sticker`, `video`, `voice`, `location`, `contact`, `new_chat_member`, `left_chat_member`, `new_chat_title`, `new_chat_photo`, `delete_chat_photo`, `group_chat_created`, `supergroup_chat_created`, `channel_chat_created`, `migrate_to_chat_id`, `migrate_from_chat_id`, `pinned_message`.
+`text`, `audio`, `document`, `photo`, `sticker`, `video`, `video_note`, `voice`, `location`, `contact`, `new_chat_members`, `left_chat_member`, `new_chat_title`, `new_chat_photo`, `delete_chat_photo`, `group_chat_created`, `supergroup_chat_created`, `channel_chat_created`, `migrate_to_chat_id`, `migrate_from_chat_id`, `pinned_message`.
+
+You can use some types in one function. Example:
+
+```content_types=["text", "sticker", "pinned_message", "photo", "audio"]```

 ### Methods

@ -181,7 +186,7 @@ def handle_text_doc(message):

 #Which could also be defined as:
 def test_message(message):
-	return message.document.mime_type == 'text/plan'
+	return message.document.mime_type == 'text/plain'

@bot.message_handler(func=test_message, content_types=['document'])
 def handle_text_doc(message)
@ -200,6 +205,14 @@ def send_something(message):

 Same as Message handlers

+#### channel_post_handler
+
+Same as Message handlers
+
+#### edited_channel_post_handler
+
+Same as Message handlers
+
 #### Callback Query Handler

 In bot2.0 update. You can get `callback_query` in update object. In telebot use `callback_query_handler` to process callback_querys.
@ -208,7 +221,7 @@ In bot2.0 update. You can get `callback_query` in update object. In telebot use
@bot.callback_query_handler(func=lambda call: True)
 def  test_callback(call):
    logger.info(call)
-``` 
+```

 #### TeleBot
 ```python
@ -221,8 +234,8 @@ tb = telebot.TeleBot(TOKEN)	#create a new Telegram Bot object
 # - none_stop: True/False (default False) - Don't stop polling when receiving an error from the Telegram servers
 # - interval: True/False (default False) - The interval between polling requests
 #           Note: Editing this parameter harms the bot's response time
-# - block: True/False (default True) - Blocks upon calling this function
-tb.polling(none_stop=False, interval=0, block=True)
+# - timeout: integer (default 20) - Timeout in seconds for long polling.
+tb.polling(none_stop=False, interval=0, timeout=20)

 # getMe
 user = tb.get_me()
@ -276,6 +289,11 @@ video = open('/tmp/video.mp4', 'rb')
 tb.send_video(chat_id, video)
 tb.send_video(chat_id, "FILEID")

+# sendVideoNote
+videonote = open('/tmp/videonote.mp4', 'rb')
+tb.send_video_note(chat_id, videonote)
+tb.send_video_note(chat_id, "FILEID")
+
 # sendLocation
 tb.send_location(chat_id, lat, lon)

@ -295,7 +313,7 @@ file = requests.get('https://api.telegram.org/file/bot{0}/{1}'.format(API_TOKEN,

 ```
 #### Reply markup
-All `send_xyz` functions of TeleBot take an optional `reply_markup` argument. This argument must be an instance of `ReplyKeyboardMarkup`, `ReplyKeyboardHide` or `ForceReply`, which are defined in types.py.
+All `send_xyz` functions of TeleBot take an optional `reply_markup` argument. This argument must be an instance of `ReplyKeyboardMarkup`, `ReplyKeyboardRemove` or `ForceReply`, which are defined in types.py.

 ```python
 from telebot import types
@ -328,12 +346,12 @@ tb.send_message(chat_id, "Choose one letter:", reply_markup=markup)
 ```
 The last example yields this result:

-![ReplyKeyboardMarkup](https://pp.vk.me/c624430/v624430512/473e5/_mxxW7FPe4U.jpg "ReplyKeyboardMarkup")
+![ReplyKeyboardMarkup](https://farm3.staticflickr.com/2933/32418726704_9ef76093cf_o_d.jpg "ReplyKeyboardMarkup")

 ```python
-# ReplyKeyboardHide: hides a previously sent ReplyKeyboardMarkup
+# ReplyKeyboardRemove: hides a previously sent ReplyKeyboardMarkup
 # Takes an optional selective argument (True/False, default False)
-markup = types.ReplyKeyboardHide(selective=False)
+markup = types.ReplyKeyboardRemove(selective=False)
 tb.send_message(chat_id, message, reply_markup=markup)
 ```

@ -345,7 +363,7 @@ tb.send_message(chat_id, "Send me another word:", reply_markup=markup)
 ```
 ForceReply:

-![ForceReply](https://pp.vk.me/c624430/v624430512/473ec/602byyWUHcs.jpg "ForceReply")
+![ForceReply](https://farm4.staticflickr.com/3809/32418726814_d1baec0fc2_o_d.jpg "ForceReply")

 ### Inline Mode

@ -389,8 +407,8 @@ def query_text(inline_query):
        print(e)

 ```
-###Working with entities:
-This object represents one special entity in a text message. For example, hashtags, usernames, URLs, etc. 
+### Working with entities:
+This object represents one special entity in a text message. For example, hashtags, usernames, URLs, etc.
 Attributes:
 * `type`
 * `url`
@ -458,7 +476,7 @@ bot.set_update_listener(handle_messages)
 bot.polling()
 ```

-### Using webhooks
+### Using web hooks
 When using webhooks telegram sends one Update per call, for processing it you should call process_new_messages([update.message]) when you recieve it.

 There are some examples using webhooks in the *examples/webhook_examples* directory.
@ -475,6 +493,26 @@ logger = telebot.logger
 telebot.logger.setLevel(logging.DEBUG) # Outputs debug messages to console.
 ```

+### Proxy
+
+You can use proxy for request. `apihelper.proxy` object will use by call `requests` proxies argument.
+
+```python
+from telebot import apihelper
+
+apihelper.proxy = {'http', 'http://10.10.1.10:3128'}
+```
+
+If you want to use socket5 proxy you need install dependency `pip install requests[socks]`.
+
+```python
+proxies = {
+    'http': 'socks5://user:pass@host:port',
+    'https': 'socks5://user:pass@host:port'
+}
+```
+
+
 ## F.A.Q.

 ### Bot 2.0
@ -487,14 +525,14 @@ April 9,2016 Telegram release new bot 2.0 API, which has a drastic revision espe
 Telegram Bot API support new type Chat for message.chat.

 - Check the ```type``` attribute in ```Chat``` object:
- 
+-
 ```python
 if message.chat.type == “private”:
 	# private chat message

 if message.chat.type == “group”:
 	# group chat message
-	
+
 if message.chat.type == “supergroup”:
 	# supergroup chat message

@ -525,12 +563,28 @@ Get help. Discuss. Chat.
 * [Telegram Proxy Bot](https://bitbucket.org/master_groosha/telegram-proxy-bot) by *Groosha* - A simple BITM (bot-in-the-middle) for Telegram acting as some kind of "proxy".
 * [Telegram Proxy Bot](https://github.com/mrgigabyte/proxybot) by *mrgigabyte* - `Credits for the original version of this bot goes to` **Groosha** `, simply added certain features which I thought were needed`.
 * [RadRetroRobot](https://github.com/Tronikart/RadRetroRobot) by *Tronikart* - Multifunctional Telegram Bot RadRetroRobot.
-* [League of Legends bot](https://telegram.me/League_of_Legends_bot) ([source](https://github.com/i32ropie/lol)) by *i32ropie* 
+* [League of Legends bot](https://telegram.me/League_of_Legends_bot) ([source](https://github.com/i32ropie/lol)) by *i32ropie*
 * [NeoBot](https://github.com/neoranger/NeoBot) by *neoranger*
 * [TagAlertBot](https://github.com/pitasi/TagAlertBot) by *pitasi*
 * [ComedoresUGRbot](http://telegram.me/ComedoresUGRbot) ([source](https://github.com/alejandrocq/ComedoresUGRbot)) by [*alejandrocq*](https://github.com/alejandrocq) - Telegram bot to check the menu of Universidad de Granada dining hall.
 * [picpingbot](https://web.telegram.org/#/im?p=%40picpingbot) - Fun anonymous photo exchange by Boogie Muffin.
 * [TheZigZagProject](https://github.com/WebShark025/TheZigZagProject) - The 'All In One' bot for Telegram! by WebShark025
 * [proxybot](https://github.com/p-hash/proxybot) - Simple Proxy Bot for Telegram. by p-hash
+* [DonantesMalagaBot](https://github.com/vfranch/DonantesMalagaBot)- DonantesMalagaBot facilitates information to Malaga blood donors about the places where they can donate today or in the incoming days. It also records the date of the last donation so that it helps the donors to know when they can donate again. - by vfranch
+* [DuttyBot](https://github.com/DmytryiStriletskyi/DuttyBot) by *Dmytryi Striletskyi* - Timetable for one university in Kiev.
+* [dailypepebot](https://telegram.me/dailypepebot) by [*Jaime*](https://github.com/jiwidi/Dailypepe) - Get's you random pepe images and gives you their id, then you can call this image with the number.
+* [DailyQwertee](https://t.me/DailyQwertee) by [*Jaime*](https://github.com/jiwidi/DailyQwertee) - Bot that manages a channel that sends qwertee daily tshirts every day at 00:00
+* [wat-bridge](https://github.com/rmed/wat-bridge) by [*rmed*](https://github.com/rmed) - Send and receive messages to/from WhatsApp through Telegram
+* [flibusta_bot](https://github.com/Kurbezz/flibusta_bot) by [*Kurbezz*](https://github.com/Kurbezz)
+* [EmaProject](https://github.com/halkliff/emaproject) by [*halkliff*](https://github.com/halkliff) - Ema - Eastern Media Assistant was made thinking on the ease-to-use feature. Coding here is simple, as much as is fast and powerful.
+* [filmratingbot](http://t.me/filmratingbot)([source](https://github.com/jcolladosp/film-rating-bot)) by [*jcolladosp*](https://github.com/jcolladosp) - Telegram bot using the Python API that gets films rating from IMDb and metacritic
+* [you2mp3bot](http://t.me/you2mp3bot)([link](https://storebot.me/bot/you2mp3bot)) - This bot can convert a Youtube video to Mp3. All you need is send the URL video.
+* [areajugonesbot](http://t.me/areajugonesbot)([link](http://t.me/areajugonesbot)) - The areajugonesbot sends news published on the videogames blog Areajugones to Telegram.
+* [Send2Kindlebot](http://t.me/Send2KindleBot) ([source](https://github.com/GabrielRF/Send2KindleBot)) by *GabrielRF* - Send to Kindle service.
+* [RastreioBot](http://t.me/RastreioBot) ([source](https://github.com/GabrielRF/RastreioBot)) by *GabrielRF* - Bot used to track packages on the Brazilian Mail Service.
+* [filex_bot](http://t.me/filex_bot)([link](https://github.com/victor141516/FileXbot-telegram))
+* [Spbu4UBot](http://t.me/Spbu4UBot)([link](https://github.com/EeOneDown/spbu4u)) by *EeOneDown* - Bot with timetables for SPbU students.
+* [SmartySBot](http://t.me/ZDU_bot)([link](https://github.com/0xVK/SmartySBot)) by *0xVK* - Telegram timetable bot, for Zhytomyr Ivan Franko State University students. 
+* [yandex_music_bot](http://t.me/yandex_music_bot)- Downloads tracks/albums/public playlists from Yandex.Music streaming service for free.

 Want to have your bot listed here? Send a Telegram message to @eternnoir or @pevdh.
--- a/README.rst
+++ b/README.rst
@ -421,8 +421,8 @@ TeleBot
    # - none_stop: True/False (default False) - Don't stop polling when receiving an error from the Telegram servers
    # - interval: True/False (default False) - The interval between polling requests
    #           Note: Editing this parameter harms the bot's response time
-    # - block: True/False (default True) - Blocks upon calling this function
-    tb.polling(none_stop=False, interval=0, block=True)
+    # - timeout: integer (default 20) - Timeout in seconds for long polling.
+    tb.polling(none_stop=False, interval=0, timeout=20)

    # getMe
    user = tb.get_me()
@ -497,7 +497,7 @@ Reply markup

 All ``send_xyz`` functions of TeleBot take an optional ``reply_markup``
 argument. This argument must be an instance of ``ReplyKeyboardMarkup``,
-``ReplyKeyboardHide`` or ``ForceReply``, which are defined in types.py.
+``ReplyKeyboardRemove`` or ``ForceReply``, which are defined in types.py.

 .. code:: python

@ -538,9 +538,9 @@ The last example yields this result:

 .. code:: python

-    # ReplyKeyboardHide: hides a previously sent ReplyKeyboardMarkup
+    # ReplyKeyboardRemove: hides a previously sent ReplyKeyboardMarkup
    # Takes an optional selective argument (True/False, default False)
-    markup = types.ReplyKeyboardHide(selective=False)
+    markup = types.ReplyKeyboardRemove(selective=False)
    tb.send_message(chat_id, message, reply_markup=markup)

 .. code:: python
--- a/examples/detailed_example/detailed_example.py
+++ b/examples/detailed_example/detailed_example.py
@ -21,7 +21,7 @@ commands = {  # command description used in the "help" command
 imageSelect = types.ReplyKeyboardMarkup(one_time_keyboard=True)  # create the image selection keyboard
 imageSelect.add('cock', 'pussy')

-hideBoard = types.ReplyKeyboardHide()  # if sent as reply_markup, will hide the keyboard
+hideBoard = types.ReplyKeyboardRemove()  # if sent as reply_markup, will hide the keyboard


 # error handling if user isn't known yet
--- a/examples/download_file_example.py
+++ b/examples/download_file_example.py
@ -5,7 +5,7 @@ CHAT_ID = 'YOUR CHAT ID'

 bot = telebot.TeleBot(TOKEN)

-ret_msg = bot.send_voice(CHAT_ID, open('tests/test_data/record.ogg'))
+ret_msg = bot.send_voice(CHAT_ID, open('tests/test_data/record.ogg', 'rb'))

 file_info = bot.get_file(ret_msg.voice.file_id)

--- a/examples/payments_example.py
+++ b/examples/payments_example.py
@ -0,0 +1,83 @@
+import telebot
+from telebot.types import LabeledPrice
+from telebot.types import ShippingOption
+
+token = '1234567890:AAAABBBBCCCCDDDDeeeeFFFFgggGHHHH'
+provider_token = '1234567890:TEST:AAAABBBBCCCCDDDD'  # @BotFather -> Bot Settings -> Payments
+bot = telebot.TeleBot(token)
+
+# More about Payments: https://core.telegram.org/bots/payments
+
+prices = [LabeledPrice(label='Working Time Machine', amount=5750), LabeledPrice('Gift wrapping', 500)]
+
+shipping_options = [
+    ShippingOption(id='instant', title='WorldWide Teleporter').add_price(LabeledPrice('Teleporter', 1000)),
+    ShippingOption(id='pickup', title='Local pickup').add_price(LabeledPrice('Pickup', 300))]
+
+
+@bot.message_handler(commands=['start'])
+def command_start(message):
+    bot.send_message(message.chat.id,
+                     "Hello, I'm the demo merchant bot."
+                     " I can sell you a Time Machine."
+                     " Use /buy to order one, /terms for Terms and Conditions")
+
+
+@bot.message_handler(commands=['terms'])
+def command_terms(message):
+    bot.send_message(message.chat.id,
+                     'Thank you for shopping with our demo bot. We hope you like your new time machine!\n'
+                     '1. If your time machine was not delivered on time, please rethink your concept of time and try again.\n'
+                     '2. If you find that your time machine is not working, kindly contact our future service workshops on Trappist-1e.'
+                     ' They will be accessible anywhere between May 2075 and November 4000 C.E.\n'
+                     '3. If you would like a refund, kindly apply for one yesterday and we will have sent it to you immediately.')
+
+
+@bot.message_handler(commands=['buy'])
+def command_pay(message):
+    bot.send_message(message.chat.id,
+                     "Real cards won't work with me, no money will be debited from your account."
+                     " Use this test card number to pay for your Time Machine: `4242 4242 4242 4242`"
+                     "\n\nThis is your demo invoice:", parse_mode='Markdown')
+    bot.send_invoice(message.chat.id, title='Working Time Machine',
+                     description='Want to visit your great-great-great-grandparents?'
+                                 ' Make a fortune at the races?'
+                                 ' Shake hands with Hammurabi and take a stroll in the Hanging Gardens?'
+                                 ' Order our Working Time Machine today!',
+                     provider_token=provider_token,
+                     currency='usd',
+                     photo_url='http://erkelzaar.tsudao.com/models/perrotta/TIME_MACHINE.jpg',
+                     photo_height=512,  # !=0/None or picture won't be shown
+                     photo_width=512,
+                     photo_size=512,
+                     is_flexible=False,  # True If you need to set up Shipping Fee
+                     prices=prices,
+                     start_parameter='time-machine-example',
+                     invoice_payload='HAPPY FRIDAYS COUPON')
+
+
+@bot.shipping_query_handler(func=lambda query: True)
+def shipping(shipping_query):
+    print(shipping_query)
+    bot.answer_shipping_query(shipping_query.id, ok=True, shipping_options=shipping_options,
+                              error_message='Oh, seems like our Dog couriers are having a lunch right now. Try again later!')
+
+
+@bot.pre_checkout_query_handler(func=lambda query: True)
+def checkout(pre_checkout_query):
+    bot.answer_pre_checkout_query(pre_checkout_query.id, ok=True,
+                                  error_message="Aliens tried to steal your card's CVV, but we successfully protected your credentials,"
+                                                " try to pay again in a few minutes, we need a small rest.")
+
+
+@bot.message_handler(content_types=['successful_payment'])
+def got_payment(message):
+    bot.send_message(message.chat.id,
+                     'Hoooooray! Thanks for payment! We will proceed your order for `{} {}` as fast as possible! '
+                     'Stay in touch.\n\nUse /buy again to get a Time Machine for your friend!'.format(
+                         message.successful_payment.total_amount / 100, message.successful_payment.currency),
+                     parse_mode='Markdown')
+
+
+bot.skip_pending = True
+bot.polling(none_stop=True, interval=0)
--- a/examples/webhook_examples/README.md
+++ b/examples/webhook_examples/README.md
@ -1,6 +1,6 @@
 # Webhook examples using pyTelegramBotAPI

-There are 3 examples in this directory using different libraries:
+There are 4 examples in this directory using different libraries:

 * **Python (CPython):** *webhook_cpython_echo_bot.py*
  * **Pros:**
@ -32,5 +32,14 @@ There are 3 examples in this directory using different libraries:
    * The project seems not to be very active, latest version dates 2013.
    * They don't recommend to use it with Python 3, but may work.
    * May be a oversized for just handling webhook petitions.
+    
+* **aiohttp (1.2.0):** *webhook_aiohttp_echo_bot.py*
+  * **Pros:**
+    * It's a web application framework
+    * Python 3 compatible
+    * Asynchronous, excellent perfomance
+    * Utilizes new async/await syntax
+  * **Cons:**
+    * Requires Python 3.4.2+, don't work with Python 2

-*Latest update of this document: 2015-10-06*
+*Latest update of this document: 2017-01-30*
--- a/examples/webhook_examples/webhook_aiohttp_echo_bot.py
+++ b/examples/webhook_examples/webhook_aiohttp_echo_bot.py
@ -0,0 +1,88 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# This is a simple echo bot using decorators and webhook with aiohttp
+# It echoes any incoming text messages and does not use the polling method.
+
+import logging
+import ssl
+
+from aiohttp import web
+
+import telebot
+
+
+API_TOKEN = '<api_token>'
+
+WEBHOOK_HOST = '<ip/host where the bot is running>'
+WEBHOOK_PORT = 8443  # 443, 80, 88 or 8443 (port need to be 'open')
+WEBHOOK_LISTEN = '0.0.0.0'  # In some VPS you may need to put here the IP addr
+
+WEBHOOK_SSL_CERT = './webhook_cert.pem'  # Path to the ssl certificate
+WEBHOOK_SSL_PRIV = './webhook_pkey.pem'  # Path to the ssl private key
+
+# Quick'n'dirty SSL certificate generation:
+#
+# openssl genrsa -out webhook_pkey.pem 2048
+# openssl req -new -x509 -days 3650 -key webhook_pkey.pem -out webhook_cert.pem
+#
+# When asked for "Common Name (e.g. server FQDN or YOUR name)" you should reply
+# with the same value in you put in WEBHOOK_HOST
+
+WEBHOOK_URL_BASE = "https://{}:{}".format(WEBHOOK_HOST, WEBHOOK_PORT)
+WEBHOOK_URL_PATH = "/{}/".format(API_TOKEN)
+
+
+logger = telebot.logger
+telebot.logger.setLevel(logging.INFO)
+
+bot = telebot.TeleBot(API_TOKEN)
+
+app = web.Application()
+
+
+# Process webhook calls
+async def handle(request):
+    if request.match_info.get('token') == bot.token:
+        request_body_dict = await request.json()
+        update = telebot.types.Update.de_json(request_body_dict)
+        bot.process_new_updates([update])
+        return web.Response()
+    else:
+        return web.Response(status=403)
+
+app.router.add_post('/{token}/', handle)
+
+
+# Handle '/start' and '/help'
+@bot.message_handler(commands=['help', 'start'])
+def send_welcome(message):
+    bot.reply_to(message,
+                 ("Hi there, I am EchoBot.\n"
+                  "I am here to echo your kind words back to you."))
+
+
+# Handle all other messages
+@bot.message_handler(func=lambda message: True, content_types=['text'])
+def echo_message(message):
+    bot.reply_to(message, message.text)
+
+
+# Remove webhook, it fails sometimes the set if there is a previous webhook
+bot.remove_webhook()
+
+# Set webhook
+bot.set_webhook(url=WEBHOOK_URL_BASE+WEBHOOK_URL_PATH,
+                certificate=open(WEBHOOK_SSL_CERT, 'r'))
+
+# Build ssl context
+context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
+context.load_cert_chain(WEBHOOK_SSL_CERT, WEBHOOK_SSL_PRIV)
+
+# Start aiohttp server
+web.run_app(
+    app,
+    host=WEBHOOK_LISTEN,
+    port=WEBHOOK_PORT,
+    ssl_context=context,
+)
--- a/examples/webhook_examples/webhook_cherrypy_echo_bot.py
+++ b/examples/webhook_examples/webhook_cherrypy_echo_bot.py
@ -73,6 +73,11 @@ bot.remove_webhook()
 bot.set_webhook(url=WEBHOOK_URL_BASE+WEBHOOK_URL_PATH,
                certificate=open(WEBHOOK_SSL_CERT, 'r'))

+# Disable CherryPy requests log
+access_log = cherrypy.log.access_log
+for handler in tuple(access_log.handlers):
+    access_log.removeHandler(handler)
+
 # Start cherrypy server
 cherrypy.config.update({
    'server.socket_host': WEBHOOK_LISTEN,
--- a/examples/webhook_examples/webhook_flask_echo_bot.py
+++ b/examples/webhook_examples/webhook_flask_echo_bot.py
@ -48,9 +48,9 @@ def index():
@app.route(WEBHOOK_URL_PATH, methods=['POST'])
 def webhook():
    if flask.request.headers.get('content-type') == 'application/json':
-        json_string = flask.request.get_data().encode('utf-8')
+        json_string = flask.request.get_data().decode('utf-8')
        update = telebot.types.Update.de_json(json_string)
-        bot.process_new_messages([update.message])
+        bot.process_new_updates([update])
        return ''
    else:
        flask.abort(403)
--- a/examples/webhook_examples/webhook_flask_heroku_echo.py
+++ b/examples/webhook_examples/webhook_flask_heroku_echo.py
@ -1,29 +1,35 @@
-import telebot
 import os
+
+import telebot
 from flask import Flask, request

-bot = telebot.TeleBot('<api_token>')
-
+TOKEN = '<api_token>'
+bot = telebot.TeleBot(TOKEN)
 server = Flask(__name__)

+
@bot.message_handler(commands=['start'])
 def start(message):
    bot.reply_to(message, 'Hello, ' + message.from_user.first_name)

+
@bot.message_handler(func=lambda message: True, content_types=['text'])
 def echo_message(message):
    bot.reply_to(message, message.text)

-@server.route("/bot", methods=['POST'])
+
+@server.route('/' + TOKEN, methods=['POST'])
 def getMessage():
    bot.process_new_updates([telebot.types.Update.de_json(request.stream.read().decode("utf-8"))])
    return "!", 200

+
@server.route("/")
 def webhook():
    bot.remove_webhook()
-    bot.set_webhook(url="https://herokuProject_url/bot")
+    bot.set_webhook(url='https://your_heroku_project.com/' + TOKEN)
    return "!", 200

-server.run(host="0.0.0.0", port=os.environ.get('PORT', 5000))
-server = Flask(__name__)
+
+if __name__ == "__main__":
+    server.run(host="0.0.0.0", port=int(os.environ.get('PORT', 5000)))
--- a/examples/webhook_examples/webhook_tornado_echo_bot.py
+++ b/examples/webhook_examples/webhook_tornado_echo_bot.py
@ -0,0 +1,94 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# This example shows webhook echo bot with Tornado web framework
+# Documenation to Tornado: http://tornadoweb.org
+
+import telebot
+import tornado.web
+import tornado.ioloop
+import tornado.httpserver
+import tornado.options
+import signal
+
+API_TOKEN = '<api_token>'
+WEBHOOK_CERT = "./cert.pem"
+WEBHOOK_PKEY = "./pkey.pem"
+WEBHOOK_HOST = "<domain_or_ip>"
+WEBHOOK_SECRET = "<secret_uri_for_updates"
+WEBHOOK_PORT = 88
+WEBHOOK_URL_BASE = "https://{0}:{1}/{2}".format(WEBHOOK_HOST, str(WEBHOOK_PORT), WEBHOOK_SECRET)
+
+# Quick'n'dirty SSL certificate generation:
+#
+# openssl genrsa -out pkey.pem 2048
+# openssl req -new -x509 -days 3650 -key pkey.pem -out cert.pem
+#
+# When asked for "Common Name (e.g. server FQDN or YOUR name)" you should reply
+# with the same value in you put in WEBHOOK_HOST
+
+bot = telebot.TeleBot(API_TOKEN)
+
+class Root(tornado.web.RequestHandler):
+    def get(self):
+        self.write("Hi! This is webhook example!")
+        self.finish()
+
+class webhook_serv(tornado.web.RequestHandler):
+    def get(self):
+        self.write("What are you doing here?")
+        self.finish()
+    def post(self):
+        if "Content-Length" in self.request.headers and \
+            "Content-Type" in self.request.headers and \
+            self.request.headers['Content-Type'] == "application/json":
+
+            # length = int(self.request.headers['Content-Length'])
+            json_data = self.request.body.decode("utf-8")
+            update = telebot.types.Update.de_json(json_data)
+            bot.process_new_updates([update])
+            self.write("")
+            self.finish()
+        else:
+            self.write("What are you doing here?")
+            self.finish()
+ 
+tornado.options.define("port", default=WEBHOOK_PORT, help="run on the given port", type=int)
+is_closing = False
+def signal_handler(signum, frame):
+    global is_closing
+    print("Exiting...")
+    is_closing = True
+
+def try_exit():
+    global is_closing
+    if is_closing:
+        # clean up here
+        tornado.ioloop.IOLoop.instance().stop()
+        print("Exit success!")
+        
+# Handle '/start' and '/help'
+@bot.message_handler(commands=['help', 'start'])
+def send_welcome(message):
+    bot.reply_to(message,
+                 ("Hi there, I am EchoBot.\n"
+                  "I am here to echo your kind words back to you."))
+
+bot.remove_webhook()
+bot.set_webhook(url=WEBHOOK_URL_BASE,
+                certificate=open(WEBHOOK_CERT, 'r'))
+tornado.options.options.logging = None
+tornado.options.parse_command_line()
+signal.signal(signal.SIGINT, signal_handler)
+application = tornado.web.Application([
+    (r"/", Root),
+    (r"/" + WEBHOOK_SECRET, webhook_serv)
+])
+
+http_server = tornado.httpserver.HTTPServer(application, ssl_options={
+        "certfile": WEBHOOK_CERT,
+        "keyfile": WEBHOOK_PKEY,
+    })
+http_server.listen(tornado.options.options.port)
+tornado.ioloop.PeriodicCallback(try_exit, 100).start()
+tornado.ioloop.IOLoop.instance().start()
--- a/setup.py
+++ b/setup.py
@ -7,7 +7,7 @@ def readme():
        return f.read()

 setup(name='pyTelegramBotAPI',
-      version='2.2.3',
+      version='3.6.0',
      description='Python Telegram bot api. ',
      long_description=readme(),
      author='eternnoir',
--- a/telebot/init.py
+++ b/telebot/init.py
--- a/telebot/apihelper.py
+++ b/telebot/apihelper.py
@ -1,11 +1,24 @@
 # -*- coding: utf-8 -*-

+try:
+    import ujson as json
+except ImportError:
+    import json
+
 import requests
+
+try:
+    from requests.packages.urllib3 import fields
+
+    format_header_param = fields.format_header_param
+except ImportError:
+    format_header_param = None
 import telebot
 from telebot import types
 from telebot import util

 logger = telebot.logger
+proxy = None

 API_URL = "https://api.telegram.org/bot{0}/{1}"
 FILE_URL = "https://api.telegram.org/file/bot{0}/{1}"
@ -14,6 +27,10 @@ CONNECT_TIMEOUT = 3.5
 READ_TIMEOUT = 9999


+def _get_req_session():
+    return util.per_thread('req_session', lambda: requests.session())
+
+
 def _make_request(token, method_name, method='get', params=None, files=None, base_url=API_URL):
    """
    Makes a request to the Telegram API.
@ -28,10 +45,13 @@ def _make_request(token, method_name, method='get', params=None, files=None, bas
    logger.debug("Request: method={0} url={1} params={2} files={3}".format(method, request_url, params, files))
    read_timeout = READ_TIMEOUT
    connect_timeout = CONNECT_TIMEOUT
+    if files and format_header_param:
+        fields.format_header_param = _no_encode(format_header_param)
    if params:
        if 'timeout' in params: read_timeout = params['timeout'] + 10
        if 'connect-timeout' in params: connect_timeout = params['connect-timeout'] + 10
-    result = requests.request(method, request_url, params=params, files=files, timeout=(connect_timeout, read_timeout))
+    result = _get_req_session().request(method, request_url, params=params, files=files,
+                                        timeout=(connect_timeout, read_timeout), proxies=proxy)
    logger.debug("The server returned: '{0}'".format(result.text.encode('utf8')))
    return _check_result(method_name, result)['result']

@ -80,7 +100,7 @@ def get_file(token, file_id):

 def download_file(token, file_path):
    url = FILE_URL.format(token, file_path)
-    result = requests.get(url)
+    result = _get_req_session().get(url)
    if result.status_code != 200:
        msg = 'The server returned HTTP {0} {1}. Response body:\n[{2}]' \
            .format(result.status_code, result.reason, result.text)
@ -115,7 +135,7 @@ def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_m
    return _make_request(token, method_url, params=payload, method='post')


-def set_webhook(token, url=None, certificate=None):
+def set_webhook(token, url=None, certificate=None, max_connections=None, allowed_updates=None):
    method_url = r'setWebhook'
    payload = {
        'url': url if url else "",
@ -123,17 +143,25 @@ def set_webhook(token, url=None, certificate=None):
    files = None
    if certificate:
        files = {'certificate': certificate}
-
+    if max_connections:
+        payload['max_connections'] = max_connections
+    if allowed_updates:
+        payload['allowed_updates'] = json.dumps(allowed_updates)
    return _make_request(token, method_url, params=payload, files=files)


+def delete_webhook(token):
+    method_url = r'deleteWebhook'
+    return _make_request(token, method_url)
+
+
 def get_webhook_info(token):
    method_url = r'getWebhookInfo'
    payload = {}
    return _make_request(token, method_url, params=payload)


-def get_updates(token, offset=None, limit=None, timeout=None):
+def get_updates(token, offset=None, limit=None, timeout=None, allowed_updates=None):
    method_url = r'getUpdates'
    payload = {}
    if offset:
@ -142,6 +170,8 @@ def get_updates(token, offset=None, limit=None, timeout=None):
        payload['limit'] = limit
    if timeout:
        payload['timeout'] = timeout
+    if allowed_updates:
+        payload['allowed_updates'] = json.dumps(allowed_updates)
    return _make_request(token, method_url, params=payload)


@ -179,6 +209,18 @@ def get_chat_members_count(token, chat_id):
    return _make_request(token, method_url, params=payload)


+def set_chat_sticker_set(token, chat_id, sticker_set_name):
+    method_url = r'setChatStickerSet'
+    payload = {'chat_id': chat_id, 'sticker_set_name': sticker_set_name}
+    return _make_request(token, method_url, params=payload)
+
+
+def delete_chat_sticker_set(token, chat_id):
+    method_url = r'deleteChatStickerSet'
+    payload = {'chat_id': chat_id}
+    return _make_request(token, method_url, params=payload)
+
+
 def get_chat_member(token, chat_id, user_id):
    method_url = r'getChatMember'
    payload = {'chat_id': chat_id, 'user_id': user_id}
@ -194,7 +236,7 @@ def forward_message(token, chat_id, from_chat_id, message_id, disable_notificati


 def send_photo(token, chat_id, photo, caption=None, reply_to_message_id=None, reply_markup=None,
-               disable_notification=None):
+               parse_mode=None, disable_notification=None):
    method_url = r'sendPhoto'
    payload = {'chat_id': chat_id}
    files = None
@ -208,15 +250,31 @@ def send_photo(token, chat_id, photo, caption=None, reply_to_message_id=None, re
        payload['reply_to_message_id'] = reply_to_message_id
    if reply_markup:
        payload['reply_markup'] = _convert_markup(reply_markup)
+    if parse_mode:
+        payload['parse_mode'] = parse_mode
    if disable_notification:
        payload['disable_notification'] = disable_notification
    return _make_request(token, method_url, params=payload, files=files, method='post')


-def send_location(token, chat_id, latitude, longitude, reply_to_message_id=None, reply_markup=None,
+def send_media_group(token, chat_id, media, disable_notification=None, reply_to_message_id=None):
+    method_url = r'sendMediaGroup'
+    media_json, files = _convert_input_media(media)
+    payload = {'chat_id': chat_id, 'media': media_json}
+    if disable_notification:
+        payload['disable_notification'] = disable_notification
+    if reply_to_message_id:
+        payload['reply_to_message_id'] = reply_to_message_id
+    return _make_request(token, method_url, params=payload, method='post' if files else 'get',
+                         files=files if files else None)
+
+
+def send_location(token, chat_id, latitude, longitude, live_period=None, reply_to_message_id=None, reply_markup=None,
                  disable_notification=None):
    method_url = r'sendLocation'
    payload = {'chat_id': chat_id, 'latitude': latitude, 'longitude': longitude}
+    if live_period:
+        payload['live_period'] = live_period
    if reply_to_message_id:
        payload['reply_to_message_id'] = reply_to_message_id
    if reply_markup:
@ -226,6 +284,36 @@ def send_location(token, chat_id, latitude, longitude, reply_to_message_id=None,
    return _make_request(token, method_url, params=payload)


+def edit_message_live_location(token, latitude, longitude, chat_id=None, message_id=None,
+                               inline_message_id=None, reply_markup=None):
+    method_url = r'editMessageLiveLocation'
+    payload = {'latitude': latitude, 'longitude': longitude}
+    if chat_id:
+        payload['chat_id'] = chat_id
+    if message_id:
+        payload['message_id'] = message_id
+    if inline_message_id:
+        payload['inline_message_id'] = inline_message_id
+    if reply_markup:
+        payload['reply_markup'] = _convert_markup(reply_markup)
+    return _make_request(token, method_url, params=payload)
+
+
+def stop_message_live_location(token, chat_id=None, message_id=None,
+                               inline_message_id=None, reply_markup=None):
+    method_url = r'stopMessageLiveLocation'
+    payload = {}
+    if chat_id:
+        payload['chat_id'] = chat_id
+    if message_id:
+        payload['message_id'] = message_id
+    if inline_message_id:
+        payload['inline_message_id'] = inline_message_id
+    if reply_markup:
+        payload['reply_markup'] = _convert_markup(reply_markup)
+    return _make_request(token, method_url, params=payload)
+
+
 def send_venue(token, chat_id, latitude, longitude, title, address, foursquare_id=None, disable_notification=None,
               reply_to_message_id=None, reply_markup=None):
    method_url = r'sendVenue'
@ -263,7 +351,7 @@ def send_chat_action(token, chat_id, action):


 def send_video(token, chat_id, data, duration=None, caption=None, reply_to_message_id=None, reply_markup=None,
-               disable_notification=None, timeout=None):
+               parse_mode=None, supports_streaming=None, disable_notification=None, timeout=None):
    method_url = r'sendVideo'
    payload = {'chat_id': chat_id}
    files = None
@ -279,6 +367,10 @@ def send_video(token, chat_id, data, duration=None, caption=None, reply_to_messa
        payload['reply_to_message_id'] = reply_to_message_id
    if reply_markup:
        payload['reply_markup'] = _convert_markup(reply_markup)
+    if parse_mode:
+        payload['parse_mode'] = parse_mode
+    if supports_streaming:
+        payload['supports_streaming'] = supports_streaming
    if disable_notification:
        payload['disable_notification'] = disable_notification
    if timeout:
@ -287,7 +379,7 @@ def send_video(token, chat_id, data, duration=None, caption=None, reply_to_messa


 def send_voice(token, chat_id, voice, caption=None, duration=None, reply_to_message_id=None, reply_markup=None,
-               disable_notification=None, timeout=None):
+               parse_mode=None, disable_notification=None, timeout=None):
    method_url = r'sendVoice'
    payload = {'chat_id': chat_id}
    files = None
@ -303,6 +395,34 @@ def send_voice(token, chat_id, voice, caption=None, duration=None, reply_to_mess
        payload['reply_to_message_id'] = reply_to_message_id
    if reply_markup:
        payload['reply_markup'] = _convert_markup(reply_markup)
+    if parse_mode:
+        payload['parse_mode'] = parse_mode
+    if disable_notification:
+        payload['disable_notification'] = disable_notification
+    if timeout:
+        payload['connect-timeout'] = timeout
+    return _make_request(token, method_url, params=payload, files=files, method='post')
+
+
+def send_video_note(token, chat_id, data, duration=None, length=None, reply_to_message_id=None, reply_markup=None,
+                    disable_notification=None, timeout=None):
+    method_url = r'sendVideoNote'
+    payload = {'chat_id': chat_id}
+    files = None
+    if not util.is_string(data):
+        files = {'video_note': data}
+    else:
+        payload['video_note'] = data
+    if duration:
+        payload['duration'] = duration
+    if length:
+        payload['length'] = length
+    else:
+        payload['length'] = 639  # seems like it is MAX length size
+    if reply_to_message_id:
+        payload['reply_to_message_id'] = reply_to_message_id
+    if reply_markup:
+        payload['reply_markup'] = _convert_markup(reply_markup)
    if disable_notification:
        payload['disable_notification'] = disable_notification
    if timeout:
@ -311,7 +431,7 @@ def send_voice(token, chat_id, voice, caption=None, duration=None, reply_to_mess


 def send_audio(token, chat_id, audio, caption=None, duration=None, performer=None, title=None, reply_to_message_id=None,
-               reply_markup=None, disable_notification=None, timeout=None):
+               reply_markup=None, parse_mode=None, disable_notification=None, timeout=None):
    method_url = r'sendAudio'
    payload = {'chat_id': chat_id}
    files = None
@ -331,6 +451,8 @@ def send_audio(token, chat_id, audio, caption=None, duration=None, performer=Non
        payload['reply_to_message_id'] = reply_to_message_id
    if reply_markup:
        payload['reply_markup'] = _convert_markup(reply_markup)
+    if parse_mode:
+        payload['parse_mode'] = parse_mode
    if disable_notification:
        payload['disable_notification'] = disable_notification
    if timeout:
@ -338,8 +460,8 @@ def send_audio(token, chat_id, audio, caption=None, duration=None, performer=Non
    return _make_request(token, method_url, params=payload, files=files, method='post')


-def send_data(token, chat_id, data, data_type, reply_to_message_id=None, reply_markup=None, disable_notification=None,
-              timeout=None, caption=None):
+def send_data(token, chat_id, data, data_type, reply_to_message_id=None, reply_markup=None, parse_mode=None,
+              disable_notification=None, timeout=None, caption=None):
    method_url = get_method_by_type(data_type)
    payload = {'chat_id': chat_id}
    files = None
@ -351,6 +473,8 @@ def send_data(token, chat_id, data, data_type, reply_to_message_id=None, reply_m
        payload['reply_to_message_id'] = reply_to_message_id
    if reply_markup:
        payload['reply_markup'] = _convert_markup(reply_markup)
+    if parse_mode and data_type == 'document':
+        payload['parse_mode'] = parse_mode
    if disable_notification:
        payload['disable_notification'] = disable_notification
    if timeout:
@ -367,9 +491,11 @@ def get_method_by_type(data_type):
        return r'sendSticker'


-def kick_chat_member(token, chat_id, user_id):
+def kick_chat_member(token, chat_id, user_id, until_date=None):
    method_url = 'kickChatMember'
    payload = {'chat_id': chat_id, 'user_id': user_id}
+    if until_date:
+        payload['until_date'] = until_date
    return _make_request(token, method_url, params=payload, method='post')


@ -379,6 +505,96 @@ def unban_chat_member(token, chat_id, user_id):
    return _make_request(token, method_url, params=payload, method='post')


+def restrict_chat_member(token, chat_id, user_id, until_date=None, can_send_messages=None,
+                         can_send_media_messages=None, can_send_other_messages=None,
+                         can_add_web_page_previews=None):
+    method_url = 'restrictChatMember'
+    payload = {'chat_id': chat_id, 'user_id': user_id}
+    if until_date:
+        payload['until_date'] = until_date
+    if can_send_messages:
+        payload['can_send_messages'] = can_send_messages
+    if can_send_media_messages:
+        payload['can_send_media_messages'] = can_send_media_messages
+    if can_send_other_messages:
+        payload['can_send_other_messages'] = can_send_other_messages
+    if can_add_web_page_previews:
+        payload['can_add_web_page_previews'] = can_add_web_page_previews
+
+    return _make_request(token, method_url, params=payload, method='post')
+
+
+def promote_chat_member(token, chat_id, user_id, can_change_info=None, can_post_messages=None,
+                        can_edit_messages=None, can_delete_messages=None, can_invite_users=None,
+                        can_restrict_members=None, can_pin_messages=None, can_promote_members=None):
+    method_url = 'promoteChatMember'
+    payload = {'chat_id': chat_id, 'user_id': user_id}
+    if can_change_info:
+        payload['can_change_info'] = can_change_info
+    if can_post_messages:
+        payload['can_post_messages'] = can_post_messages
+    if can_edit_messages:
+        payload['can_edit_messages'] = can_edit_messages
+    if can_delete_messages:
+        payload['can_delete_messages'] = can_delete_messages
+    if can_invite_users:
+        payload['can_invite_users'] = can_invite_users
+    if can_restrict_members:
+        payload['can_restrict_members'] = can_restrict_members
+    if can_pin_messages:
+        payload['can_pin_messages'] = can_pin_messages
+    if can_promote_members:
+        payload['can_promote_members'] = can_promote_members
+    return _make_request(token, method_url, params=payload, method='post')
+
+
+def export_chat_invite_link(token, chat_id):
+    method_url = 'exportChatInviteLink'
+    payload = {'chat_id': chat_id}
+    return _make_request(token, method_url, params=payload, method='post')
+
+
+def set_chat_photo(token, chat_id, photo):
+    method_url = 'setChatPhoto'
+    payload = {'chat_id': chat_id}
+    files = None
+    if not util.is_string(photo):
+        files = {'photo': photo}
+    else:
+        payload['photo'] = photo
+    return _make_request(token, method_url, params=payload, files=files, method='post')
+
+
+def delete_chat_photo(token, chat_id):
+    method_url = 'deleteChatPhoto'
+    payload = {'chat_id': chat_id}
+    return _make_request(token, method_url, params=payload, method='post')
+
+
+def set_chat_title(token, chat_id, title):
+    method_url = 'setChatTitle'
+    payload = {'chat_id': chat_id, 'title': title}
+    return _make_request(token, method_url, params=payload, method='post')
+
+
+def set_chat_description(token, chat_id, description):
+    method_url = 'setChatDescription'
+    payload = {'chat_id': chat_id, 'description': description}
+    return _make_request(token, method_url, params=payload, method='post')
+
+
+def pin_chat_message(token, chat_id, message_id, disable_notification=False):
+    method_url = 'pinChatMessage'
+    payload = {'chat_id': chat_id, 'message_id': message_id, 'disable_notification': disable_notification}
+    return _make_request(token, method_url, params=payload, method='post')
+
+
+def unpin_chat_message(token, chat_id):
+    method_url = 'unpinChatMessage'
+    payload = {'chat_id': chat_id}
+    return _make_request(token, method_url, params=payload, method='post')
+
+
 # Updating messages

 def edit_message_text(token, text, chat_id=None, message_id=None, inline_message_id=None, parse_mode=None,
@ -400,7 +616,8 @@ def edit_message_text(token, text, chat_id=None, message_id=None, inline_message
    return _make_request(token, method_url, params=payload)


-def edit_message_caption(token, caption, chat_id=None, message_id=None, inline_message_id=None, reply_markup=None):
+def edit_message_caption(token, caption, chat_id=None, message_id=None, inline_message_id=None,
+                         parse_mode=None, reply_markup=None):
    method_url = r'editMessageCaption'
    payload = {'caption': caption}
    if chat_id:
@ -409,6 +626,8 @@ def edit_message_caption(token, caption, chat_id=None, message_id=None, inline_m
        payload['message_id'] = message_id
    if inline_message_id:
        payload['inline_message_id'] = inline_message_id
+    if parse_mode:
+        payload['parse_mode'] = parse_mode
    if reply_markup:
        payload['reply_markup'] = _convert_markup(reply_markup)
    return _make_request(token, method_url, params=payload)
@ -428,6 +647,12 @@ def edit_message_reply_markup(token, chat_id=None, message_id=None, inline_messa
    return _make_request(token, method_url, params=payload)


+def delete_message(token, chat_id, message_id):
+    method_url = r'deleteMessage'
+    payload = {'chat_id': chat_id, 'message_id': message_id}
+    return _make_request(token, method_url, params=payload)
+
+
 # Game

 def send_game(token, chat_id, game_short_name, disable_notification=None, reply_to_message_id=None, reply_markup=None):
@ -443,28 +668,32 @@ def send_game(token, chat_id, game_short_name, disable_notification=None, reply_


 # https://core.telegram.org/bots/api#setgamescore
-def set_game_score(token, user_id, score, chat_id=None, message_id=None, inline_message_id=None, edit_message=None):
+def set_game_score(token, user_id, score, force=None, disable_edit_message=None, chat_id=None, message_id=None,
+                   inline_message_id=None):
    """
    Use this method to set the score of the specified user in a game. On success, if the message was sent by the bot, returns the edited Message, otherwise returns True. Returns an error, if the new score is not greater than the user's current score in the chat.
    :param token: Bot's token (you don't need to fill this)
    :param user_id: User identifier
-    :param score: New score, must be positive
+    :param score: New score, must be non-negative
+    :param force: (Optional) Pass True, if the high score is allowed to decrease. This can be useful when fixing mistakes or banning cheaters
+    :param disable_edit_message: (Optional) Pass True, if the game message should not be automatically edited to include the current scoreboard
    :param chat_id: (Optional, required if inline_message_id is not specified) Unique identifier for the target chat (or username of the target channel in the format @channelusername)
    :param message_id: (Optional, required if inline_message_id is not specified) Unique identifier of the sent message
    :param inline_message_id: (Optional, required if chat_id and message_id are not specified) Identifier of the inline message
-    :param edit_message: (Optional) Pass True, if the game message should be automatically edited to include the current scoreboard
    :return:
    """
    method_url = r'setGameScore'
    payload = {'user_id': user_id, 'score': score}
+    if force:
+        payload['force'] = force
    if chat_id:
        payload['chat_id'] = chat_id
    if message_id:
        payload['message_id'] = message_id
    if inline_message_id:
        payload['inline_message_id'] = inline_message_id
-    if edit_message:
-        payload['edit_message'] = edit_message
+    if disable_edit_message:
+        payload['disable_edit_message'] = disable_edit_message
    return _make_request(token, method_url, params=payload)


@ -491,9 +720,120 @@ def get_game_high_scores(token, user_id, chat_id=None, message_id=None, inline_m
    return _make_request(token, method_url, params=payload)


+# Payments (https://core.telegram.org/bots/api#payments)
+
+def send_invoice(token, chat_id, title, description, invoice_payload, provider_token, currency, prices,
+                 start_parameter, photo_url=None, photo_size=None, photo_width=None, photo_height=None,
+                 need_name=None, need_phone_number=None, need_email=None, need_shipping_address=None, is_flexible=None,
+                 disable_notification=None, reply_to_message_id=None, reply_markup=None, provider_data=None):
+    """
+    Use this method to send invoices. On success, the sent Message is returned.
+    :param token: Bot's token (you don't need to fill this)
+    :param chat_id: Unique identifier for the target private chat
+    :param title: Product name
+    :param description: Product description
+    :param invoice_payload: Bot-defined invoice payload, 1-128 bytes. This will not be displayed to the user, use for your internal processes.
+    :param provider_token: Payments provider token, obtained via @Botfather
+    :param currency: Three-letter ISO 4217 currency code, see https://core.telegram.org/bots/payments#supported-currencies
+    :param prices: Price breakdown, a list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.)
+    :param start_parameter: Unique deep-linking parameter that can be used to generate this invoice when used as a start parameter
+    :param photo_url: URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for.
+    :param photo_size: Photo size
+    :param photo_width: Photo width
+    :param photo_height: Photo height
+    :param need_name: Pass True, if you require the user's full name to complete the order
+    :param need_phone_number: Pass True, if you require the user's phone number to complete the order
+    :param need_email: Pass True, if you require the user's email to complete the order
+    :param need_shipping_address: Pass True, if you require the user's shipping address to complete the order
+    :param is_flexible: Pass True, if the final price depends on the shipping method
+    :param disable_notification: Sends the message silently. Users will receive a notification with no sound.
+    :param reply_to_message_id: If the message is a reply, ID of the original message
+    :param reply_markup: A JSON-serialized object for an inline keyboard. If empty, one 'Pay total price' button will be shown. If not empty, the first button must be a Pay button
+    :return: 
+    """
+    method_url = r'sendInvoice'
+    payload = {'chat_id': chat_id, 'title': title, 'description': description, 'payload': invoice_payload,
+               'provider_token': provider_token, 'start_parameter': start_parameter, 'currency': currency,
+               'prices': _convert_list_json_serializable(prices)}
+    if photo_url:
+        payload['photo_url'] = photo_url
+    if photo_size:
+        payload['photo_size'] = photo_size
+    if photo_width:
+        payload['photo_width'] = photo_width
+    if photo_height:
+        payload['photo_height'] = photo_height
+    if need_name:
+        payload['need_name'] = need_name
+    if need_phone_number:
+        payload['need_phone_number'] = need_phone_number
+    if need_email:
+        payload['need_email'] = need_email
+    if need_shipping_address:
+        payload['need_shipping_address'] = need_shipping_address
+    if is_flexible:
+        payload['is_flexible'] = is_flexible
+    if disable_notification:
+        payload['disable_notification'] = disable_notification
+    if reply_to_message_id:
+        payload['reply_to_message_id'] = reply_to_message_id
+    if reply_markup:
+        payload['reply_markup'] = _convert_markup(reply_markup)
+    if provider_data:
+        payload['provider_data'] = provider_data
+    return _make_request(token, method_url, params=payload)
+
+
+def answer_shipping_query(token, shipping_query_id, ok, shipping_options=None, error_message=None):
+    """
+    If you sent an invoice requesting a shipping address and the parameter is_flexible was specified, the Bot API will send an Update with a shipping_query field to the bot. Use this method to reply to shipping queries. On success, True is returned.
+    :param token: Bot's token (you don't need to fill this)
+    :param shipping_query_id: Unique identifier for the query to be answered
+    :param ok: Specify True if delivery to the specified address is possible and False if there are any problems (for example, if delivery to the specified address is not possible)
+    :param shipping_options: Required if ok is True. A JSON-serialized array of available shipping options.
+    :param error_message: Required if ok is False. Error message in human readable form that explains why it is impossible to complete the order (e.g. "Sorry, delivery to your desired address is unavailable'). Telegram will display this message to the user.
+    :return: 
+    """
+    method_url = 'answerShippingQuery'
+    payload = {'shipping_query_id': shipping_query_id, 'ok': ok}
+    if shipping_options:
+        payload['shipping_options'] = _convert_list_json_serializable(shipping_options)
+    if error_message:
+        payload['error_message'] = error_message
+    return _make_request(token, method_url, params=payload)
+
+
+def answer_pre_checkout_query(token, pre_checkout_query_id, ok, error_message=None):
+    """
+    Once the user has confirmed their payment and shipping details, the Bot API sends the final confirmation in the form of an Update with the field pre_checkout_query. Use this method to respond to such pre-checkout queries. On success, True is returned. Note: The Bot API must receive an answer within 10 seconds after the pre-checkout query was sent.
+    :param token: Bot's token (you don't need to fill this)
+    :param pre_checkout_query_id: Unique identifier for the query to be answered
+    :param ok: Specify True if everything is alright (goods are available, etc.) and the bot is ready to proceed with the order. Use False if there are any problems.
+    :param error_message: Required if ok is False. Error message in human readable form that explains the reason for failure to proceed with the checkout (e.g. "Sorry, somebody just bought the last of our amazing black T-shirts while you were busy filling out your payment details. Please choose a different color or garment!"). Telegram will display this message to the user.
+    :return: 
+    """
+    method_url = 'answerPreCheckoutQuery'
+    payload = {'pre_checkout_query_id': pre_checkout_query_id, 'ok': ok}
+    if error_message:
+        payload['error_message'] = error_message
+    return _make_request(token, method_url, params=payload)
+
+
 # InlineQuery

-def answer_callback_query(token, callback_query_id, text=None, show_alert=None, url=None):
+def answer_callback_query(token, callback_query_id, text=None, show_alert=None, url=None, cache_time=None):
+    """
+    Use this method to send answers to callback queries sent from inline keyboards. The answer will be displayed to the user as a notification at the top of the chat screen or as an alert. On success, True is returned.
+    Alternatively, the user can be redirected to the specified Game URL. For this option to work, you must first create a game for your bot via BotFather and accept the terms. Otherwise, you may use links like telegram.me/your_bot?start=XXXX that open your bot with a parameter.
+    :param token: Bot's token (you don't need to fill this)
+    :param callback_query_id: Unique identifier for the query to be answered
+    :param text: (Optional) Text of the notification. If not specified, nothing will be shown to the user, 0-200 characters
+    :param show_alert: (Optional) If true, an alert will be shown by the client instead of a notification at the top of the chat screen. Defaults to false.
+    :param url: (Optional) URL that will be opened by the user's client. If you have created a Game and accepted the conditions via @Botfather, specify the URL that opens your game – note that this will only work if the query comes from a callback_game button.
+    Otherwise, you may use links like telegram.me/your_bot?start=XXXX that open your bot with a parameter.
+    :param cache_time: (Optional) The maximum amount of time in seconds that the result of the callback query may be cached client-side. Telegram apps will support caching starting in version 3.14. Defaults to 0.
+    :return:
+    """
    method_url = 'answerCallbackQuery'
    payload = {'callback_query_id': callback_query_id}
    if text:
@ -502,13 +842,15 @@ def answer_callback_query(token, callback_query_id, text=None, show_alert=None,
        payload['show_alert'] = show_alert
    if url:
        payload['url'] = url
+    if cache_time:
+        payload['cache_time'] = cache_time
    return _make_request(token, method_url, params=payload, method='post')


 def answer_inline_query(token, inline_query_id, results, cache_time=None, is_personal=None, next_offset=None,
                        switch_pm_text=None, switch_pm_parameter=None):
    method_url = 'answerInlineQuery'
-    payload = {'inline_query_id': inline_query_id, 'results': _convert_inline_results(results)}
+    payload = {'inline_query_id': inline_query_id, 'results': _convert_list_json_serializable(results)}
    if cache_time:
        payload['cache_time'] = cache_time
    if is_personal:
@ -522,7 +864,59 @@ def answer_inline_query(token, inline_query_id, results, cache_time=None, is_per
    return _make_request(token, method_url, params=payload, method='post')


-def _convert_inline_results(results):
+def get_sticker_set(token, name):
+    method_url = 'getStickerSet'
+    return _make_request(token, method_url, params={'name': name})
+
+
+def upload_sticker_file(token, user_id, png_sticker):
+    method_url = 'uploadStickerFile'
+    payload = {'user_id': user_id}
+    files = {'png_sticker': png_sticker}
+    return _make_request(token, method_url, params=payload, files=files, method='post')
+
+
+def create_new_sticker_set(token, user_id, name, title, png_sticker, emojis, contains_masks=None, mask_position=None):
+    method_url = 'createNewStickerSet'
+    payload = {'user_id': user_id, 'name': name, 'title': title, 'emojis': emojis}
+    files = None
+    if not util.is_string(png_sticker):
+        files = {'png_sticker': png_sticker}
+    else:
+        payload['png_sticker'] = png_sticker
+    if contains_masks:
+        payload['contains_masks'] = contains_masks
+    if mask_position:
+        payload['mask_position'] = mask_position.to_json()
+    return _make_request(token, method_url, params=payload, files=files, method='post')
+
+
+def add_sticker_to_set(token, user_id, name, png_sticker, emojis, mask_position):
+    method_url = 'addStickerToSet'
+    payload = {'user_id': user_id, 'name': name, 'emojis': emojis}
+    files = None
+    if not util.is_string(png_sticker):
+        files = {'png_sticker': png_sticker}
+    else:
+        payload['png_sticker'] = png_sticker
+    if mask_position:
+        payload['mask_position'] = mask_position.to_json()
+    return _make_request(token, method_url, params=payload, files=files, method='post')
+
+
+def set_sticker_position_in_set(token, sticker, position):
+    method_url = 'setStickerPositionInSet'
+    payload = {'sticker': sticker, 'position': position}
+    return _make_request(token, method_url, params=payload, method='post')
+
+
+def delete_sticker_from_set(token, sticker):
+    method_url = 'deleteStickerFromSet'
+    payload = {'sticker': sticker}
+    return _make_request(token, method_url, params=payload, method='post')
+
+
+def _convert_list_json_serializable(results):
    ret = ''
    for r in results:
        if isinstance(r, types.JsonSerializable):
@ -538,6 +932,29 @@ def _convert_markup(markup):
    return markup


+def _convert_input_media(array):
+    media = []
+    files = {}
+    for input_media in array:
+        if isinstance(input_media, types.JsonSerializable):
+            media_dict = input_media.to_dic()
+            if media_dict['media'].startswith('attach://'):
+                key = media_dict['media'].replace('attach://', '')
+                files[key] = input_media.media
+            media.append(media_dict)
+    return json.dumps(media), files
+
+
+def _no_encode(func):
+    def wrapper(key, val):
+        if key == 'filename':
+            return '{0}={1}'.format(key, val)
+        else:
+            return func(key, val)
+
+    return wrapper
+
+
 class ApiException(Exception):
    """
    This class represents an Exception thrown when a call to the Telegram API fails.
--- a/telebot/types.py
+++ b/telebot/types.py
@ -96,29 +96,47 @@ class Update(JsonDeserializable):
        update_id = obj['update_id']
        message = None
        edited_message = None
+        channel_post = None
+        edited_channel_post = None
        inline_query = None
        chosen_inline_result = None
        callback_query = None
+        shipping_query = None
+        pre_checkout_query = None
        if 'message' in obj:
            message = Message.de_json(obj['message'])
        if 'edited_message' in obj:
            edited_message = Message.de_json(obj['edited_message'])
+        if 'channel_post' in obj:
+            channel_post = Message.de_json(obj['channel_post'])
+        if 'edited_channel_post' in obj:
+            edited_channel_post = Message.de_json(obj['edited_channel_post'])
        if 'inline_query' in obj:
            inline_query = InlineQuery.de_json(obj['inline_query'])
        if 'chosen_inline_result' in obj:
            chosen_inline_result = ChosenInlineResult.de_json(obj['chosen_inline_result'])
        if 'callback_query' in obj:
            callback_query = CallbackQuery.de_json(obj['callback_query'])
-        return cls(update_id, message, edited_message, inline_query, chosen_inline_result, callback_query)
+        if 'shipping_query' in obj:
+            shipping_query = ShippingQuery.de_json(obj['shipping_query'])
+        if 'pre_checkout_query' in obj:
+            pre_checkout_query = PreCheckoutQuery.de_json(obj['pre_checkout_query'])
+        return cls(update_id, message, edited_message, channel_post, edited_channel_post, inline_query,
+                   chosen_inline_result, callback_query, shipping_query, pre_checkout_query)

-    def __init__(self, update_id, message, edited_message, inline_query, chosen_inline_result, callback_query):
+    def __init__(self, update_id, message, edited_message, channel_post, edited_channel_post, inline_query,
+                 chosen_inline_result, callback_query, shipping_query, pre_checkout_query):
        self.update_id = update_id
        self.edited_message = edited_message
        self.message = message
        self.edited_message = edited_message
+        self.channel_post = channel_post
+        self.edited_channel_post = edited_channel_post
        self.inline_query = inline_query
        self.chosen_inline_result = chosen_inline_result
        self.callback_query = callback_query
+        self.shipping_query = shipping_query
+        self.pre_checkout_query = pre_checkout_query


 class WebhookInfo(JsonDeserializable):
@ -130,18 +148,28 @@ class WebhookInfo(JsonDeserializable):
        pending_update_count = obj['pending_update_count']
        last_error_date = None
        last_error_message = None
+        max_connections = None
+        allowed_updates = None
        if 'last_error_message' in obj:
            last_error_date = obj['last_error_date']
        if 'last_error_message' in obj:
            last_error_message = obj['last_error_message']
-        return cls(url, has_custom_certificate, pending_update_count, last_error_date, last_error_message)
+        if 'max_connections' in obj:
+            max_connections = obj['max_connections']
+        if 'allowed_updates' in obj:
+            allowed_updates = obj['allowed_updates']
+        return cls(url, has_custom_certificate, pending_update_count, last_error_date, last_error_message,
+                   max_connections, allowed_updates)

-    def __init__(self, url, has_custom_certificate, pending_update_count, last_error_date, last_error_message):
+    def __init__(self, url, has_custom_certificate, pending_update_count, last_error_date, last_error_message,
+                 max_connections, allowed_updates):
        self.url = url
        self.has_custom_certificate = has_custom_certificate
        self.pending_update_count = pending_update_count
        self.last_error_date = last_error_date
        self.last_error_message = last_error_message
+        self.max_connections = max_connections
+        self.allowed_updates = allowed_updates


 class User(JsonDeserializable):
@ -149,16 +177,20 @@ class User(JsonDeserializable):
    def de_json(cls, json_string):
        obj = cls.check_json(json_string)
        id = obj['id']
+        is_bot = obj['is_bot']
        first_name = obj['first_name']
        last_name = obj.get('last_name')
        username = obj.get('username')
-        return cls(id, first_name, last_name, username)
+        language_code = obj.get('language_code')
+        return cls(id, is_bot, first_name, last_name, username, language_code)

-    def __init__(self, id, first_name, last_name=None, username=None):
+    def __init__(self, id, is_bot, first_name, last_name=None, username=None, language_code=None):
        self.id = id
+        self.is_bot = is_bot
        self.first_name = first_name
        self.username = username
        self.last_name = last_name
+        self.language_code = language_code


 class GroupChat(JsonDeserializable):
@ -185,9 +217,22 @@ class Chat(JsonDeserializable):
        first_name = obj.get('first_name')
        last_name = obj.get('last_name')
        all_members_are_administrators = obj.get('all_members_are_administrators')
-        return cls(id, type, title, username, first_name, last_name, all_members_are_administrators)
+        photo = None
+        if 'photo' in obj:
+            photo = ChatPhoto.de_json(obj['photo'])
+        description = obj.get('description')
+        invite_link = obj.get('invite_link')
+        pinned_message = None
+        if 'pinned_message' in obj:
+            pinned_message = Message.de_json(obj['pinned_message'])
+        sticker_set_name = obj.get('sticker_set_name')
+        can_set_sticker_set = obj.get('can_set_sticker_set')
+        return cls(id, type, title, username, first_name, last_name, all_members_are_administrators,
+                   photo, description, invite_link, pinned_message, sticker_set_name, can_set_sticker_set)

-    def __init__(self, id, type, title=None, username=None, first_name=None, last_name=None, all_members_are_administrators=None):
+    def __init__(self, id, type, title=None, username=None, first_name=None, last_name=None,
+                 all_members_are_administrators=None, photo=None, description=None, invite_link=None,
+                 pinned_message=None, sticker_set_name=None, can_set_sticker_set=None):
        self.type = type
        self.last_name = last_name
        self.first_name = first_name
@ -195,6 +240,12 @@ class Chat(JsonDeserializable):
        self.id = id
        self.title = title
        self.all_members_are_administrators = all_members_are_administrators
+        self.photo = photo
+        self.description = description
+        self.invite_link = invite_link
+        self.pinned_message = pinned_message
+        self.sticker_set_name = sticker_set_name
+        self.can_set_sticker_set = can_set_sticker_set


 class Message(JsonDeserializable):
@ -213,17 +264,27 @@ class Message(JsonDeserializable):
            opts['forward_from'] = User.de_json(obj['forward_from'])
        if 'forward_from_chat' in obj:
            opts['forward_from_chat'] = Chat.de_json(obj['forward_from_chat'])
+        if 'forward_from_message_id' in obj:
+            opts['forward_from_message_id'] = obj.get('forward_from_message_id')
+        if 'forward_signature' in obj:
+            opts['forward_signature'] = obj.get('forward_signature')
        if 'forward_date' in obj:
-            opts['forward_date'] = obj['forward_date']
+            opts['forward_date'] = obj.get('forward_date')
        if 'reply_to_message' in obj:
            opts['reply_to_message'] = Message.de_json(obj['reply_to_message'])
        if 'edit_date' in obj:
            opts['edit_date'] = obj.get('edit_date')
+        if 'media_group_id' in obj:
+            opts['media_group_id'] = obj.get('media_group_id')
+        if 'author_signature' in obj:
+            opts['author_signature'] = obj.get('author_signature')
        if 'text' in obj:
            opts['text'] = obj['text']
            content_type = 'text'
        if 'entities' in obj:
            opts['entities'] = Message.parse_entities(obj['entities'])
+        if 'caption_entities' in obj:
+            opts['caption_entities'] = Message.parse_entities(obj['caption_entities'])
        if 'audio' in obj:
            opts['audio'] = Audio.de_json(obj['audio'])
            content_type = 'audio'
@ -242,6 +303,9 @@ class Message(JsonDeserializable):
        if 'video' in obj:
            opts['video'] = Video.de_json(obj['video'])
            content_type = 'video'
+        if 'video_note' in obj:
+            opts['video_note'] = VideoNote.de_json(obj['video_note'])
+            content_type = 'video_note'
        if 'voice' in obj:
            opts['voice'] = Audio.de_json(obj['voice'])
            content_type = 'voice'
@ -259,27 +323,52 @@ class Message(JsonDeserializable):
        if 'new_chat_member' in obj:
            opts['new_chat_member'] = User.de_json(obj['new_chat_member'])
            content_type = 'new_chat_member'
+        if 'new_chat_members' in obj:
+            chat_members = obj['new_chat_members']
+            nms = []
+            for m in chat_members:
+                nms.append(User.de_json(m))
+            opts['new_chat_members'] = nms
+            content_type = 'new_chat_members'
        if 'left_chat_member' in obj:
            opts['left_chat_member'] = User.de_json(obj['left_chat_member'])
            content_type = 'left_chat_member'
        if 'new_chat_title' in obj:
            opts['new_chat_title'] = obj['new_chat_title']
+            content_type = 'new_chat_title'
        if 'new_chat_photo' in obj:
            opts['new_chat_photo'] = Message.parse_photo(obj['new_chat_photo'])
+            content_type = 'new_chat_photo'
        if 'delete_chat_photo' in obj:
            opts['delete_chat_photo'] = obj['delete_chat_photo']
+            content_type = 'delete_chat_photo'
        if 'group_chat_created' in obj:
            opts['group_chat_created'] = obj['group_chat_created']
+            content_type = 'group_chat_created'
        if 'supergroup_chat_created' in obj:
            opts['supergroup_chat_created'] = obj['supergroup_chat_created']
+            content_type = 'supergroup_chat_created'
        if 'channel_chat_created' in obj:
            opts['channel_chat_created'] = obj['channel_chat_created']
+            content_type = 'channel_chat_created'
        if 'migrate_to_chat_id' in obj:
            opts['migrate_to_chat_id'] = obj['migrate_to_chat_id']
+            content_type = 'migrate_to_chat_id'
        if 'migrate_from_chat_id' in obj:
            opts['migrate_from_chat_id'] = obj['migrate_from_chat_id']
+            content_type = 'migrate_from_chat_id'
        if 'pinned_message' in obj:
            opts['pinned_message'] = Message.de_json(obj['pinned_message'])
+            content_type = 'pinned_message'
+        if 'invoice' in obj:
+            opts['invoice'] = Invoice.de_json(obj['invoice'])
+            content_type = 'invoice'
+        if 'successful_payment' in obj:
+            opts['successful_payment'] = SuccessfulPayment.de_json(obj['successful_payment'])
+            content_type = 'successful_payment'
+        if 'connected_website' in obj:
+            opts['connected_website'] = obj['connected_website']
+            content_type = 'connected_website'
        return cls(message_id, from_user, date, chat, content_type, opts)

    @classmethod
@ -314,19 +403,24 @@ class Message(JsonDeserializable):
        self.forward_date = None
        self.reply_to_message = None
        self.edit_date = None
+        self.media_group_id = None
+        self.author_signature = None
        self.text = None
        self.entities = None
+        self.caption_entities = None
        self.audio = None
        self.document = None
        self.photo = None
        self.sticker = None
        self.video = None
+        self.video_note = None
        self.voice = None
        self.caption = None
        self.contact = None
        self.location = None
        self.venue = None
        self.new_chat_member = None
+        self.new_chat_members = None
        self.left_chat_member = None
        self.new_chat_title = None
        self.new_chat_photo = None
@ -337,6 +431,9 @@ class Message(JsonDeserializable):
        self.migrate_to_chat_id = None
        self.migrate_from_chat_id = None
        self.pinned_message = None
+        self.invoice = None
+        self.successful_payment = None
+        self.connected_website = None
        for key in options:
            setattr(self, key, options[key])

@ -486,6 +583,27 @@ class Video(JsonDeserializable):
        self.file_size = file_size


+class VideoNote(JsonDeserializable):
+    @classmethod
+    def de_json(cls, json_string):
+        obj = cls.check_json(json_string)
+        file_id = obj['file_id']
+        length = obj['length']
+        duration = obj['duration']
+        thumb = None
+        if 'thumb' in obj:
+            thumb = PhotoSize.de_json(obj['thumb'])
+        file_size = obj.get('file_size')
+        return cls(file_id, length, duration, thumb, file_size)
+
+    def __init__(self, file_id, length, duration, thumb=None, file_size=None):
+        self.file_id = file_id
+        self.length = length
+        self.duration = duration
+        self.thumb = thumb
+        self.file_size = file_size
+
+
 class Contact(JsonDeserializable):
    @classmethod
    def de_json(cls, json_string):
@ -572,12 +690,12 @@ class ForceReply(JsonSerializable):
        return json.dumps(json_dict)


-class ReplyKeyboardHide(JsonSerializable):
+class ReplyKeyboardRemove(JsonSerializable):
    def __init__(self, selective=None):
        self.selective = selective

    def to_json(self):
-        json_dict = {'hide_keyboard': True}
+        json_dict = {'remove_keyboard': True}
        if self.selective:
            json_dict['selective'] = True
        return json.dumps(json_dict)
@ -606,6 +724,8 @@ class ReplyKeyboardMarkup(JsonSerializable):
        for button in args:
            if util.is_string(button):
                row.append({'text': button})
+            elif isinstance(button, bytes):
+                row.append({'text': button.decode('utf-8')})
            else:
                row.append(button.to_dic())
            if i % self.row_width == 0:
@ -725,13 +845,14 @@ class InlineKeyboardMarkup(Dictionaryable, JsonSerializable):

 class InlineKeyboardButton(JsonSerializable):
    def __init__(self, text, url=None, callback_data=None, switch_inline_query=None,
-                 switch_inline_query_current_chat=None, callback_game=None):
+                 switch_inline_query_current_chat=None, callback_game=None, pay=None):
        self.text = text
        self.url = url
        self.callback_data = callback_data
        self.switch_inline_query = switch_inline_query
        self.switch_inline_query_current_chat = switch_inline_query_current_chat
        self.callback_game = callback_game
+        self.pay = pay

    def to_json(self):
        return json.dumps(self.to_dic())
@ -748,6 +869,8 @@ class InlineKeyboardButton(JsonSerializable):
            json_dic['switch_inline_query_current_chat'] = self.switch_inline_query_current_chat
        if self.callback_game is not None:
            json_dic['callback_game'] = self.callback_game
+        if self.pay is not None:
+            json_dic['pay'] = self.pay
        return json_dic


@ -776,17 +899,62 @@ class CallbackQuery(JsonDeserializable):
        self.inline_message_id = inline_message_id


+class ChatPhoto(JsonDeserializable):
+    @classmethod
+    def de_json(cls, json_type):
+        obj = cls.check_json(json_type)
+        small_file_id = obj['small_file_id']
+        big_file_id = obj['big_file_id']
+        return cls(small_file_id, big_file_id)
+
+    def __init__(self, small_file_id, big_file_id):
+        self.small_file_id = small_file_id
+        self.big_file_id = big_file_id
+
+
 class ChatMember(JsonDeserializable):
    @classmethod
    def de_json(cls, json_type):
        obj = cls.check_json(json_type)
        user = User.de_json(obj['user'])
        status = obj['status']
-        return cls(user, status)
+        until_date = obj.get('until_date')
+        can_be_edited = obj.get('can_be_edited')
+        can_change_info = obj.get('can_change_info')
+        can_post_messages = obj.get('can_post_messages')
+        can_edit_messages = obj.get('can_edit_messages')
+        can_delete_messages = obj.get('can_delete_messages')
+        can_invite_users = obj.get('can_invite_users')
+        can_restrict_members = obj.get('can_restrict_members')
+        can_pin_messages = obj.get('can_pin_messages')
+        can_promote_members = obj.get('can_promote_members')
+        can_send_messages = obj.get('can_send_messages')
+        can_send_media_messages = obj.get('can_send_media_messages')
+        can_send_other_messages = obj.get('can_send_other_messages')
+        can_add_web_page_previews = obj.get('can_add_web_page_previews')
+        return cls(user, status, until_date, can_be_edited, can_change_info, can_post_messages, can_edit_messages,
+                   can_delete_messages, can_invite_users, can_restrict_members, can_pin_messages, can_promote_members,
+                   can_send_messages, can_send_media_messages, can_send_other_messages, can_add_web_page_previews)

-    def __init__(self, user, status):
+    def __init__(self, user, status, until_date, can_be_edited, can_change_info, can_post_messages, can_edit_messages,
+                 can_delete_messages, can_invite_users, can_restrict_members, can_pin_messages, can_promote_members,
+                 can_send_messages, can_send_media_messages, can_send_other_messages, can_add_web_page_previews):
        self.user = user
        self.status = status
+        self.until_date = until_date
+        self.can_be_edited = can_be_edited
+        self.can_change_info = can_change_info
+        self.can_post_messages = can_post_messages
+        self.can_edit_messages = can_edit_messages
+        self.can_delete_messages = can_delete_messages
+        self.can_invite_users = can_invite_users
+        self.can_restrict_members = can_restrict_members
+        self.can_pin_messages = can_pin_messages
+        self.can_promote_members = can_promote_members
+        self.can_send_messages = can_send_messages
+        self.can_send_media_messages = can_send_media_messages
+        self.can_send_other_messages = can_send_other_messages
+        self.can_add_web_page_previews = can_add_web_page_previews


 # InlineQuery
@ -839,12 +1007,15 @@ class InputTextMessageContent(Dictionaryable):


 class InputLocationMessageContent(Dictionaryable):
-    def __init__(self, latitude, longitude):
+    def __init__(self, latitude, longitude, live_period=None):
        self.latitude = latitude
        self.longitude = longitude
+        self.live_period = live_period

    def to_dic(self):
-        json_dic = {'latitude': self.latitudet, 'longitude': self.longitude}
+        json_dic = {'latitude': self.latitude, 'longitude': self.longitude}
+        if self.live_period:
+            json_dic['live_period'] = self.live_period
        return json_dic


@ -1005,7 +1176,7 @@ class InlineQueryResultPhoto(JsonSerializable):

 class InlineQueryResultGif(JsonSerializable):
    def __init__(self, id, gif_url, thumb_url, gif_width=None, gif_height=None, title=None, caption=None,
-                 reply_markup=None, input_message_content=None):
+                 reply_markup=None, input_message_content=None, gif_duration=None):
        """
        Represents a link to an animated GIF file.
        :param id: Unique identifier for this result, 1-64 bytes.
@ -1029,6 +1200,7 @@ class InlineQueryResultGif(JsonSerializable):
        self.caption = caption
        self.reply_markup = reply_markup
        self.input_message_content = input_message_content
+        self.gif_duration = gif_duration

    def to_json(self):
        json_dict = {'type': self.type, 'id': self.id, 'gif_url': self.gif_url, 'thumb_url': self.thumb_url}
@ -1044,12 +1216,14 @@ class InlineQueryResultGif(JsonSerializable):
            json_dict['reply_markup'] = self.reply_markup.to_dic()
        if self.input_message_content:
            json_dict['input_message_content'] = self.input_message_content.to_dic()
+        if self.gif_duration:
+            json_dict['gif_duration'] = self.gif_duration
        return json.dumps(json_dict)


 class InlineQueryResultMpeg4Gif(JsonSerializable):
    def __init__(self, id, mpeg4_url, thumb_url, mpeg4_width=None, mpeg4_height=None, title=None, caption=None,
-                 reply_markup=None, input_message_content=None):
+                 reply_markup=None, input_message_content=None, mpeg4_duration=None):
        """
        Represents a link to a video animation (H.264/MPEG-4 AVC video without sound).
        :param id: Unique identifier for this result, 1-64 bytes
@ -1073,6 +1247,7 @@ class InlineQueryResultMpeg4Gif(JsonSerializable):
        self.caption = caption
        self.reply_markup = reply_markup
        self.input_message_content = input_message_content
+        self.mpeg4_duration = mpeg4_duration

    def to_json(self):
        json_dict = {'type': self.type, 'id': self.id, 'mpeg4_url': self.mpeg4_url, 'thumb_url': self.thumb_url}
@ -1088,6 +1263,8 @@ class InlineQueryResultMpeg4Gif(JsonSerializable):
            json_dict['reply_markup'] = self.reply_markup.to_dic()
        if self.input_message_content:
            json_dict['input_message_content'] = self.input_message_content.to_dic()
+        if self.mpeg4_duration:
+            json_dict['mpeg4_duration '] = self.mpeg4_duration
        return json.dumps(json_dict)


@ -1235,13 +1412,14 @@ class InlineQueryResultDocument(JsonSerializable):


 class InlineQueryResultLocation(JsonSerializable):
-    def __init__(self, id, title, latitude, longitude, reply_markup=None,
+    def __init__(self, id, title, latitude, longitude, live_period=None, reply_markup=None,
                 input_message_content=None, thumb_url=None, thumb_width=None, thumb_height=None):
        self.type = 'location'
        self.id = id
        self.title = title
        self.latitude = latitude
        self.longitude = longitude
+        self.live_period = live_period
        self.reply_markup = reply_markup
        self.input_message_content = input_message_content
        self.thumb_url = thumb_url
@ -1251,6 +1429,8 @@ class InlineQueryResultLocation(JsonSerializable):
    def to_json(self):
        json_dict = {'type': self.type, 'id': self.id, 'latitude': self.latitude, 'longitude': self.longitude,
                     'title': self.title}
+        if self.live_period:
+            json_dict['live_period'] = self.live_period
        if self.thumb_url:
            json_dict['thumb_url'] = self.thumb_url
        if self.thumb_width:
@ -1557,3 +1737,295 @@ class GameHighScore(JsonDeserializable):
        self.position = position
        self.user = user
        self.score = score
+
+
+# Payments
+
+class LabeledPrice(JsonSerializable):
+    def __init__(self, label, amount):
+        self.label = label
+        self.amount = amount
+
+    def to_json(self):
+        return json.dumps(self.to_dic())
+
+    def to_dic(self):
+        return {'label': self.label, 'amount': self.amount}
+
+
+class Invoice(JsonDeserializable):
+    @classmethod
+    def de_json(cls, json_string):
+        obj = cls.check_json(json_string)
+        title = obj['title']
+        description = obj['description']
+        start_parameter = obj['start_parameter']
+        currency = obj['currency']
+        total_amount = obj['total_amount']
+        return cls(title, description, start_parameter, currency, total_amount)
+
+    def __init__(self, title, description, start_parameter, currency, total_amount):
+        self.title = title
+        self.description = description
+        self.start_parameter = start_parameter
+        self.currency = currency
+        self.total_amount = total_amount
+
+
+class ShippingAddress(JsonDeserializable):
+    @classmethod
+    def de_json(cls, json_string):
+        obj = cls.check_json(json_string)
+        country_code = obj['country_code']
+        state = obj['state']
+        city = obj['city']
+        street_line1 = obj['street_line1']
+        street_line2 = obj['street_line2']
+        post_code = obj['post_code']
+        return cls(country_code, state, city, street_line1, street_line2, post_code)
+
+    def __init__(self, country_code, state, city, street_line1, street_line2, post_code):
+        self.country_code = country_code
+        self.state = state
+        self.city = city
+        self.street_line1 = street_line1
+        self.street_line2 = street_line2
+        self.post_code = post_code
+
+
+class OrderInfo(JsonDeserializable):
+    @classmethod
+    def de_json(cls, json_string):
+        obj = cls.check_json(json_string)
+        name = obj.get('name')
+        phone_number = obj.get('phone_number')
+        email = obj.get('email')
+        shipping_address = None
+        if 'shipping_address' in obj:
+            shipping_address = ShippingAddress.de_json(obj['shipping_address'])
+        return cls(name, phone_number, email, shipping_address)
+
+    def __init__(self, name, phone_number, email, shipping_address):
+        self.name = name
+        self.phone_number = phone_number
+        self.email = email
+        self.shipping_address = shipping_address
+
+
+class ShippingOption(JsonSerializable):
+    def __init__(self, id, title):
+        self.id = id
+        self.title = title
+        self.prices = []
+
+    def add_price(self, *args):
+        """
+        Add LabeledPrice to ShippingOption
+        :param args: LabeledPrices 
+        """
+        for price in args:
+            self.prices.append(price)
+
+    def to_json(self):
+        price_list = []
+        for p in self.prices:
+            price_list.append(p.to_dic())
+        json_dict = json.dumps({'id': self.id, 'title': self.title, 'prices': price_list})
+        return json_dict
+
+
+class SuccessfulPayment(JsonDeserializable):
+    @classmethod
+    def de_json(cls, json_string):
+        obj = cls.check_json(json_string)
+        currency = obj['currency']
+        total_amount = obj['total_amount']
+        invoice_payload = obj['invoice_payload']
+        shipping_option_id = obj.get('shipping_option_id')
+        order_info = None
+        if 'order_info' in obj:
+            order_info = OrderInfo.de_json(obj['order_info'])
+        telegram_payment_charge_id = obj['telegram_payment_charge_id']
+        provider_payment_charge_id = obj['provider_payment_charge_id']
+        return cls(currency, total_amount, invoice_payload, shipping_option_id, order_info,
+                   telegram_payment_charge_id, provider_payment_charge_id)
+
+    def __init__(self, currency, total_amount, invoice_payload, shipping_option_id, order_info,
+                 telegram_payment_charge_id, provider_payment_charge_id):
+        self.currency = currency
+        self.total_amount = total_amount
+        self.invoice_payload = invoice_payload
+        self.shipping_option_id = shipping_option_id
+        self.order_info = order_info
+        self.telegram_payment_charge_id = telegram_payment_charge_id
+        self.provider_payment_charge_id = provider_payment_charge_id
+
+
+class ShippingQuery(JsonDeserializable):
+    @classmethod
+    def de_json(cls, json_string):
+        obj = cls.check_json(json_string)
+        id = obj['id']
+        from_user = User.de_json(obj['from'])
+        invoice_payload = obj['invoice_payload']
+        shipping_address = ShippingAddress.de_json(obj['shipping_address'])
+        return cls(id, from_user, invoice_payload, shipping_address)
+
+    def __init__(self, id, from_user, invoice_payload, shipping_address):
+        self.id = id
+        self.from_user = from_user
+        self.invoice_payload = invoice_payload
+        self.shipping_address = shipping_address
+
+
+class PreCheckoutQuery(JsonDeserializable):
+    @classmethod
+    def de_json(cls, json_string):
+        obj = cls.check_json(json_string)
+        id = obj['id']
+        from_user = User.de_json(obj['from'])
+        currency = obj['currency']
+        total_amount = obj['total_amount']
+        invoice_payload = obj['invoice_payload']
+        shipping_option_id = obj.get('shipping_option_id')
+        order_info = None
+        if 'order_info' in obj:
+            order_info = OrderInfo.de_json(obj['order_info'])
+        return cls(id, from_user, currency, total_amount, invoice_payload, shipping_option_id, order_info)
+
+    def __init__(self, id, from_user, currency, total_amount, invoice_payload, shipping_option_id, order_info):
+        self.id = id
+        self.from_user = from_user
+        self.currency = currency
+        self.total_amount = total_amount
+        self.invoice_payload = invoice_payload
+        self.shipping_option_id = shipping_option_id
+        self.order_info = order_info
+
+
+# Stickers
+
+class StickerSet(JsonDeserializable):
+    @classmethod
+    def de_json(cls, json_string):
+        obj = cls.check_json(json_string)
+        name = obj['name']
+        title = obj['title']
+        contains_masks = obj['contains_masks']
+        stickers = []
+        for s in obj['stickers']:
+            stickers.append(Sticker.de_json(s))
+        return cls(name, title, contains_masks, stickers)
+
+    def __init__(self, name, title, contains_masks, stickers):
+        self.stickers = stickers
+        self.contains_masks = contains_masks
+        self.title = title
+        self.name = name
+
+
+class Sticker(JsonDeserializable):
+    @classmethod
+    def de_json(cls, json_string):
+        obj = cls.check_json(json_string)
+        file_id = obj['file_id']
+        width = obj['width']
+        height = obj['height']
+        thumb = None
+        if 'thumb' in obj:
+            thumb = PhotoSize.de_json(obj['thumb'])
+        emoji = obj.get('emoji')
+        set_name = obj.get('set_name')
+        mask_position = None
+        if 'mask_position' in obj:
+            mask_position = MaskPosition.de_json(obj['mask_position'])
+        file_size = obj.get('file_size')
+        return cls(file_id, width, height, thumb, emoji, set_name, mask_position, file_size)
+
+    def __init__(self, file_id, width, height, thumb, emoji, set_name, mask_position, file_size):
+        self.file_id = file_id
+        self.width = width
+        self.height = height
+        self.thumb = thumb
+        self.emoji = emoji
+        self.set_name = set_name
+        self.mask_position = mask_position
+        self.file_size = file_size
+
+
+class MaskPosition(JsonDeserializable, JsonSerializable):
+    @classmethod
+    def de_json(cls, json_string):
+        obj = cls.check_json(json_string)
+        point = obj['point']
+        x_shift = obj['x_shift']
+        y_shift = obj['y_shift']
+        scale = obj['scale']
+        return cls(point, x_shift, y_shift, scale)
+
+    def __init__(self, point, x_shift, y_shift, scale):
+        self.point = point
+        self.x_shift = x_shift
+        self.y_shift = y_shift
+        self.scale = scale
+
+    def to_json(self):
+        return json.dumps(self.to_dic())
+
+    def to_dic(self):
+        return {'point': self.point, 'x_shift': self.x_shift, 'y_shift': self.y_shift, 'scale': self.scale}
+
+
+# InputMedia
+
+class InputMediaPhoto(JsonSerializable):
+    def __init__(self, media, caption=None, parse_mode=None):
+        self.type = "photo"
+        self.media = media
+        self.caption = caption
+        self.parse_mode = parse_mode
+
+    def to_json(self):
+        return json.dumps(self.to_dic())
+
+    def to_dic(self):
+        ret = {'type': self.type, 'media': 'attach://' + util.generate_random_token()
+               if not util.is_string(self.media) else self.media}
+        if self.caption:
+            ret['caption'] = self.caption
+        if self.parse_mode:
+            ret['parse_mode'] = self.parse_mode
+        return ret
+
+
+class InputMediaVideo(JsonSerializable):
+    def __init__(self, media, caption=None, parse_mode=None, width=None, height=None, duration=None,
+                 supports_streaming=None):
+        self.type = "video"
+        self.media = media
+        self.caption = caption
+        self.parse_mode = parse_mode
+        self.width = width
+        self.height = height
+        self.duration = duration
+        self.supports_streaming = supports_streaming
+
+    def to_json(self):
+        return json.dumps(self.to_dic())
+
+    def to_dic(self):
+        ret = {'type': self.type, 'media': 'attach://' + util.generate_random_token()
+               if not util.is_string(self.media) else self.media}
+        if self.caption:
+            ret['caption'] = self.caption
+        if self.parse_mode:
+            ret['parse_mode'] = self.parse_mode
+        if self.width:
+            ret['width'] = self.width
+        if self.height:
+            ret['height'] = self.height
+        if self.duration:
+            ret['duration'] = self.duration
+        if self.supports_streaming:
+            ret['supports_streaming'] = self.supports_streaming
+        return ret
--- a/telebot/util.py
+++ b/telebot/util.py
@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
-
+import random
+import string
 import threading
+import traceback
 import re
 import sys
 import six
@ -12,8 +14,11 @@ try:
    import Queue
 except ImportError:
    import queue as Queue
+import logging

-from telebot import logger
+logger = logging.getLogger('TeleBot')
+
+thread_local = threading.local()


 class WorkerThread(threading.Thread):
@ -56,8 +61,8 @@ class WorkerThread(threading.Thread):
                    self.done_event.set()
                except Queue.Empty:
                    pass
-                except:
-                    logger.debug("Exception occurred")
+                except Exception as e:
+                    logger.error(type(e).__name__ + " occurred, args=" + str(e.args) + "\n" + traceback.format_exc())
                    self.exc_info = sys.exc_info()
                    self.exception_event.set()

@ -241,3 +246,16 @@ def extract_arguments(text):
    regexp = re.compile("\/\w*(@\w*)*\s*([\s\S]*)",re.IGNORECASE)
    result = regexp.match(text)
    return result.group(2) if is_command(text) else None
+
+
+def per_thread(key, construct_value):
+    try:
+        return getattr(thread_local, key)
+    except AttributeError:
+        value = construct_value()
+        setattr(thread_local, key, value)
+        return value
+
+
+def generate_random_token():
+    return ''.join(random.sample(string.ascii_letters, 16))
--- a/tests/test_telebot.py
+++ b/tests/test_telebot.py
@ -201,7 +201,8 @@ class TestTeleBot:
    def test_send_audio_dis_noti(self):
        file_data = open('./test_data/record.mp3', 'rb')
        tb = telebot.TeleBot(TOKEN)
-        ret_msg = tb.send_audio(CHAT_ID, file_data, 1, performer='eternnoir', title='pyTelegram', disable_notification=True)
+        ret_msg = tb.send_audio(CHAT_ID, file_data, 1, performer='eternnoir', title='pyTelegram',
+                                disable_notification=True)
        assert ret_msg.content_type == 'audio'
        assert ret_msg.audio.performer == 'eternnoir'
        assert ret_msg.audio.title == 'pyTelegram'
@ -389,7 +390,7 @@ class TestTeleBot:

    def create_text_message(self, text):
        params = {'text': text}
-        chat = types.User(11, 'test')
+        chat = types.User(11, False, 'test')
        return types.Message(1, None, None, chat, 'text', params)

    def test_is_string_unicode(self):
@ -403,3 +404,73 @@ class TestTeleBot:
    def test_not_string(self):
        i1 = 10
        assert not util.is_string(i1)
+
+    def test_send_video_note(self):
+        file_data = open('./test_data/test_video.mp4', 'rb')
+        tb = telebot.TeleBot(TOKEN)
+        ret_msg = tb.send_video_note(CHAT_ID, file_data)
+        assert ret_msg.message_id
+
+    def test_send_media_group(self):
+        tb = telebot.TeleBot(TOKEN)
+        img1 = 'https://i.imgur.com/CjXjcnU.png'
+        img2 = 'https://i.imgur.com/CjXjcnU.png'
+        medias = [types.InputMediaPhoto(img1, "View"), types.InputMediaPhoto(img2, "Dog")]
+        result = tb.send_media_group(CHAT_ID, medias)
+        assert len(result) == 2
+        assert result[0].media_group_id is not None
+        assert result[0].media_group_id == result[1].media_group_id
+
+    def test_send_media_group_local_files(self):
+        photo = open('../examples/detailed_example/kitten.jpg', 'rb')
+        video = open('./test_data/test_video.mp4', 'rb')
+        tb = telebot.TeleBot(TOKEN)
+        medias = [types.InputMediaPhoto(photo, "View"),
+                  types.InputMediaVideo(video)]
+        result = tb.send_media_group(CHAT_ID, medias)
+        assert len(result) == 2
+        assert result[0].media_group_id is not None
+        assert result[1].media_group_id is not None
+
+    def test_send_photo_formating_caption(self):
+        file_data = open('../examples/detailed_example/kitten.jpg', 'rb')
+        tb = telebot.TeleBot(TOKEN)
+        ret_msg = tb.send_photo(CHAT_ID, file_data, caption='_italic_', parse_mode='Markdown')
+        assert ret_msg.caption_entities[0].type == 'italic'
+
+    def test_send_video_formatting_caption(self):
+        file_data = open('./test_data/test_video.mp4', 'rb')
+        tb = telebot.TeleBot(TOKEN)
+        ret_msg = tb.send_video(CHAT_ID, file_data, caption='_italic_', parse_mode='Markdown')
+        assert ret_msg.caption_entities[0].type == 'italic'
+
+    def test_send_audio_formatting_caption(self):
+        file_data = open('./test_data/record.mp3', 'rb')
+        tb = telebot.TeleBot(TOKEN)
+        ret_msg = tb.send_audio(CHAT_ID, file_data, caption='<b>bold</b>', parse_mode='HTML')
+        assert ret_msg.caption_entities[0].type == 'bold'
+
+    def test_send_voice_formatting_caprion(self):
+        file_data = open('./test_data/record.ogg', 'rb')
+        tb = telebot.TeleBot(TOKEN)
+        ret_msg = tb.send_voice(CHAT_ID, file_data, caption='<b>bold</b>', parse_mode='HTML')
+        assert ret_msg.caption_entities[0].type == 'bold'
+        assert ret_msg.voice.mime_type == 'audio/ogg'
+
+    def test_send_media_group_formatting_caption(self):
+        tb = telebot.TeleBot(TOKEN)
+        img1 = 'https://i.imgur.com/CjXjcnU.png'
+        img2 = 'https://i.imgur.com/CjXjcnU.png'
+        medias = [types.InputMediaPhoto(img1, "*View*", parse_mode='Markdown'),
+                  types.InputMediaPhoto(img2, "_Dog_", parse_mode='Markdown')]
+        result = tb.send_media_group(CHAT_ID, medias)
+        assert len(result) == 2
+        assert result[0].media_group_id is not None
+        assert result[0].caption_entities[0].type == 'bold'
+        assert result[1].caption_entities[0].type == 'italic'
+
+    def test_send_document_formating_caption(self):
+        file_data = open('../examples/detailed_example/kitten.jpg', 'rb')
+        tb = telebot.TeleBot(TOKEN)
+        ret_msg = tb.send_document(CHAT_ID, file_data, caption='_italic_', parse_mode='Markdown')
+        assert ret_msg.caption_entities[0].type == 'italic'
--- a/tests/test_types.py
+++ b/tests/test_types.py
@ -6,19 +6,19 @@ from telebot import types


 def test_json_user():
-    jsonstring = r'{"id":101176298,"first_name":"RDSSBOT","username":"rdss_bot"}'
+    jsonstring = r'{"id":101176298,"first_name":"RDSSBOT","username":"rdss_bot","is_bot":true}'
    u = types.User.de_json(jsonstring)
    assert u.id == 101176298


 def test_json_message():
-    jsonstring = r'{"message_id":1,"from":{"id":108929734,"first_name":"Frank","last_name":"Wang","username":"eternnoir"},"chat":{"id":1734,"first_name":"F","type":"private","last_name":"Wa","username":"oir"},"date":1435296025,"text":"HIHI"}'
+    jsonstring = r'{"message_id":1,"from":{"id":108929734,"first_name":"Frank","last_name":"Wang","username":"eternnoir","is_bot":true},"chat":{"id":1734,"first_name":"F","type":"private","last_name":"Wa","username":"oir"},"date":1435296025,"text":"HIHI"}'
    msg = types.Message.de_json(jsonstring)
    assert msg.text == 'HIHI'


 def test_json_message_group():
-    json_string = r'{"message_id":10,"from":{"id":12345,"first_name":"g","last_name":"G","username":"GG"},"chat":{"id":-866,"type":"private","title":"\u4ea4"},"date":1435303157,"text":"HIHI"}'
+    json_string = r'{"message_id":10,"from":{"id":12345,"first_name":"g","last_name":"G","username":"GG","is_bot":true},"chat":{"id":-866,"type":"private","title":"\u4ea4"},"date":1435303157,"text":"HIHI"}'
    msg = types.Message.de_json(json_string)
    assert msg.text == 'HIHI'
    assert len(msg.chat.title) != 0
@ -39,7 +39,7 @@ def test_json_Document():


 def test_json_Message_Audio():
-    json_string = r'{"message_id":131,"from":{"id":12775,"first_name":"dd","username":"dd"},"chat":{"id":10834,"first_name":"dd","type":"private","type":"private","last_name":"dd","username":"dd"},"date":1439978364,"audio":{"duration":1,"mime_type":"audio\/mpeg","title":"pyTelegram","performer":"eternnoir","file_id":"BQADBQADDH1JaB8-1KyWUss2-Ag","file_size":20096}}'
+    json_string = r'{"message_id":131,"from":{"id":12775,"first_name":"dd","username":"dd","is_bot":true },"chat":{"id":10834,"first_name":"dd","type":"private","type":"private","last_name":"dd","username":"dd"},"date":1439978364,"audio":{"duration":1,"mime_type":"audio\/mpeg","title":"pyTelegram","performer":"eternnoir","file_id":"BQADBQADDH1JaB8-1KyWUss2-Ag","file_size":20096}}'
    msg = types.Message.de_json(json_string)
    assert msg.audio.duration == 1
    assert msg.content_type == 'audio'
@ -48,7 +48,7 @@ def test_json_Message_Audio():


 def test_json_Message_Sticker():
-    json_string = r'{"message_id":98,"from":{"id":10734,"first_name":"Fd","last_name":"Wd","username":"dd"},"chat":{"id":10734,"first_name":"Fd","type":"private","last_name":"Wd","username":"dd"},"date":1435479551,"sticker":{"width":550,"height":368,"thumb":{"file_id":"AAQFABPJLB0sAAQq17w-li3bzoIfAAIC","file_size":1822,"width":90,"height":60},"file_id":"BQADBQADNAIAAsYifgYdGJOa6bGAsQI","file_size":30320}}'
+    json_string = r'{"message_id":98,"from":{"id":10734,"first_name":"Fd","last_name":"Wd","username":"dd","is_bot":true },"chat":{"id":10734,"first_name":"Fd","type":"private","last_name":"Wd","username":"dd"},"date":1435479551,"sticker":{"width":550,"height":368,"thumb":{"file_id":"AAQFABPJLB0sAAQq17w-li3bzoIfAAIC","file_size":1822,"width":90,"height":60},"file_id":"BQADBQADNAIAAsYifgYdGJOa6bGAsQI","file_size":30320}}'
    msg = types.Message.de_json(json_string)
    assert msg.sticker.height == 368
    assert msg.sticker.thumb.height == 60
@ -56,7 +56,7 @@ def test_json_Message_Sticker():


 def test_json_Message_Sticker_without_thumb():
-    json_string = r'{"message_id":98,"from":{"id":10734,"first_name":"Fd","last_name":"Wd","username":"dd"},"chat":{"id":10734,"first_name":"Fd","type":"private","last_name":"Wd","username":"dd"},"date":1435479551,"sticker":{"width":550,"height":368,"file_id":"BQADBQADNAIAAsYifgYdGJOa6bGAsQI","file_size":30320}}'
+    json_string = r'{"message_id":98,"from":{"id":10734,"first_name":"Fd","last_name":"Wd","username":"dd","is_bot":true },"chat":{"id":10734,"first_name":"Fd","type":"private","last_name":"Wd","username":"dd"},"date":1435479551,"sticker":{"width":550,"height":368,"file_id":"BQADBQADNAIAAsYifgYdGJOa6bGAsQI","file_size":30320}}'
    msg = types.Message.de_json(json_string)
    assert msg.sticker.height == 368
    assert msg.sticker.thumb == None
@ -64,21 +64,21 @@ def test_json_Message_Sticker_without_thumb():


 def test_json_Message_Document():
-    json_string = r'{"message_id":97,"from":{"id":10734,"first_name":"Fd","last_name":"Wd","username":"dd"},"chat":{"id":10,"first_name":"Fd","type":"private","last_name":"Wd","username":"dd"},"date":1435478744,"document":{"file_name":"Text File","thumb":{},"file_id":"BQADBQADMwIAAsYifgZ_CEh0u682xwI","file_size":446}}'
+    json_string = r'{"message_id":97,"from":{"id":10734,"first_name":"Fd","last_name":"Wd","username":"dd","is_bot":true },"chat":{"id":10,"first_name":"Fd","type":"private","last_name":"Wd","username":"dd"},"date":1435478744,"document":{"file_name":"Text File","thumb":{},"file_id":"BQADBQADMwIAAsYifgZ_CEh0u682xwI","file_size":446}}'
    msg = types.Message.de_json(json_string)
    assert msg.document.file_name == 'Text File'
    assert msg.content_type == 'document'


 def test_json_Message_Photo():
-    json_string = r'{"message_id":96,"from":{"id":109734,"first_name":"Fd","last_name":"Wd","username":"dd"},"chat":{"id":10734,"first_name":"Fd","type":"private","last_name":"dd","username":"dd"},"date":1435478191,"photo":[{"file_id":"AgADBQADIagxG8YifgYv8yLSj76i-dd","file_size":615,"width":90,"height":67},{"file_id":"AgADBQADIagxG8YifgYv8yLSj76i-dd","file_size":10174,"width":320,"height":240},{"file_id":"dd-A_LsTIABFNx-FUOaEa_3AABAQABAg","file_size":53013,"width":759,"height":570}]}'
+    json_string = r'{"message_id":96,"from":{"id":109734,"first_name":"Fd","last_name":"Wd","username":"dd","is_bot":true },"chat":{"id":10734,"first_name":"Fd","type":"private","last_name":"dd","username":"dd"},"date":1435478191,"photo":[{"file_id":"AgADBQADIagxG8YifgYv8yLSj76i-dd","file_size":615,"width":90,"height":67},{"file_id":"AgADBQADIagxG8YifgYv8yLSj76i-dd","file_size":10174,"width":320,"height":240},{"file_id":"dd-A_LsTIABFNx-FUOaEa_3AABAQABAg","file_size":53013,"width":759,"height":570}]}'
    msg = types.Message.de_json(json_string)
    assert len(msg.photo) == 3
    assert msg.content_type == 'photo'


 def test_json_Message_Video():
-    json_string = r'{"message_id":101,"from":{"id":109734,"first_name":"dd","last_name":"dd","username":"dd"},"chat":{"id":109734,"first_name":"dd","type":"private","last_name":"dd","username":"dd"},"date":1435481960,"video":{"duration":3,"caption":"","width":360,"height":640,"thumb":{"file_id":"AAQFABPiYnBjkDwMAAIC","file_size":1597,"width":50,"height":90},"file_id":"BAADBQADNifgb_TOPEKErGoQI","file_size":260699}}'
+    json_string = r'{"message_id":101,"from":{"id":109734,"first_name":"dd","last_name":"dd","username":"dd","is_bot":true },"chat":{"id":109734,"first_name":"dd","type":"private","last_name":"dd","username":"dd"},"date":1435481960,"video":{"duration":3,"caption":"","width":360,"height":640,"thumb":{"file_id":"AAQFABPiYnBjkDwMAAIC","file_size":1597,"width":50,"height":90},"file_id":"BAADBQADNifgb_TOPEKErGoQI","file_size":260699}}'
    msg = types.Message.de_json(json_string)
    assert msg.video
    assert msg.video.duration == 3
@ -87,7 +87,7 @@ def test_json_Message_Video():


 def test_json_Message_Location():
-    json_string = r'{"message_id":102,"from":{"id":108734,"first_name":"dd","last_name":"dd","username":"dd"},"chat":{"id":1089734,"first_name":"dd","type":"private","last_name":"dd","username":"dd"},"date":1535482469,"location":{"longitude":127.479471,"latitude":26.090577}}'
+    json_string = r'{"message_id":102,"from":{"id":108734,"first_name":"dd","last_name":"dd","username":"dd","is_bot":true },"chat":{"id":1089734,"first_name":"dd","type":"private","last_name":"dd","username":"dd"},"date":1535482469,"location":{"longitude":127.479471,"latitude":26.090577}}'
    msg = types.Message.de_json(json_string)
    assert msg.location.latitude == 26.090577
    assert msg.content_type == 'location'
@ -114,7 +114,7 @@ def test_json_voice():
    assert voice.file_size == 10481

 def test_json_update():
-    json_string = r'{"update_id":938203,"message":{"message_id":241,"from":{"id":9734,"first_name":"Fk","last_name":"Wg","username":"nir"},"chat":{"id":1111,"first_name":"Fk","type":"private","last_name":"Wg","username":"oir"},"date":1441447009,"text":"HIHI"}}'
+    json_string = r'{"update_id":938203,"message":{"message_id":241,"from":{"is_bot":true,"id":9734,"first_name":"Fk","last_name":"Wg","username":"nir"},"chat":{"id":1111,"first_name":"Fk","type":"private","last_name":"Wg","username":"oir"},"date":1441447009,"text":"HIHI"}}'
    update = types.Update.de_json(json_string)
    assert update.update_id == 938203
    assert update.message.message_id == 241
Author	SHA1	Message	Date
eternnoir	48e6757686	Fix import logger problem.	2018-03-10 14:41:34 +08:00
eternnoir	8495229ce1	Update version 3.6.0	2018-03-02 19:28:34 +08:00
FrankWang	3b60f7ca67	Merge pull request #462 from heyyyoyy/Bot_Api_3.6 Bot Api 3.6	2018-02-22 22:11:46 +08:00
FrankWang	a1930e05c2	Merge pull request #463 from dmytrostriletskyi/master Make the Heroku example actual	2018-02-22 20:52:53 +08:00
Dmytro Striletskyi	bc067662dc	Make the Heroku example actual	2018-02-16 17:52:37 +02: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
FrankWang	f47653d2e4	Update README.md	2018-01-24 19:13:29 +08:00
eternnoir	94b4a25980	Update version.	2018-01-24 19:11:03 +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	6d180e30f0	Merge pull request #443 from reacheight/master fixed example of usage sendVideoNote method	2018-01-15 10:25:06 +08:00
FrankWang	e2ed4cf065	Merge pull request #387 from fumycat/patch-1 Fix optional parameter	2018-01-15 10:23:26 +08:00
reacheight	8b2dea1d56	fixed example of usage sendVideoNote method	2018-01-10 00:26:44 +03:00
FrankWang	41e31de034	Merge pull request #429 from JekaFST/master Fix for SendLocation with live period	2017-12-06 15:50:49 +08:00
JekaFST	ae074fd5c9	Merge pull request #2 from JekaFST/JekaFST-live_location_fixes Edit and stop live location fixes	2017-12-05 01:32:06 +03: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	44531bcedf	Merge pull request #1 from JekaFST/JekaFST-FixLiveLocation Fix for SendLocation with live period	2017-12-05 00:23:32 +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
FrankWang	f0e64b3653	Merge pull request #428 from 0xVK/patch-1 Added SmartySBot to README	2017-12-04 16:21:41 +08:00
Vitaliy	8444ea588a	Added SmartySBot to README Added SmartySBot to README	2017-12-03 20:34:37 +02:00
eternnoir	b2f376a906	Remove debug message. Add content_type	2017-11-30 23:34:07 +08:00
eternnoir	d0b4bb7c69	Bump version.	2017-11-29 14:09:57 +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	a43f037bc9	Version update.	2017-11-15 00:42:50 +08:00
eternnoir	7ac246b801	Fix inline_query_handler not work.	2017-11-15 00:42:27 +08:00
eternnoir	47624a556e	Update version.	2017-11-13 10:26:27 +08:00
eternnoir	8bdbc24014	Fix ShippingOption to_json. #414	2017-11-13 10:25:39 +08:00
eternnoir	e45ced958a	Update version to support 3.4.	2017-11-13 10:19:13 +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
FrankWang	c327be5a03	Merge pull request #410 from 0xVK/fix-exec-handlers #405 - Message has callback function but it exec command handlers too.	2017-11-04 21:28:21 +08:00
Vitaliy	d8587419e1	Fixed bug when message has next step handler and exec command handlers.	2017-11-04 15:09:29 +02:00
FrankWang	35d7293ebd	Merge pull request #402 from MasterGroosha/master Bot API 3.4: new methods for live locations, new objects.	2017-10-31 09:51:23 +08: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
FrankWang	aaa968c27f	Merge pull request #396 from MasterGroosha/patch-1 Added missing author_signature field to Message object	2017-09-25 16:42:38 +08: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
FrankWang	0a80fafd76	Update README.md	2017-09-09 21:32:13 +08:00
FrankWang	4a11bb60b4	Update new_chat_member to new_chat_members	2017-09-08 15:47:16 +08:00
eternnoir	7d37374667	Fix test case.	2017-08-28 12:13:26 +08:00
FrankWang	6ad56eb30f	Merge pull request #392 from MasterGroosha/master Bot API 3.3	2017-08-28 11:50:25 +08: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
FrankWang	be786021dc	Merge pull request #389 from mostafaqanbaryan/patch-1 Update __init__.py	2017-08-22 04:06:08 +07: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
FrankWang	064b84ad3d	Merge pull request #377 from GabrielRF/master Update README.md	2017-08-13 00:40:50 +08:00
Gabriel R F	39b4f0a068	Merge branch 'master' into master	2017-08-10 15:03:39 -03:00
FrankWang	246e7e31d7	Update README.md	2017-08-08 21:50:54 +08:00
eternnoir	48bfb7b84f	Update version.	2017-08-06 15:47:59 +08: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	23d66afbb0	Merge pull request #381 from noirgif/master change the documentation of TeleBot.polling in readme	2017-08-01 09:31:01 +08:00
noirgif	ed29f9316f	change the documentation of TeleBot.polling in readme	2017-07-30 23:24:30 -07:00
Gabriel R F	e92dc3717e	Update README.md	2017-07-24 14:28:27 -03:00
FrankWang	c91ce6036b	Merge pull request #372 from Kylmakalle/master Async Methods for API v3.1	2017-07-23 15:50:02 +08:00
FrankWang	cb60a1256f	Merge pull request #374 from the31k/per_thread_requests_sessions Per-thread requests sessions	2017-07-23 15:49:42 +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
Kylmakalle	f718c36ea7	Merge remote-tracking branch 'refs/remotes/eternnoir/master'	2017-07-07 00:29:40 +03:00
Kylmakalle	ed88939110	Merge remote-tracking branch 'refs/remotes/eternnoir/master'	2017-07-07 00:25:13 +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	d2f694516a	Update version.	2017-07-01 11:24:29 +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
FrankWang	38af4f441b	Merge pull request #368 from MasterGroosha/botapi_v3.1 Bot API v3.1	2017-07-01 10:33:35 +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
FrankWang	3e04df7080	Update README.md	2017-06-28 18:01:07 +08:00
eternnoir	6af3067a12	Add proxy to readme.	2017-06-28 17:44:07 +08:00
FrankWang	32c2178b29	Merge pull request #362 from BoberMod/patch-1 Using some content types in one function	2017-06-26 08:28:28 +08:00
Vladimir	6786f87d66	Using some content types in one function	2017-06-23 17:01:05 +03:00
FrankWang	ebdd7d107e	Merge pull request #361 from ihoru/master json.dumps(allowed_updates) before sending request	2017-06-22 14:55:35 +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
FrankWang	e834903bc2	Merge pull request #357 from gabolaev/fixDownloadingExample Added file opening mode	2017-06-16 10:39:39 +08:00
George	556a04ca8b	Added file opening mode	2017-06-16 02:57:12 +03:00
FrankWang	4b165ba3f1	Merge pull request #305 from MonsterDeveloper/patch-2 Added option to disable CherryPy logging	2017-06-02 16:13:56 +08:00
FrankWang	4e1d5b83b6	Merge pull request #349 from MasterGroosha/patch-2 Fixed wrong method call	2017-06-02 16:13:18 +08: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
FrankWang	52e50f1286	Merge pull request #347 from denkorzh/patch-1 Update README.md	2017-06-01 17:23:08 +08:00
Denis M Korzhenkov	3f626d37ba	Update README.md Fixed hyperlink formatting in the subtitle	2017-06-01 10:44:46 +03:00
eternnoir	d6aaf0716a	Update version. Change log: - Fix #314	2017-05-30 17:19:03 +08:00
eternnoir	777a3afaaa	Fix #314	2017-05-30 17:18:03 +08:00
eternnoir	0b1ae6ad8b	Update version.	2017-05-30 17:18:03 +08:00
FrankWang	7aca24a18b	Merge pull request #346 from Kylmakalle/master Added payments example	2017-05-26 11:05:40 +08:00
Kylmakalle	754ca77394	Add payments bot example	2017-05-25 21:00:48 +03:00
Kylmakalle	5ffd9c5755	Merge remote-tracking branch 'refs/remotes/eternnoir/master'	2017-05-25 20:46:10 +03: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
FrankWang	2d10793686	Merge pull request #343 from Kylmakalle/feature-BotAPIV3 Payments methods	2017-05-24 14:31:11 +08:00
Kylmakalle	3a10c90799	Payments methods	2017-05-24 01:23:52 +03:00
Kylmakalle	f8fed5c942	Merge remote-tracking branch 'refs/remotes/eternnoir/feature-BotAPIV3' into feature-BotAPIV3	2017-05-23 23:37:33 +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
eternnoir	9134e8dd1a	Add send video note test case.	2017-05-21 19:58:00 +08:00
FrankWang	43a30e7777	Merge pull request #338 from Kylmakalle/feature-BotAPIV3 Video Note support.	2017-05-21 19:47:30 +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
Sergey	5969a6644c	Merge pull request #1 from eternnoir/master Merging to master	2017-05-19 16:22:07 +03:00
FrankWang	791a183af5	Merge pull request #336 from i32ropie/master Added language code for users	2017-05-19 10:04:30 +08:00
i32ropie	35214b1270	Added language code for users	2017-05-18 23:40:10 +02:00
FrankWang	50ea288c9e	Merge pull request #333 from Kurbezz/master Add methods to AsyncTeleBot	2017-05-18 21:52:18 +08: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
FrankWang	6d18a2c22f	Merge pull request #325 from Kylmakalle/master Added option to delete messages.	2017-05-16 16:54:34 +08:00
Kylmakalle	89f515b120	deleteMessage returns Ok on success, not Message type	2017-05-12 01:13:40 +03:00
FrankWang	11f0733974	Merge pull request #326 from jiwidi/master Update readme	2017-05-08 10:25:54 +08:00
jiwidi	b91eeb2752	Update readme	2017-05-07 18:27:04 +02: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	8bf226e6bf	Bump version.	2017-04-30 20:37:55 +08:00
eternnoir	450ef42a83	Fix typo.	2017-04-30 19:40:27 +08:00
FrankWang	4fc83a85ee	Merge pull request #321 from bryant1410/master Fix broken headings in Markdown files	2017-04-18 13:31:55 +08:00
Santiago Castro	8dca85b1f2	Fix broken Markdown headings	2017-04-18 01:38:53 -03:00
FrankWang	fc65b30e3a	Update README.md	2017-04-15 23:27:07 +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
FrankWang	f220a68c00	Merge pull request #312 from MonsterDeveloper/patch-3 Added webhook example with Tornado	2017-04-05 14:12:45 +08:00
FrankWang	94d723cf7b	Merge pull request #317 from MonsterDeveloper/patch-4 Added IGNORECASE flag to message_handler	2017-04-05 14:12:07 +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
Andrew Developer	2c631b2973	Added webhook example with Tornado	2017-03-23 15:34:33 +03:00
Andrew	401a848927	Added option to disable CherryPy logging	2017-03-07 21:43:14 +03:00
FrankWang	7f31f8dde8	Merge pull request #294 from bace1996/patch-1 Fixed README.MD	2017-03-05 20:18:07 +08:00
FrankWang	19b8b4d2bf	Fix readme image url link	2017-03-05 20:17:46 +08:00
eternnoir	6515c7c494	Update version.	2017-03-04 21:30:35 +08:00
eternnoir	76a48ffe82	Bug fix for edited_channel_post_handler.	2017-03-04 21:30:07 +08:00
FrankWang	f8f0e0c343	Update Bots using this API list	2017-03-03 11:00:03 +08:00
Cykrt	8129b95118	Fixed README.MD Fixed a problem that could not jump to "Using web hooks" correctly	2017-02-15 21:31:52 +08:00
FrankWang	2b7e9a6180	Merge pull request #293 from MonsterDeveloper/patch-1 Fixed typo: from plan to plain	2017-02-10 15:33:03 +08:00
Andrew	a84c0b984b	Fixed typo: from plan to plain Line 184: from `return message.document.mime_type == 'text/plan'` to `return message.document.mime_type == 'text/plain'`	2017-02-09 16:49:15 +03:00
FrankWang	a356c9a325	Merge pull request #283 from roboxv/master Extend examples with aiohttp	2017-02-02 10:45:49 +08:00
FrankWang	4c4e8deaee	Merge pull request #284 from Kuznitsin/master Non-ASCII chars for filename.	2017-02-02 10:45:19 +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
robox	6c770d81f9	Extend examples with aiohttp	2017-01-30 01:54:49 +06:00
FrankWang	d6af33fef7	Merge pull request #277 from i32ropie/master Updated from ReplyKeyboardHide() methode to ReplyKeyboardRemove()	2017-01-23 11:21:10 +08:00
i32ropie	b6fee07089	Updated from ReplyKeyboardHide() methode to ReplyKeyboardRemove()	2017-01-20 10:55:34 +01:00
FrankWang	a5d6b541a5	Update README.md	2017-01-15 00:57:05 +08:00
FrankWang	ecad88ad00	Merge pull request #275 from mefuckin/patch-1 Fix error in webhook flask example	2017-01-05 11:02:10 +08:00
Andrey Mishakin	be87e4b2b9	Fix error in webhook flask example	2017-01-04 21:50:09 +03:00
FrankWang	1215eee167	Merge pull request #272 from mymedia2/persistent-connection Use session to ensure persistent connection to api.telegram.org	2016-12-20 00:57:22 +08: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
FrankWang	57a57c8aca	Merge pull request #268 from MasterGroosha/patch-1 Added max_connections and allowed updates to WebhookInfo	2016-12-13 09:45:55 +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	c168feea32	Version update: Change log: - Telegram bot api 20161121 new feature. - Telegram bot api 20161204 new feature.	2016-12-06 12:09:28 +08: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	b0bc49c803	Update readme.	2016-12-03 13:56:22 +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
FrankWang	27a79c4be5	Merge pull request #254 from Kondra007/patch-2 Bot API November updates	2016-11-25 08:27:15 +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
FrankWang	f413ccf3fb	Merge pull request #257 from rmed/wat-bridge Added wat-bridge to the list of bots	2016-11-21 10:37:01 +08:00
Rafael Medina	9aaa00c8fd	Added wat-bridge to the list of bots	2016-11-20 19:04:21 +00:00
FrankWang	11c2505d50	Update readme.	2016-11-18 19:37:29 +08:00
FrankWang	91076d0b59	Add dailypepebot to list.	2016-11-18 19:37:00 +08: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
FrankWang	903de2a72c	Merge pull request #252 from DmytryiStriletskyi/striletskyi Update README.md	2016-11-11 15:03:15 +08:00
Dmytryi Strilteskyi	9ddc529b28	Update README.md	2016-11-09 20:24:27 +02:00
Dmytryi Striletskyi	d9ca776e2c	Update README.md	2016-11-09 20:03:28 +02:00
FrankWang	2c497edca6	Update README.md	2016-11-03 16:43:46 +08:00