Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index 9518fe7dd1fd1dee880a53c78201e021b6e3bf38..9a43cdb305e140222650bcfdd9dd97f307da934b 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -55,18 +55,7 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
        }
 
        if ($simplehtml == 7) {
-               $title2 = $data["title"];
-
-               $test1 = trim(html_entity_decode($data["text"],ENT_QUOTES,'UTF-8'));
-               $test2 = trim(html_entity_decode($data["title"],ENT_QUOTES,'UTF-8'));
-
-               // If the link description is similar to the text above then don't add the link description
-               if (($data["title"] != "") AND ((strpos($test1,$test2) !== false) OR
-                       (similar_text($test1,$test2) / strlen($data["title"])) > 0.9)) {
-                       $title2 = $data["url"];
-               }
-               $text = sprintf('<a href="%s" title="%s" class="attachment" rel="nofollow external">%s</a><br />',
-                               $data["url"], $data["title"], $title2);
+               $text = style_url_for_mastodon($data["url"]);
        } elseif (($simplehtml != 4) AND ($simplehtml != 0)) {
                $text = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]);
        } else {
@@ -171,9 +160,9 @@ function cleancss($input) {
 }
 
 /**
- * @brief Converts [url] BBCodes in a format that looks fine on Mastodon.
+ * @brief Converts [url] BBCodes in a format that looks fine on Mastodon. (callback function)
  * @param array $match Array with the matching values
- * @return string replaced value
+ * @return string reformatted link including HTML codes
  */
 function bb_style_url($match) {
         $url = $match[1];
@@ -187,12 +176,22 @@ function bb_style_url($match) {
                 return $match[0];
         }
 
+       return style_url_for_mastodon($url);
+}
+
+/**
+ * @brief Converts [url] BBCodes in a format that looks fine on Mastodon and GNU Social.
+ * @param string $url URL that is about to be reformatted
+ * @return string reformatted link including HTML codes
+ */
+function style_url_for_mastodon($url) {
         $styled_url = $url;
 
+        $parts = parse_url($url);
         $scheme = $parts['scheme'].'://';
         $styled_url = str_replace($scheme, '', $styled_url);
 
-        $html = '<a href="%s" rel="nofollow noopener" target="_blank">'.
+        $html = '<a href="%s" class="attachment" rel="nofollow noopener" target="_blank">'.
                  '<span class="invisible">%s</span>';
 
         if (strlen($styled_url) > 30) {