python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #23 from surik00/dev-1.x

Browse source 
Add pasrse_mode to all medias (Bot API 3.6 support)
This commit is contained in:
Alex Root Junior 2018-03-19 01:12:29 +02:00 • committed by GitHub
commit baf81576b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

54
aiogram/bot/bot.py
View file

@ -47,8 +47,8 @@ class Bot(BaseBot):
:return: destination :return: destination
""" """
file = await self.get_file(file_id) file = await self.get_file(file_id)
return await self.download_file(file_path=file.file_path, destination=destination, timeout=timeout, return await self.download_file(file_path=file.file_path, destination=destination,
chunk_size=chunk_size, seek=seek) timeout=timeout, chunk_size=chunk_size, seek=seek)
# === Getting updates === # === Getting updates ===
# https://core.telegram.org/bots/api#getting-updates # https://core.telegram.org/bots/api#getting-updates
@ -231,6 +231,7 @@ class Bot(BaseBot):
async def send_photo(self, chat_id: typing.Union[base.Integer, base.String], async def send_photo(self, chat_id: typing.Union[base.Integer, base.String],
photo: typing.Union[base.InputFile, base.String], photo: typing.Union[base.InputFile, base.String],
caption: typing.Union[base.String, None] = None, caption: typing.Union[base.String, None] = None,
parse_mode: typing.Union[base.String, None] = None,
disable_notification: typing.Union[base.Boolean, None] = None, disable_notification: typing.Union[base.Boolean, None] = None,
reply_to_message_id: typing.Union[base.Integer, None] = None, reply_to_message_id: typing.Union[base.Integer, None] = None,
reply_markup: typing.Union[types.InlineKeyboardMarkup, reply_markup: typing.Union[types.InlineKeyboardMarkup,
@ -260,6 +261,9 @@ class Bot(BaseBot):
""" """
reply_markup = prepare_arg(reply_markup) reply_markup = prepare_arg(reply_markup)
payload = generate_payload(**locals(), exclude=['photo']) payload = generate_payload(**locals(), exclude=['photo'])
if self.parse_mode:
payload.setdefault('parse_mode', self.parse_mode)
result = await self.send_file('photo', api.Methods.SEND_PHOTO, photo, payload) result = await self.send_file('photo', api.Methods.SEND_PHOTO, photo, payload)
return types.Message(**result) return types.Message(**result)
@ -267,6 +271,7 @@ class Bot(BaseBot):
async def send_audio(self, chat_id: typing.Union[base.Integer, base.String], async def send_audio(self, chat_id: typing.Union[base.Integer, base.String],
audio: typing.Union[base.InputFile, base.String], audio: typing.Union[base.InputFile, base.String],
caption: typing.Union[base.String, None] = None, caption: typing.Union[base.String, None] = None,
parse_mode: typing.Union[base.String, None] = None,
duration: typing.Union[base.Integer, None] = None, duration: typing.Union[base.Integer, None] = None,
performer: typing.Union[base.String, None] = None, performer: typing.Union[base.String, None] = None,
title: typing.Union[base.String, None] = None, title: typing.Union[base.String, None] = None,
@ -308,6 +313,9 @@ class Bot(BaseBot):
""" """
reply_markup = prepare_arg(reply_markup) reply_markup = prepare_arg(reply_markup)
payload = generate_payload(**locals(), exclude=['audio']) payload = generate_payload(**locals(), exclude=['audio'])
if self.parse_mode:
payload.setdefault('parse_mode', self.parse_mode)
result = await self.send_file('audio', api.Methods.SEND_AUDIO, audio, payload) result = await self.send_file('audio', api.Methods.SEND_AUDIO, audio, payload)
return types.Message(**result) return types.Message(**result)
@ -315,6 +323,7 @@ class Bot(BaseBot):
async def send_document(self, chat_id: typing.Union[base.Integer, base.String], async def send_document(self, chat_id: typing.Union[base.Integer, base.String],
document: typing.Union[base.InputFile, base.String], document: typing.Union[base.InputFile, base.String],
caption: typing.Union[base.String, None] = None, caption: typing.Union[base.String, None] = None,
parse_mode: typing.Union[base.String, None] = None,
disable_notification: typing.Union[base.Boolean, None] = None, disable_notification: typing.Union[base.Boolean, None] = None,
reply_to_message_id: typing.Union[base.Integer, None] = None, reply_to_message_id: typing.Union[base.Integer, None] = None,
reply_markup: typing.Union[types.InlineKeyboardMarkup, reply_markup: typing.Union[types.InlineKeyboardMarkup,
@ -346,6 +355,9 @@ class Bot(BaseBot):
""" """
reply_markup = prepare_arg(reply_markup) reply_markup = prepare_arg(reply_markup)
payload = generate_payload(**locals(), exclude=['document']) payload = generate_payload(**locals(), exclude=['document'])
if self.parse_mode:
payload.setdefault('parse_mode', self.parse_mode)
result = await self.send_file('document', api.Methods.SEND_DOCUMENT, document, payload) result = await self.send_file('document', api.Methods.SEND_DOCUMENT, document, payload)
return types.Message(**result) return types.Message(**result)
@ -356,6 +368,7 @@ class Bot(BaseBot):
width: typing.Union[base.Integer, None] = None, width: typing.Union[base.Integer, None] = None,
height: typing.Union[base.Integer, None] = None, height: typing.Union[base.Integer, None] = None,
caption: typing.Union[base.String, None] = None, caption: typing.Union[base.String, None] = None,
parse_mode: typing.Union[base.String, None] = None,
supports_streaming: typing.Union[base.Boolean, None] = None, supports_streaming: typing.Union[base.Boolean, None] = None,
disable_notification: typing.Union[base.Boolean, None] = None, disable_notification: typing.Union[base.Boolean, None] = None,
reply_to_message_id: typing.Union[base.Integer, None] = None, reply_to_message_id: typing.Union[base.Integer, None] = None,
@ -395,6 +408,9 @@ class Bot(BaseBot):
""" """
reply_markup = prepare_arg(reply_markup) reply_markup = prepare_arg(reply_markup)
payload = generate_payload(**locals(), exclude=['video']) payload = generate_payload(**locals(), exclude=['video'])
if self.parse_mode:
payload.setdefault('parse_mode', self.parse_mode)
result = await self.send_file('video', api.Methods.SEND_VIDEO, video, payload) result = await self.send_file('video', api.Methods.SEND_VIDEO, video, payload)
return types.Message(**result) return types.Message(**result)
@ -402,6 +418,7 @@ class Bot(BaseBot):
async def send_voice(self, chat_id: typing.Union[base.Integer, base.String], async def send_voice(self, chat_id: typing.Union[base.Integer, base.String],
voice: typing.Union[base.InputFile, base.String], voice: typing.Union[base.InputFile, base.String],
caption: typing.Union[base.String, None] = None, caption: typing.Union[base.String, None] = None,
parse_mode: typing.Union[base.String, None] = None,
duration: typing.Union[base.Integer, None] = None, duration: typing.Union[base.Integer, None] = None,
disable_notification: typing.Union[base.Boolean, None] = None, disable_notification: typing.Union[base.Boolean, None] = None,
reply_to_message_id: typing.Union[base.Integer, None] = None, reply_to_message_id: typing.Union[base.Integer, None] = None,
@ -438,6 +455,9 @@ class Bot(BaseBot):
""" """
reply_markup = prepare_arg(reply_markup) reply_markup = prepare_arg(reply_markup)
payload = generate_payload(**locals(), exclude=['voice']) payload = generate_payload(**locals(), exclude=['voice'])
if self.parse_mode:
payload.setdefault('parse_mode', self.parse_mode)
result = await self.send_file('voice', api.Methods.SEND_VOICE, voice, payload) result = await self.send_file('voice', api.Methods.SEND_VOICE, voice, payload)
return types.Message(**result) return types.Message(**result)
@ -516,8 +536,9 @@ class Bot(BaseBot):
return [types.Message(**message) for message in result] return [types.Message(**message) for message in result]
async def send_location(self, chat_id: typing.Union[base.Integer, base.String], latitude: base.Float, async def send_location(self, chat_id: typing.Union[base.Integer, base.String],
longitude: base.Float, live_period: typing.Union[base.Integer, None] = None, latitude: base.Float, longitude: base.Float,
live_period: typing.Union[base.Integer, None] = None,
disable_notification: typing.Union[base.Boolean, None] = None, disable_notification: typing.Union[base.Boolean, None] = None,
reply_to_message_id: typing.Union[base.Integer, None] = None, reply_to_message_id: typing.Union[base.Integer, None] = None,
reply_markup: typing.Union[types.InlineKeyboardMarkup, reply_markup: typing.Union[types.InlineKeyboardMarkup,
@ -625,7 +646,8 @@ class Bot(BaseBot):
return types.Message(**result) return types.Message(**result)
async def send_venue(self, chat_id: typing.Union[base.Integer, base.String], async def send_venue(self, chat_id: typing.Union[base.Integer, base.String],
latitude: base.Float, longitude: base.Float, title: base.String, address: base.String, latitude: base.Float, longitude: base.Float,
title: base.String, address: base.String,
foursquare_id: typing.Union[base.String, None] = None, foursquare_id: typing.Union[base.String, None] = None,
disable_notification: typing.Union[base.Boolean, None] = None, disable_notification: typing.Union[base.Boolean, None] = None,
reply_to_message_id: typing.Union[base.Integer, None] = None, reply_to_message_id: typing.Union[base.Integer, None] = None,
@ -667,8 +689,8 @@ class Bot(BaseBot):
return types.Message(**result) return types.Message(**result)
async def send_contact(self, chat_id: typing.Union[base.Integer, base.String], async def send_contact(self, chat_id: typing.Union[base.Integer, base.String],
phone_number: base.String, phone_number: base.String, first_name: base.String,
first_name: base.String, last_name: typing.Union[base.String, None] = None, last_name: typing.Union[base.String, None] = None,
disable_notification: typing.Union[base.Boolean, None] = None, disable_notification: typing.Union[base.Boolean, None] = None,
reply_to_message_id: typing.Union[base.Integer, None] = None, reply_to_message_id: typing.Union[base.Integer, None] = None,
reply_markup: typing.Union[types.InlineKeyboardMarkup, reply_markup: typing.Union[types.InlineKeyboardMarkup,
@ -1182,7 +1204,8 @@ class Bot(BaseBot):
return result return result
async def answer_callback_query(self, callback_query_id: base.String, text: typing.Union[base.String, None] = None, async def answer_callback_query(self, callback_query_id: base.String,
text: typing.Union[base.String, None] = None,
show_alert: typing.Union[base.Boolean, None] = None, show_alert: typing.Union[base.Boolean, None] = None,
url: typing.Union[base.String, None] = None, url: typing.Union[base.String, None] = None,
cache_time: typing.Union[base.Integer, None] = None) -> base.Boolean: cache_time: typing.Union[base.Integer, None] = None) -> base.Boolean:
@ -1265,6 +1288,7 @@ class Bot(BaseBot):
message_id: typing.Union[base.Integer, None] = None, message_id: typing.Union[base.Integer, None] = None,
inline_message_id: typing.Union[base.String, None] = None, inline_message_id: typing.Union[base.String, None] = None,
caption: typing.Union[base.String, None] = None, caption: typing.Union[base.String, None] = None,
parse_mode: typing.Union[base.String, None] = None,
reply_markup: typing.Union[types.InlineKeyboardMarkup, reply_markup: typing.Union[types.InlineKeyboardMarkup,
None] = None) -> types.Message or base.Boolean: None] = None) -> types.Message or base.Boolean:
""" """
@ -1289,6 +1313,9 @@ class Bot(BaseBot):
""" """
reply_markup = prepare_arg(reply_markup) reply_markup = prepare_arg(reply_markup)
payload = generate_payload(**locals()) payload = generate_payload(**locals())
if self.parse_mode:
payload.setdefault('parse_mode', self.parse_mode)
result = await self.request(api.Methods.EDIT_MESSAGE_CAPTION, payload) result = await self.request(api.Methods.EDIT_MESSAGE_CAPTION, payload)
if isinstance(result, bool): if isinstance(result, bool):
@ -1524,7 +1551,8 @@ class Bot(BaseBot):
return result return result
async def answer_inline_query(self, inline_query_id: base.String, results: typing.List[types.InlineQueryResult], async def answer_inline_query(self, inline_query_id: base.String,
results: typing.List[types.InlineQueryResult],
cache_time: typing.Union[base.Integer, None] = None, cache_time: typing.Union[base.Integer, None] = None,
is_personal: typing.Union[base.Boolean, None] = None, is_personal: typing.Union[base.Boolean, None] = None,
next_offset: typing.Union[base.String, None] = None, next_offset: typing.Union[base.String, None] = None,
@ -1570,8 +1598,9 @@ class Bot(BaseBot):
# === Payments === # === Payments ===
# https://core.telegram.org/bots/api#payments # https://core.telegram.org/bots/api#payments
async def send_invoice(self, chat_id: base.Integer, title: base.String, description: base.String, async def send_invoice(self, chat_id: base.Integer, title: base.String,
payload: base.String, provider_token: base.String, start_parameter: base.String, description: base.String, payload: base.String,
provider_token: base.String, start_parameter: base.String,
currency: base.String, prices: typing.List[types.LabeledPrice], currency: base.String, prices: typing.List[types.LabeledPrice],
provider_data: typing.Union[typing.Dict, None] = None, provider_data: typing.Union[typing.Dict, None] = None,
photo_url: typing.Union[base.String, None] = None, photo_url: typing.Union[base.String, None] = None,
@ -1783,7 +1812,8 @@ class Bot(BaseBot):
return types.Message(**result) return types.Message(**result)
async def get_game_high_scores(self, user_id: base.Integer, chat_id: typing.Union[base.Integer, None] = None, async def get_game_high_scores(self, user_id: base.Integer,
chat_id: typing.Union[base.Integer, None] = None,
message_id: typing.Union[base.Integer, None] = None, message_id: typing.Union[base.Integer, None] = None,
inline_message_id: typing.Union[base.String, inline_message_id: typing.Union[base.String,
None] = None) -> typing.List[types.GameHighScore]: None] = None) -> typing.List[types.GameHighScore]: