X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FText%2FMarkdown.php;h=a715de7e97e1debba48f30ebe558864bd42962b9;hb=6bb418c5a7cdd71d28a8a572059efb14401b70bd;hp=1d2f68bc7c4ef2bbc0c930c4c15acdaa01bdcd0d;hpb=15a857e4117a5e1e6e092709b3c07614934b09fb;p=friendica.git diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php index 1d2f68bc7c..a715de7e97 100644 --- a/src/Content/Text/Markdown.php +++ b/src/Content/Text/Markdown.php @@ -7,12 +7,13 @@ namespace Friendica\Content\Text; use Friendica\BaseObject; -use Michelf\MarkdownExtra; +use Friendica\Core\System; +use Friendica\Model\Contact; /** * Friendica-specific usage of Markdown * - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Markdown extends BaseObject { @@ -24,16 +25,102 @@ class Markdown extends BaseObject * @param string $text * @param bool $hardwrap * @return string + * @throws \Exception */ public static function convert($text, $hardwrap = true) { $stamp1 = microtime(true); - $MarkdownParser = new MarkdownExtra(); - $MarkdownParser->hard_wrap = $hardwrap; + $MarkdownParser = new MarkdownParser(); + $MarkdownParser->code_class_prefix = 'language-'; + $MarkdownParser->hard_wrap = $hardwrap; + $MarkdownParser->hashtag_protection = true; + $MarkdownParser->url_filter_func = function ($url) { + if (strpos($url, '#') === 0) { + $url = ltrim($_SERVER['REQUEST_URI'], '/') . $url; + } + return $url; + }; + $html = $MarkdownParser->transform($text); - self::getApp()->save_timestamp($stamp1, "parser"); + self::getApp()->getProfiler()->saveTimestamp($stamp1, "parser", System::callstack()); return $html; } + + /** + * @brief Callback function to replace a Diaspora style mention in a mention for Friendica + * + * @param array $match Matching values for the callback + * [1] = mention type (@ or !) + * [2] = name (optional) + * [3] = address + * @return string Replaced mention + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function diasporaMention2BBCodeCallback($match) + { + if ($match[3] == '') { + return; + } + + $data = Contact::getDetailsByAddr($match[3]); + + if (empty($data)) { + return; + } + + $name = $match[2]; + + if ($name == '') { + $name = $data['name']; + } + + return $match[1] . '[url=' . $data['url'] . ']' . $name . '[/url]'; + } + + /* + * we don't want to support a bbcode specific markdown interpreter + * and the markdown library we have is pretty good, but provides HTML output. + * So we'll use that to convert to HTML, then convert the HTML back to bbcode, + * and then clean up a few Diaspora specific constructs. + */ + public static function toBBCode($s) + { + $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8'); + + // The parser cannot handle paragraphs correctly + $s = str_replace(['

', '

', '

'], ['
', '
', '
'], $s); + + // Escaping hashtags that could be titles + $s = preg_replace('/^\#([^\s\#])/im', '\#$1', $s); + + $s = self::convert($s); + + $regexp = "/([@!])\{(?:([^\}]+?); ?)?([^\} ]+)\}/"; + $s = preg_replace_callback($regexp, ['self', 'diasporaMention2BBCodeCallback'], $s); + + $s = HTML::toBBCode($s); + + // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands + $s = str_replace('♲', html_entity_decode('♲', ENT_QUOTES, 'UTF-8'), $s); + + // Convert everything that looks like a link to a link + $s = preg_replace('/([^\]=]|^)(https?\:\/\/)([a-zA-Z0-9:\/\-?&;.=_~#%$!+,@]+(?