Skip to content

Commit c3d3dbe

Browse files
barsikus007null-nick
barsikus007
authored and
null-nick
committed
Add missing caption_entities parameters and utils.parse_text_entities calls
PR (pyrogram#1253)
1 parent cbcdb80 commit c3d3dbe

5 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎pyrogram/methods/messages/edit_inline_media.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ async def edit_inline_media(
7878
"""
7979
caption = media.caption
8080
parse_mode = media.parse_mode
81+
caption_entities = media.caption_entities
8182

8283
is_bytes_io = isinstance(media.media, io.BytesIO)
8384
is_uploaded_file = is_bytes_io or os.path.isfile(media.media)
@@ -231,7 +232,7 @@ async def edit_inline_media(
231232
id=unpacked,
232233
media=actual_media,
233234
reply_markup=await reply_markup.write(self) if reply_markup else None,
234-
**await self.parser.parse(caption, parse_mode)
235+
**await utils.parse_text_entities(self, caption, parse_mode, caption_entities)
235236
),
236237
sleep_threshold=self.sleep_threshold
237238
)

‎pyrogram/methods/messages/edit_inline_text.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# You should have received a copy of the GNU Lesser General Public License
1717
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
1818

19-
from typing import Optional
19+
from typing import Optional, List
2020

2121
import pyrogram
2222
from pyrogram import raw, enums
@@ -31,6 +31,7 @@ async def edit_inline_text(
3131
inline_message_id: str,
3232
text: str,
3333
parse_mode: Optional["enums.ParseMode"] = None,
34+
entities: List["types.MessageEntity"] = None,
3435
disable_web_page_preview: bool = None,
3536
reply_markup: "types.InlineKeyboardMarkup" = None
3637
) -> bool:
@@ -49,6 +50,9 @@ async def edit_inline_text(
4950
By default, texts are parsed using both Markdown and HTML styles.
5051
You can combine both syntaxes together.
5152
53+
entities (List of :obj:`~pyrogram.types.MessageEntity`):
54+
List of special entities that appear in message text, which can be specified instead of *parse_mode*.
55+
5256
disable_web_page_preview (``bool``, *optional*):
5357
Disables link previews for links in this message.
5458
@@ -82,7 +86,7 @@ async def edit_inline_text(
8286
id=unpacked,
8387
no_webpage=disable_web_page_preview or None,
8488
reply_markup=await reply_markup.write(self) if reply_markup else None,
85-
**await self.parser.parse(text, parse_mode)
89+
**await utils.parse_text_entities(self, text, parse_mode, entities)
8690
),
8791
sleep_threshold=self.sleep_threshold
8892
)

‎pyrogram/methods/messages/edit_message_media.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,12 @@ async def edit_message_media(
8585
"""
8686
caption = media.caption
8787
parse_mode = media.parse_mode
88+
caption_entities = media.caption_entities
8889

8990
message, entities = None, None
9091

9192
if caption is not None:
92-
message, entities = (await self.parser.parse(caption, parse_mode)).values()
93+
message, entities = (await utils.parse_text_entities(self, caption, parse_mode, caption_entities)).values()
9394

9495
if isinstance(media, types.InputMediaPhoto):
9596
if isinstance(media.media, io.BytesIO) or os.path.isfile(media.media):

‎pyrogram/methods/messages/send_media_group.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ async def send_media_group(
390390
raw.types.InputSingleMedia(
391391
media=media,
392392
random_id=self.rnd_id(),
393-
**await self.parser.parse(i.caption, i.parse_mode)
393+
**await utils.parse_text_entities(self, i.caption, i.parse_mode, i.caption_entities)
394394
)
395395
)
396396

‎pyrogram/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ def compute_password_check(
341341
async def parse_text_entities(
342342
client: "pyrogram.Client",
343343
text: str,
344-
parse_mode: enums.ParseMode,
344+
parse_mode: Optional[enums.ParseMode],
345345
entities: List["types.MessageEntity"]
346346
) -> Dict[str, Union[str, List[raw.base.MessageEntity]]]:
347347
if entities:

0 commit comments

Comments
 (0)