<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Content\Text;
+use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Contact;
* compatibility with Diaspora in spite of the Markdown standard.
*
* @param string $text
- * @param bool $hardwrap
+ * @param bool $hardwrap Enables line breaks on \n without two trailing spaces
+ * @param string $baseuri Optional. Prepend anchor links with this URL
* @return string
- * @throws \Exception
*/
- public static function convert($text, $hardwrap = true) {
- $stamp1 = microtime(true);
+ public static function convert($text, $hardwrap = true, $baseuri = null) {
+ DI::profiler()->startRecording('rendering');
$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;
+ $MarkdownParser->url_filter_func = function ($url) use ($baseuri) {
+ if (!empty($baseuri) && strpos($url, '#') === 0) {
+ $url = ltrim($baseuri, '/') . $url;
}
return $url;
};
$html = $MarkdownParser->transform($text);
- DI::profiler()->saveTimestamp($stamp1, "parser", System::callstack());
+ DI::profiler()->stopRecording();
return $html;
}
return '';
}
- $data = Contact::getDetailsByAddr($matches[3]);
+ $data = Contact::getByURL($matches[3]);
if (empty($data)) {
return '';
* 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)
+ public static function toBBCode($s): string
{
- $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
+ // @TODO Temporary until we find the source of the null value to finally set the correct type-hint
+ if (is_null($s)) {
+ Logger::warning('Received null value', ['callstack' => System::callstack()]);
+ return '';
+ }
+
+ if (!$s) {
+ return $s;
+ }
+
+ DI::profiler()->startRecording('rendering');
// The parser cannot handle paragraphs correctly
$s = str_replace(['</p>', '<p>', '<p dir="ltr">'], ['<br>', '<br>', '<br>'], $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:\/\-?&;.=_~#%$!+,@]+(?<!,))/ism', '$1[url=$2$3]$2$3[/url]', $s);
-
//$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3$4]$2$3$4[/url]',$s);
$s = BBCode::pregReplaceInTag('/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism', '[youtube]$2[/youtube]', 'url', $s);
$s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism' , '[youtube]$1[/youtube]', 'url', $s);
+ $s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/www.youtube.com\/shorts\/(.*?)\].*?\[\/url\]/ism' , '[youtube]$1[/youtube]', 'url', $s);
$s = BBCode::pregReplaceInTag('/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism' , '[vimeo]$2[/vimeo]' , 'url', $s);
$s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism' , '[vimeo]$1[/vimeo]' , 'url', $s);
// remove duplicate adjacent code tags
$s = preg_replace('/(\[code\])+(.*?)(\[\/code\])+/ism', '[code]$2[/code]', $s);
- // Don't show link to full picture (until it is fixed)
- $s = BBCode::scaleExternalImages($s);
-
+ DI::profiler()->stopRecording();
return $s;
}
}