Fix photosize conversion

This commit is contained in:
Daniil Gentili 2019-06-01 13:13:59 +02:00
parent 2118665a29
commit 58f0bce84b
2 changed files with 9 additions and 4 deletions

View File

@ -64,7 +64,10 @@ trait ResponseHandler
while ($this->datacenter->sockets[$datacenter]->new_incoming) {
reset($this->datacenter->sockets[$datacenter]->new_incoming);
$current_msg_id = key($this->datacenter->sockets[$datacenter]->new_incoming);
if (!isset($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id])) continue;
if (!isset($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id])) {
unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
continue;
}
$this->logger->logger((isset($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['from_container']) ? 'Inside of container, received ' : 'Received ').$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['_'].' from DC '.$datacenter, \danog\MadelineProto\Logger::ULTRA_VERBOSE);
switch ($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['_']) {

View File

@ -289,7 +289,9 @@ trait BotAPI
}
$res['photo'] = [];
foreach ($data['photo']['sizes'] as $key => $photo) {
$res['photo'][$key] = yield $this->photosize_to_botapi_async($photo, $data['photo']);
if (in_array($photo['_'], ['photoCachedSize', 'photoSize'])) {
$res['photo'][$key] = yield $this->photosize_to_botapi_async($photo, $data['photo']);
}
}
return $res;
@ -298,8 +300,8 @@ trait BotAPI
case 'messageMediaDocument':
$type_name = 'document';
$res = [];
if ($data['document']['thumb']['_'] === 'photoSize') {
$res['thumb'] = yield $this->photosize_to_botapi_async($data['document']['thumb'], [], true);
if (isset($data['document']['thumbs']) && $data['document']['thumbs'] && in_array(end($data['document']['thumbs'])['_'], ['photoCachedSize', 'photoSize'])) {
$res['thumb'] = yield $this->photosize_to_botapi_async(end($data['document']['thumbs']), [], true);
}
foreach ($data['document']['attributes'] as $attribute) {
switch ($attribute['_']) {