From aa2b3daccc4b5686a3afef88c0696e29ba743fef Mon Sep 17 00:00:00 2001
From: Lonami Exo <totufals@hotmail.com>
Date: Sun, 30 Jun 2019 13:23:18 +0200
Subject: [PATCH] Factor out setting entities to events

---
 telethon/client/updates.py        |  1 +
 telethon/events/callbackquery.py  |  9 +---
 telethon/events/chataction.py     | 81 ++++++++++++++-----------------
 telethon/events/common.py         |  7 ++-
 telethon/events/inlinequery.py    |  7 +--
 telethon/events/messagedeleted.py |  9 +---
 telethon/events/messageedited.py  |  7 +--
 telethon/events/messageread.py    | 27 +++++------
 telethon/events/newmessage.py     |  1 -
 telethon/events/userupdate.py     | 19 +++-----
 telethon/network/mtprotosender.py |  1 +
 11 files changed, 69 insertions(+), 100 deletions(-)

diff --git a/telethon/client/updates.py b/telethon/client/updates.py
index 17fc82ac..72992044 100644
--- a/telethon/client/updates.py
+++ b/telethon/client/updates.py
@@ -538,6 +538,7 @@ class EventBuilderDict:
             event = self.__dict__[builder] = builder.build(self.update)
             if isinstance(event, EventCommon):
                 event.original_update = self.update
+                event._entities = self.update._entities
                 event._set_client(self.client)
             elif event:
                 event._client = self.client
diff --git a/telethon/events/callbackquery.py b/telethon/events/callbackquery.py
index 99f0d147..46a50eb6 100644
--- a/telethon/events/callbackquery.py
+++ b/telethon/events/callbackquery.py
@@ -47,18 +47,13 @@ class CallbackQuery(EventBuilder):
     @classmethod
     def build(cls, update):
         if isinstance(update, types.UpdateBotCallbackQuery):
-            event = cls.Event(update, update.peer, update.msg_id)
+            return cls.Event(update, update.peer, update.msg_id)
         elif isinstance(update, types.UpdateInlineBotCallbackQuery):
             # See https://github.com/LonamiWebs/Telethon/pull/1005
             # The long message ID is actually just msg_id + peer_id
             mid, pid = struct.unpack('<ii', struct.pack('<q', update.msg_id.id))
             peer = types.PeerChannel(-pid) if pid < 0 else types.PeerUser(pid)
-            event = cls.Event(update, peer, mid)
-        else:
-            return
-
-        event._entities = update._entities
-        return event
+            return cls.Event(update, peer, mid)
 
     def filter(self, event):
         # We can't call super().filter(...) because it ignores chat_instance
diff --git a/telethon/events/chataction.py b/telethon/events/chataction.py
index 75734e05..79ac1f42 100644
--- a/telethon/events/chataction.py
+++ b/telethon/events/chataction.py
@@ -14,18 +14,18 @@ class ChatAction(EventBuilder):
             # Telegram does not always send
             # UpdateChannelPinnedMessage for new pins
             # but always for unpin, with update.id = 0
-            event = cls.Event(types.PeerChannel(update.channel_id),
-                              unpin=True)
+            return cls.Event(types.PeerChannel(update.channel_id),
+                             unpin=True)
 
         elif isinstance(update, types.UpdateChatParticipantAdd):
-            event = cls.Event(types.PeerChat(update.chat_id),
-                              added_by=update.inviter_id or True,
-                              users=update.user_id)
+            return cls.Event(types.PeerChat(update.chat_id),
+                             added_by=update.inviter_id or True,
+                             users=update.user_id)
 
         elif isinstance(update, types.UpdateChatParticipantDelete):
