diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 5f9a3ee78a..17e630a8fc 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -51,7 +51,7 @@ use Friendica\Util\XML;
class BBCode
{
// Update this value to the current date whenever changes are made to BBCode::convert
- const VERSION = '2021-05-21';
+ const VERSION = '2021-07-13';
const INTERNAL = 0;
const EXTERNAL = 1;
@@ -417,9 +417,9 @@ class BBCode
if (empty($attach_data['url'])) {
return $match[0];
} elseif (empty($attach_data['title']) || $no_link_desc) {
- return "\n[url]" . $attach_data['url'] . "[/url]\n";
+ return " \n[url]" . $attach_data['url'] . "[/url]\n";
} else {
- return "\n[url=" . $attach_data['url'] . ']' . $attach_data['title'] . "[/url]\n";
+ return " \n[url=" . $attach_data['url'] . ']' . $attach_data['title'] . "[/url]\n";
}
}, $body);
}
@@ -1057,7 +1057,7 @@ class BBCode
switch ($simplehtml) {
case self::API:
$text = ($is_quote_share? '
' : '') .
- '' . html_entity_decode('♲ ', ENT_QUOTES, 'UTF-8') . ' ' . $author_contact['addr'] . ":
\n" .
+ '' . html_entity_decode('♲ ', ENT_QUOTES, 'UTF-8') . ' ' . $author_contact['addr'] . ":
\n" .
'' . $content . '
';
break;
case self::DIASPORA:
@@ -1431,12 +1431,9 @@ class BBCode
} while ($oldtext != $text);
}
- // Add HTML new lines
- $text = str_replace("\n", '
', $text);
-
/// @todo Have a closer look at the different html modes
// Handle attached links or videos
- if ($simple_html == self::ACTIVITYPUB) {
+ if (in_array($simple_html, [self::API, self::ACTIVITYPUB])) {
$text = self::removeAttachment($text);
} elseif (!in_array($simple_html, [self::INTERNAL, self::EXTERNAL, self::CONNECTORS])) {
$text = self::removeAttachment($text, true);
@@ -1444,6 +1441,9 @@ class BBCode
$text = self::convertAttachment($text, $simple_html, $try_oembed, [], $uriid);
}
+ // Add HTML new lines
+ $text = str_replace("\n", '
', $text);
+
$nosmile = strpos($text, '[nosmile]') !== false;
$text = str_replace('[nosmile]', '', $text);
@@ -1749,7 +1749,7 @@ class BBCode
}
if (!$for_plaintext) {
- if (in_array($simple_html, [self::OSTATUS, self::ACTIVITYPUB])) {
+ if (in_array($simple_html, [self::OSTATUS, self::API, self::ACTIVITYPUB])) {
$text = preg_replace_callback("/\[url\](.*?)\[\/url\]/ism", 'self::convertUrlForActivityPubCallback', $text);
$text = preg_replace_callback("/\[url\=(.*?)\](.*?)\[\/url\]/ism", 'self::convertUrlForActivityPubCallback', $text);
}
@@ -1782,7 +1782,7 @@ class BBCode
$text = preg_replace("/#\[url\=.*?\]\^\[\/url\]\[url\=(.*?)\](.*?)\[\/url\]/i",
"[bookmark=$1]$2[/bookmark]", $text);
- if (in_array($simple_html, [self::API, self::OSTATUS, self::TWITTER])) {
+ if (in_array($simple_html, [self::OSTATUS, self::TWITTER])) {
$text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "self::expandLinksCallback", $text);
//$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
$text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$text);
@@ -1821,7 +1821,7 @@ class BBCode
* - [url=]#[/url]
*/
$text = preg_replace_callback("/(?:#\[url\=[^\[\]]*\]|\[url\=[^\[\]]*\]#)(.*?)\[\/url\]/ism", function($matches) use ($simple_html) {
- if ($simple_html == BBCode::ACTIVITYPUB) {
+ if ($simple_html == self::ACTIVITYPUB) {
return '#'
. XML::escape($matches[1]) . '';
@@ -2115,7 +2115,7 @@ class BBCode
{
$ret = [];
- BBCode::performWithEscapedTags($string, ['noparse', 'pre', 'code', 'img'], function ($string) use (&$ret) {
+ self::performWithEscapedTags($string, ['noparse', 'pre', 'code', 'img'], function ($string) use (&$ret) {
// Convert hashtag links to hashtags
$string = preg_replace('/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism', '#$2 ', $string);
@@ -2222,8 +2222,8 @@ class BBCode
*/
public static function setMentions($body, $profile_uid = 0, $network = '')
{
- BBCode::performWithEscapedTags($body, ['noparse', 'pre', 'code', 'img'], function ($body) use ($profile_uid, $network) {
- $tags = BBCode::getTags($body);
+ self::performWithEscapedTags($body, ['noparse', 'pre', 'code', 'img'], function ($body) use ($profile_uid, $network) {
+ $tags = self::getTags($body);
$tagged = [];
$inform = '';
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index a92a901cf5..0e3de02d67 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2211,10 +2211,10 @@ class Contact
}
if ((!empty($ret['addr']) && ($ret['addr'] != $contact['addr'])) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
- $ret['uri-date'] = DateTimeFormat::utcNow();
+ $ret['uri-date'] = $updated;
}
- if (($ret['name'] != $contact['name']) || ($ret['nick'] != $contact['nick'])) {
+ if ((!empty($ret['name']) && ($ret['name'] != $contact['name'])) || (!empty($ret['nick']) && ($ret['nick'] != $contact['nick']))) {
$ret['name-date'] = $updated;
}
diff --git a/src/Object/Api/Mastodon/Status.php b/src/Object/Api/Mastodon/Status.php
index 90e8732ce2..468126b4e6 100644
--- a/src/Object/Api/Mastodon/Status.php
+++ b/src/Object/Api/Mastodon/Status.php
@@ -131,7 +131,7 @@ class Status extends BaseDataTransferObject
$this->muted = $userAttributes->muted;
$this->bookmarked = $userAttributes->bookmarked;
$this->pinned = $userAttributes->pinned;
- $this->content = BBCode::convertForUriId($item['uri-id'], ($item['raw-body'] ?? $item['body']), BBCode::EXTERNAL);
+ $this->content = BBCode::convertForUriId($item['uri-id'], ($item['raw-body'] ?? $item['body']), BBCode::API);
$this->reblog = $reblog;
$this->application = $application->toArray();
$this->account = $account->toArray();
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index e31141ea46..60ae653855 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -534,7 +534,7 @@ class Notifier
foreach ($contacts as $contact) {
// Direct delivery of local contacts
- if ($target_uid = User::getIdForURL($contact['url'])) {
+ if (!in_array($cmd, [Delivery::RELOCATION, Delivery::SUGGESTION, Delivery::DELETION, Delivery::MAIL]) && $target_uid = User::getIdForURL($contact['url'])) {
Logger::info('Direct delivery', ['uri-id' => $target_item['uri-id'], 'target' => $target_uid]);
$fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH];
Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);