LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-08-04 12:10:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into asyncio

Browse Source
This commit is contained in:
Lonami Exo 2018-04-08 15:57:06 +02:00
commit 946dd69211
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
telethon/events/chataction.py
View File

@ -268,12 +268,12 @@ class ChatAction(EventBuilder):
return self._input_users[0] return self._input_users[0]
@property @property
async def user_id(self): def user_id(self):
""" """
Returns the marked signed ID of the first user, if any. Returns the marked signed ID of the first user, if any.
""" """
if await self.input_users: if self._user_peers:
return utils.get_peer_id(self._input_users[0]) return utils.get_peer_id(self._user_peers[0])
@property @property
async def users(self): async def users(self):
@ -321,9 +321,9 @@ class ChatAction(EventBuilder):
return self._input_users return self._input_users
@property @property
async def user_ids(self): def user_ids(self):
""" """
Returns the marked signed ID of the users, if any. Returns the marked signed ID of the users, if any.
""" """
if await self.input_users: if self._user_peers:
return [utils.get_peer_id(u) for u in self._input_users] return [utils.get_peer_id(u) for u in self._user_peers]

3
telethon/events/newmessage.py
View File

@ -263,8 +263,7 @@ class NewMessage(EventBuilder):
""" """
Returns the marked sender integer ID, if present. Returns the marked sender integer ID, if present.
""" """
if self.input_sender: return self.message.from_id
return utils.get_peer_id(self._input_sender)
@property @property
def text(self): def text(self):