diff --git a/src/danog/MadelineProto/Logger.php b/src/danog/MadelineProto/Logger.php index a9b50960..46fa8be7 100644 --- a/src/danog/MadelineProto/Logger.php +++ b/src/danog/MadelineProto/Logger.php @@ -54,7 +54,7 @@ class Logger self::$default = new self($mode, $optional, $prefix, $level, $max_size); } - public function __construct($mode, $optional = null, $prefix = '', $level = self::NOTICE, $max_size = 100*1024*1024) + public function __construct($mode, $optional = null, $prefix = '', $level = self::NOTICE, $max_size = 100 * 1024 * 1024) { if ($mode === null) { throw new Exception(\danog\MadelineProto\Lang::$current_lang['no_mode_specified']); diff --git a/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php b/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php index 4ac00b58..ec93e90c 100644 --- a/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php @@ -542,7 +542,7 @@ trait AuthKeyHandler $this->logger->logger(sprintf(\danog\MadelineProto\Lang::$current_lang['gen_perm_auth_key'], $id), \danog\MadelineProto\Logger::NOTICE); $socket->auth_key = $this->create_auth_key(-1, $id); $socket->authorized = false; - } else if ($socket->auth_key === null && $media) { + } elseif ($socket->auth_key === null && $media) { $socket->auth_key = $this->datacenter->sockets[intval($id)]->auth_key; $socket->authorized = $this->datacenter->sockets[intval($id)]->authorized; } diff --git a/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php b/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php index 57580713..655eb163 100644 --- a/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php @@ -340,7 +340,6 @@ trait ResponseHandler $aargs['datacenter'] .= '_media'; } - throw new \danog\MadelineProto\Exception('Received request to switch to DC '.$this->datacenter->curdc); case 401: switch ($server_answer['error_message']) { diff --git a/src/danog/MadelineProto/TL/Conversion/BotAPI.php b/src/danog/MadelineProto/TL/Conversion/BotAPI.php index 0c054493..358c39f1 100644 --- a/src/danog/MadelineProto/TL/Conversion/BotAPI.php +++ b/src/danog/MadelineProto/TL/Conversion/BotAPI.php @@ -506,15 +506,15 @@ trait BotAPI $offset = 0; foreach ($args['entities'] as $entity) { do { - while ($entity['offset'] > $offset+$this->mb_strlen($multiple_args[$i]['message'])) { + while ($entity['offset'] > $offset + $this->mb_strlen($multiple_args[$i]['message'])) { $offset += $this->mb_strlen($multiple_args[$i]['message']); $i++; } $entity['offset'] -= $offset; - if ($entity['offset']+$entity['length'] > $this->mb_strlen($multiple_args[$i]['message'])) { + if ($entity['offset'] + $entity['length'] > $this->mb_strlen($multiple_args[$i]['message'])) { $newentity = $entity; - $newentity['length'] = $entity['length']-($this->mb_strlen($multiple_args[$i]['message'])-$entity['offset']); - $entity['length'] = $this->mb_strlen($multiple_args[$i]['message'])-$entity['offset']; + $newentity['length'] = $entity['length'] - ($this->mb_strlen($multiple_args[$i]['message']) - $entity['offset']); + $entity['length'] = $this->mb_strlen($multiple_args[$i]['message']) - $entity['offset']; $multiple_args[$i]['entities'][] = $entity; $offset += $this->mb_strlen($multiple_args[$i]['message']); @@ -529,6 +529,7 @@ trait BotAPI } } while (true); } + return $multiple_args; } diff --git a/src/danog/MadelineProto/Wrappers/TOS.php b/src/danog/MadelineProto/Wrappers/TOS.php index e7a4af13..24519e55 100644 --- a/src/danog/MadelineProto/Wrappers/TOS.php +++ b/src/danog/MadelineProto/Wrappers/TOS.php @@ -18,8 +18,8 @@ namespace danog\MadelineProto\Wrappers; */ trait TOS { - public function check_tos() - { + public function check_tos() + { if ($this->authorized === self::LOGGED_IN && !$this->get_self()['bot']) { if ($this->tos['expires'] < time()) { $this->logger->logger('Fetching TOS...'); diff --git a/tests/testing.php b/tests/testing.php index 1e5f3d48..c2c78796 100755 --- a/tests/testing.php +++ b/tests/testing.php @@ -45,10 +45,8 @@ echo 'Loading MadelineProto...'.PHP_EOL; $MadelineProto = new \danog\MadelineProto\API(getcwd().'/testing.madeline', $settings); - $MadelineProto->messages->sendMessage(['peer' => '@pwrtelegramgroupita', 'message' => ''.str_repeat('a b c d', 700).'', 'parse_mode' => 'markdown']); - try { $MadelineProto->get_self(); } catch (\danog\MadelineProto\Exception $e) { @@ -272,5 +270,3 @@ 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); } - -