Merge pull request #13161 from annando/bluesky-activities

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

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 80644329ff4d857fc05269ce23e10be935214316..ff8fc3cbea9af9cd5294583e8eba98a42a0c39be 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -496,7 +496,7 @@ class OStatus
                                $orig_uri = $xpath->query('activity:object/atom:id', $entry)->item(0)->nodeValue;
                                Logger::notice('Favorite', ['uri' => $orig_uri, 'item' => $item]);
 
-                               $item['verb'] = Activity::LIKE;
+                               $item['body'] = $item['verb'] = Activity::LIKE;
                                $item['thr-parent'] = $orig_uri;
                                $item['gravity'] = Item::GRAVITY_ACTIVITY;
                                $item['object-type'] = Activity\ObjectType::NOTE;
@@ -1515,6 +1515,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 +1709,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)) {