LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-26 11:23:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix ChatAction.user_left was considered as user_kicked

Browse Source 
Closes #1660.
This commit is contained in:
Lonami Exo 2021-01-02 12:24:32 +01:00
parent d0ee3c3a56
commit 3df4807fb9
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
telethon/events/chataction.py
View File

@ -54,20 +54,9 @@ class ChatAction(EventBuilder):
kicked_by=True, kicked_by=True,
users=update.user_id) users=update.user_id)
elif isinstance(update, types.UpdateChannel): # UpdateChannel is sent if we leave a channel, and the update._entities
# We rely on the fact that update._entities is set by _process_update # set by _process_update would let us make some guesses. However it's
# This update only has the channel ID, and Telegram *should* have sent # better not to rely on this. Rely only in MessageActionChatDeleteUser.
# the entity in the Updates.chats list. If it did, check Channel.left
# to determine what happened.
peer = types.PeerChannel(update.channel_id)
channel = update._entities.get(utils.get_peer_id(peer))
if channel is not None:
if isinstance(channel, types.ChannelForbidden) or channel.left:
return cls.Event(peer,
kicked_by=True)
else:
return cls.Event(peer,
added_by=True)
elif (isinstance(update, ( elif (isinstance(update, (
types.UpdateNewMessage, types.UpdateNewChannelMessage)) types.UpdateNewMessage, types.UpdateNewChannelMessage))
@ -86,7 +75,7 @@ class ChatAction(EventBuilder):
users=action.users) users=action.users)
elif isinstance(action, types.MessageActionChatDeleteUser): elif isinstance(action, types.MessageActionChatDeleteUser):
return cls.Event(msg, return cls.Event(msg,
kicked_by=msg.from_id or True, kicked_by=utils.get_peer_id(msg.from_id) if msg.from_id else True,
users=action.user_id) users=action.user_id)
elif isinstance(action, types.MessageActionChatCreate): elif isinstance(action, types.MessageActionChatCreate):
return cls.Event(msg, return cls.Event(msg,