Skip to content

Commit ef8f3bd

Browse files
delivrancedelivrance
committed
Revert: CallbackQuery edit_* bound methods renamed to edit_message_*
1 parent 61ed44f commit ef8f3bd

2 files changed

Lines changed: 67 additions & 91 deletions

File tree

‎docs/source/api/bound-methods.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ CallbackQuery
8181
^^^^^^^^^^^^^
8282

8383
.. hlist::
84-
:columns: 3
84+
:columns: 4
8585

8686
- :meth:`~CallbackQuery.answer`
87-
- :meth:`~CallbackQuery.edit_message_text`
88-
- :meth:`~CallbackQuery.edit_message_caption`
89-
- :meth:`~CallbackQuery.edit_message_media`
90-
- :meth:`~CallbackQuery.edit_message_reply_markup`
87+
- :meth:`~CallbackQuery.edit_text`
88+
- :meth:`~CallbackQuery.edit_caption`
89+
- :meth:`~CallbackQuery.edit_media`
90+
- :meth:`~CallbackQuery.edit_reply_markup`
9191

9292
InlineQuery
9393
^^^^^^^^^^^
@@ -141,10 +141,10 @@ Details
141141

142142
.. CallbackQuery
143143
.. automethod:: CallbackQuery.answer()
144-
.. automethod:: CallbackQuery.edit_message_text()
145-
.. automethod:: CallbackQuery.edit_message_caption()
146-
.. automethod:: CallbackQuery.edit_message_media()
147-
.. automethod:: CallbackQuery.edit_message_reply_markup()
144+
.. automethod:: CallbackQuery.edit_text()
145+
.. automethod:: CallbackQuery.edit_caption()
146+
.. automethod:: CallbackQuery.edit_media()
147+
.. automethod:: CallbackQuery.edit_reply_markup()
148148

149149
.. InlineQuery
150150
.. automethod:: InlineQuery.answer()

‎pyrogram/client/types/bots_and_keyboards/callback_query.py‎

Lines changed: 58 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,16 @@ def answer(self, text: str = None, show_alert: bool = None, url: str = None, cac
173173
cache_time=cache_time
174174
)
175175