-            event = cls.Event(types.PeerChat(update.chat_id),
-                              kicked_by=True,
-                              users=update.user_id)
+            return cls.Event(types.PeerChat(update.chat_id),
+                             kicked_by=True,
+                             users=update.user_id)
 
         elif (isinstance(update, (
                 types.UpdateNewMessage, types.UpdateNewChannelMessage))
@@ -33,53 +33,46 @@ class ChatAction(EventBuilder):
             msg = update.message
             action = update.message.action
             if isinstance(action, types.MessageActionChatJoinedByLink):
-                event = cls.Event(msg,
-                                  added_by=True,
-                                  users=msg.from_id)
+                return cls.Event(msg,
+                                 added_by=True,
+                                 users=msg.from_id)
             elif isinstance(action, types.MessageActionChatAddUser):
                 # If a user adds itself, it means they joined
                 added_by = ([msg.from_id] == action.users) or msg.from_id
-                event = cls.Event(msg,
-                                  added_by=added_by,
-                                  users=action.users)
+                return cls.Event(msg,
+                                 added_by=added_by,
+                                 users=action.users)
             elif isinstance(action, types.MessageActionChatDeleteUser):
-                event = cls.Event(msg,
-                                  kicked_by=msg.from_id or True,
-                                  users=action.user_id)
+                return cls.Event(msg,
+                                 kicked_by=msg.from_id or True,
+                                 users=action.user_id)
             elif isinstance(action, types.MessageActionChatCreate):
-                event = cls.Event(msg,
-                                  users=action.users,
-                                  created=True,
-                                  new_title=action.title)
+                return cls.Event(msg,
+                                 users=action.users,
+                                 created=True,
+                                 new_title=action.title)
             elif isinstance(action, types.MessageActionChannelCreate):
-                event = cls.Event(msg,
-                                  created=True,
-                                  users=msg.from_id,
-                                  new_title=action.title)
+                return cls.Event(msg,
+                                 created=True,
+                                 users=msg.from_id,
+                                 new_title=action.title)
             elif isinstance(action, types.MessageActionChatEditTitle):
-                event = cls.Event(msg,
-                                  users=msg.from_id,
-                                  new_title=action.title)
+                return cls.Event(msg,
+                                 users=msg.from_id,
+                                 new_title=action.title)
             elif isinstance(action, types.MessageActionChatEditPhoto):
-                event = cls.Event(msg,
-                                  users=msg.from_id,
-                                  new_photo=action.photo)
+                return cls.Event(msg,
+                                 users=msg.from_id,
+                                 new_photo=action.photo)
             elif isinstance(action, types.MessageActionChatDeletePhoto):
-                event = cls.Event(msg,
-                                  users=msg.from_id,
-                                  new_photo=True)
+                return cls.Event(msg,
+                                 users=msg.from_id,
+                                 new_photo=True)
             elif isinstance(action, types.MessageActionPinMessage):
                 # Telegram always sends this service message for new pins
-                event = cls.Event(msg,
-                                  users=msg.from_id,
-                                  new_pin=msg.reply_to_msg_id)
-            else:
-                return
-        else:
-            return
-
-        event._entities = update._entities
-        return event
+                return cls.Event(msg,
+                                 users=msg.from_id,
+                                 new_pin=msg.reply_to_msg_id)
 
     class Event(EventCommon):
         """
diff --git a/telethon/events/common.py b/telethon/events/common.py
index eeb24c0c..32ea0cf6 100644
--- a/telethon/events/common.py
+++ b/telethon/events/common.py
@@ -78,7 +78,12 @@ class EventBuilder(abc.ABC):
     @classmethod
     @abc.abstractmethod
     def build(cls, update):
-        """Builds an event for the given update if possible, or returns None"""
+        """
+        Builds an event for the given update if possible, or returns None.
+
+        `others` are the rest of updates that came in the same container
+        as the current `update`.
+        """
 
     async def resolve(self, client):
         """Helper method to allow event builders to be resolved before usage"""
diff --git a/telethon/events/inlinequery.py b/telethon/events/inlinequery.py
index 794ca857..a97d2026 100644
--- a/telethon/events/inlinequery.py
+++ b/telethon/events/inlinequery.py
@@ -48,12 +48,7 @@ class InlineQuery(EventBuilder):
     @classmethod
     def build(cls, update):
         if isinstance(update, types.UpdateBotInlineQuery):
-            event = cls.Event(update)
-        else:
-            return
-
-        event._entities = update._entities
-        return event
+            return cls.Event(update)
 
     def filter(self, event):
         if self.pattern:
diff --git a/telethon/events/messagedeleted.py b/telethon/events/messagedeleted.py
index dc86997d..92ee9332 100644
--- a/telethon/events/messagedeleted.py
+++ b/telethon/events/messagedeleted.py
@@ -27,20 +27,15 @@ class MessageDeleted(EventBuilder):
     @classmethod
     def build(cls, update):
         if isinstance(update, types.UpdateDeleteMessages):
-            event = cls.Event(
+            return cls.Event(
                 deleted_ids=update.messages,
                 peer=None
             )
         elif isinstance(update, types.UpdateDeleteChannelMessages):
-            event = cls.Event(
+            return cls.Event(
                 deleted_ids=update.messages,
                 peer=types.PeerChannel(update.channel_id)
             )
-        else:
-            return
-
-        event._entities = update._entities
-        return event
 
     class Event(EventCommon):
         def __init__(self, deleted_ids, peer):
diff --git a/telethon/events/messageedited.py b/telethon/events/messageedited.py
index 83a71dd6..bcdc084c 100644
--- a/telethon/events/messageedited.py
+++ b/telethon/events/messageedited.py
@@ -36,12 +36,7 @@ class MessageEdited(NewMessage):
     def build(cls, update):
         if isinstance(update, (types.UpdateEditMessage,
                                types.UpdateEditChannelMessage)):
-            event = cls.Event(update.message)
-        else:
-            return
-
-        event._entities = update._entities
-        return event
+            return cls.Event(update.message)
 
     class Event(NewMessage.Event):
         pass  # Required if we want a different name for it
diff --git a/telethon/events/messageread.py b/telethon/events/messageread.py
index 00ac6073..d3bae43d 100644
--- a/telethon/events/messageread.py
+++ b/telethon/events/messageread.py
@@ -22,27 +22,22 @@ class MessageRead(EventBuilder):
     @classmethod
     def build(cls, update):
         if isinstance(update, types.UpdateReadHistoryInbox):
-            event = cls.Event(update.peer, update.max_id, False)
+            return cls.Event(update.peer, update.max_id, False)
         elif isinstance(update, types.UpdateReadHistoryOutbox):
-            event = cls.Event(update.peer, update.max_id, True)
+            return cls.Event(update.peer, update.max_id, True)
         elif isinstance(update, types.UpdateReadChannelInbox):
-            event = cls.Event(types.PeerChannel(update.channel_id),
-                                      update.max_id, False)
+            return cls.Event(types.PeerChannel(update.channel_id),
+                             update.max_id, False)
         elif isinstance(update, types.UpdateReadChannelOutbox):
-            event = cls.Event(types.PeerChannel(update.channel_id),
-                              update.max_id, True)
+            return cls.Event(types.PeerChannel(update.channel_id),
+                             update.max_id, True)
         elif isinstance(update, types.UpdateReadMessagesContents):
-            event = cls.Event(message_ids=update.messages,
-                              contents=True)
+            return cls.Event(message_ids=update.messages,
+                             contents=True)
         elif isinstance(update, types.UpdateChannelReadMessagesContents):
-            event = cls.Event(types.PeerChannel(update.channel_id),
-                              message_ids=update.messages,
-                              contents=True)
-        else:
-            return
-
-        event._entities = update._entities
-        return event
+            return cls.Event(types.PeerChannel(update.channel_id),
+                             message_ids=update.messages,
+                             contents=True)
 
     def filter(self, event):
         if self.inbox == event.outbox:
diff --git a/telethon/events/newmessage.py b/telethon/events/newmessage.py
index c1396f72..cfda9624 100644
--- a/telethon/events/newmessage.py
+++ b/telethon/events/newmessage.py
@@ -128,7 +128,6 @@ class NewMessage(EventBuilder):
             if ori.from_id == ori.to_id.user_id and not ori.fwd_from:
                 event.message.out = True
 
-        event._entities = update._entities
         return event
 
     def filter(self, event):
diff --git a/telethon/events/userupdate.py b/telethon/events/userupdate.py
index 742c8034..647a3bc2 100644
--- a/telethon/events/userupdate.py
+++ b/telethon/events/userupdate.py
@@ -14,21 +14,16 @@ class UserUpdate(EventBuilder):
     @classmethod
     def build(cls, update):
         if isinstance(update, types.UpdateUserStatus):
-            event = cls.Event(update.user_id,
-                              status=update.status)
+            return cls.Event(update.user_id,
+                             status=update.status)
         elif isinstance(update, types.UpdateChatUserTyping):
             # Unfortunately, we can't know whether `chat_id`'s type
-            event = cls.Event(update.user_id,
-                              chat_id=update.chat_id,
-                              typing=update.action)
+            return cls.Event(update.user_id,
+                             chat_id=update.chat_id,
+                             typing=update.action)
         elif isinstance(update, types.UpdateUserTyping):
-            event = cls.Event(update.user_id,
-                              typing=update.action)
-        else:
-            return
-
-        event._entities = update._entities
-        return event
+            return cls.Event(update.user_id,
+                             typing=update.action)
 
     class Event(EventCommon, SenderGetter):
         """
diff --git a/telethon/network/mtprotosender.py b/telethon/network/mtprotosender.py
index 6b5f6585..ac61fe97 100644
--- a/telethon/network/mtprotosender.py
+++ b/telethon/network/mtprotosender.py
@@ -551,6 +551,7 @@ class MTProtoSender:
 
         self._log.debug('Handling update %s', message.obj.__class__.__name__)
         if self._update_callback:
+            print(message.obj.stringify())
             self._update_callback(message.obj)
 
     async def _handle_pong(self, message):