]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/OStatus.php
Avoid local network communication / invalid url requests
[friendica.git] / src / Protocol / OStatus.php
index 7e17ab9f98e5179c5b23d0a9e40cd4462a2a2f1d..2a160724b4d0ea16cdbd55de357c6c4860875371 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
 namespace Friendica\Protocol;
 
 use DOMDocument;
+use DOMElement;
 use DOMXPath;
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -38,7 +40,7 @@ use Friendica\Model\ItemURI;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
-use Friendica\Network\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
@@ -67,24 +69,24 @@ class OStatus
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact = null, $onlyfetch)
+       private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact = null, bool $onlyfetch): array
        {
                $author = [];
-               $author["author-link"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
-               $author["author-name"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $context);
+               $author['author-link'] = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
+               $author['author-name'] = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $context);
                $addr = XML::getFirstNodeValue($xpath, 'atom:author/atom:email/text()', $context);
 
-               $aliaslink = $author["author-link"];
+               $aliaslink = $author['author-link'];
 
                $alternate_item = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0);
                if (is_object($alternate_item)) {
                        foreach ($alternate_item->attributes as $attributes) {
-                               if (($attributes->name == "href") && ($attributes->textContent != "")) {
-                                       $author["author-link"] = $attributes->textContent;
+                               if (($attributes->name == 'href') && ($attributes->textContent != '')) {
+                                       $author['author-link'] = $attributes->textContent;
                                }
                        }
                }
-               $author["author-id"] = Contact::getIdForURL($author["author-link"]);
+               $author['author-id'] = Contact::getIdForURL($author['author-link']);
 
                $author['contact-id'] = ($contact['id'] ?? 0) ?: $author['author-id'];
 
@@ -94,34 +96,43 @@ class OStatus
                This here would be better, but we would get problems with contacts from the statusnet addon
                This is kept here as a reminder for the future
 
-               $cid = Contact::getIdForURL($author["author-link"], $importer["uid"]);
+               $cid = Contact::getIdForURL($author['author-link'], $importer['uid']);
                if ($cid) {
                        $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
                }
 */
                if ($aliaslink != '') {
-                       $condition = ["`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)",
-                                       $importer["uid"], $aliaslink, Protocol::STATUSNET,
-                                       Contact::SHARING, Contact::FRIEND];
-                       $contact = DBA::selectFirst('contact', [], $condition);
+                       $contact = DBA::selectFirst('contact', [], [
+                               "`uid` = ? AND `alias` = ? AND `rel` IN (?, ?)",
+                               $importer['uid'],
+                               $aliaslink,
+                               Contact::SHARING, Contact::FRIEND,
+                       ]);
                }
 
-               if (!DBA::isResult($contact) && $author["author-link"] != '') {
-                       if ($aliaslink == "") {
-                               $aliaslink = $author["author-link"];
+               if (!DBA::isResult($contact) && $author['author-link'] != '') {
+                       if ($aliaslink == '') {
+                               $aliaslink = $author['author-link'];
                        }
 
-                       $condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
-                                       $importer["uid"], Strings::normaliseLink($author["author-link"]), Strings::normaliseLink($aliaslink),
-                                       Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND];
-                       $contact = DBA::selectFirst('contact', [], $condition);
+                       $contact = DBA::selectFirst('contact', [], [
+                               "`uid` = ? AND `nurl` IN (?, ?) AND `rel` IN (?, ?)",
+                               $importer['uid'],
+                               Strings::normaliseLink($author['author-link']),
+                               Strings::normaliseLink($aliaslink),
+                               Contact::SHARING,
+                               Contact::FRIEND,
+                       ]);
                }
 
                if (!DBA::isResult($contact) && ($addr != '')) {
-                       $condition = ["`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)",
-                                       $importer["uid"], $addr, Protocol::STATUSNET,
-                                       Contact::SHARING, Contact::FRIEND];
-                       $contact = DBA::selectFirst('contact', [], $condition);
+                       $contact = DBA::selectFirst('contact', [], [
+                               "`uid` = ? AND `addr` = ? AND `rel` IN (?, ?)",
+                               $importer['uid'],
+                               $addr,
+                               Contact::SHARING,
+                               Contact::FRIEND,
+                       ]);
                }
 
                if (DBA::isResult($contact)) {
@@ -130,40 +141,40 @@ class OStatus
                        } elseif (!empty(APContact::getByURL($contact['url'], false))) {
                                ActivityPub\Receiver::switchContact($contact['id'], $importer['uid'], $contact['url']);
                        }
-                       $author["contact-id"] = $contact["id"];
+                       $author['contact-id'] = $contact['id'];
                }
 
                $avatarlist = [];
                $avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context);
                foreach ($avatars as $avatar) {
-                       $href = "";
+                       $href = '';
                        $width = 0;
                        foreach ($avatar->attributes as $attributes) {
-                               if ($attributes->name == "href") {
+                               if ($attributes->name == 'href') {
                                        $href = $attributes->textContent;
                                }
-                               if ($attributes->name == "width") {
+                               if ($attributes->name == 'width') {
                                        $width = $attributes->textContent;
                                }
                        }
-                       if ($href != "") {
+                       if ($href != '') {
                                $avatarlist[$width] = $href;
                        }
                }
                if (count($avatarlist) > 0) {
                        krsort($avatarlist);
-                       $author["author-avatar"] = Probe::fixAvatar(current($avatarlist), $author["author-link"]);
+                       $author['author-avatar'] = Probe::fixAvatar(current($avatarlist), $author['author-link']);
                }
 
                $displayname = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()', $context);
-               if ($displayname != "") {
-                       $author["author-name"] = $displayname;
+               if ($displayname != '') {
+                       $author['author-name'] = $displayname;
                }
 
-               $author["owner-id"] = $author["author-id"];
+               $author['owner-id'] = $author['author-id'];
 
                // Only update the contacts if it is an OStatus contact
-               if (DBA::isResult($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == Protocol::OSTATUS)) {
+               if (DBA::isResult($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact['network'] == Protocol::OSTATUS)) {
 
                        // Update contact data
                        $current = $contact;
@@ -179,41 +190,41 @@ class OStatus
                        // if ($value != "")
                        //      $contact["poll"] = $value;
 
-                       $contact['url'] = $author["author-link"];
+                       $contact['url'] = $author['author-link'];
                        $contact['nurl'] = Strings::normaliseLink($contact['url']);
 
                        $value = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
-                       if ($value != "") {
-                               $contact["alias"] = $value;
+                       if ($value != '') {
+                               $contact['alias'] = $value;
                        }
 
                        $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()', $context);
-                       if ($value != "") {
-                               $contact["name"] = $value;
+                       if ($value != '') {
+                               $contact['name'] = $value;
                        }
 
                        $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $context);
-                       if ($value != "") {
-                               $contact["nick"] = $value;
+                       if ($value != '') {
+                               $contact['nick'] = $value;
                        }
 
                        $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:note/text()', $context);
-                       if ($value != "") {
-                               $contact["about"] = HTML::toBBCode($value);
+                       if ($value != '') {
+                               $contact['about'] = HTML::toBBCode($value);
                        }
 
                        $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:address/poco:formatted/text()', $context);
-                       if ($value != "") {
-                               $contact["location"] = $value;
+                       if ($value != '') {
+                               $contact['location'] = $value;
                        }
 
                        $contact['name-date'] = DateTimeFormat::utcNow();
 
-                       Contact::update($contact, ['id' => $contact["id"]], $current);
+                       Contact::update($contact, ['id' => $contact['id']], $current);
 
-                       if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
-                               Logger::log("Update profile picture for contact ".$contact["id"], Logger::DEBUG);
-                               Contact::updateAvatar($contact["id"], $author["author-avatar"]);
+                       if (!empty($author['author-avatar']) && ($author['author-avatar'] != $current['avatar'])) {
+                               Logger::info('Update profile picture for contact ' . $contact['id']);
+                               Contact::updateAvatar($contact['id'], $author['author-avatar']);
                        }
 
                        // Ensure that we are having this contact (with uid=0)
@@ -224,20 +235,26 @@ class OStatus
                                $old_contact = DBA::selectFirst('contact', $fields, ['id' => $cid]);
 
                                // Update it with the current values
-                               $fields = ['url' => $author["author-link"], 'name' => $contact["name"],
-                                               'nurl' => Strings::normaliseLink($author["author-link"]),
-                                               'nick' => $contact["nick"], 'alias' => $contact["alias"],
-                                               'about' => $contact["about"], 'location' => $contact["location"],
-                                               'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()];
+                               $fields = [
+                                       'url' => $author['author-link'],
+                                       'name' => $contact['name'],
+                                       'nurl' => Strings::normaliseLink($author['author-link']),
+                                       'nick' => $contact['nick'],
+                                       'alias' => $contact['alias'],
+                                       'about' => $contact['about'],
+                                       'location' => $contact['location'],
+                                       'success_update' => DateTimeFormat::utcNow(),
+                                       'last-update' => DateTimeFormat::utcNow(),
+                               ];
 
                                Contact::update($fields, ['id' => $cid], $old_contact);
 
                                // Update the avatar
-                               if (!empty($author["author-avatar"])) {
-                                       Contact::updateAvatar($cid, $author["author-avatar"]);
+                               if (!empty($author['author-avatar'])) {
+                                       Contact::updateAvatar($cid, $author['author-avatar']);
                                }
                        }
-               } elseif (empty($contact["network"]) || ($contact["network"] != Protocol::DFRN)) {
+               } elseif (empty($contact['network']) || ($contact['network'] != Protocol::DFRN)) {
                        $contact = [];
                }
 
@@ -254,10 +271,10 @@ class OStatus
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function salmonAuthor($xml, array $importer)
+       public static function salmonAuthor(string $xml, array $importer): array
        {
-               if ($xml == "") {
-                       return;
+               if (empty($xml)) {
+                       return [];
                }
 
                $doc = new DOMDocument();
@@ -273,7 +290,7 @@ class OStatus
                $xpath->registerNamespace('ostatus', ActivityNamespace::OSTATUS);
                $xpath->registerNamespace('statusnet', ActivityNamespace::STATUSNET);
 
-               $contact = ["id" => 0];
+               $contact = ['id' => 0];
 
                // Fetch the first author
                $authordata = $xpath->query('//author')->item(0);
@@ -285,10 +302,9 @@ class OStatus
         * Read attributes from element
         *
         * @param object $element Element object
-        *
         * @return array attributes
         */
-       private static function readAttributes($element)
+       private static function readAttributes($element): array
        {
                $attribute = [];
 
@@ -324,23 +340,24 @@ class OStatus
         * @param string  $hub        Called by reference, returns the fetched hub data
         * @param boolean $stored     Is the post fresh imported or from the database?
         * @param boolean $initialize Is it the leading post so that data has to be initialized?
-        *
+        * @param integer $direction  Direction, default UNKNOWN(0)
         * @return boolean Could the XML be processed?
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function process($xml, array $importer, array &$contact = null, &$hub, $stored = false, $initialize = true, $direction = Conversation::UNKNOWN)
+       private static function process(string $xml, array $importer, array &$contact = null, string &$hub, bool $stored = false, bool $initialize = true, int $direction = Conversation::UNKNOWN)
        {
                if ($initialize) {
                        self::$itemlist = [];
                        self::$conv_list = [];
                }
 
-               Logger::log('Import OStatus message for user ' . $importer['uid'], Logger::DEBUG);
+               Logger::info('Import OStatus message for user ' . $importer['uid']);
 
-               if ($xml == "") {
+               if (empty($xml)) {
                        return false;
                }
+
                $doc = new DOMDocument();
                @$doc->loadXML($xml);
 
@@ -354,26 +371,26 @@ class OStatus
                $xpath->registerNamespace('ostatus', ActivityNamespace::OSTATUS);
                $xpath->registerNamespace('statusnet', ActivityNamespace::STATUSNET);
 
-               $hub = "";
+               $hub = '';
                $hub_items = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0);
                if (is_object($hub_items)) {
                        $hub_attributes = $hub_items->attributes;
                        if (is_object($hub_attributes)) {
                                foreach ($hub_attributes as $hub_attribute) {
-                                       if ($hub_attribute->name == "href") {
+                                       if ($hub_attribute->name == 'href') {
                                                $hub = $hub_attribute->textContent;
-                                               Logger::log("Found hub ".$hub, Logger::DEBUG);
+                                               Logger::info('Found hub ', ['hub' => $hub]);
                                        }
                                }
                        }
                }
 
                $header = [];
-               $header["uid"] = $importer["uid"];
-               $header["network"] = Protocol::OSTATUS;
-               $header["wall"] = 0;
-               $header["origin"] = 0;
-               $header["gravity"] = GRAVITY_COMMENT;
+               $header['uid'] = $importer['uid'];
+               $header['network'] = Protocol::OSTATUS;
+               $header['wall'] = 0;
+               $header['origin'] = 0;
+               $header['gravity'] = Item::GRAVITY_COMMENT;
 
                if (!is_object($doc->firstChild) || empty($doc->firstChild->tagName)) {
                        return false;
@@ -381,7 +398,7 @@ class OStatus
 
                $first_child = $doc->firstChild->tagName;
 
-               if ($first_child == "feed") {
+               if ($first_child == 'feed') {
                        $entries = $xpath->query('/atom:feed/atom:entry');
                } else {
                        $entries = $xpath->query('/atom:entry');
@@ -395,9 +412,9 @@ class OStatus
                        $doc2->formatOutput = true;
                        $xml2 = $doc2->saveXML();
 
-                       $header["protocol"] = Conversation::PARCEL_SALMON;
-                       $header["source"] = $xml2;
-                       $header["direction"] = $direction;
+                       $header['protocol'] = Conversation::PARCEL_SALMON;
+                       $header['source'] = $xml2;
+                       $header['direction'] = $direction;
                } elseif (!$initialize) {
                        return false;
                }
@@ -427,86 +444,89 @@ class OStatus
 
                        $item = array_merge($header, $author);
 
-                       $item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
+                       $item['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
                        $item['uri-id'] = ItemURI::insert(['uri' => $item['uri']]);
 
-                       $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $entry);
+                       $item['verb'] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $entry);
 
                        // Delete a message
-                       if (in_array($item["verb"], ['qvitter-delete-notice', Activity::DELETE, 'delete'])) {
+                       if (in_array($item['verb'], ['qvitter-delete-notice', Activity::DELETE, 'delete'])) {
                                self::deleteNotice($item);
                                continue;
                        }
 
-                       if (in_array($item["verb"], [Activity::O_UNFAVOURITE, Activity::UNFAVORITE])) {
+                       if (in_array($item['verb'], [Activity::O_UNFAVOURITE, Activity::UNFAVORITE])) {
                                // Ignore "Unfavorite" message
-                               Logger::log("Ignore unfavorite message ".print_r($item, true), Logger::DEBUG);
+                               Logger::info('Ignore unfavorite message ', ['item' => $item]);
                                continue;
                        }
 
                        // Deletions come with the same uri, so we check for duplicates after processing deletions
-                       if (Post::exists(['uid' => $importer["uid"], 'uri' => $item["uri"]])) {
-                               Logger::log('Post with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', Logger::DEBUG);
+                       if (Post::exists(['uid' => $importer['uid'], 'uri' => $item['uri']])) {
+                               Logger::info('Post with URI ' . $item['uri'] . ' already existed for user ' . $importer['uid'] . '.');
                                continue;
                        } else {
-                               Logger::log('Processing post with URI '.$item["uri"].' for user '.$importer["uid"].'.', Logger::DEBUG);
+                               Logger::info('Processing post with URI ' .  $item['uri'] . ' for user ' . $importer['uid'] . '.');
                        }
 
-                       if ($item["verb"] == Activity::JOIN) {
+                       if ($item['verb'] == Activity::JOIN) {
                                // ignore "Join" messages
-                               Logger::log("Ignore join message ".print_r($item, true), Logger::DEBUG);
+                               Logger::info('Ignore join message ', ['item' => $item]);
                                continue;
                        }
 
-                       if ($item["verb"] == "http://mastodon.social/schema/1.0/block") {
+                       if ($item['verb'] == 'http://mastodon.social/schema/1.0/block') {
                                // ignore mastodon "block" messages
-                               Logger::log("Ignore block message ".print_r($item, true), Logger::DEBUG);
+                               Logger::info('Ignore block message ', ['item' => $item]);
                                continue;
                        }
 
-                       if ($item["verb"] == Activity::FOLLOW) {
+                       if ($item['verb'] == Activity::FOLLOW) {
                                Contact::addRelationship($importer, $contact, $item);
                                continue;
                        }
 
-                       if ($item["verb"] == Activity::O_UNFOLLOW) {
+                       if ($item['verb'] == Activity::O_UNFOLLOW) {
                                $dummy = null;
                                Contact::removeFollower($contact);
                                continue;
                        }
 
-                       if ($item["verb"] == Activity::FAVORITE) {
-                               $orig_uri = $xpath->query("activity:object/atom:id", $entry)->item(0)->nodeValue;
-                               Logger::log("Favorite ".$orig_uri." ".print_r($item, true));
+                       if ($item['verb'] == Activity::FAVORITE) {
+                               $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["thr-parent"] = $orig_uri;
-                               $item["gravity"] = GRAVITY_ACTIVITY;
-                               $item["object-type"] = Activity\ObjectType::NOTE;
+                               $item['verb'] = Activity::LIKE;
+                               $item['thr-parent'] = $orig_uri;
+                               $item['gravity'] = Item::GRAVITY_ACTIVITY;
+                               $item['object-type'] = Activity\ObjectType::NOTE;
                        }
 
                        // http://activitystrea.ms/schema/1.0/rsvp-yes
-                       if (!in_array($item["verb"], [Activity::POST, Activity::LIKE, Activity::SHARE])) {
-                               Logger::log("Unhandled verb ".$item["verb"]." ".print_r($item, true), Logger::DEBUG);
+                       if (!in_array($item['verb'], [Activity::POST, Activity::LIKE, Activity::SHARE])) {
+                               Logger::info('Unhandled verb', ['verb' => $item['verb'], 'item' => $item]);
                        }
 
                        self::processPost($xpath, $entry, $item, $importer);
 
                        if ($initialize && (count(self::$itemlist) > 0)) {
                                if (self::$itemlist[0]['uri'] == self::$itemlist[0]['thr-parent']) {
+                                       $uid = self::$itemlist[0]['uid'];
                                        // We will import it everytime, when it is started by our contacts
-                                       $valid = Contact::isSharingByURL(self::$itemlist[0]['author-link'], self::$itemlist[0]['uid']);
+                                       $valid = Contact::isSharingByURL(self::$itemlist[0]['author-link'], $uid);
 
                                        if (!$valid) {
                                                // If not, then it depends on this setting
-                                               $valid = ((self::$itemlist[0]['uid'] == 0) || !DI::pConfig()->get(self::$itemlist[0]['uid'], 'system', 'accept_only_sharer', false));
+                                               $valid = !$uid || DI::pConfig()->get($uid, 'system', 'accept_only_sharer') != Item::COMPLETION_NONE;
+
                                                if ($valid) {
-                                                       Logger::log("Item with uri ".self::$itemlist[0]['uri']." will be imported due to the system settings.", Logger::DEBUG);
+                                                       Logger::info('Item with URI ' . self::$itemlist[0]['uri'] . ' will be imported due to the system settings.');
                                                }
                                        } else {
-                                               Logger::log("Item with uri ".self::$itemlist[0]['uri']." belongs to a contact (".self::$itemlist[0]['contact-id']."). It will be imported.", Logger::DEBUG);
+                                               Logger::info('Item with URI ' . self::$itemlist[0]['uri'] . ' belongs to a contact (' . self::$itemlist[0]['contact-id'] . '). It will be imported.');
                                        }
-                                       if ($valid) {
+
+                                       if ($valid && DI::pConfig()->get($uid, 'system', 'accept_only_sharer') != Item::COMPLETION_LIKE) {
                                                // Never post a thread when the only interaction by our contact was a like
                                                $valid = false;
                                                $verbs = [Activity::POST, Activity::SHARE];
@@ -516,7 +536,7 @@ class OStatus
                                                        }
                                                }
                                                if ($valid) {
-                                                       Logger::log("Item with uri ".self::$itemlist[0]['uri']." will be imported since the thread contains posts or shares.", Logger::DEBUG);
+                                                       Logger::info('Item with URI ' . self::$itemlist[0]['uri'] . ' will be imported since the thread contains posts or shares.');
                                                }
                                        }
                                } else {
@@ -533,20 +553,20 @@ class OStatus
                                                }
                                        }
                                        foreach (self::$itemlist as $item) {
-                                               $found = Post::exists(['uid' => $importer["uid"], 'uri' => $item["uri"]]);
+                                               $found = Post::exists(['uid' => $importer['uid'], 'uri' => $item['uri']]);
                                                if ($found) {
-                                                       Logger::log("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already exists.", Logger::DEBUG);
+                                                       Logger::notice('Item with URI ' . $item['uri'] . ' for user ' . $importer['uid'] . ' already exists.');
                                                } elseif ($item['contact-id'] < 0) {
-                                                       Logger::log("Item with uri ".$item["uri"]." is from a blocked contact.", Logger::DEBUG);
+                                                       Logger::notice('Item with URI ' . $item['uri'] . ' is from a blocked contact.');
                                                } else {
                                                        $ret = Item::insert($item);
-                                                       Logger::log("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret);
+                                                       Logger::info('Item with URI ' . $item['uri'] . ' for user ' . $importer['uid'] . ' stored. Return value: ' . $ret);
                                                }
                                        }
                                }
                                self::$itemlist = [];
                        }
-                       Logger::log('Processing done for post with URI '.$item["uri"].' for user '.$importer["uid"].'.', Logger::DEBUG);
+                       Logger::info('Processing done for post with URI ' . $item['uri'] . ' for user '.$importer['uid'] . '.');
                }
                return true;
        }
@@ -562,13 +582,13 @@ class OStatus
        {
                $condition = ['uid' => $item['uid'], 'author-id' => $item['author-id'], 'uri' => $item['uri']];
                if (!Post::exists($condition)) {
-                       Logger::log('Item from '.$item['author-link'].' with uri '.$item['uri'].' for user '.$item['uid']." wasn't found. We don't delete it.");
+                       Logger::notice('Item from ' . $item['author-link'] . ' with uri ' . $item['uri'] . ' for user ' . $item['uid'] . " wasn't found. We don't delete it.");
                        return;
                }
 
                Item::markForDeletion($condition);
 
-               Logger::log('Deleted item with uri '.$item['uri'].' for user '.$item['uid']);
+               Logger::notice('Deleted item with URI ' . $item['uri'] . ' for user ' . $item['uid']);
        }
 
        /**
@@ -584,40 +604,40 @@ class OStatus
         */
        private static function processPost(DOMXPath $xpath, $entry, array &$item, array $importer)
        {
-               $item["body"] = HTML::toBBCode(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry));
-               $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $entry);
-               if (($item["object-type"] == Activity\ObjectType::BOOKMARK) || ($item["object-type"] == Activity\ObjectType::EVENT)) {
-                       $item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
-                       $item["body"] = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry);
-               } elseif ($item["object-type"] == Activity\ObjectType::QUESTION) {
-                       $item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
+               $item['body'] = HTML::toBBCode(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry));
+               $item['object-type'] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $entry);
+               if (($item['object-type'] == Activity\ObjectType::BOOKMARK) || ($item['object-type'] == Activity\ObjectType::EVENT)) {
+                       $item['title'] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
+                       $item['body'] = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry);
+               } elseif ($item['object-type'] == Activity\ObjectType::QUESTION) {
+                       $item['title'] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
                }
 
-               $item["created"] = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
-               $item["edited"] = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
-               $item['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry);
+               $item['created'] = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
+               $item['edited'] = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
+               $item['conversation'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry);
 
                $conv = $xpath->query('ostatus:conversation', $entry);
                if (is_object($conv->item(0))) {
                        foreach ($conv->item(0)->attributes as $attributes) {
-                               if ($attributes->name == "ref") {
-                                       $item['conversation-uri'] = $attributes->textContent;
+                               if ($attributes->name == 'ref') {
+                                       $item['conversation'] = $attributes->textContent;
                                }
-                               if ($attributes->name == "href") {
-                                       $item['conversation-href'] = $attributes->textContent;
+                               if ($attributes->name == 'href') {
+                                       $item['conversation'] = $attributes->textContent;
                                }
                        }
                }
 
-               $related = "";
+               $related = '';
 
                $inreplyto = $xpath->query('thr:in-reply-to', $entry);
                if (is_object($inreplyto->item(0))) {
                        foreach ($inreplyto->item(0)->attributes as $attributes) {
-                               if ($attributes->name == "ref") {
-                                       $item["thr-parent"] = $attributes->textContent;
+                               if ($attributes->name == 'ref') {
+                                       $item['thr-parent'] = $attributes->textContent;
                                }
-                               if ($attributes->name == "href") {
+                               if ($attributes->name == 'href') {
                                        $related = $attributes->textContent;
                                }
                        }
@@ -625,7 +645,7 @@ class OStatus
 
                $georsspoint = $xpath->query('georss:point', $entry);
                if (!empty($georsspoint) && ($georsspoint->length > 0)) {
-                       $item["coord"] = $georsspoint->item(0)->nodeValue;
+                       $item['coord'] = $georsspoint->item(0)->nodeValue;
                }
 
                $categories = $xpath->query('atom:category', $entry);
@@ -650,248 +670,55 @@ class OStatus
                        $add_body = $link_data['add_body'];
                }
 
-               $repeat_of = "";
+               $repeat_of = '';
 
                $notice_info = $xpath->query('statusnet:notice_info', $entry);
                if ($notice_info && ($notice_info->length > 0)) {
                        foreach ($notice_info->item(0)->attributes as $attributes) {
-                               if ($attributes->name == "source") {
-                                       $item["app"] = strip_tags($attributes->textContent);
+                               if ($attributes->name == 'source') {
+                                       $item['app'] = strip_tags($attributes->textContent);
                                }
-                               if ($attributes->name == "repeat_of") {
+                               if ($attributes->name == 'repeat_of') {
                                        $repeat_of = $attributes->textContent;
                                }
                        }
                }
                // Is it a repeated post?
-               if (($repeat_of != "") || ($item["verb"] == Activity::SHARE)) {
+               if (($repeat_of != '') || ($item['verb'] == Activity::SHARE)) {
                        $link_data = self::processRepeatedItem($xpath, $entry, $item, $importer);
                        if (!empty($link_data['add_body'])) {
                                $add_body .= $link_data['add_body'];
                        }
                }
 
-               $item["body"] .= $add_body;
+               $item['body'] .= $add_body;
 
                Tag::storeFromBody($item['uri-id'], $item['body']);
 
                // Mastodon Content Warning
-               if (($item["verb"] == Activity::POST) && $xpath->evaluate('boolean(atom:summary)', $entry)) {
+               if (($item['verb'] == Activity::POST) && $xpath->evaluate('boolean(atom:summary)', $entry)) {
                        $clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry);
                        if (!empty($clear_text)) {
                                $item['content-warning'] = HTML::toBBCode($clear_text);
                        }
                }
 
-               if (($self != '') && empty($item['protocol'])) {
-                       self::fetchSelf($self, $item);
-               }
-
-               if (!empty($item["conversation-href"])) {
-                       self::fetchConversation($item['conversation-href'], $item['conversation-uri']);
-               }
-
-               if (isset($item["thr-parent"])) {
-                       if (!Post::exists(['uid' => $importer["uid"], 'uri' => $item['thr-parent']])) {
+               if (isset($item['thr-parent'])) {
+                       if (!Post::exists(['uid' => $importer['uid'], 'uri' => $item['thr-parent']])) {
                                if ($related != '') {
-                                       self::fetchRelated($related, $item["thr-parent"], $importer);
+                                       self::fetchRelated($related, $item['thr-parent'], $importer);
                                }
                        } else {
-                               Logger::log('Reply with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', Logger::DEBUG);
+                               Logger::info('Reply with URI ' . $item['uri'] . ' already existed for user ' . $importer['uid'] . '.');
                        }
                } else {
-                       $item["thr-parent"] = $item["uri"];
-                       $item["gravity"] = GRAVITY_PARENT;
-               }
-
-               if (($item['author-link'] != '') && !empty($item['protocol'])) {
-                       $item = Conversation::insert($item);
+                       $item['thr-parent'] = $item['uri'];
+                       $item['gravity'] = Item::GRAVITY_PARENT;
                }
 
                self::$itemlist[] = $item;
        }
 
-       /**
-        * Fetch the conversation for posts
-        *
-        * @param string $conversation     The link to the conversation
-        * @param string $conversation_uri The conversation in "uri" format
-        * @return void
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        */
-       private static function fetchConversation($conversation, $conversation_uri)
-       {
-               // Ensure that we only store a conversation once in a process
-               if (isset(self::$conv_list[$conversation])) {
-                       return;
-               }
-
-               self::$conv_list[$conversation] = true;
-
-               $curlResult = DI::httpClient()->get($conversation, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
-
-               if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
-                       return;
-               }
-
-               $xml = '';
-
-               if ($curlResult->inHeader('Content-Type') &&
-                       in_array('application/atom+xml', $curlResult->getHeader('Content-Type'))) {
-                       $xml = $curlResult->getBody();
-               }
-
-               if ($xml == '') {
-                       $doc = new DOMDocument();
-                       if (!@$doc->loadHTML($curlResult->getBody())) {
-                               return;
-                       }
-                       $xpath = new DOMXPath($doc);
-
-                       $links = $xpath->query('//link');
-                       if ($links) {
-                               $file = '';
-                               foreach ($links as $link) {
-                                       $attribute = self::readAttributes($link);
-                                       if (($attribute['rel'] == 'alternate') && ($attribute['type'] == 'application/atom+xml')) {
-                                               $file = $attribute['href'];
-                                       }
-                               }
-                               if ($file != '') {
-                                       $conversation_atom = DI::httpClient()->get($attribute['href']);
-
-                                       if ($conversation_atom->isSuccess()) {
-                                               $xml = $conversation_atom->getBody();
-                                       }
-                               }
-                       }
-               }
-
-               if ($xml == '') {
-                       return;
-               }
-
-               self::storeConversation($xml, $conversation, $conversation_uri);
-       }
-
-       /**
-        * Store a feed in several conversation entries
-        *
-        * @param string $xml              The feed
-        * @param string $conversation     conversation
-        * @param string $conversation_uri conversation uri
-        * @return void
-        * @throws \Exception
-        */
-       private static function storeConversation($xml, $conversation = '', $conversation_uri = '')
-       {
-               $doc = new DOMDocument();
-               @$doc->loadXML($xml);
-
-               $xpath = new DOMXPath($doc);
-               $xpath->registerNamespace('atom', ActivityNamespace::ATOM1);
-               $xpath->registerNamespace('thr', ActivityNamespace::THREAD);
-               $xpath->registerNamespace('ostatus', ActivityNamespace::OSTATUS);
-
-               $entries = $xpath->query('/atom:feed/atom:entry');
-
-               // Now store the entries
-               foreach ($entries as $entry) {
-                       $doc2 = new DOMDocument();
-                       $doc2->preserveWhiteSpace = false;
-                       $doc2->formatOutput = true;
-
-                       $conv_data = [];
-
-                       $conv_data['protocol'] = Conversation::PARCEL_SPLIT_CONVERSATION;
-                       $conv_data['direction'] = Conversation::PULL;
-                       $conv_data['network'] = Protocol::OSTATUS;
-                       $conv_data['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
-
-                       $inreplyto = $xpath->query('thr:in-reply-to', $entry);
-                       if (is_object($inreplyto->item(0))) {
-                               foreach ($inreplyto->item(0)->attributes as $attributes) {
-                                       if ($attributes->name == "ref") {
-                                               $conv_data['reply-to-uri'] = $attributes->textContent;
-                                       }
-                               }
-                       }
-
-                       $conv_data['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry);
-
-                       $conv = $xpath->query('ostatus:conversation', $entry);
-                       if (is_object($conv->item(0))) {
-                               foreach ($conv->item(0)->attributes as $attributes) {
-                                       if ($attributes->name == "ref") {
-                                               $conv_data['conversation-uri'] = $attributes->textContent;
-                                       }
-                                       if ($attributes->name == "href") {
-                                               $conv_data['conversation-href'] = $attributes->textContent;
-                                       }
-                               }
-                       }
-
-                       if ($conversation != '') {
-                               $conv_data['conversation-uri'] = $conversation;
-                       }
-
-                       if ($conversation_uri != '') {
-                               $conv_data['conversation-uri'] = $conversation_uri;
-                       }
-
-                       $entry = $doc2->importNode($entry, true);
-
-                       $doc2->appendChild($entry);
-
-                       $conv_data['source'] = $doc2->saveXML();
-
-                       Logger::log('Store conversation data for uri '.$conv_data['uri'], Logger::DEBUG);
-                       Conversation::insert($conv_data);
-               }
-       }
-
-       /**
-        * Fetch the own post so that it can be stored later
-        *
-        * We want to store the original data for later processing.
-        * This function is meant for cases where we process a feed with multiple entries.
-        * In that case we need to fetch the single posts here.
-        *
-        * @param string $self The link to the self item
-        * @param array  $item The item array
-        * @return void
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        */
-       private static function fetchSelf($self, array &$item)
-       {
-               $condition = ['item-uri' => $self, 'protocol' => [Conversation::PARCEL_DFRN,
-                       Conversation::PARCEL_DIASPORA_DFRN, Conversation::PARCEL_LEGACY_DFRN,
-                       Conversation::PARCEL_LOCAL_DFRN, Conversation::PARCEL_DIRECT, Conversation::PARCEL_SALMON]];
-               if (DBA::exists('conversation', $condition)) {
-                       Logger::log('Conversation '.$item['uri'].' is already stored.', Logger::DEBUG);
-                       return;
-               }
-
-               $curlResult = DI::httpClient()->get($self);
-
-               if (!$curlResult->isSuccess()) {
-                       return;
-               }
-
-               // We reformat the XML to make it better readable
-               $doc = new DOMDocument();
-               $doc->loadXML($curlResult->getBody());
-               $doc->preserveWhiteSpace = false;
-               $doc->formatOutput = true;
-               $xml = $doc->saveXML();
-
-               $item["protocol"] = Conversation::PARCEL_SALMON;
-               $item["source"] = $xml;
-               $item["direction"] = Conversation::PULL;
-
-               Logger::log('Conversation '.$item['uri'].' is now fetched.', Logger::DEBUG);
-       }
-
        /**
         * Fetch related posts and processes them
         *
@@ -902,27 +729,10 @@ class OStatus
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function fetchRelated($related, $related_uri, $importer)
+       private static function fetchRelated(string $related, string $related_uri, array $importer)
        {
-               $condition = ['item-uri' => $related_uri, 'protocol' => [Conversation::PARCEL_DFRN,
-                       Conversation::PARCEL_DIASPORA_DFRN, Conversation::PARCEL_LEGACY_DFRN,
-                       Conversation::PARCEL_LOCAL_DFRN, Conversation::PARCEL_DIRECT, Conversation::PARCEL_SALMON]];
-               $conversation = DBA::selectFirst('conversation', ['source', 'protocol'], $condition);
-               if (DBA::isResult($conversation)) {
-                       $stored = true;
-                       $xml = $conversation['source'];
-                       if (self::process($xml, $importer, $contact, $hub, $stored, false, Conversation::PULL)) {
-                               Logger::log('Got valid cached XML for URI '.$related_uri, Logger::DEBUG);
-                               return;
-                       }
-                       if ($conversation['protocol'] == Conversation::PARCEL_SALMON) {
-                               Logger::log('Delete invalid cached XML for URI '.$related_uri, Logger::DEBUG);
-                               DBA::delete('conversation', ['item-uri' => $related_uri]);
-                       }
-               }
-
                $stored = false;
-               $curlResult = DI::httpClient()->get($related, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
+               $curlResult = DI::httpClient()->get($related, HttpClientAccept::ATOM_XML);
 
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return;
@@ -932,7 +742,7 @@ class OStatus
 
                if ($curlResult->inHeader('Content-Type') &&
                        in_array('application/atom+xml', $curlResult->getHeader('Content-Type'))) {
-                       Logger::log('Directly fetched XML for URI ' . $related_uri, Logger::DEBUG);
+                       Logger::info('Directly fetched XML for URI ' . $related_uri);
                        $xml = $curlResult->getBody();
                }
 
@@ -954,10 +764,10 @@ class OStatus
                                        }
                                }
                                if ($atom_file != '') {
-                                       $curlResult = DI::httpClient()->get($atom_file);
+                                       $curlResult = DI::httpClient()->get($atom_file, HttpClientAccept::ATOM_XML);
 
                                        if ($curlResult->isSuccess()) {
-                                               Logger::log('Fetched XML for URI ' . $related_uri, Logger::DEBUG);
+                                               Logger::info('Fetched XML for URI ' . $related_uri);
                                                $xml = $curlResult->getBody();
                                        }
                                }
@@ -966,10 +776,10 @@ class OStatus
 
                // Workaround for older GNU Social servers
                if (($xml == '') && strstr($related, '/notice/')) {
-                       $curlResult = DI::httpClient()->get(str_replace('/notice/', '/api/statuses/show/', $related) . '.atom');
+                       $curlResult = DI::httpClient()->get(str_replace('/notice/', '/api/statuses/show/', $related) . '.atom', HttpClientAccept::ATOM_XML);
 
                        if ($curlResult->isSuccess()) {
-                               Logger::log('GNU Social workaround to fetch XML for URI ' . $related_uri, Logger::DEBUG);
+                               Logger::info('GNU Social workaround to fetch XML for URI ' . $related_uri);
                                $xml = $curlResult->getBody();
                        }
                }
@@ -977,29 +787,19 @@ class OStatus
                // Even more worse workaround for GNU Social ;-)
                if ($xml == '') {
                        $related_guess = self::convertHref($related_uri);
-                       $curlResult = DI::httpClient()->get(str_replace('/notice/', '/api/statuses/show/', $related_guess) . '.atom');
+                       $curlResult = DI::httpClient()->get(str_replace('/notice/', '/api/statuses/show/', $related_guess) . '.atom', HttpClientAccept::ATOM_XML);
 
                        if ($curlResult->isSuccess()) {
-                               Logger::log('GNU Social workaround 2 to fetch XML for URI ' . $related_uri, Logger::DEBUG);
+                               Logger::info('GNU Social workaround 2 to fetch XML for URI ' . $related_uri);
                                $xml = $curlResult->getBody();
                        }
                }
 
-               // Finally we take the data that we fetched from "ostatus:conversation"
-               if ($xml == '') {
-                       $condition = ['item-uri' => $related_uri, 'protocol' => Conversation::PARCEL_SPLIT_CONVERSATION];
-                       $conversation = DBA::selectFirst('conversation', ['source'], $condition);
-                       if (DBA::isResult($conversation)) {
-                               $stored = true;
-                               Logger::log('Got cached XML from conversation for URI '.$related_uri, Logger::DEBUG);
-                               $xml = $conversation['source'];
-                       }
-               }
-
                if ($xml != '') {
+                       $hub = '';
                        self::process($xml, $importer, $contact, $hub, $stored, false, Conversation::PULL);
                } else {
-                       Logger::log("XML couldn't be fetched for URI: ".$related_uri." - href: ".$related, Logger::DEBUG);
+                       Logger::info('XML could not be fetched for URI: ' . $related_uri . ' - href: ' . $related);
                }
                return;
        }
@@ -1016,7 +816,7 @@ class OStatus
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer)
+       private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer): array
        {
                $activityobject = $xpath->query('activity:object', $entry)->item(0);
 
@@ -1028,7 +828,7 @@ class OStatus
 
                $orig_uri = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobject);
 
-               $links = $xpath->query("atom:link", $activityobject);
+               $links = $xpath->query('atom:link', $activityobject);
                if ($links) {
                        $link_data = self::processLinks($links, $item);
                }
@@ -1039,22 +839,22 @@ class OStatus
 
                $orig_author = self::fetchAuthor($xpath, $activityobject, $importer, $dummy, false);
 
-               $item["author-name"] = $orig_author["author-name"];
-               $item["author-link"] = $orig_author["author-link"];
-               $item["author-id"] = $orig_author["author-id"];
+               $item['author-name'] = $orig_author['author-name'];
+               $item['author-link'] = $orig_author['author-link'];
+               $item['author-id'] = $orig_author['author-id'];
 
-               $item["body"] = HTML::toBBCode($orig_body);
-               $item["created"] = $orig_created;
-               $item["edited"] = $orig_edited;
+               $item['body'] = HTML::toBBCode($orig_body);
+               $item['created'] = $orig_created;
+               $item['edited'] = $orig_edited;
 
-               $item["uri"] = $orig_uri;
+               $item['uri'] = $orig_uri;
 
-               $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobject);
+               $item['verb'] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobject);
 
-               $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobject);
+               $item['object-type'] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobject);
 
                // Mastodon Content Warning
-               if (($item["verb"] == Activity::POST) && $xpath->evaluate('boolean(atom:summary)', $activityobject)) {
+               if (($item['verb'] == Activity::POST) && $xpath->evaluate('boolean(atom:summary)', $activityobject)) {
                        $clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $activityobject);
                        if (!empty($clear_text)) {
                                $item['content-warning'] = HTML::toBBCode($clear_text);
@@ -1064,8 +864,8 @@ class OStatus
                $inreplyto = $xpath->query('thr:in-reply-to', $activityobject);
                if (is_object($inreplyto->item(0))) {
                        foreach ($inreplyto->item(0)->attributes as $attributes) {
-                               if ($attributes->name == "ref") {
-                                       $item["thr-parent"] = $attributes->textContent;
+                               if ($attributes->name == 'ref') {
+                                       $item['thr-parent'] = $attributes->textContent;
                                }
                        }
                }
@@ -1078,10 +878,9 @@ class OStatus
         *
         * @param object $links The xml data that contain links
         * @param array  $item  The item array
-        *
         * @return array with data from the links
         */
-       private static function processLinks($links, array &$item)
+       private static function processLinks($links, array &$item): array
        {
                $link_data = ['add_body' => '', 'self' => ''];
 
@@ -1090,24 +889,23 @@ class OStatus
 
                        if (!empty($attribute['rel']) && !empty($attribute['href'])) {
                                switch ($attribute['rel']) {
-                                       case "alternate":
-                                               $item["plink"] = $attribute['href'];
-                                               if (($item["object-type"] == Activity\ObjectType::QUESTION)
-                                                       || ($item["object-type"] == Activity\ObjectType::EVENT)
+                                       case 'alternate':
+                                               $item['plink'] = $attribute['href'];
+                                               if (($item['object-type'] == Activity\ObjectType::QUESTION)
+                                                       || ($item['object-type'] == Activity\ObjectType::EVENT)
                                                ) {
                                                        Post\Media::insert(['uri-id' => $item['uri-id'], 'type' => Post\Media::UNKNOWN,
                                                                'url' => $attribute['href'], 'mimetype' => $attribute['type'] ?? null,
                                                                'size' => $attribute['length'] ?? null, 'description' => $attribute['title'] ?? null]);
                                                }
                                                break;
-                                       case "ostatus:conversation":
+
+                                       case 'ostatus:conversation':
                                                $link_data['conversation'] = $attribute['href'];
-                                               $item['conversation-href'] = $link_data['conversation'];
-                                               if (!isset($item['conversation-uri'])) {
-                                                       $item['conversation-uri'] = $item['conversation-href'];
-                                               }
+                                               $item['conversation'] = $link_data['conversation'];
                                                break;
-                                       case "enclosure":
+
+                                       case 'enclosure':
                                                $filetype = strtolower(substr($attribute['type'], 0, strpos($attribute['type'], '/')));
                                                if ($filetype == 'image') {
                                                        $link_data['add_body'] .= "\n[img]".$attribute['href'].'[/img]';
@@ -1117,10 +915,11 @@ class OStatus
                                                                'size' => $attribute['length'] ?? null, 'description' => $attribute['title'] ?? null]);
                                                }
                                                break;
-                                       case "related":
-                                               if ($item["object-type"] != Activity\ObjectType::BOOKMARK) {
-                                                       if (!isset($item["thr-parent"])) {
-                                                               $item["thr-parent"] = $attribute['href'];
+
+                                       case 'related':
+                                               if ($item['object-type'] != Activity\ObjectType::BOOKMARK) {
+                                                       if (!isset($item['thr-parent'])) {
+                                                               $item['thr-parent'] = $attribute['href'];
                                                        }
                                                        $link_data['related'] = $attribute['href'];
                                                } else {
@@ -1129,12 +928,16 @@ class OStatus
                                                                'size' => $attribute['length'] ?? null, 'description' => $attribute['title'] ?? null]);
                                                }
                                                break;
-                                       case "self":
-                                               if (empty($item["plink"])) {
-                                                       $item["plink"] = $attribute['href'];
+
+                                       case 'self':
+                                               if (empty($item['plink'])) {
+                                                       $item['plink'] = $attribute['href'];
                                                }
                                                $link_data['self'] = $attribute['href'];
                                                break;
+
+                                       default:
+                                               Logger::notice('Unsupported rel=' . $attribute['rel'] . ', href=' . $attribute['href'] . ', object-type=' . $item['object-type']);
                                }
                        }
                }
@@ -1145,70 +948,32 @@ class OStatus
         * Create an url out of an uri
         *
         * @param string $href URI in the format "parameter1:parameter1:..."
-        *
         * @return string URL in the format http(s)://....
         */
-       private static function convertHref($href)
+       private static function convertHref(string $href): string
        {
-               $elements = explode(":", $href);
+               $elements = explode(':', $href);
 
-               if ((count($elements) <= 2) || ($elements[0] != "tag")) {
+               if ((count($elements) <= 2) || ($elements[0] != 'tag')) {
                        return $href;
                }
 
-               $server = explode(",", $elements[1]);
-               $conversation = explode("=", $elements[2]);
+               $server = explode(',', $elements[1]);
+               $conversation = explode('=', $elements[2]);
 
-               if ((count($elements) == 4) && ($elements[2] == "post")) {
-                       return "http://".$server[0]."/notice/".$elements[3];
+               if ((count($elements) == 4) && ($elements[2] == 'post')) {
+                       return 'http://' . $server[0] . '/notice/' . $elements[3];
                }
 
-               if ((count($conversation) != 2) || ($conversation[1] =="")) {
+               if ((count($conversation) != 2) || ($conversation[1] == '')) {
                        return $href;
                }
-               if ($elements[3] == "objectType=thread") {
-                       return "http://".$server[0]."/conversation/".$conversation[1];
-               } else {
-                       return "http://".$server[0]."/notice/".$conversation[1];
-               }
-       }
-
-       /**
-        * Cleans the body of a post if it contains picture links
-        *
-        * @param string $body The body
-        *
-        * @return string The cleaned body
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        */
-       public static function formatPicturePost($body, $uriid)
-       {
-               $siteinfo = BBCode::getAttachedData($body);
 
-               if (($siteinfo["type"] == "photo") && (!empty($siteinfo["preview"]) || !empty($siteinfo["image"]))) {
-                       if (isset($siteinfo["preview"])) {
-                               $preview = $siteinfo["preview"];
-                       } else {
-                               $preview = $siteinfo["image"];
-                       }
-
-                       // Is it a remote picture? Then make a smaller preview here
-                       $preview = Post\Link::getByLink($uriid, $preview, Proxy::SIZE_SMALL);
-
-                       // Is it a local picture? Then make it smaller here
-                       $preview = str_replace(["-0.jpg", "-0.png"], ["-2.jpg", "-2.png"], $preview);
-                       $preview = str_replace(["-1.jpg", "-1.png"], ["-2.jpg", "-2.png"], $preview);
-
-                       if (isset($siteinfo["url"])) {
-                               $url = $siteinfo["url"];
-                       } else {
-                               $url = $siteinfo["image"];
-                       }
-
-                       $body = trim($siteinfo["text"])." [url]".$url."[/url]\n[img]".$preview."[/img]";
+               if ($elements[3] == 'objectType=thread') {
+                       return 'http://' . $server[0] . '/conversation/' . $conversation[1];
+               } else {
+                       return 'http://' . $server[0] . '/notice/' . $conversation[1];
                }
-
-               return $body;
        }
 
        /**
@@ -1218,54 +983,63 @@ class OStatus
         * @param array       $owner     Contact data of the poster
         * @param string      $filter    The related feed filter (activity, posts or comments)
         *
-        * @return object header root element
+        * @return DOMElement Header root element
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function addHeader(DOMDocument $doc, array $owner, $filter)
+       private static function addHeader(DOMDocument $doc, array $owner, string $filter): DOMElement
        {
                $root = $doc->createElementNS(ActivityNamespace::ATOM1, 'feed');
                $doc->appendChild($root);
 
-               $root->setAttribute("xmlns:thr", ActivityNamespace::THREAD);
-               $root->setAttribute("xmlns:georss", ActivityNamespace::GEORSS);
-               $root->setAttribute("xmlns:activity", ActivityNamespace::ACTIVITY);
-               $root->setAttribute("xmlns:media", ActivityNamespace::MEDIA);
-               $root->setAttribute("xmlns:poco", ActivityNamespace::POCO);
-               $root->setAttribute("xmlns:ostatus", ActivityNamespace::OSTATUS);
-               $root->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET);
-               $root->setAttribute("xmlns:mastodon", ActivityNamespace::MASTODON);
+               $root->setAttribute('xmlns:thr', ActivityNamespace::THREAD);
+               $root->setAttribute('xmlns:georss', ActivityNamespace::GEORSS);
+               $root->setAttribute('xmlns:activity', ActivityNamespace::ACTIVITY);
+               $root->setAttribute('xmlns:media', ActivityNamespace::MEDIA);
+               $root->setAttribute('xmlns:poco', ActivityNamespace::POCO);
+               $root->setAttribute('xmlns:ostatus', ActivityNamespace::OSTATUS);
+               $root->setAttribute('xmlns:statusnet', ActivityNamespace::STATUSNET);
+               $root->setAttribute('xmlns:mastodon', ActivityNamespace::MASTODON);
 
                $title = '';
-               $selfUri = '/feed/' . $owner["nick"] . '/';
+               $selfUri = '/feed/' . $owner['nick'] . '/';
                switch ($filter) {
                        case 'activity':
                                $title = DI::l10n()->t('%s\'s timeline', $owner['name']);
                                $selfUri .= $filter;
                                break;
+
                        case 'posts':
                                $title = DI::l10n()->t('%s\'s posts', $owner['name']);
                                break;
+
                        case 'comments':
                                $title = DI::l10n()->t('%s\'s comments', $owner['name']);
                                $selfUri .= $filter;
                                break;
                }
 
-               $selfUri = "/dfrn_poll/" . $owner["nick"];
+               $selfUri = '/dfrn_poll/' . $owner['nick'];
 
-               $attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION];
-               XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
-               XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]);
-               XML::addElement($doc, $root, "title", $title);
-               XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename')));
-               XML::addElement($doc, $root, "logo", User::getAvatarUrl($owner, Proxy::SIZE_SMALL));
-               XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
+               $attributes = [
+                       'uri' => 'https://friendi.ca',
+                       'version' => App::VERSION . '-' . DB_UPDATE_VERSION,
+               ];
+               XML::addElement($doc, $root, 'generator', App::PLATFORM, $attributes);
+               XML::addElement($doc, $root, 'id', DI::baseUrl() . '/profile/' . $owner['nick']);
+               XML::addElement($doc, $root, 'title', $title);
+               XML::addElement($doc, $root, 'subtitle', sprintf("Updates from %s on %s", $owner['name'], DI::config()->get('config', 'sitename')));
+               XML::addElement($doc, $root, 'logo', User::getAvatarUrl($owner, Proxy::SIZE_SMALL));
+               XML::addElement($doc, $root, 'updated', DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
                $author = self::addAuthor($doc, $owner, true);
                $root->appendChild($author);
 
-               $attributes = ["href" => $owner["url"], "rel" => "alternate", "type" => "text/html"];
-               XML::addElement($doc, $root, "link", "", $attributes);
+               $attributes = [
+                       'href' => $owner['url'],
+                       'rel' => 'alternate',
+                       'type' => 'text/html',
+               ];
+               XML::addElement($doc, $root, 'link', '', $attributes);
 
                /// @TODO We have to find out what this is
                /// $attributes = array("href" => DI::baseUrl()."/sup",
@@ -1273,25 +1047,30 @@ class OStatus
                ///             "type" => "application/json");
                /// XML::addElement($doc, $root, "link", "", $attributes);
 
-               self::hublinks($doc, $root, $owner["nick"]);
+               self::addHubLink($doc, $root, $owner['nick']);
 
-               $attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "salmon"];
-               XML::addElement($doc, $root, "link", "", $attributes);
+               $attributes = ['href' => DI::baseUrl() . '/salmon/' . $owner['nick'], 'rel' => 'salmon'];
+               XML::addElement($doc, $root, 'link', '', $attributes);
 
-               $attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies"];
-               XML::addElement($doc, $root, "link", "", $attributes);
+               $attributes = ['href' => DI::baseUrl() . '/salmon/' . $owner['nick'], 'rel' => 'http://salmon-protocol.org/ns/salmon-replies'];
+               XML::addElement($doc, $root, 'link', '', $attributes);
 
-               $attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"];
-               XML::addElement($doc, $root, "link", "", $attributes);
+               $attributes = ['href' => DI::baseUrl() . '/salmon/' . $owner['nick'], 'rel' => 'http://salmon-protocol.org/ns/salmon-mention'];
+               XML::addElement($doc, $root, 'link', '', $attributes);
 
-               $attributes = ["href" => DI::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"];
-               XML::addElement($doc, $root, "link", "", $attributes);
+               $attributes = ['href' => DI::baseUrl() . $selfUri, 'rel' => 'self', 'type' => 'application/atom+xml'];
+               XML::addElement($doc, $root, 'link', '', $attributes);
 
                if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
-                       $condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false,
-                                       'archive' => false, 'hidden' => false, 'blocked' => false];
-                       $members = DBA::count('contact', $condition);
-                       XML::addElement($doc, $root, "statusnet:group_info", "", ["member_count" => $members]);
+                       $members = DBA::count('contact', [
+                               'uid'     => $owner['uid'],
+                               'self'    => false,
+                               'pending' => false,
+                               'archive' => false,
+                               'hidden'  => false,
+                               'blocked' => false,
+                       ]);
+                       XML::addElement($doc, $root, 'statusnet:group_info', '', ['member_count' => $members]);
                }
 
                return $root;
@@ -1301,69 +1080,29 @@ class OStatus
         * Add the link to the push hubs to the XML document
         *
         * @param DOMDocument $doc  XML document
-        * @param object      $root XML root element where the hub links are added
-        * @param object      $nick nick
+        * @param DOMElement  $root XML root element where the hub links are added
+        * @param string      $nick Nickname
         * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function hublinks(DOMDocument $doc, $root, $nick)
+       public static function addHubLink(DOMDocument $doc, DOMElement $root, string $nick)
        {
-               $h = DI::baseUrl() . '/pubsubhubbub/'.$nick;
-               XML::addElement($doc, $root, "link", "", ["href" => $h, "rel" => "hub"]);
+               $h = DI::baseUrl() . '/pubsubhubbub/' . $nick;
+               XML::addElement($doc, $root, 'link', '', ['href' => $h, 'rel' => 'hub']);
        }
 
        /**
         * Adds attachment data to the XML document
         *
         * @param DOMDocument $doc  XML document
-        * @param object      $root XML root element where the hub links are added
+        * @param DOMElement  $root XML root element where the hub links are added
         * @param array       $item Data of the item that is to be posted
         * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function getAttachment(DOMDocument $doc, $root, $item)
+       public static function getAttachment(DOMDocument $doc, DOMElement $root, array $item)
        {
-               $siteinfo = BBCode::getAttachedData($item["body"]);
-
-               switch ($siteinfo["type"]) {
-                       case 'photo':
-                               if (!empty($siteinfo["image"])) {
-                                       $imgdata = Images::getInfoFromURLCached($siteinfo["image"]);
-                                       if ($imgdata) {
-                                               $attributes = ["rel" => "enclosure",
-                                                               "href" => $siteinfo["image"],
-                                                               "type" => $imgdata["mime"],
-                                                               "length" => intval($imgdata["size"])];
-                                               XML::addElement($doc, $root, "link", "", $attributes);
-                                       }
-                               }
-                               break;
-                       case 'video':
-                               $attributes = ["rel" => "enclosure",
-                                               "href" => $siteinfo["url"],
-                                               "type" => "text/html; charset=UTF-8",
-                                               "length" => "0",
-                                               "title" => ($siteinfo["title"] ?? '') ?: $siteinfo["url"],
-                               ];
-                               XML::addElement($doc, $root, "link", "", $attributes);
-                               break;
-                       default:
-                               break;
-               }
-
-               if (!DI::config()->get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
-                       $imgdata = Images::getInfoFromURLCached($siteinfo["image"]);
-                       if ($imgdata) {
-                               $attributes = ["rel" => "enclosure",
-                                               "href" => $siteinfo["image"],
-                                               "type" => $imgdata["mime"],
-                                               "length" => intval($imgdata["size"])];
-
-                               XML::addElement($doc, $root, "link", "", $attributes);
-                       }
-               }
-
-               foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
+               foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO, Post\Media::DOCUMENT, Post\Media::TORRENT]) as $attachment) {
                        $attributes = ['rel' => 'enclosure',
                                'href' => $attachment['url'],
                                'type' => $attachment['mimetype']];
@@ -1385,75 +1124,80 @@ class OStatus
         * @param DOMDocument $doc          XML document
         * @param array       $owner        Contact data of the poster
         * @param bool        $show_profile Whether to show profile
-        *
-        * @return \DOMElement author element
+        * @return DOMElement Author element
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true)
+       private static function addAuthor(DOMDocument $doc, array $owner, bool $show_profile = true): DOMElement
        {
                $profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid']]);
-               $author = $doc->createElement("author");
-               XML::addElement($doc, $author, "id", $owner["url"]);
+               $author = $doc->createElement('author');
+               XML::addElement($doc, $author, 'id', $owner['url']);
                if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
-                       XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::GROUP);
+                       XML::addElement($doc, $author, 'activity:object-type', Activity\ObjectType::GROUP);
                } else {
-                       XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::PERSON);
+                       XML::addElement($doc, $author, 'activity:object-type', Activity\ObjectType::PERSON);
                }
 
-               XML::addElement($doc, $author, "uri", $owner["url"]);
-               XML::addElement($doc, $author, "name", $owner["nick"]);
-               XML::addElement($doc, $author, "email", $owner["addr"]);
+               XML::addElement($doc, $author, 'uri', $owner['url']);
+               XML::addElement($doc, $author, 'name', $owner['nick']);
+               XML::addElement($doc, $author, 'email', $owner['addr']);
                if ($show_profile) {
-                       XML::addElement($doc, $author, "summary", BBCode::convertForUriId($owner['uri-id'], $owner["about"], BBCode::OSTATUS));
+                       XML::addElement($doc, $author, 'summary', BBCode::convertForUriId($owner['uri-id'], $owner['about'], BBCode::OSTATUS));
                }
 
-               $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $owner["url"]];
-               XML::addElement($doc, $author, "link", "", $attributes);
+               $attributes = [
+                       'rel' => 'alternate',
+                       'type' => 'text/html',
+                       'href' => $owner['url'],
+               ];
+               XML::addElement($doc, $author, 'link', '', $attributes);
 
                $attributes = [
-                               "rel" => "avatar",
-                               "type" => "image/jpeg", // To-Do?
-                               "media:width" => Proxy::PIXEL_SMALL,
-                               "media:height" => Proxy::PIXEL_SMALL,
-                               "href" => User::getAvatarUrl($owner, Proxy::SIZE_SMALL)];
-               XML::addElement($doc, $author, "link", "", $attributes);
-
-               if (isset($owner["thumb"])) {
+                       'rel' => 'avatar',
+                       'type' => 'image/jpeg', // To-Do?
+                       'media:width' => Proxy::PIXEL_SMALL,
+                       'media:height' => Proxy::PIXEL_SMALL,
+                       'href' => User::getAvatarUrl($owner, Proxy::SIZE_SMALL),
+               ];
+               XML::addElement($doc, $author, 'link', '', $attributes);
+
+               if (isset($owner['thumb'])) {
                        $attributes = [
-                                       "rel" => "avatar",
-                                       "type" => "image/jpeg", // To-Do?
-                                       "media:width" => Proxy::PIXEL_THUMB,
-                                       "media:height" => Proxy::PIXEL_THUMB,
-                                       "href" => User::getAvatarUrl($owner, Proxy::SIZE_THUMB)];
-                       XML::addElement($doc, $author, "link", "", $attributes);
+                               'rel' => 'avatar',
+                               'type' => 'image/jpeg', // To-Do?
+                               'media:width' => Proxy::PIXEL_THUMB,
+                               'media:height' => Proxy::PIXEL_THUMB,
+                               'href' => User::getAvatarUrl($owner, Proxy::SIZE_THUMB),
+                       ];
+                       XML::addElement($doc, $author, 'link', '', $attributes);
                }
 
-               XML::addElement($doc, $author, "poco:preferredUsername", $owner["nick"]);
-               XML::addElement($doc, $author, "poco:displayName", $owner["name"]);
+               XML::addElement($doc, $author, 'poco:preferredUsername', $owner['nick']);
+               XML::addElement($doc, $author, 'poco:displayName', $owner['name']);
                if ($show_profile) {
-                       XML::addElement($doc, $author, "poco:note", BBCode::convertForUriId($owner['uri-id'], $owner["about"], BBCode::OSTATUS));
+                       XML::addElement($doc, $author, 'poco:note', BBCode::convertForUriId($owner['uri-id'], $owner['about'], BBCode::OSTATUS));
 
-                       if (trim($owner["location"]) != "") {
-                               $element = $doc->createElement("poco:address");
-                               XML::addElement($doc, $element, "poco:formatted", $owner["location"]);
+                       if (trim($owner['location']) != '') {
+                               $element = $doc->createElement('poco:address');
+                               XML::addElement($doc, $element, 'poco:formatted', $owner['location']);
                                $author->appendChild($element);
                        }
                }
 
                if (DBA::isResult($profile) && !$show_profile) {
-                       if (trim($profile["homepage"]) != "") {
-                               $urls = $doc->createElement("poco:urls");
-                               XML::addElement($doc, $urls, "poco:type", "homepage");
-                               XML::addElement($doc, $urls, "poco:value", $profile["homepage"]);
-                               XML::addElement($doc, $urls, "poco:primary", "true");
+                       if (trim($profile['homepage']) != '') {
+                               $urls = $doc->createElement('poco:urls');
+                               XML::addElement($doc, $urls, 'poco:type', 'homepage');
+                               XML::addElement($doc, $urls, 'poco:value', $profile['homepage']);
+                               XML::addElement($doc, $urls, 'poco:primary', 'true');
                                $author->appendChild($urls);
                        }
 
-                       XML::addElement($doc, $author, "followers", "", ["url" => DI::baseUrl() . "/profile/" . $owner["nick"] . "/contacts/followers"]);
-                       XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]);
+                       XML::addElement($doc, $author, 'followers', '', ['url' => DI::baseUrl() . '/profile/' . $owner['nick'] . '/contacts/followers']);
+                       XML::addElement($doc, $author, 'statusnet:profile_info', '', ['local_id' => $owner['uid']]);
 
-                       if ($profile["publish"]) {
-                               XML::addElement($doc, $author, "mastodon:scope", "public");
+                       if ($profile['publish']) {
+                               XML::addElement($doc, $author, 'mastodon:scope', 'public');
                        }
                }
 
@@ -1470,10 +1214,9 @@ class OStatus
         * Returns the given activity if present - otherwise returns the "post" activity
         *
         * @param array $item Data of the item that is to be posted
-        *
         * @return string activity
         */
-       public static function constructVerb(array $item)
+       public static function constructVerb(array $item): string
        {
                if (!empty($item['verb'])) {
                        return $item['verb'];
@@ -1486,10 +1229,9 @@ class OStatus
         * Returns the given object type if present - otherwise returns the "note" object type
         *
         * @param array $item Data of the item that is to be posted
-        *
         * @return string Object type
         */
-       private static function constructObjecttype(array $item)
+       private static function constructObjecttype(array $item): string
        {
                if (!empty($item['object-type']) && in_array($item['object-type'], [Activity\ObjectType::NOTE, Activity\ObjectType::COMMENT])) {
                        return $item['object-type'];
@@ -1506,15 +1248,15 @@ class OStatus
         * @param array       $owner     Contact data of the poster
         * @param bool        $toplevel  optional default false
         *
-        * @return \DOMElement Entry element
+        * @return DOMElement Entry element
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false)
+       private static function entry(DOMDocument $doc, array $item, array $owner, bool $toplevel = false): DOMElement
        {
-               if ($item["verb"] == Activity::LIKE) {
+               if ($item['verb'] == Activity::LIKE) {
                        return self::likeEntry($doc, $item, $owner, $toplevel);
-               } elseif (in_array($item["verb"], [Activity::FOLLOW, Activity::O_UNFOLLOW])) {
+               } elseif (in_array($item['verb'], [Activity::FOLLOW, Activity::O_UNFOLLOW])) {
                        return self::followEntry($doc, $item, $owner, $toplevel);
                } else {
                        return self::noteEntry($doc, $item, $owner, $toplevel);
@@ -1528,29 +1270,28 @@ class OStatus
         * @param array       $item     Data of the item that is to be posted
         * @param array       $owner    Contact data of the poster
         * @param bool        $toplevel Is it for en entry element (false) or a feed entry (true)?
-        *
-        * @return \DOMElement Entry element with "like"
+        * @return DOMElement Entry element with "like"
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function likeEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
+       private static function likeEntry(DOMDocument $doc, array $item, array $owner, bool $toplevel): DOMElement
        {
-               if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
-                       Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
+               if (($item['gravity'] != Item::GRAVITY_PARENT) && (Strings::normaliseLink($item['author-link']) != Strings::normaliseLink($owner['url']))) {
+                       Logger::info('OStatus entry is from author ' . $owner['url'] . ' - not from ' . $item['author-link'] . '. Quitting.');
                }
 
                $entry = self::entryHeader($doc, $owner, $item, $toplevel);
 
-               $verb = ActivityNamespace::ACTIVITY_SCHEMA . "favorite";
-               self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false);
+               $verb = ActivityNamespace::ACTIVITY_SCHEMA . 'favorite';
+               self::entryContent($doc, $entry, $item, $owner, 'Favorite', $verb, false);
 
-               $parent = Post::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);
+               $parent = Post::selectFirst([], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
                if (DBA::isResult($parent)) {
-                       $as_object = $doc->createElement("activity:object");
+                       $as_object = $doc->createElement('activity:object');
 
-                       XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
+                       XML::addElement($doc, $as_object, 'activity:object-type', self::constructObjecttype($parent));
 
-                       self::entryContent($doc, $as_object, $parent, $owner, "New entry");
+                       self::entryContent($doc, $as_object, $parent, $owner, 'New entry');
 
                        $entry->appendChild($as_object);
                }
@@ -1566,39 +1307,42 @@ class OStatus
         * @param DOMDocument $doc     XML document
         * @param array       $owner   Contact data of the poster
         * @param array       $contact Contact data of the target
-        *
-        * @return object author element
+        * @return DOMElement author element
         */
-       private static function addPersonObject(DOMDocument $doc, array $owner, array $contact)
+       private static function addPersonObject(DOMDocument $doc, array $owner, array $contact): DOMElement
        {
-               $object = $doc->createElement("activity:object");
-               XML::addElement($doc, $object, "activity:object-type", Activity\ObjectType::PERSON);
+               $object = $doc->createElement('activity:object');
+               XML::addElement($doc, $object, 'activity:object-type', Activity\ObjectType::PERSON);
 
                if ($contact['network'] == Protocol::PHANTOM) {
-                       XML::addElement($doc, $object, "id", $contact['url']);
+                       XML::addElement($doc, $object, 'id', $contact['url']);
                        return $object;
                }
 
-               XML::addElement($doc, $object, "id", $contact["alias"]);
-               XML::addElement($doc, $object, "title", $contact["nick"]);
+               XML::addElement($doc, $object, 'id', $contact['alias']);
+               XML::addElement($doc, $object, 'title', $contact['nick']);
 
-               $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $contact["url"]];
-               XML::addElement($doc, $object, "link", "", $attributes);
+               XML::addElement($doc, $object, 'link', '', [
+                       'rel' => 'alternate',
+                       'type' => 'text/html',
+                       'href' => $contact['url'],
+               ]);
 
                $attributes = [
-                               "rel" => "avatar",
-                               "type" => "image/jpeg", // To-Do?
-                               "media:width" => 300,
-                               "media:height" => 300,
-                               "href" => $contact["photo"]];
-               XML::addElement($doc, $object, "link", "", $attributes);
-
-               XML::addElement($doc, $object, "poco:preferredUsername", $contact["nick"]);
-               XML::addElement($doc, $object, "poco:displayName", $contact["name"]);
-
-               if (trim($contact["location"]) != "") {
-                       $element = $doc->createElement("poco:address");
-                       XML::addElement($doc, $element, "poco:formatted", $contact["location"]);
+                       'rel' => 'avatar',
+                       'type' => 'image/jpeg', // To-Do?
+                       'media:width' => 300,
+                       'media:height' => 300,
+                       'href' => $contact['photo'],
+               ];
+               XML::addElement($doc, $object, 'link', '', $attributes);
+
+               XML::addElement($doc, $object, 'poco:preferredUsername', $contact['nick']);
+               XML::addElement($doc, $object, 'poco:displayName', $contact['name']);
+
+               if (trim($contact['location']) != '') {
+                       $element = $doc->createElement('poco:address');
+                       XML::addElement($doc, $element, 'poco:formatted', $contact['location']);
                        $object->appendChild($element);
                }
 
@@ -1612,16 +1356,15 @@ class OStatus
         * @param array       $item     Data of the follow/unfollow message
         * @param array       $owner    Contact data of the poster
         * @param bool        $toplevel Is it for en entry element (false) or a feed entry (true)?
-        *
-        * @return \DOMElement Entry element
+        * @return DOMElement Entry element
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function followEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
+       private static function followEntry(DOMDocument $doc, array $item, array $owner, bool $toplevel): DOMElement
        {
-               $item["id"] = $item['parent'] = 0;
-               $item["created"] = $item["edited"] = date("c");
-               $item["private"] = Item::PRIVATE;
+               $item['id'] = $item['parent'] = 0;
+               $item['created'] = $item['edited'] = date('c');
+               $item['private'] = Item::PRIVATE;
 
                $contact = Contact::getByURL($item['follow']);
                $item['follow'] = $contact['url'];
@@ -1632,7 +1375,7 @@ class OStatus
                        $contact['alias'] = $contact['url'];
                }
 
-               $condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($contact["url"])];
+               $condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($contact['url'])];
                $user_contact = DBA::selectFirst('contact', ['id'], $condition);
 
                if (DBA::isResult($user_contact)) {
@@ -1644,19 +1387,19 @@ class OStatus
                if ($item['verb'] == Activity::FOLLOW) {
                        $message = DI::l10n()->t('%s is now following %s.');
                        $title = DI::l10n()->t('following');
-                       $action = "subscription";
+                       $action = 'subscription';
                } else {
                        $message = DI::l10n()->t('%s stopped following %s.');
                        $title = DI::l10n()->t('stopped following');
-                       $action = "unfollow";
+                       $action = 'unfollow';
                }
 
-               $item["uri"] = $item['parent-uri'] = $item['thr-parent']
+               $item['uri'] = $item['parent-uri'] = $item['thr-parent']
                                = 'tag:' . DI::baseUrl()->getHostname().
                                ','.date('Y-m-d').':'.$action.':'.$owner['uid'].
                                ':person:'.$connect_id.':'.$item['created'];
 
-               $item["body"] = sprintf($message, $owner["nick"], $contact["nick"]);
+               $item['body'] = sprintf($message, $owner['nick'], $contact['nick']);
 
                $entry = self::entryHeader($doc, $owner, $item, $toplevel);
 
@@ -1677,30 +1420,29 @@ class OStatus
         * @param array       $item      Data of the item that is to be posted
         * @param array       $owner     Contact data of the poster
         * @param bool        $toplevel  Is it for en entry element (false) or a feed entry (true)?
-        *
-        * @return \DOMElement Entry element
+        * @return DOMElement Entry element
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
+       private static function noteEntry(DOMDocument $doc, array $item, array $owner, bool $toplevel): DOMElement
        {
-               if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
-                       Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
+               if (($item['gravity'] != Item::GRAVITY_PARENT) && (Strings::normaliseLink($item['author-link']) != Strings::normaliseLink($owner['url']))) {
+                       Logger::info('OStatus entry is from author ' . $owner['url'] . ' - not from ' . $item['author-link'] . '. Quitting.');
                }
 
                if (!$toplevel) {
                        if (!empty($item['title'])) {
                                $title = BBCode::convertForUriId($item['uri-id'], $item['title'], BBCode::OSTATUS);
                        } else {
-                               $title = sprintf("New note by %s", $owner["nick"]);
+                               $title = sprintf('New note by %s', $owner['nick']);
                        }
                } else {
-                       $title = sprintf("New comment by %s", $owner["nick"]);
+                       $title = sprintf('New comment by %s', $owner['nick']);
                }
 
                $entry = self::entryHeader($doc, $owner, $item, $toplevel);
 
-               XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::NOTE);
+               XML::addElement($doc, $entry, 'activity:object-type', Activity\ObjectType::NOTE);
 
                self::entryContent($doc, $entry, $item, $owner, $title, '', true);
 
@@ -1716,32 +1458,32 @@ class OStatus
         * @param array       $owner    Contact data of the poster
         * @param array       $item
         * @param bool        $toplevel Is it for en entry element (false) or a feed entry (true)?
-        *
-        * @return \DOMElement The entry element where the elements are added
+        * @return DOMElement The entry element where the elements are added
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function entryHeader(DOMDocument $doc, array $owner, array $item, $toplevel)
+       public static function entryHeader(DOMDocument $doc, array $owner, array $item, bool $toplevel): DOMElement
        {
                if (!$toplevel) {
-                       $entry = $doc->createElement("entry");
+                       $entry = $doc->createElement('entry');
 
                        if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
                                $contact = Contact::getByURL($item['author-link']) ?: $owner;
+                               $contact['nickname'] = $contact['nickname'] ?? $contact['nick'];
                                $author = self::addAuthor($doc, $contact, false);
                                $entry->appendChild($author);
                        }
                } else {
-                       $entry = $doc->createElementNS(ActivityNamespace::ATOM1, "entry");
+                       $entry = $doc->createElementNS(ActivityNamespace::ATOM1, 'entry');
 
-                       $entry->setAttribute("xmlns:thr", ActivityNamespace::THREAD);
-                       $entry->setAttribute("xmlns:georss", ActivityNamespace::GEORSS);
-                       $entry->setAttribute("xmlns:activity", ActivityNamespace::ACTIVITY);
-                       $entry->setAttribute("xmlns:media", ActivityNamespace::MEDIA);
-                       $entry->setAttribute("xmlns:poco", ActivityNamespace::POCO);
-                       $entry->setAttribute("xmlns:ostatus", ActivityNamespace::OSTATUS);
-                       $entry->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET);
-                       $entry->setAttribute("xmlns:mastodon", ActivityNamespace::MASTODON);
+                       $entry->setAttribute('xmlns:thr', ActivityNamespace::THREAD);
+                       $entry->setAttribute('xmlns:georss', ActivityNamespace::GEORSS);
+                       $entry->setAttribute('xmlns:activity', ActivityNamespace::ACTIVITY);
+                       $entry->setAttribute('xmlns:media', ActivityNamespace::MEDIA);
+                       $entry->setAttribute('xmlns:poco', ActivityNamespace::POCO);
+                       $entry->setAttribute('xmlns:ostatus', ActivityNamespace::OSTATUS);
+                       $entry->setAttribute('xmlns:statusnet', ActivityNamespace::STATUSNET);
+                       $entry->setAttribute('xmlns:mastodon', ActivityNamespace::MASTODON);
 
                        $author = self::addAuthor($doc, $owner);
                        $entry->appendChild($author);
@@ -1754,7 +1496,7 @@ class OStatus
         * Adds elements to the XML document
         *
         * @param DOMDocument $doc       XML document
-        * @param \DOMElement $entry     Entry element where the content is added
+        * @param DOMElement  $entry     Entry element where the content is added
         * @param array       $item      Data of the item that is to be posted
         * @param array       $owner     Contact data of the poster
         * @param string      $title     Title for the post
@@ -1763,38 +1505,39 @@ class OStatus
         * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, array $owner, $title, $verb = "", $complete = true)
+       private static function entryContent(DOMDocument $doc, DOMElement $entry, array $item, array $owner, string $title, string $verb = '', bool $complete = true)
        {
-               if ($verb == "") {
+               if ($verb == '') {
                        $verb = self::constructVerb($item);
                }
 
-               XML::addElement($doc, $entry, "id", $item["uri"]);
-               XML::addElement($doc, $entry, "title", html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
+               XML::addElement($doc, $entry, 'id', $item['uri']);
+               XML::addElement($doc, $entry, 'title', html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
 
-               $body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
-               $body = self::formatPicturePost($body, $item['uri-id']);
+               $body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
 
                if (!empty($item['title'])) {
-                       $body = "[b]".$item['title']."[/b]\n\n".$body;
+                       $body = '[b]' . $item['title'] . "[/b]\n\n" . $body;
                }
 
                $body = BBCode::convertForUriId($item['uri-id'], $body, BBCode::OSTATUS);
 
-               XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);
+               XML::addElement($doc, $entry, 'content', $body, ['type' => 'html']);
 
-               XML::addElement($doc, $entry, "link", "", ["rel" => "alternate", "type" => "text/html",
-                                                               "href" => DI::baseUrl()."/display/".$item["guid"]]
-               );
+               XML::addElement($doc, $entry, 'link', '', [
+                       'rel' => 'alternate',
+                       'type' => 'text/html',
+                       'href' => DI::baseUrl() . '/display/' . $item['guid'],
+               ]);
 
-               if ($complete && ($item["id"] > 0)) {
-                       XML::addElement($doc, $entry, "status_net", "", ["notice_id" => $item["id"]]);
+               if ($complete && ($item['id'] > 0)) {
+                       XML::addElement($doc, $entry, 'status_net', '', ['notice_id' => $item['id']]);
                }
 
-               XML::addElement($doc, $entry, "activity:verb", $verb);
+               XML::addElement($doc, $entry, 'activity:verb', $verb);
 
-               XML::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM));
-               XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM));
+               XML::addElement($doc, $entry, 'published', DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM));
+               XML::addElement($doc, $entry, 'updated', DateTimeFormat::utc($item['edited'] . '+00:00', DateTimeFormat::ATOM));
        }
 
        /**
@@ -1808,11 +1551,11 @@ class OStatus
         * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true)
+       private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, bool $complete = true)
        {
                $mentioned = [];
 
-               if ($item['gravity'] != GRAVITY_PARENT) {
+               if ($item['gravity'] != Item::GRAVITY_PARENT) {
                        $parent = Post::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
 
                        $thrparent = Post::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner['uid'], 'uri' => $item['thr-parent']]);
@@ -1843,28 +1586,17 @@ class OStatus
                }
 
                if (intval($item['parent']) > 0) {
-                       $conversation_href = $conversation_uri = str_replace('/objects/', '/context/', $item['thr-parent']);
-
-                       if (isset($parent_item)) {
-                               $conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);
-                               if (DBA::isResult($conversation)) {
-                                       if ($conversation['conversation-uri'] != '') {
-                                               $conversation_uri = $conversation['conversation-uri'];
-                                       }
-                                       if ($conversation['conversation-href'] != '') {
-                                               $conversation_href = $conversation['conversation-href'];
-                                       }
-                               }
-                       }
+                       $conversation_href = $conversation_uri = $item['conversation'];
 
-                       XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:conversation", "href" => $conversation_href]);
+                       XML::addElement($doc, $entry, 'link', '', ['rel' => 'ostatus:conversation', 'href' => $conversation_href]);
 
                        $attributes = [
-                                       "href" => $conversation_href,
-                                       "local_id" => $item['parent'],
-                                       "ref" => $conversation_uri];
+                               'href' => $conversation_href,
+                               'local_id' => $item['parent'],
+                               'ref' => $conversation_uri,
+                       ];
 
-                       XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
+                       XML::addElement($doc, $entry, 'ostatus:conversation', $conversation_uri, $attributes);
                }
 
                // uri-id isn't present for follow entry pseudo-items
@@ -1876,72 +1608,70 @@ class OStatus
                // Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)
                $newmentions = [];
                foreach ($mentioned as $mention) {
-                       $newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention);
-                       $newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention);
+                       $newmentions[str_replace('http://', 'https://', $mention)] = str_replace('http://', 'https://', $mention);
+                       $newmentions[str_replace('https://', 'http://', $mention)] = str_replace('https://', 'http://', $mention);
                }
                $mentioned = $newmentions;
 
                foreach ($mentioned as $mention) {
                        $contact = Contact::getByURL($mention, false, ['contact-type']);
                        if (!empty($contact) && ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
-                               XML::addElement($doc, $entry, "link", "",
-                                       [
-                                               "rel" => "mentioned",
-                                               "ostatus:object-type" => Activity\ObjectType::GROUP,
-                                               "href" => $mention]
-                               );
+                               XML::addElement($doc, $entry, 'link', '', [
+                                       'rel' => 'mentioned',
+                                       'ostatus:object-type' => Activity\ObjectType::GROUP,
+                                       'href' => $mention,
+                               ]);
                        } else {
-                               XML::addElement($doc, $entry, "link", "",
-                                       [
-                                               "rel" => "mentioned",
-                                               "ostatus:object-type" => Activity\ObjectType::PERSON,
-                                               "href" => $mention]
-                               );
+                               XML::addElement($doc, $entry, 'link', '', [
+                                       'rel' => 'mentioned',
+                                       'ostatus:object-type' => Activity\ObjectType::PERSON,
+                                               'href' => $mention,
+                               ]);
                        }
                }
 
                if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
-                       XML::addElement($doc, $entry, "link", "", [
-                               "rel" => "mentioned",
-                               "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
-                               "href" => $owner['url']
+                       XML::addElement($doc, $entry, 'link', '', [
+                               'rel' => 'mentioned',
+                               'ostatus:object-type' => 'http://activitystrea.ms/schema/1.0/group',
+                               'href' => $owner['url']
                        ]);
                }
 
                if ($item['private'] != Item::PRIVATE) {
-                       XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention",
-                                                                       "href" => "http://activityschema.org/collection/public"]);
-                       XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
-                                                                       "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/collection",
-                                                                       "href" => "http://activityschema.org/collection/public"]);
-                       XML::addElement($doc, $entry, "mastodon:scope", "public");
+                       XML::addElement($doc, $entry, 'link', '', ['rel' => 'ostatus:attention',
+                                                                       'href' => 'http://activityschema.org/collection/public']);
+                       XML::addElement($doc, $entry, 'link', '', ['rel' => 'mentioned',
+                                                                       'ostatus:object-type' => 'http://activitystrea.ms/schema/1.0/collection',
+                                                                       'href' => 'http://activityschema.org/collection/public']);
+                       XML::addElement($doc, $entry, 'mastodon:scope', 'public');
                }
 
                foreach ($tags as $tag) {
                        if ($tag['type'] == Tag::HASHTAG) {
-                               XML::addElement($doc, $entry, "category", "", ["term" => $tag['name']]);
+                               XML::addElement($doc, $entry, 'category', '', ['term' => $tag['name']]);
                        }
                }
 
                self::getAttachment($doc, $entry, $item);
 
-               if ($complete && ($item["id"] > 0)) {
-                       $app = $item["app"];
-                       if ($app == "") {
-                               $app = "web";
+               if ($complete && ($item['id'] > 0)) {
+                       $app = $item['app'];
+                       if ($app == '') {
+                               $app = 'web';
                        }
 
-                       $attributes = ["local_id" => $item["id"], "source" => $app];
+                       $attributes = ['local_id' => $item['id'], 'source' => $app];
 
-                       if (isset($parent["id"])) {
-                               $attributes["repeat_of"] = $parent["id"];
+                       if (isset($parent['id'])) {
+                               $attributes['repeat_of'] = $parent['id'];
                        }
 
-                       if ($item["coord"] != "") {
-                               XML::addElement($doc, $entry, "georss:point", $item["coord"]);
+                       if ($item['coord'] != '') {
+                               XML::addElement($doc, $entry, 'georss:point', $item['coord']);
                        }
 
-                       XML::addElement($doc, $entry, "statusnet:notice_info", "", $attributes);
+                       XML::addElement($doc, $entry, 'statusnet:notice_info', '', $attributes);
                }
        }
 
@@ -1957,25 +1687,24 @@ class OStatus
         * cache or it is empty
         *
         * @param string  $owner_nick  Nickname of the feed owner
-        * @param string  $last_update Date of the last update
+        * @param string  $last_update Date of the last update (in "Y-m-d H:i:s" format)
         * @param integer $max_items   Number of maximum items to fetch
         * @param string  $filter      Feed items filter (activity, posts or comments)
         * @param boolean $nocache     Wether to bypass caching
-        *
-        * @return string XML feed
+        * @return string XML feed or empty string on error
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false)
+       public static function feed(string $owner_nick, string &$last_update, int $max_items = 300, string $filter = 'activity', bool $nocache = false): string
        {
                $stamp = microtime(true);
 
                $owner = User::getOwnerDataByNick($owner_nick);
                if (!$owner) {
-                       return;
+                       return '';
                }
 
-               $cachekey = "ostatus:feed:" . $owner_nick . ":" . $filter . ":" . $last_update;
+               $cachekey = 'ostatus:feed:' . $owner_nick . ':' . $filter . ':' . $last_update;
 
                $previous_created = $last_update;
 
@@ -1983,7 +1712,7 @@ class OStatus
                if ((time() - strtotime($owner['last-item'])) < 15*60) {
                        $result = DI::cache()->get($cachekey);
                        if (!$nocache && !is_null($result)) {
-                               Logger::log('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', Logger::DEBUG);
+                               Logger::info('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)');
                                $last_update = $result['last_update'];
                                return $result['feed'];
                        }
@@ -1994,11 +1723,16 @@ class OStatus
                }
 
                $check_date = DateTimeFormat::utc($last_update);
-               $authorid = Contact::getIdForURL($owner["url"]);
+               $authorid = Contact::getIdForURL($owner['url']);
 
-               $condition = ["`uid` = ? AND `received` > ? AND NOT `deleted`
-                       AND `private` != ? AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
-                       $owner["uid"], $check_date, Item::PRIVATE, Protocol::OSTATUS, Protocol::DFRN];
+               $condition = [
+                       "`uid` = ? AND `received` > ? AND NOT `deleted` AND `private` != ? AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
+                       $owner['uid'],
+                       $check_date,
+                       Item::PRIVATE,
+                       Protocol::OSTATUS,
+                       Protocol::DFRN,
+               ];
 
                if ($filter === 'comments') {
                        $condition[0] .= " AND `object-type` = ? ";
@@ -2007,7 +1741,7 @@ class OStatus
 
                if ($owner['contact-type'] != Contact::TYPE_COMMUNITY) {
                        $condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
-                       $condition[] = $owner["id"];
+                       $condition[] = $owner['id'];
                        $condition[] = $authorid;
                }
 
@@ -2031,7 +1765,7 @@ class OStatus
                                $item['body'] .= '🍼';
                        }
 
-                       if (in_array($item["verb"], [Activity::FOLLOW, Activity::O_UNFOLLOW, Activity::LIKE])) {
+                       if (in_array($item['verb'], [Activity::FOLLOW, Activity::O_UNFOLLOW, Activity::LIKE])) {
                                continue;
                        }
 
@@ -2048,7 +1782,7 @@ class OStatus
                $msg = ['feed' => $feeddata, 'last_update' => $last_update];
                DI::cache()->set($cachekey, $msg, Duration::QUARTER_HOUR);
 
-               Logger::log('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created, Logger::DEBUG);
+               Logger::info('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created);
 
                return $feeddata;
        }
@@ -2063,7 +1797,7 @@ class OStatus
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function salmon(array $item, array $owner)
+       public static function salmon(array $item, array $owner): string
        {
                $doc = new DOMDocument('1.0', 'utf-8');
                $doc->formatOutput = true;
@@ -2087,7 +1821,7 @@ class OStatus
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function isSupportedByContactUrl($url)
+       public static function isSupportedByContactUrl(string $url): bool
        {
                $probe = Probe::uri($url, Protocol::OSTATUS);
                return $probe['network'] == Protocol::OSTATUS;