diff --git a/bot.php b/bot.php index eaa19c23..33cbc70b 100755 --- a/bot.php +++ b/bot.php @@ -44,7 +44,6 @@ class EventHandler extends \danog\MadelineProto\EventHandler try { yield $this->messages->sendMessage(['peer' => $update, 'message' => "$res", 'reply_to_msg_id' => isset($update['message']['id']) ? $update['message']['id'] : null, 'parse_mode' => 'HTML']); //'entities' => [['_' => 'messageEntityPre', 'offset' => 0, 'length' => strlen($res), 'language' => 'json']]]); - yield $this->messages->sendMessage(['peer' => $update, 'message' => "
owo uwu
", 'reply_to_msg_id' => isset($update['message']['id']) ? $update['message']['id'] : null, 'parse_mode' => 'HTML']); //'entities' => [['_' => 'messageEntityPre', 'offset' => 0, 'length' => strlen($res), 'language' => 'json']]]); if (isset($update['message']['media']) && $update['message']['media']['_'] !== 'messageMediaGame') { yield $this->messages->sendMedia(['peer' => $update, 'message' => $update['message']['message'], 'media' => $update]); //yield $this->download_to_dir($update, '/tmp'); diff --git a/composer.json b/composer.json index b9d36989..8453a124 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "danog/magicalserializer": "^1.0", "phpseclib/phpseclib": "dev-master#5e7d39153270dfd19d585504b0a29ac65a62adf9 as 2.0.15", "vlucas/phpdotenv": "^3", - "erusev/parsedown": "^1.6", + "erusev/parsedown": "^1.7", "ext-mbstring": "*", "ext-json": "*", "ext-xml": "*", diff --git a/layerdiff.php b/layerdiff.php index 58f1dd19..32640022 100644 --- a/layerdiff.php +++ b/layerdiff.php @@ -50,6 +50,7 @@ function getUrl($constructor, $type) { $changed = str_replace('.', '_', $constructor); + return "[$constructor](https://github.com/danog/MadelineProtoDocs/blob/geochats/docs/API_docs/$type/$changed.md)"; return "[$constructor](https://docs.madelineproto.xyz/API_docs/$type/$changed.html)"; } $old = getTL($argv[1]); diff --git a/src/danog/MadelineProto/TL/Conversion/BotAPI.php b/src/danog/MadelineProto/TL/Conversion/BotAPI.php index d66c81f5..50d73045 100644 --- a/src/danog/MadelineProto/TL/Conversion/BotAPI.php +++ b/src/danog/MadelineProto/TL/Conversion/BotAPI.php @@ -688,7 +688,7 @@ trait BotAPI public function html_fixtags($text) { $diff = 0; - preg_match_all('#(.*?)(<(u|s|a|b|\bstrong\b|\bblockquote\b|\bstrike\b|\bdel\b|\bem\b|i|\bcode\b|\bpre\b)[^>]*>)(.*?)(<\s*/\s*\3>)#is', $text, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE); + preg_match_all('#(.*?)(<(\bu\b|\bs\b|\ba\b|\bb\b|\bstrong\b|\bblockquote\b|\bstrike\b|\bdel\b|\bem\b|i|\bcode\b|\bpre\b)[^>]*>)(.*?)([<]\s*/\s*\3[>])#is', $text, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE); if ($matches) { foreach ($matches as $match) { if (trim($match[1][0]) != '') {