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

Add support for tg://user?id= syntax mentions

Browse Source
This commit is contained in:
Daniil Gentili 2018-03-02 19:47:47 +01:00
parent 05a73fbe31
commit c329b4a527
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/danog/MadelineProto/MTProtoTools/CallHandler.php
View File

@ -185,9 +185,8 @@ trait CallHandler
} catch (\danog\MadelineProto\NothingInTheSocketException $e) { } catch (\danog\MadelineProto\NothingInTheSocketException $e) {
$last_error = 'Nothing in the socket'; $last_error = 'Nothing in the socket';
\danog\MadelineProto\Logger::log('An error getting response of method '.$method.': '.$e->getMessage().' in '.basename($e->getFile(), '.php').' on line '.$e->getLine().'. Retrying...', \danog\MadelineProto\Logger::WARNING); \danog\MadelineProto\Logger::log('An error getting response of method '.$method.': '.$e->getMessage().' in '.basename($e->getFile(), '.php').' on line '.$e->getLine().'. Retrying...', \danog\MadelineProto\Logger::WARNING);
if ($this->is_http($aargs['datacenter'])) { if ($res_count > 3) $this->close_and_reopen($aargs['datacenter']);
$this->close_and_reopen($aargs['datacenter']); var_dump($res_count);
}
continue; //2; continue; //2;
} }
} }

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

@ -334,28 +334,28 @@ trait BotAPI
return $arguments; return $arguments;
} }
public function parse_node($node, &$entities, &$nmessage, $recursive = true) public function parse_node($node, &$entities, &$new_message, $recursive = true)
{ {
switch ($node->nodeName) { switch ($node->nodeName) {
case 'br': case 'br':
$nmessage .= "\n"; $new_message .= "\n";
break; break;
case 'b': case 'b':
case 'strong': case 'strong':
$text = $this->html_entity_decode($node->textContent); $text = $this->html_entity_decode($node->textContent);
$entities[] = ['_' => 'messageEntityBold', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text)]; $entities[] = ['_' => 'messageEntityBold', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text)];
$nmessage .= $text; $new_message .= $text;
break; break;
case 'i': case 'i':
case 'em': case 'em':
$text = $this->html_entity_decode($node->textContent); $text = $this->html_entity_decode($node->textContent);
$entities[] = ['_' => 'messageEntityItalic', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text)]; $entities[] = ['_' => 'messageEntityItalic', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text)];
$nmessage .= $text; $new_message .= $text;
break; break;
case 'code': case 'code':
$text = $this->html_entity_decode($node->textContent); $text = $this->html_entity_decode($node->textContent);
$entities[] = ['_' => 'messageEntityCode', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text)]; $entities[] = ['_' => 'messageEntityCode', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text)];
$nmessage .= $text; $new_message .= $text;
break; break;
case 'pre': case 'pre':
$text = $this->html_entity_decode($node->textContent); $text = $this->html_entity_decode($node->textContent);
@ -363,24 +363,24 @@ trait BotAPI
if ($language === null) { if ($language === null) {
$language = ''; $language = '';
} }
$entities[] = ['_' => 'messageEntityPre', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text), 'language' => $language]; $entities[] = ['_' => 'messageEntityPre', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text), 'language' => $language];
$nmessage .= $text; $new_message .= $text;
break; break;
case 'p': case 'p':
foreach ($node->childNodes as $node) { foreach ($node->childNodes as $node) {
$this->parse_node($node, $entities, $nmessage); $this->parse_node($node, $entities, $new_message);
} }
break; break;
case 'a': case 'a':
$text = $this->html_entity_decode($node->textContent); $text = $this->html_entity_decode($node->textContent);
$href = $node->getAttribute('href'); $href = $node->getAttribute('href');
if (preg_match('|mention:|', $href)) { if (preg_match('|mention:(.*)|', $href, $matches) || preg_match('|tg://user\?id=(.*)|', $href, $matches)) {
$mention = $this->get_info(str_replace('mention:', '', $href)); $mention = $this->get_info($matches[1]);
if (!isset($mention['InputUser'])) { if (!isset($mention['InputUser'])) {
throw new \danog\MadelineProto\Exception(\danog\MadelineProto\Lang::$current_lang['peer_not_in_db']); throw new \danog\MadelineProto\Exception(\danog\MadelineProto\Lang::$current_lang['peer_not_in_db']);
} }
$entities[] = ['_' => 'inputMessageEntityMentionName', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text), 'user_id' => $mention['InputUser']]; $entities[] = ['_' => 'inputMessageEntityMentionName', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text), 'user_id' => $mention['InputUser']];
} elseif (preg_match('|buttonurl:|', $href)) { } elseif (preg_match('|buttonurl:(.*)|', $href)) {
if (!isset($entities['buttons'])) { if (!isset($entities['buttons'])) {
$entities['buttons'] = []; $entities['buttons'] = [];
} }
@ -391,12 +391,12 @@ trait BotAPI
} }
break; break;
} else { } else {
$entities[] = ['_' => 'messageEntityTextUrl', 'offset' => mb_strlen($nmessage), 'length' => mb_strlen($text), 'url' => $href]; $entities[] = ['_' => 'messageEntityTextUrl', 'offset' => mb_strlen($new_message), 'length' => mb_strlen($text), 'url' => $href];
} }
$nmessage .= $text; $new_message .= $text;
break; break;
default: default:
$nmessage .= $this->html_entity_decode($node->nodeValue); $new_message .= $this->html_entity_decode($node->nodeValue);
break; break;
} }
} }
@ -411,7 +411,7 @@ trait BotAPI
$arguments['parse_mode'] = 'HTML'; $arguments['parse_mode'] = 'HTML';
} }
if (preg_match('/html/i', $arguments['parse_mode'])) { if (preg_match('/html/i', $arguments['parse_mode'])) {
$nmessage = ''; $new_message = '';
try { try {
$arguments['message'] = $this->html_fixtags($arguments['message']); $arguments['message'] = $this->html_fixtags($arguments['message']);
@ -421,7 +421,7 @@ trait BotAPI
$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'], $nmessage); $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']);
@ -431,7 +431,7 @@ trait BotAPI
} catch (\DOMException $e) { } catch (\DOMException $e) {
} catch (\danog\MadelineProto\Exception $e) { } catch (\danog\MadelineProto\Exception $e) {
} }
$arguments['message'] = $nmessage; $arguments['message'] = $new_message;
} }
return $arguments; return $arguments;