Merge pull request #13724 from Raroun/Fix-for-Issue-#13637---Photo-caption-prevents...

[friendica.git] / src / Protocol / OStatus.php

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index a93a0584dd234b05fb29f8ce2cc82ca3f683e481..d6a2f2dad1ce3b8cb8bb180087ba2a377afa3c7f 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -385,12 +385,14 @@ class OStatus
                        }
                }
 
-               $header = [];
-               $header['uid'] = $importer['uid'];
-               $header['network'] = Protocol::OSTATUS;
-               $header['wall'] = 0;
-               $header['origin'] = 0;
-               $header['gravity'] = Item::GRAVITY_COMMENT;
+               // Initial header elements
+               $header = [
+                       'uid'     => $importer['uid'],
+                       'network' => Protocol::OSTATUS,
+                       'wall'    => 0,
+                       'origin'  => 0,
+                       'gravity' => Item::GRAVITY_COMMENT,
+               ];
 
                if (!is_object($doc->firstChild) || empty($doc->firstChild->tagName)) {
                        return false;
@@ -1468,6 +1470,8 @@ class OStatus
                        $entry = $doc->createElement('entry');
 
                        if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
+                               $entry->setAttribute('xmlns:activity', ActivityNamespace::ACTIVITY);
+
                                $contact = Contact::getByURL($item['author-link']) ?: $owner;
                                $contact['nickname'] = $contact['nickname'] ?? $contact['nick'];
                                $author = self::addAuthor($doc, $contact, false);
@@ -1515,6 +1519,7 @@ class OStatus
                XML::addElement($doc, $entry, 'title', html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
 
                $body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
+               $body = Post\Media::addHTMLLinkToBody($item['uri-id'], $body);
 
                if (!empty($item['title'])) {
                        $body = '[b]' . $item['title'] . "[/b]\n\n" . $body;
@@ -1708,7 +1713,7 @@ class OStatus
 
                $previous_created = $last_update;
 
-               // Don't cache when the last item was posted less then 15 minutes ago (Cache duration)
+               // Don't cache when the last item was posted less than 15 minutes ago (Cache duration)
                if ((time() - strtotime($owner['last-item'])) < 15*60) {
                        $result = DI::cache()->get($cachekey);
                        if (!$nocache && !is_null($result)) {