Revert to old version (waiting for fixes in MadelineProto)

This commit is contained in:
Alexander Pankratov 2019-06-30 03:47:22 +03:00
parent a406e7d567
commit 11928d939f
3 changed files with 30 additions and 30 deletions

View File

@ -8,7 +8,7 @@
"require": { "require": {
"php": ">=7.2.0", "php": ">=7.2.0",
"ext-json": "*", "ext-json": "*",
"danog/madelineproto":"4.0.3", "danog/madelineproto":"dev-session_optimization",
"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,6 +25,10 @@
{ {
"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",

52
composer.lock generated
View File

@ -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": "fbc0c94143a9da8e5123f91929b3ddcc", "content-hash": "65a0e83e5c8a9f0f7d58f56325c5def4",
"packages": [ "packages": [
{ {
"name": "amphp/amp", "name": "amphp/amp",
@ -573,16 +573,16 @@
}, },
{ {
"name": "amphp/parallel", "name": "amphp/parallel",
"version": "v1.1.1", "version": "v1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/amphp/parallel.git", "url": "https://github.com/amphp/parallel.git",
"reference": "687776dc6933af4c6009ac58f915faf45e8463ce" "reference": "53aa422eaf89a539b4df58284f7bdf5219e37f66"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/amphp/parallel/zipball/687776dc6933af4c6009ac58f915faf45e8463ce", "url": "https://api.github.com/repos/amphp/parallel/zipball/53aa422eaf89a539b4df58284f7bdf5219e37f66",
"reference": "687776dc6933af4c6009ac58f915faf45e8463ce", "reference": "53aa422eaf89a539b4df58284f7bdf5219e37f66",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -597,9 +597,6 @@
"amphp/phpunit-util": "^1", "amphp/phpunit-util": "^1",
"phpunit/phpunit": "^6" "phpunit/phpunit": "^6"
}, },
"suggest": {
"ext-pthreads": "Required for thread contexts"
},
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@ -632,7 +629,7 @@
"multi-processing", "multi-processing",
"multi-threading" "multi-threading"
], ],
"time": "2019-01-09T21:31:46+00:00" "time": "2019-05-11T17:13:47+00:00"
}, },
{ {
"name": "amphp/parser", "name": "amphp/parser",
@ -1264,17 +1261,11 @@
}, },
{ {
"name": "danog/madelineproto", "name": "danog/madelineproto",
"version": "4.0.3", "version": "dev-session_optimization",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/danog/MadelineProto.git", "url": "https://github.com/xtrime-ru/madelineProto",
"reference": "704152680bb03c108d01123bbcb4602c66dcbcff" "reference": "2749e1ae72db5c75e03eca01080c5cb1f0a5d28e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/danog/MadelineProto/zipball/704152680bb03c108d01123bbcb4602c66dcbcff",
"reference": "704152680bb03c108d01123bbcb4602c66dcbcff",
"shasum": ""
}, },
"require": { "require": {
"amphp/amp": "^2.0", "amphp/amp": "^2.0",
@ -1295,7 +1286,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-xml": "*", "ext-xml": "*",
"php": ">=7.1.0", "php": ">=7.1.0",
"phpseclib/phpseclib": "dev-master#c62fc0c73373426d3ff8729f10e82e09e1874866 as 2.0.15", "phpseclib/phpseclib": "dev-master#5e7d39153270dfd19d585504b0a29ac65a62adf9 as 2.0.15",
"vlucas/phpdotenv": "^3" "vlucas/phpdotenv": "^3"
}, },
"conflict": { "conflict": {
@ -1321,7 +1312,6 @@
"src/polyfill.php" "src/polyfill.php"
] ]
}, },
"notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"AGPL-3.0-only" "AGPL-3.0-only"
], ],
@ -1335,19 +1325,19 @@
"homepage": "https://daniil.it/MadelineProto", "homepage": "https://daniil.it/MadelineProto",
"keywords": [ "keywords": [
"GB", "GB",
"Messenger", "PHP",
"audio", "audio",
"bytes", "bytes",
"client", "client",
"files", "files",
"messenger",
"mtproto", "mtproto",
"php",
"protocol", "protocol",
"stickers", "stickers",
"telegram", "telegram",
"video" "video"
], ],
"time": "2019-06-21T15:02:52+00:00" "time": "2019-06-30T00:42:26+00:00"
}, },
{ {
"name": "danog/magicalserializer", "name": "danog/magicalserializer",
@ -2163,12 +2153,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/vlucas/phpdotenv.git", "url": "https://github.com/vlucas/phpdotenv.git",
"reference": "5084b23845c24dbff8ac6c204290c341e4776c92" "reference": "9159290ad347bf56fa6d208bf35645c450f9e567"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/5084b23845c24dbff8ac6c204290c341e4776c92", "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9159290ad347bf56fa6d208bf35645c450f9e567",
"reference": "5084b23845c24dbff8ac6c204290c341e4776c92", "reference": "9159290ad347bf56fa6d208bf35645c450f9e567",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2195,10 +2185,15 @@
"BSD-3-Clause" "BSD-3-Clause"
], ],
"authors": [ "authors": [
{
"name": "Graham Campbell",
"email": "graham@alt-three.com",
"homepage": "https://gjcampbell.co.uk/"
},
{ {
"name": "Vance Lucas", "name": "Vance Lucas",
"email": "vance@vancelucas.com", "email": "vance@vancelucas.com",
"homepage": "http://www.vancelucas.com" "homepage": "https://vancelucas.com/"
} }
], ],
"description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
@ -2207,7 +2202,7 @@
"env", "env",
"environment" "environment"
], ],
"time": "2019-06-15T22:40:20+00:00" "time": "2019-06-29T14:13:05+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
@ -2252,6 +2247,7 @@
], ],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": { "stability-flags": {
"danog/madelineproto": 20,
"amphp/amp": 20, "amphp/amp": 20,
"amphp/http-server": 20, "amphp/http-server": 20,
"amphp/dns": 20, "amphp/dns": 20,

View File

@ -24,7 +24,7 @@ return [
], ],
'connection_settings' => [ 'connection_settings' => [
'all' => [ 'all' => [
'proxy' => \danog\MadelineProto\Stream\Proxy\SocksProxy::getName(), 'proxy' => '\SocksProxy',
'proxy_extra' => [ 'proxy_extra' => [
'address' => getenv('TELEGRAM_PROXY_ADDRESS'), 'address' => getenv('TELEGRAM_PROXY_ADDRESS'),
'port' => getenv('TELEGRAM_PROXY_PORT'), 'port' => getenv('TELEGRAM_PROXY_PORT'),