176-
def edit_message_text(
176+
def edit_text(
177177
self,
178178
text: str,
179179
parse_mode: str = "",
180180
disable_web_page_preview: bool = None,
181181
reply_markup: "pyrogram.InlineKeyboardMarkup" = None
182182
) -> Union["pyrogram.Message", bool]:
183-
"""Bound method *edit_message_text* of :obj:`CallbackQuery`.
183+
"""Edit the text of messages attached to this callback query.
184+
185+
Bound method *edit_message_text* of :obj:`CallbackQuery`.
184186
185187
Parameters:
186188
text (``str``):
@@ -203,34 +205,33 @@ def edit_message_text(
203205
Raises:
204206
RPCError: In case of a Telegram RPC error.
205207
"""
206-
chat_id = None
207-
message_id = None
208-
inline_message_id = None
209-
210-
if self.message is not None:
211-
chat_id = self.message.chat.id
212-
message_id = self.message.message_id
213-
214-
if self.inline_message_id is not None:
215-
inline_message_id = self.inline_message_id
216-
217-
return self._client.edit_message_text(
218-
text=text,
219-
chat_id=chat_id,
220-
message_id=message_id,
221-
inline_message_id=inline_message_id,
222-
parse_mode=parse_mode,
223-
disable_web_page_preview=disable_web_page_preview,
224-
reply_markup=reply_markup
225-
)
208+
if self.inline_message_id is None:
209+
return self._client.edit_message_text(
210+
chat_id=self.message.chat.id,
211+
message_id=self.message.message_id,
212+
text=text,
213+
parse_mode=parse_mode,
214+
disable_web_page_preview=disable_web_page_preview,
215+
reply_markup=reply_markup
216+
)
217+
else:
218+
return self._client.edit_inline_text(
219+
inline_message_id=self.inline_message_id,
220+
text=text,
221+
parse_mode=parse_mode,
222+
disable_web_page_preview=disable_web_page_preview,
223+
reply_markup=reply_markup
224+
)
226225

227-
def edit_message_caption(
226+
def edit_caption(
228227
self,
229228
caption: str,
230229
parse_mode: str = "",
231230
reply_markup: "pyrogram.InlineKeyboardMarkup" = None
232231
) -> Union["pyrogram.Message", bool]:
233-
"""Bound method *edit_message_caption* of :obj:`CallbackQuery`.
232+
"""Edit the caption of media messages attached to this callback query.
233+
234+
Bound method *edit_message_caption* of :obj:`CallbackQuery`.
234235
235236
Parameters:
236237
caption (``str``):
@@ -250,32 +251,16 @@ def edit_message_caption(
250251
Raises:
251252
RPCError: In case of a Telegram RPC error.
252253
"""
253-
chat_id = None
254-
message_id = None
255-
inline_message_id = None
256-
257-
if self.message is not None:
258-
chat_id = self.message.chat.id
259-
message_id = self.message.message_id
260-
261-
if self.inline_message_id is not None:
262-
inline_message_id = self.inline_message_id
263-
264-
return self._client.edit_message_text(
265-
text=caption,
266-
chat_id=chat_id,
267-
message_id=message_id,
268-
inline_message_id=inline_message_id,
269-
parse_mode=parse_mode,
270-
reply_markup=reply_markup
271-
)
254+
return self.edit_text(caption, parse_mode, reply_markup)
272255

273-
def edit_message_media(
256+
def edit_media(
274257
self,
275258
media: "pyrogram.InputMedia",
276259
reply_markup: "pyrogram.InlineKeyboardMarkup" = None
277260
) -> Union["pyrogram.Message", bool]:
278-
"""Bound method *edit_message_media* of :obj:`CallbackQuery`.
261+
"""Edit animation, audio, document, photo or video messages attached to this callback query.
262+
263+
Bound method *edit_message_media* of :obj:`CallbackQuery`.
279264
280265
Parameters:
281266
media (:obj:`InputMedia`):
@@ -291,30 +276,27 @@ def edit_message_media(
291276
Raises:
292277
RPCError: In case of a Telegram RPC error.
293278
"""
294-
chat_id = None
295-
message_id = None
296-
inline_message_id = None
297-
298-
if self.message is not None:
299-
chat_id = self.message.chat.id
300-
message_id = self.message.message_id
301-
302-
if self.inline_message_id is not None:
303-
inline_message_id = self.inline_message_id
304-
305-
return self._client.edit_message_media(
306-
media=media,
307-
chat_id=chat_id,
308-
message_id=message_id,
309-
inline_message_id=inline_message_id,
310-
reply_markup=reply_markup
311-
)
279+
if self.inline_message_id is None:
280+
return self._client.edit_message_media(
281+
chat_id=self.message.chat.id,
282+
message_id=self.message.message_id,
283+
media=media,
284+
reply_markup=reply_markup
285+
)
286+
else:
287+
return self._client.edit_inline_media(
288+
inline_message_id=self.inline_message_id,
289+
media=media,
290+
reply_markup=reply_markup
291+
)
312292

313-
def edit_message_reply_markup(
293+
def edit_reply_markup(
314294
self,
315295
reply_markup: "pyrogram.InlineKeyboardMarkup" = None
316296
) -> Union["pyrogram.Message", bool]:
317-
"""Bound method *edit_message_reply_markup* of :obj:`CallbackQuery`.
297+
"""Edit only the reply markup of messages attached to this callback query.
298+
299+
Bound method *edit_message_reply_markup* of :obj:`CallbackQuery`.
318300
319301
Parameters:
320302
reply_markup (:obj:`InlineKeyboardMarkup`):
@@ -327,20 +309,14 @@ def edit_message_reply_markup(
327309
Raises:
328310
RPCError: In case of a Telegram RPC error.
329311
"""
330-
chat_id = None
331-
message_id = None
332-
inline_message_id = None
333-
334-
if self.message is not None:
335-
chat_id = self.message.chat.id
336-
message_id = self.message.message_id
337-
338-
if self.inline_message_id is not None:
339-
inline_message_id = self.inline_message_id
340-
341-
return self._client.edit_message_reply_markup(
342-
reply_markup=reply_markup,
343-
chat_id=chat_id,
344-
message_id=message_id,
345-
inline_message_id=inline_message_id
346-
)
312+
if self.inline_message_id is None:
313+
return self._client.edit_message_reply_markup(
314+
chat_id=self.message.chat.id,
315+
message_id=self.message.message_id,
316+
reply_markup=reply_markup
317+
)
318+
else:
319+
return self._client.edit_inline_reply_markup(
320+
inline_message_id=self.inline_message_id,
321+
reply_markup=reply_markup
322+
)

0 commit comments

Comments
 (0)