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

Fix infinite recursion for custom.Message.message

Browse Source
This commit is contained in:
Lonami Exo 2018-07-20 12:24:48 +02:00
parent aa67f107af
commit 13437cc3f2
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
telethon/tl/custom/message.py
View File

@ -105,24 +105,23 @@ class Message(ChatGetter, SenderGetter):
The message text, formatted using the client's default parse mode.
Will be ``None`` for :tl:`MessageService`.
"""
if self._text is None\
and isinstance(self.original_message, types.Message):
if self._text is None and 'message' in self.__dict__:
if not self._client.parse_mode:
return self.original_message.message
return self.__dict__['message']
self._text = self._client.parse_mode.unparse(
self.original_message.message, self.original_message.entities)
self.__dict__['message'], self.__dict__.get('entities'))
return self._text
@text.setter
def text(self, value):
if isinstance(self.original_message, types.Message):
if self._client.parse_mode:
msg, ent = self._client.parse_mode.parse(value)
else:
msg, ent = value, []
self.original_message.message = msg
self.original_message.entities = ent
self._text = value
if self._client.parse_mode:
msg, ent = self._client.parse_mode.parse(value)
else:
msg, ent = value, []
self.__dict__['message'] = msg
self.__dict__['entities'] = ent
self._text = value
@property
def raw_text(self):
@ -130,15 +129,13 @@ class Message(ChatGetter, SenderGetter):
The raw message text, ignoring any formatting.
Will be ``None`` for :tl:`MessageService`.
"""
if isinstance(self.original_message, types.Message):
return self.original_message.message
return self.__dict__.get('message')
@raw_text.setter
def raw_text(self, value):
if isinstance(self.original_message, types.Message):
self.original_message.message = value
self.original_message.entities = []
self._text = None
self.__dict__['message'] = value
self.__dict__['entities'] = []
self._text = None
@property
def message(self):
@ -515,14 +512,14 @@ class Message(ChatGetter, SenderGetter):
>>> for _, inner_text in m.get_entities_text(MessageEntityCode):
>>> print(inner_text)
"""
if not self.original_message.entities:
ent = self.__dict__.get('entities')
if not ent:
return []
ent = self.original_message.entities
if cls and ent:
if cls:
ent = [c for c in ent if isinstance(c, cls)]
texts = get_inner_text(self.original_message.message, ent)
texts = get_inner_text(self.__dict__.get('message'), ent)
return list(zip(ent, texts))
async def click(self, i=None, j=None,