Browse Source

Add new Content\Text\MarkdownParser

- Add autolinker to MarkdownParser->doAutoLinks()
- Set hashtag_protection and url_filter_func properties of MarkdownParser
pull/6845/head
Hypolite Petovan 3 years ago
parent
commit
4d70e32829
  1. 16
      src/Content/Text/Markdown.php
  2. 18
      src/Content/Text/MarkdownParser.php

16
src/Content/Text/Markdown.php

@ -9,7 +9,6 @@ namespace Friendica\Content\Text;
use Friendica\BaseObject;
use Friendica\Core\System;
use Friendica\Model\Contact;
use Michelf\MarkdownExtra;
/**
* Friendica-specific usage of Markdown
@ -31,11 +30,18 @@ class Markdown extends BaseObject
public static function convert($text, $hardwrap = true) {
$stamp1 = microtime(true);
$MarkdownParser = new MarkdownExtra();
$MarkdownParser->hard_wrap = $hardwrap;
$MarkdownParser->code_class_prefix = 'language-';
$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);
$html = preg_replace('/<a(.*?)href="#/is', '<a$1href="' . ltrim($_SERVER['REQUEST_URI'], '/') . '#', $html);
self::getApp()->getProfiler()->saveTimestamp($stamp1, "parser", System::callstack());

18
src/Content/Text/MarkdownParser.php

@ -0,0 +1,18 @@
<?php
namespace Friendica\Content\Text;
use Friendica\Util\Strings;
use Michelf\MarkdownExtra;
class MarkdownParser extends MarkdownExtra
{
protected function doAutoLinks($text)
{
$text = parent::doAutoLinks($text);
$text = preg_replace_callback(Strings::autoLinkRegEx(),
array($this, '_doAutoLinks_url_callback'), $text);
return $text;
}
}
Loading…
Cancel
Save