diff --git a/src/danog/MadelineProto/CombinedAPI.php b/src/danog/MadelineProto/CombinedAPI.php index 39bea774..6dc38ee3 100644 --- a/src/danog/MadelineProto/CombinedAPI.php +++ b/src/danog/MadelineProto/CombinedAPI.php @@ -65,7 +65,6 @@ class CombinedAPI foreach ($paths as $path => $settings) { $this->addInstance($path, $settings); } - } public function addInstance($path, $settings = []) @@ -74,6 +73,7 @@ class CombinedAPI if (isset($this->event_handler_instance)) { $this->event_handler_instance->referenceInstance($path); } + return; } @@ -172,7 +172,7 @@ class CombinedAPI public function event_update_handler($update, $instance) { - $method_name = 'on' . ucfirst($update['_']); + $method_name = 'on'.ucfirst($update['_']); if (method_exists($this->event_handler_instance, $method_name)) { $this->event_handler_instance->$method_name($update, $instance); } elseif (method_exists($this->event_handler_instance, 'onAny')) { @@ -199,8 +199,8 @@ class CombinedAPI } catch (\danog\MadelineProto\Exception $e) { register_shutdown_function(function () { \danog\MadelineProto\Logger::log(['Restarting script...']); - $a = fsockopen((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'tls' : 'tcp') . '://' . $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT']); - fwrite($a, $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . ' ' . $_SERVER['SERVER_PROTOCOL'] . "\r\n" . 'Host: ' . $_SERVER['SERVER_NAME'] . "\r\n\r\n"); + $a = fsockopen((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'tls' : 'tcp').'://'.$_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT']); + fwrite($a, $_SERVER['REQUEST_METHOD'].' '.$_SERVER['REQUEST_URI'].' '.$_SERVER['SERVER_PROTOCOL']."\r\n".'Host: '.$_SERVER['SERVER_NAME']."\r\n\r\n"); }); } } @@ -236,7 +236,7 @@ class CombinedAPI } foreach ($instance->API->datacenter->sockets as $id => $connection) { - $read[$id . '-' . $path] = $connection->getSocket(); + $read[$id.'-'.$path] = $connection->getSocket(); } } if (time() - $this->serialized > $this->serialization_interval) { diff --git a/src/danog/MadelineProto/MTProtoTools/PeerHandler.php b/src/danog/MadelineProto/MTProtoTools/PeerHandler.php index 3116df72..f1421efa 100644 --- a/src/danog/MadelineProto/MTProtoTools/PeerHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/PeerHandler.php @@ -478,6 +478,7 @@ trait PeerHandler $this->full_chats[$partial['bot_api_id']] = $res; $partial = $this->get_info($id); + return array_merge($partial, $res); } diff --git a/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php b/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php index 1c2c0641..4c98177f 100644 --- a/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php @@ -315,7 +315,7 @@ trait ResponseHandler if (isset($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['chat'])) { $this->add_chats([$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['chat']]); } - + if (isset($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['result']['users'])) { $this->add_users($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['result']['users']); }