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

Improve message splitting

Browse Source
This commit is contained in:
Daniil Gentili 2019-05-31 15:31:23 +02:00
parent 84abb90c2a
commit c7ed411070
1 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -558,27 +558,37 @@ trait BotAPI
$i = 0; $i = 0;
$offset = 0; $offset = 0;
foreach ($args['entities'] as $entity) { for ($k = 0; $k < count($args['entities']); $k++) {
$entity = $args['entities'][$k];
do { 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']); $offset += $this->mb_strlen($multiple_args[$i]['message']);
$i++; $i++;
} }
$entity['offset'] -= $offset; $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 = $entity;
$newentity['length'] = $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']; $entity['length'] = $this->mb_strlen($multiple_args[$i]['message']) - $entity['offset'];
$offset += $this->mb_strlen($multiple_args[$i]['message']); $offset += $entity['length']; //$this->mb_strlen($multiple_args[$i]['message']);
$newentity['offset'] = $offset; $newentity['offset'] = $offset;
$prev_length = $this->mb_strlen($multiple_args[$i]['message']); $prev_length = $this->mb_strlen($multiple_args[$i]['message']);
$multiple_args[$i]['message'] = rtrim($multiple_args[$i]['message']); $multiple_args[$i]['message'] = rtrim($multiple_args[$i]['message']);
$entity['length'] -= $prev_length - $this->mb_strlen($multiple_args[$i]['message']); $diff = $prev_length - $this->mb_strlen($multiple_args[$i]['message']);
if ($diff) {
$entity['length'] -= $diff;
foreach ($args['entities'] as $key => &$eentity) {
if ($key > $k) {
$eentity['offset'] -= $diff;
}
}
}
$multiple_args[$i]['entities'][] = $entity; $multiple_args[$i]['entities'][] = $entity;
$i++; $i++;
$entity = $newentity; $entity = $newentity;
@ -586,8 +596,15 @@ trait BotAPI
} else { } else {
$prev_length = $this->mb_strlen($multiple_args[$i]['message']); $prev_length = $this->mb_strlen($multiple_args[$i]['message']);
$multiple_args[$i]['message'] = rtrim($multiple_args[$i]['message']); $multiple_args[$i]['message'] = rtrim($multiple_args[$i]['message']);
$entity['length'] -= $prev_length - $this->mb_strlen($multiple_args[$i]['message']); $diff = $prev_length - $this->mb_strlen($multiple_args[$i]['message']);
if ($diff) {
$entity['length'] -= $diff;
foreach ($args['entities'] as $key => &$eentity) {
if ($key > $k) {
$eentity['offset'] -= $diff;
}
}
}
$multiple_args[$i]['entities'][] = $entity; $multiple_args[$i]['entities'][] = $entity;
break; break;
} }
@ -615,23 +632,30 @@ trait BotAPI
public function html_fixtags($text) public function html_fixtags($text)
{ {
preg_match_all('#(.*?)(<(a|b|\bstrong\b|\bem\b|i|\bcode\b|\bpre\b)[^>]*>)([^<]*?)(<\\/\\3>)(.*)?#is', $text, $matches, PREG_SET_ORDER); preg_match_all('#(.*?)(<(a|b|\bstrong\b|\bem\b|i|\bcode\b|\bpre\b)[^>]*>)(.*?)(<\s*/\s*\3>)#is', $text, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
if ($matches) { if ($matches) {
$last = count($matches) - 1; foreach ($matches as $match) {
foreach ($matches as $val) { if (trim($match[1][0]) != '') {
if (trim($val[1]) != '') { $temp = substr($text, 0, $match[1][1]);
$text = str_replace($val[1], htmlentities($val[1]), $text); $temp .= htmlentities($match[1][0]);
$temp .= substr($text, $match[1][1] + strlen($match[1][0]));
$text = $temp;
} }
$text = str_replace($val[4], htmlentities(trim($val[4])), $text); $temp = substr($text, 0, $match[4][1]);
if ($val == $matches[$last]) { $temp .= htmlentities($match[4][0]);
$text = str_replace($val[6], $this->html_fixtags($val[6]), $text); $temp .= substr($text, $match[4][1] + strlen($match[4][0]));
$text = $temp;
/*if ($match == $matches[$last]) {
$text = str_replace($match[6], $this->html_fixtags($match[6]), $text);
}*/
} }
preg_match_all('#<a\s*href=("|\')(.+?)("|\')\s*>#is', $text, $matches, PREG_OFFSET_CAPTURE);
foreach ($matches[2] as $match) {
$temp = substr($text, 0, $match[1]);
$temp .= htmlentities($match[0]);
$temp .= substr($text, $match[1] + strlen($match[0]));
$text = $temp;
} }
preg_match_all('#<a href="(.+?)">#is', $text, $matches);
foreach ($matches[1] as $match) {
$text = str_replace($match, htmlentities($match), $text);
}
return $text; return $text;
} else { } else {
return htmlentities($text); return htmlentities($text);