mirror of
https://github.com/danog/TelegramApiServer.git
synced 2024-11-30 04:19:13 +01:00
Fix for photoSize download on TL_layer 100+
This commit is contained in:
Alexander Pankratov
parent
7f3abb31ff
commit
7c8486b0a3
@ -8,7 +8,7 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.2.0",
|
"php": ">=7.2.0",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"danog/madelineproto":"dev-session_optimization",
|
"danog/madelineproto":"dev-master",
|
||||||
"amphp/amp": "dev-master",
|
"amphp/amp": "dev-master",
|
||||||
"amphp/http-server": "dev-master",
|
"amphp/http-server": "dev-master",
|
||||||
"amphp/dns": "dev-master as v0.9.x-dev",
|
"amphp/dns": "dev-master as v0.9.x-dev",
|
||||||
@ -25,10 +25,6 @@
|
|||||||
{
|
{
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/swoole/ide-helper.git"
|
"url": "https://github.com/swoole/ide-helper.git"
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/xtrime-ru/madelineProto"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
|
|||||||
71
composer.lock
generated
71
composer.lock
generated
@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "65a0e83e5c8a9f0f7d58f56325c5def4",
|
"content-hash": "8b8ba3322d447f03eb284d1e73aabfae",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "amphp/amp",
|
"name": "amphp/amp",
|
||||||
@ -255,12 +255,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/amphp/dns.git",
|
"url": "https://github.com/amphp/dns.git",
|
||||||
"reference": "fbf1ae2d89c390175a34fd9337e42eac8cc35b86"
|
"reference": "2e7921a13ad0fa36cbccafb29b7d6e15dc2740af"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/amphp/dns/zipball/fbf1ae2d89c390175a34fd9337e42eac8cc35b86",
|
"url": "https://api.github.com/repos/amphp/dns/zipball/2e7921a13ad0fa36cbccafb29b7d6e15dc2740af",
|
||||||
"reference": "fbf1ae2d89c390175a34fd9337e42eac8cc35b86",
|
"reference": "2e7921a13ad0fa36cbccafb29b7d6e15dc2740af",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -271,6 +271,7 @@
|
|||||||
"amphp/windows-registry": "^0.3",
|
"amphp/windows-registry": "^0.3",
|
||||||
"daverandom/libdns": "^2.0.1",
|
"daverandom/libdns": "^2.0.1",
|
||||||
"ext-filter": "*",
|
"ext-filter": "*",
|
||||||
|
"ext-json": "*",
|
||||||
"php": ">=7.0"
|
"php": ">=7.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
@ -323,7 +324,7 @@
|
|||||||
"dns",
|
"dns",
|
||||||
"resolve"
|
"resolve"
|
||||||
],
|
],
|
||||||
"time": "2019-06-13T16:38:23+00:00"
|
"time": "2019-07-08T20:49:23+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "amphp/file",
|
"name": "amphp/file",
|
||||||
@ -451,20 +452,20 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "amphp/http",
|
"name": "amphp/http",
|
||||||
"version": "v1.2.0",
|
"version": "v1.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/amphp/http.git",
|
"url": "https://github.com/amphp/http.git",
|
||||||
"reference": "91c023aec2219aae6cec49a4dc576fb617916f2b"
|
"reference": "3b1cddc3f67b618a6197a5e87df834c53f79fcce"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/amphp/http/zipball/91c023aec2219aae6cec49a4dc576fb617916f2b",
|
"url": "https://api.github.com/repos/amphp/http/zipball/3b1cddc3f67b618a6197a5e87df834c53f79fcce",
|
||||||
"reference": "91c023aec2219aae6cec49a4dc576fb617916f2b",
|
"reference": "3b1cddc3f67b618a6197a5e87df834c53f79fcce",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7"
|
"php": ">=7.1"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"amphp/php-cs-fixer-config": "dev-master",
|
"amphp/php-cs-fixer-config": "dev-master",
|
||||||
@ -474,7 +475,10 @@
|
|||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Amp\\Http\\": "src"
|
"Amp\\Http\\": "src"
|
||||||
}
|
},
|
||||||
|
"files": [
|
||||||
|
"src/functions.php"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
"license": [
|
"license": [
|
||||||
@ -487,7 +491,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "Basic HTTP primitives which can be shared by servers and clients.",
|
"description": "Basic HTTP primitives which can be shared by servers and clients.",
|
||||||
"time": "2019-06-10T17:53:40+00:00"
|
"time": "2019-07-01T19:11:10+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "amphp/http-server",
|
"name": "amphp/http-server",
|
||||||
@ -495,12 +499,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/amphp/http-server.git",
|
"url": "https://github.com/amphp/http-server.git",
|
||||||
"reference": "2cacc09f718d2924f07f042c6ad5640666c8a056"
|
"reference": "eba1151848f2cfb9c959ef05737480b9f80f7d43"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/amphp/http-server/zipball/2cacc09f718d2924f07f042c6ad5640666c8a056",
|
"url": "https://api.github.com/repos/amphp/http-server/zipball/eba1151848f2cfb9c959ef05737480b9f80f7d43",
|
||||||
"reference": "2cacc09f718d2924f07f042c6ad5640666c8a056",
|
"reference": "eba1151848f2cfb9c959ef05737480b9f80f7d43",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -569,7 +573,7 @@
|
|||||||
"non-blocking",
|
"non-blocking",
|
||||||
"server"
|
"server"
|
||||||
],
|
],
|
||||||
"time": "2019-06-17T15:29:09+00:00"
|
"time": "2019-07-16T16:29:16+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "amphp/parallel",
|
"name": "amphp/parallel",
|
||||||
@ -1205,16 +1209,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "danog/libdns-json",
|
"name": "danog/libdns-json",
|
||||||
"version": "0.1",
|
"version": "0.1.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/danog/LibDNSJson.git",
|
"url": "https://github.com/danog/LibDNSJson.git",
|
||||||
"reference": "24908c65f44d54db04c2c427ba9e752be6701fd0"
|
"reference": "7d5e07815d57afa64ef7cdbe1a65fbead9a3e7bd"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/danog/LibDNSJson/zipball/24908c65f44d54db04c2c427ba9e752be6701fd0",
|
"url": "https://api.github.com/repos/danog/LibDNSJson/zipball/7d5e07815d57afa64ef7cdbe1a65fbead9a3e7bd",
|
||||||
"reference": "24908c65f44d54db04c2c427ba9e752be6701fd0",
|
"reference": "7d5e07815d57afa64ef7cdbe1a65fbead9a3e7bd",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1257,15 +1261,21 @@
|
|||||||
"libdns",
|
"libdns",
|
||||||
"message"
|
"message"
|
||||||
],
|
],
|
||||||
"time": "2019-06-12T12:39:17+00:00"
|
"time": "2019-07-14T14:59:51+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "danog/madelineproto",
|
"name": "danog/madelineproto",
|
||||||
"version": "dev-session_optimization",
|
"version": "dev-master",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/xtrime-ru/madelineProto",
|
"url": "https://github.com/danog/MadelineProto.git",
|
||||||
"reference": "2749e1ae72db5c75e03eca01080c5cb1f0a5d28e"
|
"reference": "005d762a8f8e2d2f08c8d7ec476948f6e9816a19"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/danog/MadelineProto/zipball/005d762a8f8e2d2f08c8d7ec476948f6e9816a19",
|
||||||
|
"reference": "005d762a8f8e2d2f08c8d7ec476948f6e9816a19",
|
||||||
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"amphp/amp": "^2.0",
|
"amphp/amp": "^2.0",
|
||||||
@ -1280,7 +1290,7 @@
|
|||||||
"danog/dns-over-https": "^0.1",
|
"danog/dns-over-https": "^0.1",
|
||||||
"danog/magicalserializer": "^1.0",
|
"danog/magicalserializer": "^1.0",
|
||||||
"danog/primemodule": "^1",
|
"danog/primemodule": "^1",
|
||||||
"erusev/parsedown": "^1.6",
|
"erusev/parsedown": "^1.7",
|
||||||
"ext-fileinfo": "*",
|
"ext-fileinfo": "*",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-mbstring": "*",
|
"ext-mbstring": "*",
|
||||||
@ -1312,6 +1322,7 @@
|
|||||||
"src/polyfill.php"
|
"src/polyfill.php"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
"license": [
|
"license": [
|
||||||
"AGPL-3.0-only"
|
"AGPL-3.0-only"
|
||||||
],
|
],
|
||||||
@ -1325,19 +1336,19 @@
|
|||||||
"homepage": "https://daniil.it/MadelineProto",
|
"homepage": "https://daniil.it/MadelineProto",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"GB",
|
"GB",
|
||||||
"PHP",
|
"Messenger",
|
||||||
"audio",
|
"audio",
|
||||||
"bytes",
|
"bytes",
|
||||||
"client",
|
"client",
|
||||||
"files",
|
"files",
|
||||||
"messenger",
|
|
||||||
"mtproto",
|
"mtproto",
|
||||||
|
"php",
|
||||||
"protocol",
|
"protocol",
|
||||||
"stickers",
|
"stickers",
|
||||||
"telegram",
|
"telegram",
|
||||||
"video"
|
"video"
|
||||||
],
|
],
|
||||||
"time": "2019-06-30T00:42:26+00:00"
|
"time": "2019-07-16T13:18:37+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "danog/magicalserializer",
|
"name": "danog/magicalserializer",
|
||||||
@ -2212,7 +2223,7 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/swoole/ide-helper.git",
|
"url": "https://github.com/swoole/ide-helper.git",
|
||||||
"reference": "7035aeb5c6d42c22b44aef1304aac62d6733b5e5"
|
"reference": "d8fcff025cd386635f74fe68fb669be4c5b4a0d4"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"squizlabs/php_codesniffer": "~3.4.0",
|
"squizlabs/php_codesniffer": "~3.4.0",
|
||||||
@ -2234,7 +2245,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "IDE help files for Swoole.",
|
"description": "IDE help files for Swoole.",
|
||||||
"time": "2019-05-22T19:49:35+00:00"
|
"time": "2019-07-07T19:43:22+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"aliases": [
|
"aliases": [
|
||||||
|
|||||||
@ -207,9 +207,8 @@ class Client
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Загружает медиафайл из указанного сообщения во временный файл
|
* Загружает медиафайл из указанного сообщения в поток
|
||||||
*
|
*
|
||||||
* Внимание! Необходимо самостоятельно удалять временные файлы после их использования
|
|
||||||
* @param $data
|
* @param $data
|
||||||
* @return \Amp\Promise
|
* @return \Amp\Promise
|
||||||
* @throws \Throwable
|
* @throws \Throwable
|
||||||
@ -253,7 +252,7 @@ class Client
|
|||||||
}
|
}
|
||||||
|
|
||||||
$stream = fopen('php://memory', 'rwb');
|
$stream = fopen('php://memory', 'rwb');
|
||||||
yield $this->MadelineProto->downloadToStream($message, $stream);
|
yield $this->MadelineProto->downloadToStream($info, $stream);
|
||||||
rewind($stream);
|
rewind($stream);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
@ -267,9 +266,8 @@ class Client
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Загружает превью медиафайла из указанного сообщения во временный файл
|
* Загружает превью медиафайла из указанного сообщения в поток
|
||||||
*
|
*
|
||||||
* Внимание! Необходимо самостоятельно удалять временные файлы после их использования
|
|
||||||
* @param array $data
|
* @param array $data
|
||||||
* @return \Amp\Promise
|
* @return \Amp\Promise
|
||||||
* @throws \Throwable
|
* @throws \Throwable
|
||||||
@ -319,8 +317,19 @@ class Client
|
|||||||
|
|
||||||
}
|
}
|
||||||
$info = yield $this->MadelineProto->getDownloadInfo($thumb);
|
$info = yield $this->MadelineProto->getDownloadInfo($thumb);
|
||||||
|
|
||||||
|
//Фикс для LAYER 100+
|
||||||
|
//TODO: Удалить, когда снова станет доступна загрузка photoSize
|
||||||
|
if (isset($info['thumb_size'])) {
|
||||||
|
$infoFull = yield $this->MadelineProto->getDownloadInfo($media);
|
||||||
|
$infoFull['InputFileLocation']['thumb_size'] = $info['thumb_size'];
|
||||||
|
$infoFull['size'] = $info['size'];
|
||||||
|
$infoFull['mime'] = $info['mime'];
|
||||||
|
$info = $infoFull;
|
||||||
|
}
|
||||||
|
|
||||||
$stream = fopen('php://memory', 'rwb');
|
$stream = fopen('php://memory', 'rwb');
|
||||||
yield $this->MadelineProto->downloadToStream($thumb, $stream);
|
yield $this->MadelineProto->downloadToStream($info, $stream);
|
||||||
rewind($stream);
|
rewind($stream);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user