diff --git a/.gitignore b/.gitignore index 133236f..078cef4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ vendor .* -*.madeline -*.madeline.lock -*.madeline.slock +/sessions/* madeline.phar* \ No newline at end of file diff --git a/composer.json b/composer.json index d5d0355..032f745 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "amphp/websocket-server": "dev-master", "amphp/websocket-client": "dev-master", "vlucas/phpdotenv": "^4", - "danog/madelineproto":"dev-master#26d746d7499dc49316456ce20a8116ceda56a6f4", + "danog/madelineproto":"dev-master", "danog/tgseclib": "^3", "amphp/http-server-form-parser": "^1.1" }, @@ -33,10 +33,5 @@ "psr-4": { "TelegramApiServer\\": "src/" } - }, - "scripts": { - "post-autoload-dump": [ - "cd vendor/danog/madelineproto/ && git submodule init && git submodule update" - ] } } diff --git a/composer.lock b/composer.lock index 58480a5..8ed99f9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "066edb46e47dc35089a2eb8a91be978c", + "content-hash": "5c7f2c233c20d70ced8e832eb6f64623", "packages": [ { "name": "amphp/amp", @@ -2138,12 +2138,12 @@ "source": { "type": "git", "url": "https://github.com/danog/MadelineProto.git", - "reference": "26d746d7499dc49316456ce20a8116ceda56a6f4" + "reference": "58a3efacc6213f2eb90220f0a90b1cb807fca620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/danog/MadelineProto/zipball/26d746d7499dc49316456ce20a8116ceda56a6f4", - "reference": "26d746d7499dc49316456ce20a8116ceda56a6f4", + "url": "https://api.github.com/repos/danog/MadelineProto/zipball/58a3efacc6213f2eb90220f0a90b1cb807fca620", + "reference": "58a3efacc6213f2eb90220f0a90b1cb807fca620", "shasum": "" }, "require": { @@ -2176,9 +2176,11 @@ "ext-zlib": "*", "league/uri": "^6", "php": ">=7.4.0", - "tivie/htaccess-parser": "^0.2.3" + "symfony/polyfill-mbstring": "*", + "symfony/polyfill-php80": "^1.18" }, "conflict": { + "ext-pthreads": "*", "krakjoe/pthreads-polyfill": "*" }, "require-dev": { @@ -2247,7 +2249,7 @@ "type": "github" } ], - "time": "2020-09-18T20:27:11+00:00" + "time": "2020-10-02T22:44:29+00:00" }, { "name": "danog/magicalserializer", @@ -3306,49 +3308,161 @@ "time": "2020-07-14T12:35:20+00:00" }, { - "name": "tivie/htaccess-parser", - "version": "0.2.3", + "name": "symfony/polyfill-mbstring", + "version": "v1.18.1", "source": { "type": "git", - "url": "https://github.com/tivie/php-htaccess-parser.git", - "reference": "36d89eeaa45c215a45e315765d7b64b333f5f8d5" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tivie/php-htaccess-parser/zipball/36d89eeaa45c215a45e315765d7b64b333f5f8d5", - "reference": "36d89eeaa45c215a45e315765d7b64b333f5f8d5", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a", + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=5.3.3" }, - "require-dev": { - "phpdocumentor/phpdocumentor": "2.8.1", - "phpunit/phpunit": "4.3.*" + "suggest": { + "ext-mbstring": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { "psr-4": { - "Tivie\\HtaccessParser\\": "src/" - } + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "MIT" ], "authors": [ { - "name": "Estevão Soares dos Santos", - "email": "estevao@soares-dos-santos.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "A .htaccess parser and validator implemented in PHP", - "homepage": "https://github.com/tivie/php-htaccess-parser", + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", "keywords": [ - ".htaccess", - "htaccess" + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" ], - "time": "2017-10-21T03:19:48+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.18.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981", + "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981", + "shasum": "" + }, + "require": { + "php": ">=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" }, { "name": "vlucas/phpdotenv", @@ -3432,12 +3546,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "0749ceaf15c136d085b722a5bb88141398a54142" + "reference": "e859317fce42b1ec2d42b204285beaba541e8dbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0749ceaf15c136d085b722a5bb88141398a54142", - "reference": "0749ceaf15c136d085b722a5bb88141398a54142", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e859317fce42b1ec2d42b204285beaba541e8dbf", + "reference": "e859317fce42b1ec2d42b204285beaba541e8dbf", "shasum": "" }, "conflict": { @@ -3540,6 +3654,8 @@ "mittwald/typo3_forum": "<1.2.1", "monolog/monolog": ">=1.8,<1.12", "namshi/jose": "<2.2", + "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", + "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", "nystudio107/craft-seomatic": "<3.3", "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", "october/backend": ">=1.0.319,<1.0.467", @@ -3729,7 +3845,7 @@ "type": "tidelift" } ], - "time": "2020-09-24T17:02:11+00:00" + "time": "2020-10-02T17:02:13+00:00" } ], "aliases": [], diff --git a/config.php b/config.php index 449cf67..bd66384 100644 --- a/config.php +++ b/config.php @@ -49,6 +49,9 @@ $settings = [ ], 'download'=>[ 'report_broken_media' => false, + ], + 'ipc' => [ + 'slow' => true ] ], 'api' => [