clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Visible URL are shortened when transmitting to OStatus

This commit is contained in:
Michael 2018-03-16 20:50:53 +00:00
parent 3ca2dc70b3
commit e1a72b8f5a
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Content/Text/BBCode.php
View File

@ -678,7 +678,7 @@ class BBCode
$return = ''; $return = '';
if ($simplehtml == 7) { if ($simplehtml == 7) {
$return = self::convertUrlForMastodon($data["url"]); $return = self::convertUrlForOStatus($data["url"]);
} elseif (($simplehtml != 4) && ($simplehtml != 0)) { } elseif (($simplehtml != 4) && ($simplehtml != 0)) {
$return = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]); $return = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]);
} else { } else {
@ -790,7 +790,7 @@ class BBCode
* @param array $match Array with the matching values * @param array $match Array with the matching values
* @return string reformatted link including HTML codes * @return string reformatted link including HTML codes
*/ */
private static function convertUrlForMastodonCallback($match) private static function convertUrlForOStatusCallback($match)
{ {
$url = $match[1]; $url = $match[1];
@ -803,34 +803,27 @@ class BBCode
return $match[0]; return $match[0];
} }
return self::convertUrlForMastodon($url); return self::convertUrlForOStatus($url);
} }
/** /**
* @brief Converts [url] BBCodes in a format that looks fine on Mastodon and GNU Social. * @brief Converts [url] BBCodes in a format that looks fine on OStatus systems.
* @param string $url URL that is about to be reformatted * @param string $url URL that is about to be reformatted
* @return string reformatted link including HTML codes * @return string reformatted link including HTML codes
*/ */
private static function convertUrlForMastodon($url) private static function convertUrlForOStatus($url)
{ {
$parts = parse_url($url); $parts = parse_url($url);
$scheme = $parts['scheme'] . '://'; $scheme = $parts['scheme'] . '://';
$styled_url = str_replace($scheme, '', $url); $styled_url = str_replace($scheme, '', $url);
$html = '<a href="%s" class="attachment" rel="nofollow noopener" target="_blank">' .
'<span class="invisible">%s</span>';
if (strlen($styled_url) > 30) { if (strlen($styled_url) > 30) {
$html .= '<span class="ellipsis">%s</span>' . $styled_url = substr($styled_url, 0, 30) . "…";
'<span class="invisible">%s</span></a>';
$ellipsis = substr($styled_url, 0, 30);
$rest = substr($styled_url, 30);
return sprintf($html, $url, $scheme, $ellipsis, $rest);
} else {
$html .= '%s</a>';
return sprintf($html, $url, $scheme, $styled_url);
} }
$html = '<a href="%s" target="_blank">%s</a>';
return sprintf($html, $url, $styled_url);
} }
/** /**
@ -1501,8 +1494,8 @@ class BBCode
$autolink_regex = "/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism"; $autolink_regex = "/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism";
$text = preg_replace($autolink_regex, '$1[url]$2[/url]', $text); $text = preg_replace($autolink_regex, '$1[url]$2[/url]', $text);
if ($simple_html == 7) { if ($simple_html == 7) {
$text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForMastodonCallback', $text); $text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
$text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForMastodonCallback', $text); $text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
} else { } else {
$text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::shortenVisibleUrlCallback', $text); $text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::shortenVisibleUrlCallback', $text);
$text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::shortenVisibleUrlCallback', $text); $text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::shortenVisibleUrlCallback', $text);