From e46e70770249e6517fa52c75df93b1df479f116f Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Sun, 29 Dec 2019 23:30:02 +0000 Subject: [PATCH] Improve cb --- src/danog/MadelineProto/MTProtoSession/ResponseHandler.php | 4 +++- src/danog/MadelineProto/MTProtoTools/Files.php | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/danog/MadelineProto/MTProtoSession/ResponseHandler.php b/src/danog/MadelineProto/MTProtoSession/ResponseHandler.php index 598e3278..103a2e8f 100644 --- a/src/danog/MadelineProto/MTProtoSession/ResponseHandler.php +++ b/src/danog/MadelineProto/MTProtoSession/ResponseHandler.php @@ -321,6 +321,8 @@ trait ResponseHandler if (isset($request['promise']) && \is_object($request['promise'])) { Loop::defer(function () use (&$request, $data) { if (isset($request['promise'])) { + $this->logger->logger('Rejecting: '.(isset($request['_']) ? $request['_'] : '-')); + $promise = $request['promise']; unset($request['promise']); try { @@ -521,7 +523,7 @@ trait ResponseHandler if (\is_numeric($seconds) && $seconds < $limit) { //$this->gotResponseForOutgoingMessageId($request_id); - $this->logger->logger('Flood, waiting '.$seconds.' seconds before repeating async call...', \danog\MadelineProto\Logger::NOTICE); + $this->logger->logger('Flood, waiting '.$seconds.' seconds before repeating async call of '.($request['_'] ?? '').'...', \danog\MadelineProto\Logger::NOTICE); $request['sent'] += $seconds; Loop::delay($seconds * 1000, [$this, 'methodRecall'], ['message_id' => $request_id, ]); diff --git a/src/danog/MadelineProto/MTProtoTools/Files.php b/src/danog/MadelineProto/MTProtoTools/Files.php index 4d661ead..388e9eb9 100644 --- a/src/danog/MadelineProto/MTProtoTools/Files.php +++ b/src/danog/MadelineProto/MTProtoTools/Files.php @@ -470,13 +470,15 @@ trait Files /** * Read callback, called when the chunk is read and fully resent. * + * @param mixed ...$params Params to be passed to cb + * * @return void */ - public function callback(): void + public function callback(...$params): void { $this->read[$this->offset++]->resolve(); if ($this->cb) { - Tools::callFork(($this->cb)()); + Tools::callFork(($this->cb)(...$params)); } } };