keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8343 from MrPetovan/bug/8338-diaspora-mentions

Browse source 
Replace Diaspora mentions before the parsing to HTML in Text\Markdown
This commit is contained in:
Philipp 2020-02-28 07:35:49 +01:00 committed by GitHub
commit 8bbd32ffd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/Content/Text/Markdown.php
View file

@ -53,6 +53,8 @@ class Markdown
return $url; return $url;
}; };
$text = self::convertDiasporaMentionsToHtml($text);
$html = $MarkdownParser->transform($text); $html = $MarkdownParser->transform($text);
DI::profiler()->saveTimestamp($stamp1, "parser", System::callstack()); DI::profiler()->saveTimestamp($stamp1, "parser", System::callstack());
@ -61,35 +63,42 @@ class Markdown
} }
/** /**
* Callback function to replace a Diaspora style mention in a mention for Friendica * Replace Diaspora-style mentions in a text since they trip the Markdown parser autolinker.
* *
* @param array $match Matching values for the callback * @param string $text
* [1] = mention type (@ or !) * @return string
* [2] = name (optional)
* [3] = address
* @return string Replaced mention
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/ */
private static function diasporaMention2BBCodeCallback($match) private static function convertDiasporaMentionsToHtml(string $text)
{ {
if ($match[3] == '') { return preg_replace_callback(
return; '/([@!]){(?:([^}]+?); ?)?([^} ]+)}/',
} /*
* Matching values for the callback
* [1] = mention type (@ or !)
* [2] = name (optional)
* [3] = profile URL
*/
function ($matches) {
if ($matches[3] == '') {
return '';
}
$data = Contact::getDetailsByAddr($match[3]); $data = Contact::getDetailsByAddr($matches[3]);
if (empty($data)) { if (empty($data)) {
return; return '';
} }
$name = $match[2]; $name = $matches[2];
if ($name == '') { if ($name == '') {
$name = $data['name']; $name = $data['name'];
} }
return $match[1] . '[url=' . $data['url'] . ']' . $name . '[/url]'; return $matches[1] . '<a href="' . $data['url'] . '">' . $name . '</a>';
},
$text
);
} }
/* /*
@ -110,9 +119,6 @@ class Markdown
$s = self::convert($s); $s = self::convert($s);
$regexp = "/([@!])\{(?:([^\}]+?); ?)?([^\} ]+)\}/";
$s = preg_replace_callback($regexp, ['self', 'diasporaMention2BBCodeCallback'], $s);
$s = HTML::toBBCode($s); $s = HTML::toBBCode($s);
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands