From 9a21b861b599e666568aea98e20d0340afaa4ed9 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Sat, 14 Jan 2017 11:54:50 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/danog/MadelineProto/MTProto.php | 2 +- .../MTProtoTools/PeerHandler.php | 102 +++++++++++++----- .../MTProtoTools/UpdateHandler.php | 10 +- .../MadelineProto/Wrappers/FilesHandler.php | 1 + 4 files changed, 85 insertions(+), 30 deletions(-) diff --git a/src/danog/MadelineProto/MTProto.php b/src/danog/MadelineProto/MTProto.php index 584b4082..e1760d74 100644 --- a/src/danog/MadelineProto/MTProto.php +++ b/src/danog/MadelineProto/MTProto.php @@ -201,7 +201,7 @@ Slv8kg9qv1m6XHVQY3PnEw+QQtqSIXklHwIDAQAB 'handle_updates' => true, // Should I handle updates? 'callback' => [$this, 'get_updates_update_handler'], // A callable function that will be called every time an update is received, must accept an array (for the update) as the only parameter ], - 'pwr' => ['pwr' => false, 'db_token' => false, 'strict' => false] + 'pwr' => ['pwr' => false, 'db_token' => false, 'strict' => false], ]; foreach ($default_settings as $key => $param) { if (!isset($settings[$key])) { diff --git a/src/danog/MadelineProto/MTProtoTools/PeerHandler.php b/src/danog/MadelineProto/MTProtoTools/PeerHandler.php index 3faeebee..559fb036 100644 --- a/src/danog/MadelineProto/MTProtoTools/PeerHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/PeerHandler.php @@ -239,7 +239,9 @@ trait PeerHandler return $res; } - public function get_full_info($id) { + + public function get_full_info($id) + { $partial = $this->get_info($id); switch ($partial['type']) { case 'user': @@ -258,21 +260,31 @@ trait PeerHandler } $partial = $this->get_info($id); $partial['full'] = $full; + return $partial; } - public function get_pwr_chat($id, $fullfetch = true, $send = true) { + public function get_pwr_chat($id, $fullfetch = true, $send = true) + { $full = $fullfetch ? $this->get_full_info($id) : $this->get_info($id); $res = ['id' => $full['bot_api_id'], 'type' => $full['type']]; switch ($full['type']) { case 'user': case 'bot': foreach (['first_name', 'last_name', 'username', 'verified', 'restricted', 'restriction_reason', 'status', 'bot_inline_placeholder', 'access_hash', 'phone'] as $key) { - if (isset($full['User'][$key])) $res[$key] = $full['User'][$key]; + if (isset($full['User'][$key])) { + $res[$key] = $full['User'][$key]; + } + } + if (isset($full['full']['about'])) { + $res['about'] = $full['full']['about']; + } + if (isset($full['full']['bot_info'])) { + $res['bot_info'] = $full['full']['bot_info']; + } + if (isset($full['full']['profile_photo']['sizes'])) { + $res['photo'] = end($full['full']['profile_photo']['sizes']); } - if (isset($full['full']['about'])) $res['about'] = $full['full']['about']; - if (isset($full['full']['bot_info'])) $res['bot_info'] = $full['full']['bot_info']; - if (isset($full['full']['profile_photo']['sizes'])) $res['photo'] = end($full['full']['profile_photo']['sizes']); $bio = ''; if ($full['type'] == 'user' && isset($res['username']) && !isset($res['about']) && $fullfetch) { if (preg_match('/meta property="og:description" content=".+/', file_get_contents('https://telegram.me/'.$res['username']), $biores)) { @@ -287,32 +299,54 @@ trait PeerHandler break; case 'chat': foreach (['title', 'participants_count', 'admin', 'admins_enabled'] as $key) { - if (isset($full['Chat'][$key])) $res[$key] = $full['Chat'][$key]; + if (isset($full['Chat'][$key])) { + $res[$key] = $full['Chat'][$key]; + } } - if (isset($full['full']['chat_photo']['sizes'])) $res['photo'] = end($full['full']['chat_photo']['sizes']); - if (isset($full['full']['exported_invite']['link'])) $res['invite'] = $full['full']['exported_invite']['link']; - if (isset($full['full']['participants']['participants'])) $res['participants'] = $full['full']['participants']['participants']; + if (isset($full['full']['chat_photo']['sizes'])) { + $res['photo'] = end($full['full']['chat_photo']['sizes']); + } + if (isset($full['full']['exported_invite']['link'])) { + $res['invite'] = $full['full']['exported_invite']['link']; + } + if (isset($full['full']['participants']['participants'])) { + $res['participants'] = $full['full']['participants']['participants']; + } break; case 'channel': case 'supergroup': foreach (['title', 'democracy', 'restricted', 'restriction_reason', 'access_hash', 'username', 'signatures'] as $key) { - if (isset($full['Chat'][$key])) $res[$key] = $full['Chat'][$key]; + if (isset($full['Chat'][$key])) { + $res[$key] = $full['Chat'][$key]; + } } foreach (['can_view_participants', 'can_set_username', 'participants_count', 'admins_count', 'kicked_count', 'migrated_from_chat_id', 'migrated_from_max_id', 'pinned_msg_id', 'about'] as $key) { - if (isset($full['full'][$key])) $res[$key] = $full['full'][$key]; + if (isset($full['full'][$key])) { + $res[$key] = $full['full'][$key]; + } } - if (isset($full['full']['chat_photo']['sizes'])) $res['photo'] = end($full['full']['chat_photo']['sizes']); - if (isset($full['full']['exported_invite']['link'])) $res['invite'] = $full['full']['exported_invite']['link']; - if (isset($full['full']['participants']['participants'])) $res['participants'] = $full['full']['participants']['participants']; + if (isset($full['full']['chat_photo']['sizes'])) { + $res['photo'] = end($full['full']['chat_photo']['sizes']); + } + if (isset($full['full']['exported_invite']['link'])) { + $res['invite'] = $full['full']['exported_invite']['link']; + } + if (isset($full['full']['participants']['participants'])) { + $res['participants'] = $full['full']['participants']['participants']; + } break; } if (isset($res['participants'])) { foreach ($res['participants'] as $key => $participant) { $newres['user'] = $this->get_pwr_chat($participant['user_id'], false, false); - if (isset($participant['inviter_id'])) $newres['inviter'] = $this->get_pwr_chat($participant['inviter_id'], false, false); - if (isset($participant['date'])) $newres['date'] = $participant['date']; + if (isset($participant['inviter_id'])) { + $newres['inviter'] = $this->get_pwr_chat($participant['inviter_id'], false, false); + } + if (isset($participant['date'])) { + $newres['date'] = $participant['date']; + } switch ($participant['_']) { case 'chatParticipant': $newres['role'] = 'user'; @@ -340,8 +374,12 @@ trait PeerHandler foreach ($gres['participants'] as $participant) { $newres['user'] = $this->get_pwr_chat($participant['user_id'], false, false); $key++; - if (isset($participant['inviter_id'])) $newres['inviter'] = $this->get_pwr_chat($participant['inviter_id'], false, false); - if (isset($participant['date'])) $newres['date'] = $participant['date']; + if (isset($participant['inviter_id'])) { + $newres['inviter'] = $this->get_pwr_chat($participant['inviter_id'], false, false); + } + if (isset($participant['date'])) { + $newres['date'] = $participant['date']; + } switch ($participant['_']) { case 'channelParticipant': $newres['role'] = 'user'; @@ -376,28 +414,40 @@ trait PeerHandler return $res; } - public function store_db($res, $force = false) { + public function store_db($res, $force = false) + { if (!isset($this->settings['pwr']) || $this->settings['pwr']['pwr'] === false) { try { - if (isset($res['username'])) shell_exec('curl '.escapeshellarg('https://api.pwrtelegram.xyz/getchat?chat_id=@'.$res['username']).' -s -o /dev/null >/dev/null 2>/dev/null & '); - } catch (\danog\MadelineProto\Exception $e) { \danog\MadelineProto\Logger::log($e->getMessage()); }; + if (isset($res['username'])) { + shell_exec('curl '.escapeshellarg('https://api.pwrtelegram.xyz/getchat?chat_id=@'.$res['username']).' -s -o /dev/null >/dev/null 2>/dev/null & '); + } + } catch (\danog\MadelineProto\Exception $e) { + \danog\MadelineProto\Logger::log($e->getMessage()); + } + return; } if (!empty($res)) { - if (isset($res['participants'])) unset($res['participants']); - $this->qres []= $res; + if (isset($res['participants'])) { + unset($res['participants']); + } + $this->qres[] = $res; } if ($this->last_stored < time() && !$force) { return false; } - if (empty($this->qres)) return false; + if (empty($this->qres)) { + return false; + } try { $payload = json_encode($this->qres); $path = '/tmp/ids'.hash('sha256', $payload); file_put_contents($path, $payload); $result = shell_exec('curl '.escapeshellarg('https://id.pwrtelegram.xyz/db'.$this->settings['pwr']['db_token'].'/addnewmadeline?d=pls').' -d '.escapeshellarg('@'.$path).' -s -o '.escapeshellarg($path.'.log').' >/dev/null 2>/dev/null & '); \danog\MadelineProto\Logger::log($result); - } catch (\danog\MadelineProto\Exception $e) { \danog\MadelineProto\Logger::log($e->getMessage()); }; + } catch (\danog\MadelineProto\Exception $e) { + \danog\MadelineProto\Logger::log($e->getMessage()); + } $this->qres = []; $this->last_stored = time() + 5; } diff --git a/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php b/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php index 80bb5a86..2ac43861 100644 --- a/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php @@ -23,7 +23,8 @@ trait UpdateHandler public $updates_key = 0; private $getting_state = false; - public function pwr_update_handler($update) { + public function pwr_update_handler($update) + { if (isset($update['message']['to_id'])) { $full_chat = $this->get_pwr_chat($update['message']['to_id']); } @@ -32,7 +33,6 @@ trait UpdateHandler } } - public function get_updates_update_handler($update) { if (!$this->settings['updates']['handle_updates']) { @@ -431,6 +431,10 @@ trait UpdateHandler $update['message']['out'] = true; } \danog\MadelineProto\Logger::log('Saving an update of type '.$update['_'].'...'); - if ($this->settings['pwr']['strict']) $this->pwr_update_handler($update); else $this->settings['updates']['callback']($update); + if ($this->settings['pwr']['strict']) { + $this->pwr_update_handler($update); + } else { + $this->settings['updates']['callback']($update); + } } } diff --git a/src/danog/MadelineProto/Wrappers/FilesHandler.php b/src/danog/MadelineProto/Wrappers/FilesHandler.php index f10d2837..30276c92 100644 --- a/src/danog/MadelineProto/Wrappers/FilesHandler.php +++ b/src/danog/MadelineProto/Wrappers/FilesHandler.php @@ -530,6 +530,7 @@ trait FilesHandler $info = $this->get_download_info($message_media); $this->download_to_stream($info, $stream, $cb, filesize($file), $info['size']); fclose($stream); + return $file; }