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 2018-03-29 21:05:15 +00:00 committed by StyleCI Bot
parent 91fa43094d
commit acb73834d4
2 changed files with 70 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
magna.php
View File

@ -36,12 +36,12 @@ $MadelineProto->session = 'session.madeline';
$MadelineProto->inputEncryptedFileAudio = $MadelineProto->upload_encrypted('tests/mosconi.mp3'); $MadelineProto->inputEncryptedFileAudio = $MadelineProto->upload_encrypted('tests/mosconi.mp3');
}*/ }*/
class EventHandler extends \danog\MadelineProto\EventHandler class EventHandler extends \danog\MadelineProto\EventHandler
{ {
private $times = []; private $times = [];
private $calls = []; private $calls = [];
private $my_users = []; private $my_users = [];
public function configureCall($call) public function configureCall($call)
{ {
include 'songs.php'; include 'songs.php';
@ -59,6 +59,7 @@ class EventHandler extends \danog\MadelineProto\EventHandler
$call->parseConfig(); $call->parseConfig();
$call->playOnHold($songs); $call->playOnHold($songs);
} }
public function handleMessage($chat_id, $from_id, $message) public function handleMessage($chat_id, $from_id, $message)
{ {
try { try {
@ -100,7 +101,7 @@ Propic art by @magnaluna on [deviantart](https://magnaluna.deviantart.com).", 'p
} }
} }
if ($message === '/broadcast' && $from_id === 101374607) { if ($message === '/broadcast' && $from_id === 101374607) {
$time = time()+100; $time = time() + 100;
foreach ($this->get_dialogs() as $peer) { foreach ($this->get_dialogs() as $peer) {
if (isset($peer['user_id'])) { if (isset($peer['user_id'])) {
$this->programmed_call[] = [$peer['user_id'], $time]; $this->programmed_call[] = [$peer['user_id'], $time];
@ -135,6 +136,7 @@ Propic art by @magnaluna on [deviantart](https://magnaluna.deviantart.com).", 'p
$message = isset($update['message']['message']) ? $update['message']['message'] : ''; $message = isset($update['message']['message']) ? $update['message']['message'] : '';
$this->handleMessage($chat_id, $from_id, $message); $this->handleMessage($chat_id, $from_id, $message);
} }
public function onUpdateNewEncryptedMessage($update) public function onUpdateNewEncryptedMessage($update)
{ {
return; return;
@ -143,16 +145,24 @@ Propic art by @magnaluna on [deviantart](https://magnaluna.deviantart.com).", 'p
$message = isset($update['message']['decrypted_message']['message']) ? $update['message']['decrypted_message']['message'] : ''; $message = isset($update['message']['decrypted_message']['message']) ? $update['message']['decrypted_message']['message'] : '';
$this->handleMessage($chat_id, $from_id, $message); $this->handleMessage($chat_id, $from_id, $message);
} }
public function onUpdateEncryption($update) {
public function onUpdateEncryption($update)
{
return; return;
try { try {
if ($update['chat']['_'] !== 'encryptedChat') return; if ($update['chat']['_'] !== 'encryptedChat') {
return;
}
$chat_id = $this->get_info($update)['InputEncryptedChat']; $chat_id = $this->get_info($update)['InputEncryptedChat'];
$from_id = $this->get_secret_chat($chat_id)['user_id']; $from_id = $this->get_secret_chat($chat_id)['user_id'];
$message = ''; $message = '';
} catch (\danog\MadelineProto\Exception $e) { return; } } catch (\danog\MadelineProto\Exception $e) {
return;
}
$this->handleMessage($chat_id, $from_id, $message); $this->handleMessage($chat_id, $from_id, $message);
} }
public function onUpdatePhoneCall($update) public function onUpdatePhoneCall($update)
{ {
if (is_object($update['phone_call']) && isset($update['phone_call']->madeline) && $update['phone_call']->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_INCOMING) { if (is_object($update['phone_call']) && isset($update['phone_call']->madeline) && $update['phone_call']->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_INCOMING) {
@ -168,6 +178,7 @@ Propic art by @magnaluna on [deviantart](https://magnaluna.deviantart.com).", 'p
} }
} }
} }
public function onLoop() public function onLoop()
{ {
foreach ($this->programmed_call as $key => $pair) { foreach ($this->programmed_call as $key => $pair) {
@ -209,7 +220,6 @@ Propic art by @magnaluna on [deviantart](https://magnaluna.deviantart.com).", 'p
} }
} }
} }
} }
} }

6
src/danog/MadelineProto/Wrappers/Loop.php
View File

@ -19,10 +19,12 @@ namespace danog\MadelineProto\Wrappers;
trait Loop trait Loop
{ {
private $loop_callback; private $loop_callback;
public function setLoopCallback($callback) public function setLoopCallback($callback)
{ {
$this->loop_callback = $callback; $this->loop_callback = $callback;
} }
public function loop($max_forks = 0) public function loop($max_forks = 0)
{ {
if (in_array($this->settings['updates']['callback'], [['danog\\MadelineProto\\API', 'get_updates_update_handler'], 'get_updates_update_handler'])) { if (in_array($this->settings['updates']['callback'], [['danog\\MadelineProto\\API', 'get_updates_update_handler'], 'get_updates_update_handler'])) {
@ -51,7 +53,7 @@ trait Loop
die; die;
} }
} }
if ($this->loop_callback !== NULL) { if ($this->loop_callback !== null) {
($this->loop_callback)(); ($this->loop_callback)();
} }
} }
@ -62,7 +64,7 @@ trait Loop
$offset = $update['update_id'] + 1; $offset = $update['update_id'] + 1;
$this->settings['updates']['callback']($update['update']); $this->settings['updates']['callback']($update['update']);
} }
if ($this->loop_callback !== NULL) { if ($this->loop_callback !== null) {
($this->loop_callback)(); ($this->loop_callback)();
} }
} }