From 8a93db8f301d479dda8e7b564c8c63d0a2d1ded3 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Tue, 20 Feb 2018 11:13:43 +0000 Subject: [PATCH] Update copyrights, and add phar creation script --- .gitignore | 3 + bot.php | 2 +- build_docs.php | 2 +- composer.json | 3 +- lua/madeline.php | 2 +- lua/td.php | 2 +- magna.php | 2 +- makephar.php | 66 +++++ phartesting.php | 230 ++++++++++++++++++ secret_bot.php | 2 +- src/BigIntegor.php | 2 +- src/Socket.php | 2 +- src/danog/MadelineProto/API.php | 22 +- src/danog/MadelineProto/APIFactory.php | 2 +- .../MadelineProto/AnnotationsBuilder.php | 2 +- src/danog/MadelineProto/Bug74586Exception.php | 2 +- src/danog/MadelineProto/Connection.php | 2 +- src/danog/MadelineProto/DataCenter.php | 2 +- src/danog/MadelineProto/DocsBuilder.php | 2 +- .../DocsBuilder/Constructors.php | 2 +- .../MadelineProto/DocsBuilder/Methods.php | 2 +- src/danog/MadelineProto/Exception.php | 2 +- src/danog/MadelineProto/Lang.php | 2 +- src/danog/MadelineProto/Logger.php | 2 +- src/danog/MadelineProto/Lua.php | 2 +- src/danog/MadelineProto/MTProto.php | 2 +- .../MadelineProto/MTProtoTools/AckHandler.php | 2 +- .../MTProtoTools/AuthKeyHandler.php | 2 +- .../MTProtoTools/CallHandler.php | 2 +- .../MadelineProto/MTProtoTools/Crypt.php | 2 +- .../MadelineProto/MTProtoTools/Files.php | 2 +- .../MTProtoTools/MessageHandler.php | 2 +- .../MTProtoTools/MsgIdHandler.php | 2 +- .../MTProtoTools/PeerHandler.php | 2 +- .../MTProtoTools/ResponseHandler.php | 2 +- .../MTProtoTools/SaltHandler.php | 2 +- .../MTProtoTools/SeqNoHandler.php | 2 +- .../MTProtoTools/UpdateHandler.php | 2 +- .../NothingInTheSocketException.php | 2 +- src/danog/MadelineProto/PTSException.php | 2 +- src/danog/MadelineProto/Proxy.php | 2 +- src/danog/MadelineProto/RPCErrorException.php | 2 +- src/danog/MadelineProto/RSA.php | 3 +- src/danog/MadelineProto/ResponseException.php | 2 +- .../SecretChats/AuthKeyHandler.php | 2 +- .../SecretChats/MessageHandler.php | 2 +- .../SecretChats/ResponseHandler.php | 2 +- .../SecretChats/SeqNoHandler.php | 2 +- src/danog/MadelineProto/SecurityException.php | 2 +- src/danog/MadelineProto/Serialization.php | 45 ++-- .../MadelineProto/TL/Conversion/BotAPI.php | 2 +- .../TL/Conversion/BotAPIFiles.php | 2 +- .../MadelineProto/TL/Conversion/Exception.php | 2 +- src/danog/MadelineProto/TL/Conversion/TD.php | 2 +- src/danog/MadelineProto/TL/Exception.php | 2 +- .../MadelineProto/TL/PrettyException.php | 2 +- src/danog/MadelineProto/TL/TL.php | 2 +- src/danog/MadelineProto/TL/TLConstructor.php | 2 +- src/danog/MadelineProto/TL/TLMethod.php | 2 +- src/danog/MadelineProto/TL/TLParams.php | 2 +- src/danog/MadelineProto/TL/Types/Button.php | 2 +- src/danog/MadelineProto/TL/Types/Bytes.php | 2 +- .../MadelineProto/Threads/SocketHandler.php | 2 +- .../MadelineProto/Threads/SocketReader.php | 2 +- src/danog/MadelineProto/Tools.php | 2 +- .../MadelineProto/VoIP/AuthKeyHandler.php | 2 +- .../MadelineProto/Wrappers/DialogHandler.php | 2 +- src/danog/MadelineProto/Wrappers/Login.php | 2 +- tests/testing.php | 2 +- translator.php | 2 +- userbots/MadelineProto_bot.php | 2 +- userbots/pipesbot.php | 2 +- userbots/pwrtelegram_debug_bot.php | 2 +- 73 files changed, 409 insertions(+), 95 deletions(-) create mode 100755 makephar.php create mode 100755 phartesting.php diff --git a/.gitignore b/.gitignore index 3d835325..e70701c9 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,6 @@ tests/500mb *.save *.save.1 *.save.* +composer +phar +madeline.phar diff --git a/bot.php b/bot.php index 86c63999..29a4953d 100755 --- a/bot.php +++ b/bot.php @@ -1,7 +1,7 @@ #!/usr/bin/env php =5.6.0", "danog/primemodule": "dev-master", "danog/magicalserializer": "dev-master", - "phpseclib/phpseclib": "dev-master#273ad17", + "phpseclib/phpseclib": "dev-master#0d9dc46", "vlucas/phpdotenv": "^2.4", "erusev/parsedown": "^1.6", "rollbar/rollbar": "dev-master", @@ -21,6 +21,7 @@ "ext-xml": "*" }, "require-dev": { + "spatie/7to5": "^1.2", "phpdocumentor/reflection-docblock": "^3.1" }, "suggest": { diff --git a/lua/madeline.php b/lua/madeline.php index be70fd45..8344ce64 100755 --- a/lua/madeline.php +++ b/lua/madeline.php @@ -1,7 +1,7 @@ #!/usr/bin/env php . +*/ + +require 'vendor/autoload.php'; +use \Spatie\Php7to5\DirectoryConverter; + +function rimraf($dir) { + if (is_dir($dir)) { + $objects = scandir($dir); + foreach ($objects as $object) { + if ($object != "." && $object != "..") { + if (is_dir($dir."/".$object)) { + rimraf($dir."/".$object); + } else { + unlink($dir."/".$object); + } + } + } + rmdir($dir); + } +} + +@unlink('madeline.phar'); +rimraf('phar'); +rimraf('composer'); +mkdir('phar'); +mkdir('composer'); +chdir('composer'); +file_put_contents('composer.json', '{ + "name": "danog/madelineprototests", + "minimum-stability":"dev", + "require": { + "danog/madelineproto": "dev-master" + }, + "repositories": [ + { + "type": "git", + "url": "https://github.com/danog/phpseclib" + } + ], + "authors": [ + { + "name": "Daniil Gentili", + "email": "daniil@daniil.it" + } + ] +}'); +shell_exec('composer update'); + +(new DirectoryConverter(__DIR__.'/composer', ['.php']))->alsoCopyNonPhpFiles()->savePhp5FilesTo(__DIR__.'/phar'); + +$p = new Phar(__DIR__.'/madeline.phar', 0, 'madeline.phar'); +$p->buildFromDirectory(__DIR__.'/phar', '/^((?!tests).)*(\.php|\.py|\.tl|\.json)$/i'); +$p->addFromString('.git/refs/heads/master', file_get_contents(__DIR__.'/.git/refs/heads/master')); + +$p->setStub(''); diff --git a/phartesting.php b/phartesting.php new file mode 100755 index 00000000..fa424414 --- /dev/null +++ b/phartesting.php @@ -0,0 +1,230 @@ +#!/usr/bin/env php +. +*/ +require_once 'madeline.phar'; +//include 'SocksProxy.php'; +if (!function_exists('readline')) { + function readline($prompt = null) + { + if ($prompt) { + echo $prompt; + } + $fp = fopen('php://stdin', 'r'); + $line = rtrim(fgets($fp, 1024)); + + return $line; + } +} + +if (file_exists('web_data.php')) { + require_once 'web_data.php'; +} + +echo 'Deserializing MadelineProto from testing.madeline...'.PHP_EOL; +$MadelineProto = false; + +try { + $MadelineProto = new \danog\MadelineProto\API('testing.madeline'); +} catch (\danog\MadelineProto\Exception $e) { + var_dump($e->getMessage()); +} +if (file_exists('.env')) { + echo 'Loading .env...'.PHP_EOL; + $dotenv = new Dotenv\Dotenv(getcwd()); + $dotenv->load(); +} +if (getenv('TEST_SECRET_CHAT') == '') { + die('TEST_SECRET_CHAT is not defined in .env, please define it.'.PHP_EOL); +} +echo 'Loading settings...'.PHP_EOL; +var_dump(getenv('MTPROTO_SETTINGS')); +$settings = json_decode(getenv('MTPROTO_SETTINGS'), true) ?: []; +//$settings['connection_settings']['all']['proxy'] = '\SocksProxy'; +//$settings['connection_settings']['all']['proxy_extra'] = ['address' => '127.0.0.1', 'port' => 1080]; + +var_dump($settings); +if ($MadelineProto === false) { + echo 'Loading MadelineProto...'.PHP_EOL; + $MadelineProto = new \danog\MadelineProto\API($settings); + if (getenv('TRAVIS_COMMIT') == '') { + $sentCode = $MadelineProto->phone_login(readline('Enter your phone number: ')); + \danog\MadelineProto\Logger::log([$sentCode], \danog\MadelineProto\Logger::NOTICE); + echo 'Enter the code you received: '; + $code = fgets(STDIN, (isset($sentCode['type']['length']) ? $sentCode['type']['length'] : 5) + 1); + $authorization = $MadelineProto->complete_phone_login($code); + \danog\MadelineProto\Logger::log([$authorization], \danog\MadelineProto\Logger::NOTICE); + if ($authorization['_'] === 'account.noPassword') { + throw new \danog\MadelineProto\Exception('2FA is enabled but no password is set!'); + } + if ($authorization['_'] === 'account.password') { + \danog\MadelineProto\Logger::log(['2FA is enabled'], \danog\MadelineProto\Logger::NOTICE); + $authorization = $MadelineProto->complete_2fa_login(readline('Please enter your password (hint '.$authorization['hint'].'): ')); + } + if ($authorization['_'] === 'account.needSignup') { + \danog\MadelineProto\Logger::log(['Registering new user'], \danog\MadelineProto\Logger::NOTICE); + $authorization = $MadelineProto->complete_signup(readline('Please enter your first name: '), readline('Please enter your last name (can be empty): ')); + } + } else { + $MadelineProto->bot_login(getenv('BOT_TOKEN')); + } +} +\danog\MadelineProto\Logger::log(['hey'], \danog\MadelineProto\Logger::ULTRA_VERBOSE); +\danog\MadelineProto\Logger::log(['hey'], \danog\MadelineProto\Logger::VERBOSE); +\danog\MadelineProto\Logger::log(['hey'], \danog\MadelineProto\Logger::NOTICE); +\danog\MadelineProto\Logger::log(['hey'], \danog\MadelineProto\Logger::WARNING); +\danog\MadelineProto\Logger::log(['hey'], \danog\MadelineProto\Logger::ERROR); +\danog\MadelineProto\Logger::log(['hey'], \danog\MadelineProto\Logger::FATAL_ERROR); +//$MadelineProto->phone->createGroupCall(['channel' => -1001333587884 + +$message = (getenv('TRAVIS_COMMIT') == '') ? 'I iz works always (io laborare sembre) (yo lavorar siempre) (mi labori ĉiam) (я всегда работать) (Ik werkuh altijd) (Ngimbonga ngaso sonke isikhathi ukusebenza)' : ('Travis ci tests in progress: commit '.getenv('TRAVIS_COMMIT').', job '.getenv('TRAVIS_JOB_NUMBER').', PHP version: '.getenv('TRAVIS_PHP_VERSION')); + +echo 'Serializing MadelineProto to testing.madeline...'.PHP_EOL; echo 'Wrote '.\danog\MadelineProto\Serialization::serialize('testing.madeline', $MadelineProto).' bytes'.PHP_EOL; +/* +$m = new \danog\MadelineProto\API($settings); +$m->import_authorization($MadelineProto->export_authorization()); +*/ +if (stripos(readline('Do you want to make a call? (y/n): '), 'y') !== false) { + $controller = $MadelineProto->request_call(getenv('TEST_SECRET_CHAT'))->play('input.raw')->then('input.raw')->playOnHold(['input.raw'])->setOutputFile('output.raw'); + while ($controller->getCallState() < \danog\MadelineProto\VoIP::CALL_STATE_READY) { + $MadelineProto->get_updates(); + } + //$MadelineProto->messages->sendMessage(['peer' => $controller->getOtherID(), 'message' => 'Emojis: '.implode('', $controller->getVisualization())]); + var_dump($controller->configuration); + while ($controller->getCallState() < \danog\MadelineProto\VoIP::CALL_STATE_ENDED) { + $MadelineProto->get_updates(); + } +} +if (stripos(readline('Do you want to handle incoming calls? (y/n): '), 'y') !== false) { + $howmany = readline('How many calls would you like me to handle? '); + $offset = 0; + while ($howmany > 0) { + $updates = $MadelineProto->API->get_updates(['offset' => $offset, 'limit' => 50, 'timeout' => 0]); // Just like in the bot API, you can specify an offset, a limit and a timeout + foreach ($updates as $update) { + \danog\MadelineProto\Logger::log([$update]); + $offset = $update['update_id'] + 1; // Just like in the bot API, the offset must be set to the last update_id + switch ($update['update']['_']) { + case 'updatePhoneCall': + if (is_object($update['update']['phone_call']) && $update['update']['phone_call']->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_INCOMING) { + $update['update']['phone_call']->accept()->play('input.raw')->then('input.raw')->playOnHold(['input.raw'])->setOutputFile('output.raw'); + $howmany--; + } + } + } + //echo 'Wrote '.\danog\MadelineProto\Serialization::serialize('testing.madeline', $MadelineProto).' bytes'.PHP_EOL; + } +} +if (stripos(readline('Do you want to make the secret chat tests? (y/n): '), 'y') !== false) { + $secret = $MadelineProto->API->request_secret_chat(getenv('TEST_SECRET_CHAT')); + echo 'Waiting for '.getenv('TEST_SECRET_CHAT').' (secret chat id '.$secret.') to accept the secret chat...'.PHP_EOL; + while ($MadelineProto->secret_chat_status($secret) !== 2) { + $MadelineProto->get_updates(); + } + $offset = 0; + + $InputEncryptedChat = $MadelineProto->get_secret_chat($secret)['InputEncryptedChat']; + $sentMessage = $MadelineProto->messages->sendEncrypted(['peer' => $InputEncryptedChat, 'message' => ['_' => 'decryptedMessage', 'media' => ['_' => 'decryptedMessageMediaEmpty'], 'ttl' => 10, 'message' => $message, 'entities' => [['_' => 'messageEntityCode', 'offset' => 0, 'length' => mb_strlen($message)]]]]); // should work with all layers + \danog\MadelineProto\Logger::log([$sentMessage], \danog\MadelineProto\Logger::NOTICE); + /* + while (true) { + $updates = $MadelineProto->API->get_updates(['offset' => $offset, 'limit' => 50, 'timeout' => 0]); // Just like in the bot API, you can specify an offset, a limit and a timeout + //\danog\MadelineProto\Logger::log([$updates]); + foreach ($updates as $update) { + $offset = $update['update_id'] + 1; // Just like in the bot API, the offset must be set to the last update_id + switch ($update['update']['_']) { + case 'updateNewEncryptedMessage': + var_dump($update); + } + echo 'Wrote '.\danog\MadelineProto\Serialization::serialize('testing.madeline', $MadelineProto).' bytes'.PHP_EOL; + } + }*/ + + $secret_media = []; + + // Photo uploaded as document, secret chat + $inputEncryptedFile = $MadelineProto->upload_encrypted('tests/faust.jpg', 'fausticorn.jpg'); // This gets an inputFile object with file name magic + $secret_media['document_photo'] = ['peer' => $secret, 'file' => $inputEncryptedFile, 'message' => ['_' => 'decryptedMessage', 'ttl' => 0, 'message' => '', 'media' => ['_' => 'decryptedMessageMediaDocument', 'thumb' => file_get_contents('tests/faust.preview.jpg'), 'thumb_w' => 90, 'thumb_h' => 90, 'mime_type' => mime_content_type('tests/faust.jpg'), 'caption' => 'This file was uploaded using MadelineProto', 'key' => $inputEncryptedFile['key'], 'iv' => $inputEncryptedFile['iv'], 'file_name' => 'faust.jpg', 'size' => filesize('tests/faust.jpg'), 'attributes' => [['_' => 'documentAttributeImageSize', 'w' => 1280, 'h' => 914]]]]]; + + // Photo, secret chat + $secret_media['photo'] = ['peer' => $secret, 'file' => $inputEncryptedFile, 'message' => ['_' => 'decryptedMessage', 'ttl' => 0, 'message' => '', 'media' => ['_' => 'decryptedMessageMediaPhoto', 'thumb' => file_get_contents('tests/faust.preview.jpg'), 'thumb_w' => 90, 'thumb_h' => 90, 'caption' => 'This file was uploaded using MadelineProto', 'key' => $inputEncryptedFile['key'], 'iv' => $inputEncryptedFile['iv'], 'size' => filesize('tests/faust.jpg'), 'w' => 1280, 'h' => 914]]]; + + // GIF, secret chat + $inputEncryptedFile = $MadelineProto->upload_encrypted('tests/pony.mp4'); + $secret_media['gif'] = ['peer' => $secret, 'file' => $inputEncryptedFile, 'message' => ['_' => 'decryptedMessage', 'ttl' => 0, 'message' => '', 'media' => ['_' => 'decryptedMessageMediaDocument', 'thumb' => file_get_contents('tests/pony.preview.jpg'), 'thumb_w' => 90, 'thumb_h' => 90, 'mime_type' => mime_content_type('tests/pony.mp4'), 'caption' => 'test', 'key' => $inputEncryptedFile['key'], 'iv' => $inputEncryptedFile['iv'], 'file_name' => 'pony.mp4', 'size' => filesize('tests/faust.jpg'), 'attributes' => [['_' => 'documentAttributeAnimated']]]]]; + + // Sticker, secret chat + $inputEncryptedFile = $MadelineProto->upload_encrypted('tests/lel.webp'); + $secret_media['sticker'] = ['peer' => $secret, 'file' => $inputEncryptedFile, 'message' => ['_' => 'decryptedMessage', 'ttl' => 0, 'message' => '', 'media' => ['_' => 'decryptedMessageMediaDocument', 'thumb' => file_get_contents('tests/lel.preview.jpg'), 'thumb_w' => 90, 'thumb_h' => 90, 'mime_type' => mime_content_type('tests/lel.webp'), 'caption' => 'test', 'key' => $inputEncryptedFile['key'], 'iv' => $inputEncryptedFile['iv'], 'file_name' => 'lel.webp', 'size' => filesize('tests/lel.webp'), 'attributes' => [['_' => 'documentAttributeSticker', 'alt' => 'LEL', 'stickerset' => ['_' => 'inputStickerSetEmpty']]]]]]; + + // Document, secrey chat + $time = time(); + $inputEncryptedFile = $MadelineProto->upload_encrypted('tests/60', 'magic'); // This gets an inputFile object with file name magic + var_dump(time() - $time); + $secret_media['document'] = ['peer' => $secret, 'file' => $inputEncryptedFile, 'message' => ['_' => 'decryptedMessage', 'ttl' => 0, 'message' => '', 'media' => ['_' => 'decryptedMessageMediaDocument', 'thumb' => file_get_contents('tests/faust.preview.jpg'), 'thumb_w' => 90, 'thumb_h' => 90, 'mime_type' => 'magic/magic', 'caption' => 'test', 'key' => $inputEncryptedFile['key'], 'iv' => $inputEncryptedFile['iv'], 'file_name' => 'magic.magic', 'size' => filesize('tests/60'), 'attributes' => [['_' => 'documentAttributeFilename', 'file_name' => 'fairy']]]]]; + + // Video, secret chat + $inputEncryptedFile = $MadelineProto->upload_encrypted('tests/swing.mp4'); + $secret_media['video'] = ['peer' => $secret, 'file' => $inputEncryptedFile, 'message' => ['_' => 'decryptedMessage', 'ttl' => 0, 'message' => '', 'media' => ['_' => 'decryptedMessageMediaDocument', 'thumb' => file_get_contents('tests/swing.preview.jpg'), 'thumb_w' => 90, 'thumb_h' => 90, 'mime_type' => mime_content_type('tests/swing.mp4'), 'caption' => 'test', 'key' => $inputEncryptedFile['key'], 'iv' => $inputEncryptedFile['iv'], 'file_name' => 'swing.mp4', 'size' => filesize('tests/swing.mp4'), 'attributes' => [['_' => 'documentAttributeVideo', 'duration' => 5, 'w' => 1280, 'h' => 720]]]]]; + + // audio, secret chat + $inputEncryptedFile = $MadelineProto->upload_encrypted('tests/mosconi.mp3'); + $secret_media['audio'] = ['peer' => $secret, 'file' => $inputEncryptedFile, 'message' => ['_' => 'decryptedMessage', 'ttl' => 0, 'message' => '', 'media' => ['_' => 'decryptedMessageMediaDocument', 'thumb' => file_get_contents('tests/faust.preview.jpg'), 'thumb_w' => 90, 'thumb_h' => 90, 'mime_type' => mime_content_type('tests/mosconi.mp3'), 'caption' => 'test', 'key' => $inputEncryptedFile['key'], 'iv' => $inputEncryptedFile['iv'], 'file_name' => 'mosconi.mp3', 'size' => filesize('tests/mosconi.mp3'), 'attributes' => [['_' => 'documentAttributeAudio', 'voice' => false, 'duration' => 1, 'title' => 'AH NON LO SO IO', 'performer' => 'IL DIO GERMANO MOSCONI']]]]]; + + $secret_media['voice'] = ['peer' => $secret, 'file' => $inputEncryptedFile, 'message' => ['_' => 'decryptedMessage', 'ttl' => 0, 'message' => '', 'media' => ['_' => 'decryptedMessageMediaDocument', 'thumb' => file_get_contents('tests/faust.preview.jpg'), 'thumb_w' => 90, 'thumb_h' => 90, 'mime_type' => mime_content_type('tests/mosconi.mp3'), 'caption' => 'test', 'key' => $inputEncryptedFile['key'], 'iv' => $inputEncryptedFile['iv'], 'file_name' => 'mosconi.mp3', 'size' => filesize('tests/mosconi.mp3'), 'attributes' => [['_' => 'documentAttributeAudio', 'voice' => true, 'duration' => 1, 'title' => 'AH NON LO SO IO', 'performer' => 'IL DIO GERMANO MOSCONI']]]]]; + + foreach ($secret_media as $type => $smessage) { + $type = $MadelineProto->messages->sendEncryptedFile($smessage); + } +} + +$mention = $MadelineProto->get_info(getenv('TEST_USERNAME')); // Returns an array with all of the constructors that can be extracted from a username or an id +$mention = $mention['user_id']; // Selects only the numeric user id +$media = []; + +// Sticker +$inputFile = $MadelineProto->upload('tests/lel.webp'); +var_dump($inputFile); +$media['sticker'] = ['_' => 'inputMediaUploadedDocument', 'file' => $inputFile, 'mime_type' => mime_content_type('tests/lel.webp'), 'caption' => 'test', 'attributes' => [['_' => 'documentAttributeSticker', 'alt' => 'LEL', 'stickerset' => ['_' => 'inputStickerSetEmpty']]]]; + +// Video +$inputFile = $MadelineProto->upload('tests/swing.mp4'); +$media['video'] = ['_' => 'inputMediaUploadedDocument', 'file' => $inputFile, 'mime_type' => mime_content_type('tests/swing.mp4'), 'caption' => 'test', 'attributes' => [['_' => 'documentAttributeVideo', 'duration' => 5, 'w' => 1280, 'h' => 720]]]; + +// audio +$inputFile = $MadelineProto->upload('tests/mosconi.mp3'); +$media['audio'] = ['_' => 'inputMediaUploadedDocument', 'file' => $inputFile, 'mime_type' => mime_content_type('tests/mosconi.mp3'), 'caption' => 'test', 'attributes' => [['_' => 'documentAttributeAudio', 'voice' => false, 'duration' => 1, 'title' => 'AH NON LO SO IO', 'performer' => 'IL DIO GERMANO MOSCONI']]]; + +// voice +$media['voice'] = ['_' => 'inputMediaUploadedDocument', 'file' => $inputFile, 'mime_type' => mime_content_type('tests/mosconi.mp3'), 'caption' => 'test', 'attributes' => [['_' => 'documentAttributeAudio', 'voice' => true, 'duration' => 1, 'title' => 'AH NON LO SO IO', 'performer' => 'IL DIO GERMANO MOSCONI']]]; + +// Document +$time = time(); +$inputFile = $MadelineProto->upload('tests/60', 'magic'); // This gets an inputFile object with file name magic +var_dump(time() - $time); +$media['document'] = ['_' => 'inputMediaUploadedDocument', 'file' => $inputFile, 'mime_type' => 'magic/magic', 'caption' => 'This file was uploaded using MadelineProto', 'attributes' => [['_' => 'documentAttributeFilename', 'file_name' => 'magic.magic']]]; + +$message = 'yay'; +$mention = $MadelineProto->get_info(getenv('TEST_USERNAME')); // Returns an array with all of the constructors that can be extracted from a username or an id +$mention = $mention['user_id']; // Selects only the numeric user id + +foreach (json_decode(getenv('TEST_DESTINATION_GROUPS'), true) as $peer) { + $sentMessage = $MadelineProto->messages->sendMessage(['peer' => $peer, 'message' => $message, 'entities' => [['_' => 'inputMessageEntityMentionName', 'offset' => 0, 'length' => mb_strlen($message), 'user_id' => $mention]]]); + \danog\MadelineProto\Logger::log([$sentMessage], \danog\MadelineProto\Logger::NOTICE); + + foreach ($media as $type => $inputMedia) { + $type = $MadelineProto->messages->sendMedia(['peer' => $peer, 'media' => $inputMedia, 'message' => '['.$message.'](mention:'.$mention.')', 'parse_mode' => 'markdown']); + } +} + +foreach (json_decode(getenv('TEST_DESTINATION_GROUPS'), true) as $peer) { + $sentMessage = $MadelineProto->messages->sendMessage(['peer' => $peer, 'message' => $message, 'entities' => [['_' => 'inputMessageEntityMentionName', 'offset' => 0, 'length' => mb_strlen($message), 'user_id' => $mention]]]); + \danog\MadelineProto\Logger::log([$sentMessage], \danog\MadelineProto\Logger::NOTICE); +} diff --git a/secret_bot.php b/secret_bot.php index f86574cf..19548125 100755 --- a/secret_bot.php +++ b/secret_bot.php @@ -1,7 +1,7 @@ #!/usr/bin/env php session = $params; - if (!file_exists($lock = $params.'.lock')) { - touch($lock); + $realpaths = Serialization::realpaths($params); + if (!file_exists($realpaths['lockfile'])) { + touch($realpaths['lockfile']); clearstatcache(); } - $lock = fopen($lock, 'r'); + $realpaths['lockfile'] = fopen($realpaths['lockfile'], 'r'); \danog\MadelineProto\Logger::log(['Waiting for shared lock of serialization lockfile...']); - flock($lock, LOCK_SH); - $unserialized = file_get_contents($params); - flock($lock, LOCK_UN); - fclose($lock); + flock($realpaths['lockfile'], LOCK_SH); + try { + $unserialized = file_get_contents($realpaths['file']); + } finally { + flock($realpaths['lockfile'], LOCK_UN); + fclose($realpaths['lockfile']); + } $tounserialize = str_replace('O:26:"danog\MadelineProto\Button":', 'O:35:"danog\MadelineProto\TL\Types\Button":', $unserialized); foreach (['RSA', 'TL\TLMethod', 'TL\TLConstructor', 'MTProto', 'API', 'DataCenter', 'Connection', 'TL\Types\Button', 'TL\Types\Bytes', 'APIFactory'] as $class) { @@ -44,7 +49,6 @@ class API extends APIFactory \danog\MadelineProto\Logger::class_exists(); try { - // $unserialized = \danog\Serialization::unserialize($tounserialize); $unserialized = unserialize($tounserialize); } catch (\danog\MadelineProto\Bug74586Exception $e) { $unserialized = \danog\Serialization::unserialize($tounserialize); diff --git a/src/danog/MadelineProto/APIFactory.php b/src/danog/MadelineProto/APIFactory.php index 8040de5f..d7f4f459 100644 --- a/src/danog/MadelineProto/APIFactory.php +++ b/src/danog/MadelineProto/APIFactory.php @@ -1,6 +1,6 @@ load($rsa_key); $this->n = \phpseclib\Common\Functions\Objects::getVar($key, 'modulus'); $this->e = \phpseclib\Common\Functions\Objects::getVar($key, 'exponent'); - \danog\MadelineProto\Logger::log([\danog\MadelineProto\Lang::$current_lang['computing_fingerprint']], Logger::ULTRA_VERBOSE); $this->fp = substr( sha1( diff --git a/src/danog/MadelineProto/ResponseException.php b/src/danog/MadelineProto/ResponseException.php index 2201e14e..d62e3577 100644 --- a/src/danog/MadelineProto/ResponseException.php +++ b/src/danog/MadelineProto/ResponseException.php @@ -1,6 +1,6 @@ $file, 'lockfile' => $file.'.lock', 'tempfile' => $file.'.temp.session']; + } + /** * Serialize API class. * @@ -47,20 +54,21 @@ class Serialization $instance->API->__construct($instance->API->settings); } $instance->serialized = time(); - if (!file_exists($lock = $filename.'.lock')) { - touch($lock); + $realpaths = self::realpaths($filename); + if (!file_exists($realpaths['lockfile'])) { + touch($realpaths['lockfile']); clearstatcache(); } - $lock = fopen($lock, 'w'); + $realpaths['lockfile'] = fopen($realpaths['lockfile'], 'w'); \danog\MadelineProto\Logger::log(['Waiting for exclusive lock of serialization lockfile...']); - flock($lock, LOCK_EX); + flock($realpaths['lockfile'], LOCK_EX); try { - $wrote = file_put_contents($filename.'.temp.session', serialize($instance)); - rename($filename.'.temp.session', $filename); + $wrote = file_put_contents($realpaths['tempfile'], serialize($instance)); + rename($realpaths['tempfile'], $realpaths['file']); } finally { - flock($lock, LOCK_UN); - fclose($lock); + flock($realpaths['lockfile'], LOCK_UN); + fclose($realpaths['lockfile']); } return $wrote; @@ -78,17 +86,21 @@ class Serialization public static function deserialize($filename, $no_updates = false) { if (file_exists($filename)) { - if (!file_exists($lock = $filename.'.lock')) { - touch($lock); + $realpaths = self::realpaths($filename); + if (!file_exists($realpaths['lockfile'])) { + touch($realpaths['lockfile']); clearstatcache(); } - $lock = fopen($lock, 'r'); + $realpaths['lockfile'] = fopen($realpaths['lockfile'], 'r'); \danog\MadelineProto\Logger::log(['Waiting for shared lock of serialization lockfile...']); - flock($lock, LOCK_SH); - $unserialized = file_get_contents($filename); - flock($lock, LOCK_UN); - fclose($lock); + flock($realpaths['lockfile'], LOCK_SH); + try { + $unserialized = file_get_contents($realpaths['file']); + } finally { + flock($realpaths['lockfile'], LOCK_UN); + fclose($realpaths['lockfile']); + } $tounserialize = str_replace('O:26:"danog\MadelineProto\Button":', 'O:35:"danog\MadelineProto\TL\Types\Button":', $unserialized); foreach (['RSA', 'TL\TLMethod', 'TL\TLConstructor', 'MTProto', 'API', 'DataCenter', 'Connection', 'TL\Types\Button', 'TL\Types\Bytes', 'APIFactory'] as $class) { @@ -98,7 +110,6 @@ class Serialization \danog\MadelineProto\Logger::class_exists(); try { - // $unserialized = \danog\Serialization::unserialize($tounserialize); $unserialized = unserialize($tounserialize); } catch (\danog\MadelineProto\Bug74586Exception $e) { $unserialized = \danog\Serialization::unserialize($tounserialize); diff --git a/src/danog/MadelineProto/TL/Conversion/BotAPI.php b/src/danog/MadelineProto/TL/Conversion/BotAPI.php index 3af89720..b2b92bba 100644 --- a/src/danog/MadelineProto/TL/Conversion/BotAPI.php +++ b/src/danog/MadelineProto/TL/Conversion/BotAPI.php @@ -1,6 +1,6 @@