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

Merge branch 'beta' of https://github.com/danog/MadelineProto into beta

Browse Source
This commit is contained in:
Daniil Gentili 2018-03-02 23:24:19 +00:00
commit ec0a5e4190
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/danog/MadelineProto/TL/Conversion/BotAPI.php
View File

@ -393,7 +393,7 @@ trait BotAPI
} else { } else {
$entities[] = ['_' => 'messageEntityTextUrl', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text), 'url' => $href]; $entities[] = ['_' => 'messageEntityTextUrl', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text), 'url' => $href];
} }
$new_message .= $text; $new_message .= $text;
break; break;
default: default:
@ -414,21 +414,20 @@ trait BotAPI
if (preg_match('/html/i', $arguments['parse_mode'])) { if (preg_match('/html/i', $arguments['parse_mode'])) {
$new_message = ''; $new_message = '';
$arguments['message'] = $this->html_fixtags($arguments['message']);
$arguments['message'] = $this->html_fixtags($arguments['message']); $dom = new \DOMDocument();
$dom = new \DOMDocument(); $dom->loadHTML(mb_convert_encoding($arguments['message'], 'HTML-ENTITIES', 'UTF-8'));
$dom->loadHTML(mb_convert_encoding($arguments['message'], 'HTML-ENTITIES', 'UTF-8')); if (!isset($arguments['entities'])) {
if (!isset($arguments['entities'])) { $arguments['entities'] = [];
$arguments['entities'] = []; }
} foreach ($dom->getElementsByTagName('body')->item(0)->childNodes as $node) {
foreach ($dom->getElementsByTagName('body')->item(0)->childNodes as $node) { $this->parse_node($node, $arguments['entities'], $new_message);
$this->parse_node($node, $arguments['entities'], $new_message); }
} if (isset($arguments['entities']['buttons'])) {
if (isset($arguments['entities']['buttons'])) { $arguments['reply_markup'] = $this->build_rows($arguments['entities']['buttons']);
$arguments['reply_markup'] = $this->build_rows($arguments['entities']['buttons']); unset($arguments['entities']['buttons']);
unset($arguments['entities']['buttons']); }
} unset($arguments['parse_mode']);
unset($arguments['parse_mode']);
$arguments['message'] = $new_message; $arguments['message'] = $new_message;
} }