Merge branch 'test'

This commit is contained in:
Dan 2018-02-07 20:09:20 +01:00
commit 444b695284
2 changed files with 8 additions and 2 deletions

View File

@ -171,7 +171,7 @@ class Client:
self.rnd_id = self.session.msg_id self.rnd_id = self.session.msg_id
self.get_dialogs() self.get_dialogs()
self.session.update_handler = self.update_handler self.session.set_update_handler(self, self.update_handler)
mimetypes.init() mimetypes.init()

View File

@ -26,6 +26,7 @@ from os import urandom
from queue import Queue from queue import Queue
from threading import Event, Thread from threading import Event, Thread
import pyrogram
from pyrogram import __copyright__, __license__, __version__ from pyrogram import __copyright__, __license__, __version__
from pyrogram.api import functions, types, core from pyrogram.api import functions, types, core
from pyrogram.api.all import layer from pyrogram.api.all import layer
@ -109,6 +110,7 @@ class Session:
self.is_connected = Event() self.is_connected = Event()
self.client = None
self.update_handler = None self.update_handler = None
self.total_connections = 0 self.total_connections = 0
@ -247,6 +249,10 @@ class Session:
log.debug("{} stopped".format(name)) log.debug("{} stopped".format(name))
def set_update_handler(self, client: pyrogram, update_handler: callable):
self.client = client
self.update_handler = update_handler
def unpack_dispatch_and_ack(self, packet: bytes): def unpack_dispatch_and_ack(self, packet: bytes):
# TODO: A better dispatcher # TODO: A better dispatcher
data = self.unpack(BytesIO(packet)) data = self.unpack(BytesIO(packet))
@ -288,7 +294,7 @@ class Session:
msg_id = i.body.msg_id msg_id = i.body.msg_id
else: else:
if self.update_handler: if self.update_handler:
self.update_handler(i.body) self.update_handler(self.client, i.body)
if msg_id in self.results: if msg_id in self.results:
self.results[msg_id].value = getattr(i.body, "result", i.body) self.results[msg_id].value = getattr(i.body, "result", i.body)