Skip to content

Commit

Permalink
Add missing caption_entities parameters and `utils.parse_text_entit…
Browse files Browse the repository at this point in the history
…ies calls`

PR (pyrogram#1253)
  • Loading branch information
barsikus007 authored and null-nick committed Aug 8, 2023
1 parent cbcdb80 commit c3d3dbe
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
3 changes: 2 additions & 1 deletion pyrogram/methods/messages/edit_inline_media.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ async def edit_inline_media(
"""
caption = media.caption
parse_mode = media.parse_mode
caption_entities = media.caption_entities

is_bytes_io = isinstance(media.media, io.BytesIO)
is_uploaded_file = is_bytes_io or os.path.isfile(media.media)
Expand Down Expand Up @@ -231,7 +232,7 @@ async def edit_inline_media(
id=unpacked,
media=actual_media,
reply_markup=await reply_markup.write(self) if reply_markup else None,
**await self.parser.parse(caption, parse_mode)
**await utils.parse_text_entities(self, caption, parse_mode, caption_entities)
),
sleep_threshold=self.sleep_threshold
)
Expand Down
8 changes: 6 additions & 2 deletions pyrogram/methods/messages/edit_inline_text.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.

from typing import Optional
from typing import Optional, List

import pyrogram
from pyrogram import raw, enums
Expand All @@ -31,6 +31,7 @@ async def edit_inline_text(
inline_message_id: str,
text: str,
parse_mode: Optional["enums.ParseMode"] = None,
entities: List["types.MessageEntity"] = None,
disable_web_page_preview: bool = None,
reply_markup: "types.InlineKeyboardMarkup" = None
) -> bool:
Expand All @@ -49,6 +50,9 @@ async def edit_inline_text(
By default, texts are parsed using both Markdown and HTML styles.
You can combine both syntaxes together.
entities (List of :obj:`~pyrogram.types.MessageEntity`):
List of special entities that appear in message text, which can be specified instead of *parse_mode*.
disable_web_page_preview (``bool``, *optional*):
Disables link previews for links in this message.
Expand Down Expand Up @@ -82,7 +86,7 @@ async def edit_inline_text(
id=unpacked,
no_webpage=disable_web_page_preview or None,
reply_markup=await reply_markup.write(self) if reply_markup else None,
**await self.parser.parse(text, parse_mode)
**await utils.parse_text_entities(self, text, parse_mode, entities)
),
sleep_threshold=self.sleep_threshold
)
3 changes: 2 additions & 1 deletion pyrogram/methods/messages/edit_message_media.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,12 @@ async def edit_message_media(
"""
caption = media.caption
parse_mode = media.parse_mode
caption_entities = media.caption_entities

message, entities = None, None

if caption is not None:
message, entities = (await self.parser.parse(caption, parse_mode)).values()
message, entities = (await utils.parse_text_entities(self, caption, parse_mode, caption_entities)).values()

if isinstance(media, types.InputMediaPhoto):
if isinstance(media.media, io.BytesIO) or os.path.isfile(media.media):
Expand Down
2 changes: 1 addition & 1 deletion pyrogram/methods/messages/send_media_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ async def send_media_group(
raw.types.InputSingleMedia(
media=media,
random_id=self.rnd_id(),
**await self.parser.parse(i.caption, i.parse_mode)
**await utils.parse_text_entities(self, i.caption, i.parse_mode, i.caption_entities)
)
)

Expand Down
2 changes: 1 addition & 1 deletion pyrogram/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def compute_password_check(
async def parse_text_entities(
client: "pyrogram.Client",
text: str,
parse_mode: enums.ParseMode,
parse_mode: Optional[enums.ParseMode],
entities: List["types.MessageEntity"]
) -> Dict[str, Union[str, List[raw.base.MessageEntity]]]:
if entities:
Expand Down

0 comments on commit c3d3dbe

Please sign in to comment.