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 5

Add editMessageText, editMessageCaption, editMessageReplyMarkup and move deleteMessage

Browse source
This commit is contained in:
Alex Root Junior 2017-06-02 02:23:07 +03:00
parent de773b6931
commit 4c0d89d25a
2 changed files with 60 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
aiogram/api.py
View file

@ -112,7 +112,7 @@ class ApiMethods:
GET_CHAT_MEMBERS_COUNT = 'getChatMembersCount'
GET_CHAT_MEMBER = 'getChatMember'
ANSWER_CALLBACK_QUERY = 'answerCallbackQuery'
EDIT_MESSAGE_TEXT = 'editMessageText' # TODO
EDIT_MESSAGE_CAPTION = 'editMessageCaption' # TODO
EDIT_MESSAGE_REPLY_MARKUP = 'editMessageReplyMarkup' # TODO
EDIT_MESSAGE_TEXT = 'editMessageText'
EDIT_MESSAGE_CAPTION = 'editMessageCaption'
EDIT_MESSAGE_REPLY_MARKUP = 'editMessageReplyMarkup'
DELETE_MESSAGE = 'deleteMessage'

64
aiogram/bot.py
View file

@ -135,12 +135,6 @@ class AIOGramBot:
message = await self.request(ApiMethods.SEND_MESSAGE, payload)
return self.prepare_object(Message.de_json(message))
async def delete_message(self, chat_id, message_id):
payload = generate_payload(**locals())
await self.request(ApiMethods.DELETE_MESSAGE, payload)
return True
async def forward_message(self, chat_id, from_chat_id, message_id, disable_notification=None):
"""
chat_id Integer or String Yes Unique identifier for the target chat or username of the target channel (in the format @channelusername)
@ -320,6 +314,62 @@ class AIOGramBot:
raw = await self.request(ApiMethods.GET_CHAT_MEMBER, payload)
return self.prepare_object(ChatMember.de_json(raw))
async def answer_callback_query(self, callback_query_id, text=None, show_alert=None, url=None, cache_time=None ):
async def answer_callback_query(self, callback_query_id, text=None, show_alert=None, url=None, cache_time=None):
payload = generate_payload(**locals())
return await self.request(ApiMethods.LEAVE_CHAT, payload)
async def edit_message_text(self, text, chat_id=None, message_id=None, inline_message_id=None, parse_mode=None,
disable_web_page_preview=None, reply_markup=None):
if reply_markup and hasattr(reply_markup, 'to_json'):
reply_markup = json.dumps(reply_markup.to_json())
if hasattr(message_id, 'message_id'):
message_id = message_id.message_id
if hasattr(inline_message_id, 'message_id'):
inline_message_id = inline_message_id.message_id
payload = generate_payload(**locals())
raw = await self.request(ApiMethods.EDIT_MESSAGE_TEXT, payload)
if raw is True:
return raw
return self.prepare_object(Message.de_json(raw))
async def edit_message_caption(self, chat_id=None, message_id=None, inline_message_id=None, caption=None,
reply_markup=None):
if reply_markup and hasattr(reply_markup, 'to_json'):
reply_markup = json.dumps(reply_markup.to_json())
if hasattr(message_id, 'message_id'):
message_id = message_id.message_id
if hasattr(inline_message_id, 'message_id'):
inline_message_id = inline_message_id.message_id
payload = generate_payload(**locals())
raw = await self.request(ApiMethods.EDIT_MESSAGE_TEXT, payload)
if raw is True:
return raw
return self.prepare_object(Message.de_json(raw))
async def edit_message_reply_markup(self, chat_id=None, message_id=None, inline_message_id=None, reply_markup=None):
if reply_markup and hasattr(reply_markup, 'to_json'):
reply_markup = json.dumps(reply_markup.to_json())
if hasattr(message_id, 'message_id'):
message_id = message_id.message_id
if hasattr(inline_message_id, 'message_id'):
inline_message_id = inline_message_id.message_id
payload = generate_payload(**locals())
raw = await self.request(ApiMethods.EDIT_MESSAGE_TEXT, payload)
if raw is True:
return raw
return self.prepare_object(Message.de_json(raw))
async def delete_message(self, chat_id, message_id):
payload = generate_payload(**locals())
await self.request(ApiMethods.DELETE_MESSAGE, payload)
return True