danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Daniil Gentili 2017-01-14 11:54:50 +00:00 committed by StyleCI Bot
parent 3b861dcd34
commit 9a21b861b5
4 changed files with 85 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/danog/MadelineProto/MTProto.php
View File

@ -201,7 +201,7 @@ Slv8kg9qv1m6XHVQY3PnEw+QQtqSIXklHwIDAQAB
'handle_updates' => true, // Should I handle updates? '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 '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) { foreach ($default_settings as $key => $param) {
if (!isset($settings[$key])) { if (!isset($settings[$key])) {

102
src/danog/MadelineProto/MTProtoTools/PeerHandler.php
View File

@ -239,7 +239,9 @@ trait PeerHandler
return $res; return $res;
} }
public function get_full_info($id) {
public function get_full_info($id)
{
$partial = $this->get_info($id); $partial = $this->get_info($id);
switch ($partial['type']) { switch ($partial['type']) {
case 'user': case 'user':
@ -258,21 +260,31 @@ trait PeerHandler
} }
$partial = $this->get_info($id); $partial = $this->get_info($id);
$partial['full'] = $full; $partial['full'] = $full;
return $partial; 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); $full = $fullfetch ? $this->get_full_info($id) : $this->get_info($id);
$res = ['id' => $full['bot_api_id'], 'type' => $full['type']]; $res = ['id' => $full['bot_api_id'], 'type' => $full['type']];
switch ($full['type']) { switch ($full['type']) {
case 'user': case 'user':
case 'bot': case 'bot':
foreach (['first_name', 'last_name', 'username', 'verified', 'restricted', 'restriction_reason', 'status', 'bot_inline_placeholder', 'access_hash', 'phone'] as $key) { 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 = ''; $bio = '';
if ($full['type'] == 'user' && isset($res['username']) && !isset($res['about']) && $fullfetch) { 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)) { if (preg_match('/meta property="og:description" content=".+/', file_get_contents('https://telegram.me/'.$res['username']), $biores)) {
@ -287,32 +299,54 @@ trait PeerHandler
break; break;
case 'chat': case 'chat':
foreach (['title', 'participants_count', 'admin', 'admins_enabled'] as $key) { 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']['chat_photo']['sizes'])) {
if (isset($full['full']['exported_invite']['link'])) $res['invite'] = $full['full']['exported_invite']['link']; $res['photo'] = end($full['full']['chat_photo']['sizes']);
if (isset($full['full']['participants']['participants'])) $res['participants'] = $full['full']['participants']['participants']; }
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; break;
case 'channel': case 'channel':
case 'supergroup': case 'supergroup':
foreach (['title', 'democracy', 'restricted', 'restriction_reason', 'access_hash', 'username', 'signatures'] as $key) { 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) { 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']['chat_photo']['sizes'])) {
if (isset($full['full']['exported_invite']['link'])) $res['invite'] = $full['full']['exported_invite']['link']; $res['photo'] = end($full['full']['chat_photo']['sizes']);
if (isset($full['full']['participants']['participants'])) $res['participants'] = $full['full']['participants']['participants']; }
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; break;
} }
if (isset($res['participants'])) { if (isset($res['participants'])) {
foreach ($res['participants'] as $key => $participant) { foreach ($res['participants'] as $key => $participant) {
$newres['user'] = $this->get_pwr_chat($participant['user_id'], false, false); $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['inviter_id'])) {
if (isset($participant['date'])) $newres['date'] = $participant['date']; $newres['inviter'] = $this->get_pwr_chat($participant['inviter_id'], false, false);
}
if (isset($participant['date'])) {
$newres['date'] = $participant['date'];
}
switch ($participant['_']) { switch ($participant['_']) {
case 'chatParticipant': case 'chatParticipant':
$newres['role'] = 'user'; $newres['role'] = 'user';
@ -340,8 +374,12 @@ trait PeerHandler
foreach ($gres['participants'] as $participant) { foreach ($gres['participants'] as $participant) {
$newres['user'] = $this->get_pwr_chat($participant['user_id'], false, false); $newres['user'] = $this->get_pwr_chat($participant['user_id'], false, false);
$key++; $key++;
if (isset($participant['inviter_id'])) $newres['inviter'] = $this->get_pwr_chat($participant['inviter_id'], false, false); if (isset($participant['inviter_id'])) {
if (isset($participant['date'])) $newres['date'] = $participant['date']; $newres['inviter'] = $this->get_pwr_chat($participant['inviter_id'], false, false);
}
if (isset($participant['date'])) {
$newres['date'] = $participant['date'];
}
switch ($participant['_']) { switch ($participant['_']) {
case 'channelParticipant': case 'channelParticipant':
$newres['role'] = 'user'; $newres['role'] = 'user';
@ -376,28 +414,40 @@ trait PeerHandler
return $res; 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) { if (!isset($this->settings['pwr']) || $this->settings['pwr']['pwr'] === false) {
try { 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 & '); if (isset($res['username'])) {
} catch (\danog\MadelineProto\Exception $e) { \danog\MadelineProto\Logger::log($e->getMessage()); }; 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; return;
} }
if (!empty($res)) { if (!empty($res)) {
if (isset($res['participants'])) unset($res['participants']); if (isset($res['participants'])) {
$this->qres []= $res; unset($res['participants']);
}
$this->qres[] = $res;
} }
if ($this->last_stored < time() && !$force) { if ($this->last_stored < time() && !$force) {
return false; return false;
} }
if (empty($this->qres)) return false; if (empty($this->qres)) {
return false;
}
try { try {
$payload = json_encode($this->qres); $payload = json_encode($this->qres);
$path = '/tmp/ids'.hash('sha256', $payload); $path = '/tmp/ids'.hash('sha256', $payload);
file_put_contents($path, $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 & '); $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); \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->qres = [];
$this->last_stored = time() + 5; $this->last_stored = time() + 5;
} }

10
src/danog/MadelineProto/MTProtoTools/UpdateHandler.php
View File

@ -23,7 +23,8 @@ trait UpdateHandler
public $updates_key = 0; public $updates_key = 0;
private $getting_state = false; private $getting_state = false;
public function pwr_update_handler($update) { public function pwr_update_handler($update)
{
if (isset($update['message']['to_id'])) { if (isset($update['message']['to_id'])) {
$full_chat = $this->get_pwr_chat($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) public function get_updates_update_handler($update)
{ {
if (!$this->settings['updates']['handle_updates']) { if (!$this->settings['updates']['handle_updates']) {
@ -431,6 +431,10 @@ trait UpdateHandler
$update['message']['out'] = true; $update['message']['out'] = true;
} }
\danog\MadelineProto\Logger::log('Saving an update of type '.$update['_'].'...'); \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);
}
} }
} }

1
src/danog/MadelineProto/Wrappers/FilesHandler.php
View File

@ -530,6 +530,7 @@ trait FilesHandler
$info = $this->get_download_info($message_media); $info = $this->get_download_info($message_media);
$this->download_to_stream($info, $stream, $cb, filesize($file), $info['size']); $this->download_to_stream($info, $stream, $cb, filesize($file), $info['size']);
fclose($stream); fclose($stream);
return $file; return $file;
} }