LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-08-07 13:34:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes after review (#4499)

Browse Source
This commit is contained in:
Gregory Eremeev 2024-10-25 17:37:39 -03:00
parent 3a1d25c80a
commit 255dcbafce
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
telethon/client/messages.py
View File

@ -827,6 +827,7 @@ class MessageMethods:
""" """
if file is not None: if file is not None:
if isinstance(message, types.Message): if isinstance(message, types.Message):
formatting_entities = formatting_entities or message.entities
message = message.message message = message.message
return await self.send_file( return await self.send_file(
entity, file, caption=message, reply_to=reply_to, entity, file, caption=message, reply_to=reply_to,

16
tests/telethon/client/test_messages.py
View File

@ -6,7 +6,7 @@ import pytest
from telethon import TelegramClient from telethon import TelegramClient
from telethon.client import MessageMethods from telethon.client import MessageMethods
from telethon.tl.types import PeerChat, MessageMediaDocument, Message from telethon.tl.types import PeerChat, MessageMediaDocument, Message, MessageEntityBold
@pytest.mark.asyncio @pytest.mark.asyncio
@ -46,7 +46,11 @@ async def test_send_message_with_file_forwards_args():
class TestMessageMethods: class TestMessageMethods:
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_send_msg_and_file(self): @pytest.mark.parametrize(
'formatting_entities',
([MessageEntityBold(offset=0, length=0)], None)
)
async def test_send_msg_and_file(self, formatting_entities):
async def async_func(result): # AsyncMock was added only in 3.8 async def async_func(result): # AsyncMock was added only in 3.8
return result return result
msg_methods = MessageMethods() msg_methods = MessageMethods()
@ -56,6 +60,7 @@ class TestMessageMethods:
entity = 'test_entity' entity = 'test_entity'
message = Message( message = Message(
id=1, peer_id=PeerChat(chat_id=0), message='expected_caption', date=None, id=1, peer_id=PeerChat(chat_id=0), message='expected_caption', date=None,
entities=[MessageEntityBold(offset=9, length=9)],
) )
media_file = MessageMediaDocument() media_file = MessageMediaDocument()
@ -65,13 +70,14 @@ class TestMessageMethods:
) as mock_obj: ) as mock_obj:
result = await msg_methods.send_message( result = await msg_methods.send_message(
entity=entity, message=message, file=media_file, entity=entity, message=message, file=media_file,
formatting_entities=formatting_entities,
) )
mock_obj.assert_called_once_with( mock_obj.assert_called_once_with(
entity, media_file, caption=message.message, entity, media_file, caption=message.message,
reply_to=None, attributes=None, parse_mode=(), formatting_entities=formatting_entities or message.entities,
reply_to=None, silent=None, attributes=None, parse_mode=(),
force_document=False, thumb=None, buttons=None, force_document=False, thumb=None, buttons=None,
clear_draft=False, silent=None, schedule=None, clear_draft=False, schedule=None, supports_streaming=False,
supports_streaming=False, formatting_entities=None,
comment_to=None, background=None, nosound_video=None, comment_to=None, background=None, nosound_video=None,
) )
assert result == expected_result assert result == expected_result