danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/danog/MadelineProto

Browse Source
This commit is contained in:
Daniil Gentili 2017-02-16 20:05:27 +01:00
commit 7e3abd0fe1
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/danog/MadelineProto/TL/Files.php
View File

@ -607,8 +607,12 @@ trait Files
$res['InputFileLocation'] = ['_' => 'inputFileLocation', 'volume_id' => $photo['location']['volume_id'], 'local_id' => $photo['location']['local_id'], 'secret' => $photo['location']['secret'], 'dc_id' => $photo['location']['dc_id']]; $res['InputFileLocation'] = ['_' => 'inputFileLocation', 'volume_id' => $photo['location']['volume_id'], 'local_id' => $photo['location']['local_id'], 'secret' => $photo['location']['secret'], 'dc_id' => $photo['location']['dc_id']];
$res['ext'] = $this->get_extension_from_location($res['InputFileLocation'], '.jpg'); $res['ext'] = $this->get_extension_from_location($res['InputFileLocation'], '.jpg');
$res['mime'] = 'image/jpeg'; $res['mime'] = 'image/jpeg';
if (isset($photo['location']['size'])) $res['size'] = $photo['location']['size']; if (isset($photo['location']['size'])) {
if (isset($photo['location']['bytes'])) $res['size'] = strlen($photo['location']['bytes']); $res['size'] = $photo['location']['size'];
}
if (isset($photo['location']['bytes'])) {
$res['size'] = strlen($photo['location']['bytes']);
}
return $res; return $res;
case 'photoSize': case 'photoSize':
@ -617,8 +621,12 @@ trait Files
$res['InputFileLocation'] = ['_' => 'inputFileLocation', 'volume_id' => $message_media['location']['volume_id'], 'local_id' => $message_media['location']['local_id'], 'secret' => $message_media['location']['secret'], 'dc_id' => $message_media['location']['dc_id']]; $res['InputFileLocation'] = ['_' => 'inputFileLocation', 'volume_id' => $message_media['location']['volume_id'], 'local_id' => $message_media['location']['local_id'], 'secret' => $message_media['location']['secret'], 'dc_id' => $message_media['location']['dc_id']];
$res['ext'] = $this->get_extension_from_location($res['InputFileLocation'], '.jpg'); $res['ext'] = $this->get_extension_from_location($res['InputFileLocation'], '.jpg');
$res['mime'] = 'image/jpeg'; $res['mime'] = 'image/jpeg';
if (isset($photo['location']['size'])) $res['size'] = $photo['location']['size']; if (isset($photo['location']['size'])) {
if (isset($photo['location']['bytes'])) $res['size'] = strlen($photo['location']['bytes']); $res['size'] = $photo['location']['size'];
}
if (isset($photo['location']['bytes'])) {
$res['size'] = strlen($photo['location']['bytes']);
}
return $res; return $res;
case 'messageMediaDocument': case 'messageMediaDocument':
@ -650,7 +658,9 @@ trait Files
$res['name'] = $message_media['document']['access_hash']; $res['name'] = $message_media['document']['access_hash'];
} }
if (isset($message_media['document']['size'])) $res['size'] = $message_media['document']['size']; if (isset($message_media['document']['size'])) {
$res['size'] = $message_media['document']['size'];
}
$res['name'] .= '_'.$message_media['document']['id']; $res['name'] .= '_'.$message_media['document']['id'];
$res['mime'] = $message_media['document']['mime_type']; $res['mime'] = $message_media['document']['mime_type'];