LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-07-15 18:42:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename Request.msg_id to request_msg_id to avoid name clash (fix #122)

Browse Source
This commit is contained in:
Lonami Exo 2017-06-18 10:01:59 +02:00
parent 765ae870cf
commit 8afb0a3f6b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
telethon/network/mtproto_sender.py
View File

@ -133,13 +133,13 @@ class MtProtoSender:
def _send_packet(self, packet, request): def _send_packet(self, packet, request):
"""Sends the given packet bytes with the additional """Sends the given packet bytes with the additional
information of the original request. This does NOT lock the threads!""" information of the original request. This does NOT lock the threads!"""
request.msg_id = self.session.get_new_msg_id() request.request_msg_id = self.session.get_new_msg_id()
# First calculate plain_text to encrypt it # First calculate plain_text to encrypt it
with BinaryWriter() as plain_writer: with BinaryWriter() as plain_writer:
plain_writer.write_long(self.session.salt, signed=False) plain_writer.write_long(self.session.salt, signed=False)
plain_writer.write_long(self.session.id, signed=False) plain_writer.write_long(self.session.id, signed=False)
plain_writer.write_long(request.msg_id) plain_writer.write_long(request.request_msg_id)
plain_writer.write_int( plain_writer.write_int(
self.session.generate_sequence(request.confirmed)) self.session.generate_sequence(request.confirmed))
@ -223,7 +223,7 @@ class MtProtoSender:
if code == 0x62d6b459: if code == 0x62d6b459:
ack = reader.tgread_object() ack = reader.tgread_object()
for r in self._pending_receive: for r in self._pending_receive:
if r.msg_id in ack.msg_ids: if r.request_msg_id in ack.msg_ids:
self._logger.warning('Ack found for the a request') self._logger.warning('Ack found for the a request')
if self.logging_out: if self.logging_out:
@ -259,7 +259,7 @@ class MtProtoSender:
try: try:
request = next(r for r in self._pending_receive request = next(r for r in self._pending_receive
if r.msg_id == received_msg_id) if r.request_msg_id == received_msg_id)
self._logger.warning('Pong confirmed a request') self._logger.warning('Pong confirmed a request')
request.confirm_received = True request.confirm_received = True
@ -296,7 +296,7 @@ class MtProtoSender:
try: try:
request = next(r for r in self._pending_receive request = next(r for r in self._pending_receive
if r.msg_id == bad_msg_id) if r.request_msg_id == bad_msg_id)
self.send(request) self.send(request)
except StopIteration: pass except StopIteration: pass
@ -330,7 +330,7 @@ class MtProtoSender:
try: try:
request = next(r for r in self._pending_receive request = next(r for r in self._pending_receive
if r.msg_id == request_id) if r.request_msg_id == request_id)
request.confirm_received = True request.confirm_received = True
except StopIteration: except StopIteration:

2
telethon/tl/mtproto_request.py
View File

@ -5,7 +5,7 @@ class MTProtoRequest:
def __init__(self): def __init__(self):
self.sent = False self.sent = False
self.msg_id = 0 # Long self.request_msg_id = 0 # Long
self.sequence = 0 self.sequence = 0
self.dirty = False self.dirty = False