Create a proper Message class (msg_id, seqno, body; only .to_bytes())

telethon/tl/__init__.py

@@ -1,4 +1,5 @@
 from .tlobject import TLObject
 from .session import Session
 from .gzip_packed import GzipPacked
+from .message import Message
 from .message_container import MessageContainer

telethon/tl/message.py

@@ -0,0 +1,17 @@
+import struct
+
+from . import TLObject, GzipPacked
+
+
+class Message(TLObject):
+    """https://core.telegram.org/mtproto/service_messages#simple-container"""
+    def __init__(self, session, request):
+        super().__init__()
+        del self.content_related
+        self.msg_id = session.get_new_msg_id()
+        self.seq_no = session.generate_sequence(request.content_related)
+        self.request = request
+
+    def to_bytes(self):
+        body = GzipPacked.gzip_if_smaller(self.request)
+        return struct.pack('<qii', self.msg_id, self.seq_no, len(body)) + body

telethon/tl/message_container.py

@@ -5,31 +5,19 @@ from ..extensions import BinaryWriter
 class MessageContainer(TLObject):
     constructor_id = 0x73f1f8dc
 
-    # TODO Currently it's a bit of a hack, since the container actually holds
-    # messages (message id, sequence number, request body), not requests.
-    # Probably create a proper "Message" class
-    def __init__(self, session, requests):
+    def __init__(self, messages):
         super().__init__()
         self.content_related = False
-        self.session = session
-        self.requests = requests
+        self.messages = messages
 
     def to_bytes(self):
         # TODO Change this to delete the on_send from this class
         with BinaryWriter() as writer:
             writer.write_int(MessageContainer.constructor_id, signed=False)
-            writer.write_int(len(self.requests))
-            for x in self.requests:
-                x.request_msg_id = self.session.get_new_msg_id()
+            writer.write_int(len(self.messages))
+            for m in self.messages:
+                writer.write(m.to_bytes())
 
-                writer.write_long(x.request_msg_id)
-                writer.write_int(
-                    self.session.generate_sequence(x.content_related)
-                )
-
-                packet = GzipPacked.gzip_if_smaller(x)
-                writer.write_int(len(packet))
-                writer.write(packet)
             return writer.get_bytes()
 
     @staticmethod