]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/OStatus.php
Merge pull request #7828 from nupplaphil/task/move_enotify
[friendica.git] / src / Protocol / OStatus.php
index 875880a936354640862bade57570770af2329f55..597645a8ec2bf556d6a556bb9ac258c917e61ac8 100644 (file)
@@ -11,11 +11,13 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Friendica\Core\Lock;
+use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\GContact;
@@ -23,16 +25,15 @@ use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
+use Friendica\Protocol\ActivityNamespace;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/dba.php';
-require_once 'include/items.php';
 require_once 'mod/share.php';
-require_once 'include/enotify.php';
 require_once 'include/api.php';
 
 /**
@@ -46,13 +47,15 @@ class OStatus
        /**
         * @brief Fetches author data
         *
-        * @param object $xpath     The xpath object
-        * @param object $context   The xml context of the author details
-        * @param array  $importer  user record of the importing user
-        * @param array  $contact   Called by reference, will contain the fetched contact
-        * @param bool   $onlyfetch Only fetch the header without updating the contact entries
+        * @param DOMXPath $xpath     The xpath object
+        * @param object   $context   The xml context of the author details
+        * @param array    $importer  user record of the importing user
+        * @param array    $contact   Called by reference, will contain the fetched contact
+        * @param bool     $onlyfetch Only fetch the header without updating the contact entries
         *
         * @return array Array of author related entries for the item
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact = null, $onlyfetch)
        {
@@ -73,9 +76,9 @@ class OStatus
                }
                $author["author-id"] = Contact::getIdForURL($author["author-link"]);
 
-               $author["contact-id"] = $contact["id"];
+               $author['contact-id'] = ($contact['id'] ?? 0) ?: $author['author-id'];
 
-               $contact = null;
+               $contact = [];
 
 /*
                This here would be better, but we would get problems with contacts from the statusnet addon
@@ -114,6 +117,8 @@ class OStatus
                if (DBA::isResult($contact)) {
                        if ($contact['blocked']) {
                                $contact['id'] = -1;
+                       } elseif (!empty(APContact::getByURL($contact['url'], false))) {
+                               ActivityPub\Receiver::switchContact($contact['id'], $importer['uid'], $contact['url']);
                        }
                        $author["contact-id"] = $contact["id"];
                }
@@ -232,7 +237,7 @@ class OStatus
 
                        GContact::link($gcid, $contact["uid"], $contact["id"]);
                } elseif ($contact["network"] != Protocol::DFRN) {
-                       $contact = null;
+                       $contact = [];
                }
 
                return $author;
@@ -245,6 +250,8 @@ class OStatus
         * @param array  $importer user record of the importing user
         *
         * @return array Array of author related entries for the item
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function salmonAuthor($xml, array $importer)
        {
@@ -256,14 +263,14 @@ class OStatus
                @$doc->loadXML($xml);
 
                $xpath = new DOMXPath($doc);
-               $xpath->registerNamespace('atom', NAMESPACE_ATOM1);
-               $xpath->registerNamespace('thr', NAMESPACE_THREAD);
-               $xpath->registerNamespace('georss', NAMESPACE_GEORSS);
-               $xpath->registerNamespace('activity', NAMESPACE_ACTIVITY);
-               $xpath->registerNamespace('media', NAMESPACE_MEDIA);
-               $xpath->registerNamespace('poco', NAMESPACE_POCO);
-               $xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
-               $xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
+               $xpath->registerNamespace('atom', ActivityNamespace::ATOM1);
+               $xpath->registerNamespace('thr', ActivityNamespace::THREAD);
+               $xpath->registerNamespace('georss', ActivityNamespace::GEORSS);
+               $xpath->registerNamespace('activity', ActivityNamespace::ACTIVITY);
+               $xpath->registerNamespace('media', ActivityNamespace::MEDIA);
+               $xpath->registerNamespace('poco', ActivityNamespace::POCO);
+               $xpath->registerNamespace('ostatus', ActivityNamespace::OSTATUS);
+               $xpath->registerNamespace('statusnet', ActivityNamespace::STATUSNET);
 
                $contact = ["id" => 0];
 
@@ -299,8 +306,10 @@ class OStatus
         * @param array  $contact  contact
         * @param string $hub      Called by reference, returns the fetched hub data
         * @return void
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       public static function import($xml, array $importer, array &$contact = null, &$hub)
+       public static function import($xml, array $importer, array &$contact, &$hub)
        {
                self::process($xml, $importer, $contact, $hub);
        }
@@ -316,6 +325,8 @@ class OStatus
         * @param boolean $initialize Is it the leading post so that data has to be initialized?
         *
         * @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)
        {
@@ -333,14 +344,14 @@ class OStatus
                @$doc->loadXML($xml);
 
                $xpath = new DOMXPath($doc);
-               $xpath->registerNamespace('atom', NAMESPACE_ATOM1);
-               $xpath->registerNamespace('thr', NAMESPACE_THREAD);
-               $xpath->registerNamespace('georss', NAMESPACE_GEORSS);
-               $xpath->registerNamespace('activity', NAMESPACE_ACTIVITY);
-               $xpath->registerNamespace('media', NAMESPACE_MEDIA);
-               $xpath->registerNamespace('poco', NAMESPACE_POCO);
-               $xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
-               $xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
+               $xpath->registerNamespace('atom', ActivityNamespace::ATOM1);
+               $xpath->registerNamespace('thr', ActivityNamespace::THREAD);
+               $xpath->registerNamespace('georss', ActivityNamespace::GEORSS);
+               $xpath->registerNamespace('activity', ActivityNamespace::ACTIVITY);
+               $xpath->registerNamespace('media', ActivityNamespace::MEDIA);
+               $xpath->registerNamespace('poco', ActivityNamespace::POCO);
+               $xpath->registerNamespace('ostatus', ActivityNamespace::OSTATUS);
+               $xpath->registerNamespace('statusnet', ActivityNamespace::STATUSNET);
 
                $hub = "";
                $hub_items = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0);
@@ -393,8 +404,6 @@ class OStatus
                $authordata = $xpath->query('//author')->item(0);
                $author = self::fetchAuthor($xpath, $authordata, $importer, $contact, $stored);
 
-               $entry = $xpath->query('/atom:entry');
-
                // Reverse the order of the entries
                $entrylist = [];
 
@@ -414,13 +423,6 @@ class OStatus
                                $author = self::fetchAuthor($xpath, $entry, $importer, $contact, $stored);
                        }
 
-                       $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $entry);
-                       if ($value != "") {
-                               $nickname = $value;
-                       } else {
-                               $nickname = $author["author-name"];
-                       }
-
                        $item = array_merge($header, $author);
 
                        $item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
@@ -428,12 +430,12 @@ class OStatus
                        $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"], [NAMESPACE_OSTATUS."/unfavorite", 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);
                                continue;
@@ -447,7 +449,7 @@ class OStatus
                                Logger::log('Processing post with URI '.$item["uri"].' for user '.$importer["uid"].'.', Logger::DEBUG);
                        }
 
-                       if ($item["verb"] == ACTIVITY_JOIN) {
+                       if ($item["verb"] == Activity::JOIN) {
                                // ignore "Join" messages
                                Logger::log("Ignore join message ".print_r($item, true), Logger::DEBUG);
                                continue;
@@ -459,29 +461,29 @@ class OStatus
                                continue;
                        }
 
-                       if ($item["verb"] == ACTIVITY_FOLLOW) {
-                               Contact::addRelationship($importer, $contact, $item, $nickname);
+                       if ($item["verb"] == Activity::FOLLOW) {
+                               Contact::addRelationship($importer, $contact, $item);
                                continue;
                        }
 
-                       if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
+                       if ($item["verb"] == Activity::O_UNFOLLOW) {
                                $dummy = null;
                                Contact::removeFollower($importer, $contact, $item, $dummy);
                                continue;
                        }
 
-                       if ($item["verb"] == ACTIVITY_FAVORITE) {
+                       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));
 
-                               $item["verb"] = ACTIVITY_LIKE;
+                               $item["verb"] = Activity::LIKE;
                                $item["parent-uri"] = $orig_uri;
                                $item["gravity"] = GRAVITY_ACTIVITY;
-                               $item["object-type"] = ACTIVITY_OBJ_NOTE;
+                               $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])) {
+                       if (!in_array($item["verb"], [Activity::POST, Activity::LIKE, Activity::SHARE])) {
                                Logger::log("Unhandled verb ".$item["verb"]." ".print_r($item, true), Logger::DEBUG);
                        }
 
@@ -490,10 +492,11 @@ class OStatus
                        if ($initialize && (count(self::$itemlist) > 0)) {
                                if (self::$itemlist[0]['uri'] == self::$itemlist[0]['parent-uri']) {
                                        // We will import it everytime, when it is started by our contacts
-                                       $valid = !empty(self::$itemlist[0]['contact-id']);
+                                       $valid = Contact::isSharingByURL(self::$itemlist[0]['author-link'], self::$itemlist[0]['uid']);
+
                                        if (!$valid) {
                                                // If not, then it depends on this setting
-                                               $valid = !Config::get('system', 'ostatus_full_threads');
+                                               $valid = ((self::$itemlist[0]['uid'] == 0) || !PConfig::get(self::$itemlist[0]['uid'], 'system', 'accept_only_sharer', false));
                                                if ($valid) {
                                                        Logger::log("Item with uri ".self::$itemlist[0]['uri']." will be imported due to the system settings.", Logger::DEBUG);
                                                }
@@ -503,9 +506,9 @@ class OStatus
                                        if ($valid) {
                                                // Never post a thread when the only interaction by our contact was a like
                                                $valid = false;
-                                               $verbs = [ACTIVITY_POST, ACTIVITY_SHARE];
+                                               $verbs = [Activity::POST, Activity::SHARE];
                                                foreach (self::$itemlist as $item) {
-                                                       if (!empty($item['contact-id']) && in_array($item['verb'], $verbs)) {
+                                                       if (in_array($item['verb'], $verbs) && Contact::isSharingByURL($item['author-link'], $item['uid'])) {
                                                                $valid = true;
                                                        }
                                                }
@@ -523,7 +526,6 @@ class OStatus
 
                                if ($valid) {
                                        $default_contact = 0;
-                                       $key = count(self::$itemlist);
                                        for ($key = count(self::$itemlist) - 1; $key >= 0; $key--) {
                                                if (empty(self::$itemlist[$key]['contact-id'])) {
                                                        self::$itemlist[$key]['contact-id'] = $default_contact;
@@ -559,8 +561,10 @@ class OStatus
 
        /**
         * Removes notice item from database
+        *
         * @param array $item item
         * @return void
+        * @throws \Exception
         */
        private static function deleteNotice(array $item)
        {
@@ -578,20 +582,22 @@ class OStatus
        /**
         * @brief Processes the XML for a post
         *
-        * @param object $xpath    The xpath object
-        * @param object $entry    The xml entry that is processed
-        * @param array  $item     The item array
-        * @param array  $importer user record of the importing user
+        * @param DOMXPath $xpath    The xpath object
+        * @param object   $entry    The xml entry that is processed
+        * @param array    $item     The item array
+        * @param array    $importer user record of the importing user
         * @return void
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        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_OBJ_BOOKMARK) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
+               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_OBJ_QUESTION) {
+               } elseif ($item["object-type"] == Activity\ObjectType::QUESTION) {
                        $item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
                }
 
@@ -634,15 +640,15 @@ class OStatus
                if ($categories) {
                        foreach ($categories as $category) {
                                foreach ($category->attributes as $attributes) {
-                                       if ($attributes->name == "term") {
+                                       if ($attributes->name == 'term') {
                                                $term = $attributes->textContent;
-                                               if (!empty($item["tag"])) {
-                                                       $item["tag"] .= ',';
+                                               if (!empty($item['tag'])) {
+                                                       $item['tag'] .= ',';
                                                } else {
-                                                       $item["tag"] = '';
+                                                       $item['tag'] = '';
                                                }
 
-                                               $item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]";
+                                               $item['tag'] .= '#[url=' . System::baseUrl() . '/search?tag=' . $term . ']' . $term . '[/url]';
                                        }
                                }
                        }
@@ -672,7 +678,7 @@ class OStatus
                        }
                }
                // 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'];
@@ -687,7 +693,7 @@ class OStatus
                }
 
                // 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);
@@ -728,6 +734,7 @@ class OStatus
         * @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)
        {
@@ -738,7 +745,7 @@ class OStatus
 
                self::$conv_list[$conversation] = true;
 
-               $curlResult = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
+               $curlResult = Network::curl($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
 
                if (!$curlResult->isSuccess()) {
                        return;
@@ -790,6 +797,7 @@ class OStatus
         * @param string $conversation     conversation
         * @param string $conversation_uri conversation uri
         * @return void
+        * @throws \Exception
         */
        private static function storeConversation($xml, $conversation = '', $conversation_uri = '')
        {
@@ -797,9 +805,9 @@ class OStatus
                @$doc->loadXML($xml);
 
                $xpath = new DOMXPath($doc);
-               $xpath->registerNamespace('atom', NAMESPACE_ATOM1);
-               $xpath->registerNamespace('thr', NAMESPACE_THREAD);
-               $xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
+               $xpath->registerNamespace('atom', ActivityNamespace::ATOM1);
+               $xpath->registerNamespace('thr', ActivityNamespace::THREAD);
+               $xpath->registerNamespace('ostatus', ActivityNamespace::OSTATUS);
 
                $entries = $xpath->query('/atom:feed/atom:entry');
 
@@ -873,6 +881,7 @@ class OStatus
         * @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)
        {
@@ -908,6 +917,8 @@ class OStatus
         * @param string $related_uri The related item in "uri" format
         * @param array  $importer    user record of the importing user
         * @return void
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function fetchRelated($related, $related_uri, $importer)
        {
@@ -927,7 +938,7 @@ class OStatus
                }
 
                $stored = false;
-               $curlResult = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
+               $curlResult = Network::curl($related, false, ['accept_content' => 'application/atom+xml, text/html']);
 
                if (!$curlResult->isSuccess()) {
                        return;
@@ -1011,12 +1022,14 @@ class OStatus
        /**
         * @brief Processes the XML for a repeated post
         *
-        * @param object $xpath    The xpath object
-        * @param object $entry    The xml entry that is processed
-        * @param array  $item     The item array
-        * @param array  $importer user record of the importing user
+        * @param DOMXPath $xpath    The xpath object
+        * @param object   $entry    The xml entry that is processed
+        * @param array    $item     The item array
+        * @param array    $importer user record of the importing user
         *
         * @return array with data from links
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer)
        {
@@ -1056,7 +1069,7 @@ class OStatus
                $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);
@@ -1094,8 +1107,8 @@ class OStatus
                                switch ($attribute['rel']) {
                                        case "alternate":
                                                $item["plink"] = $attribute['href'];
-                                               if (($item["object-type"] == ACTIVITY_OBJ_QUESTION)
-                                                       || ($item["object-type"] == ACTIVITY_OBJ_EVENT)
+                                               if (($item["object-type"] == Activity\ObjectType::QUESTION)
+                                                       || ($item["object-type"] == Activity\ObjectType::EVENT)
                                                ) {
                                                        $item["body"] .= add_page_info($attribute['href']);
                                                }
@@ -1120,11 +1133,11 @@ class OStatus
                                                        if (!isset($attribute['length'])) {
                                                                $attribute['length'] = "0";
                                                        }
-                                                       $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.defaults($attribute, 'title', '').'"[/attach]';
+                                                       $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.($attribute['title'] ?? '') .'"[/attach]';
                                                }
                                                break;
                                        case "related":
-                                               if ($item["object-type"] != ACTIVITY_OBJ_BOOKMARK) {
+                                               if ($item["object-type"] != Activity\ObjectType::BOOKMARK) {
                                                        if (!isset($item["parent-uri"])) {
                                                                $item["parent-uri"] = $attribute['href'];
                                                        }
@@ -1175,7 +1188,6 @@ class OStatus
                } else {
                        return "http://".$server[0]."/notice/".$conversation[1];
                }
-               return $href;
        }
 
        /**
@@ -1226,12 +1238,13 @@ class OStatus
         * @param string $body The body
         *
         * @return string The cleaned body
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function formatPicturePost($body)
        {
                $siteinfo = BBCode::getAttachedData($body);
 
-               if (($siteinfo["type"] == "photo")) {
+               if (($siteinfo["type"] == "photo") && (!empty($siteinfo["preview"]) || !empty($siteinfo["image"]))) {
                        if (isset($siteinfo["preview"])) {
                                $preview = $siteinfo["preview"];
                        } else {
@@ -1260,28 +1273,27 @@ class OStatus
        /**
         * @brief Adds the header elements to the XML document
         *
-        * @param object $doc    XML document
-        * @param array  $owner  Contact data of the poster
-        * @param string $filter The related feed filter (activity, posts or comments)
-        * @param bool   $feed_mode Behave like a regular feed for users if true
+        * @param DOMDocument $doc       XML document
+        * @param array       $owner     Contact data of the poster
+        * @param string      $filter    The related feed filter (activity, posts or comments)
+        * @param bool        $feed_mode Behave like a regular feed for users if true
         *
         * @return object header root element
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function addHeader(DOMDocument $doc, array $owner, $filter, $feed_mode = false)
        {
-               $a = get_app();
-
-               $root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
+               $root = $doc->createElementNS(ActivityNamespace::ATOM1, 'feed');
                $doc->appendChild($root);
 
-               $root->setAttribute("xmlns:thr", NAMESPACE_THREAD);
-               $root->setAttribute("xmlns:georss", NAMESPACE_GEORSS);
-               $root->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY);
-               $root->setAttribute("xmlns:media", NAMESPACE_MEDIA);
-               $root->setAttribute("xmlns:poco", NAMESPACE_POCO);
-               $root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
-               $root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
-               $root->setAttribute("xmlns:mastodon", NAMESPACE_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"] . '/';
@@ -1337,7 +1349,7 @@ class OStatus
                $attributes = ["href" => System::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"];
                XML::addElement($doc, $root, "link", "", $attributes);
 
-               if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
+               if ($owner['account-type'] == Contact::TYPE_COMMUNITY) {
                        $condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false,
                                        'archive' => false, 'hidden' => false, 'blocked' => false];
                        $members = DBA::count('contact', $condition);
@@ -1350,10 +1362,11 @@ class OStatus
        /**
         * @brief Add the link to the push hubs to the XML document
         *
-        * @param object $doc  XML document
-        * @param object $root XML root element where the hub links are added
-        * @param object $nick nick
+        * @param DOMDocument $doc  XML document
+        * @param object      $root XML root element where the hub links are added
+        * @param object      $nick nick
         * @return void
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function hublinks(DOMDocument $doc, $root, $nick)
        {
@@ -1364,20 +1377,20 @@ class OStatus
        /**
         * @brief Adds attachment data to the XML document
         *
-        * @param object $doc  XML document
-        * @param object $root XML root element where the hub links are added
-        * @param array  $item Data of the item that is to be posted
+        * @param DOMDocument $doc  XML document
+        * @param object      $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
         */
        private static function getAttachment(DOMDocument $doc, $root, $item)
        {
-               $o = "";
                $siteinfo = BBCode::getAttachedData($item["body"]);
 
                switch ($siteinfo["type"]) {
                        case 'photo':
                                if (!empty($siteinfo["image"])) {
-                                       $imgdata = Image::getInfoFromURL($siteinfo["image"]);
+                                       $imgdata = Images::getInfoFromURLCached($siteinfo["image"]);
                                        if ($imgdata) {
                                                $attributes = ["rel" => "enclosure",
                                                                "href" => $siteinfo["image"],
@@ -1392,7 +1405,8 @@ class OStatus
                                                "href" => $siteinfo["url"],
                                                "type" => "text/html; charset=UTF-8",
                                                "length" => "",
-                                               "title" => defaults($siteinfo, "title", $siteinfo["url"])];
+                                               "title" => ($siteinfo["title"] ?? '') ?: $siteinfo["url"],
+                               ];
                                XML::addElement($doc, $root, "link", "", $attributes);
                                break;
                        default:
@@ -1400,7 +1414,7 @@ class OStatus
                }
 
                if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
-                       $imgdata = Image::getInfoFromURL($siteinfo["image"]);
+                       $imgdata = Images::getInfoFromURLCached($siteinfo["image"]);
                        if ($imgdata) {
                                $attributes = ["rel" => "enclosure",
                                                "href" => $siteinfo["image"],
@@ -1436,21 +1450,22 @@ class OStatus
        /**
         * @brief Adds the author element to the XML document
         *
-        * @param object $doc   XML document
-        * @param array  $owner Contact data of the poster
-        * @param bool   $show_profile Whether to show profile
+        * @param DOMDocument $doc          XML document
+        * @param array       $owner        Contact data of the poster
+        * @param bool        $show_profile Whether to show profile
         *
-        * @return object author element
+        * @return \DOMElement author element
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true)
        {
                $profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]);
                $author = $doc->createElement("author");
                XML::addElement($doc, $author, "id", $owner["url"]);
-               if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
-                       XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_GROUP);
+               if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
+                       XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::GROUP);
                } else {
-                       XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_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"]);
@@ -1501,7 +1516,7 @@ class OStatus
                                $author->appendChild($urls);
                        }
 
-                       XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl()."/viewcontacts/".$owner["nick"]]);
+                       XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl() . "/profile/" . $owner["nick"] . "/contacts/followers"]);
                        XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]);
 
                        if ($profile["publish"]) {
@@ -1531,7 +1546,7 @@ class OStatus
                        return $item['verb'];
                }
 
-               return ACTIVITY_POST;
+               return Activity::POST;
        }
 
        /**
@@ -1543,21 +1558,25 @@ class OStatus
         */
        private static function constructObjecttype(array $item)
        {
-               if (in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT]))
+               if (!empty($item['object-type']) && in_array($item['object-type'], [Activity\ObjectType::NOTE, Activity\ObjectType::COMMENT])) {
                        return $item['object-type'];
-               return ACTIVITY_OBJ_NOTE;
+               }
+
+               return Activity\ObjectType::NOTE;
        }
 
        /**
         * @brief Adds an entry element to the XML document
         *
-        * @param object $doc       XML document
-        * @param array  $item      Data of the item that is to be posted
-        * @param array  $owner     Contact data of the poster
-        * @param bool   $toplevel  optional default false
-        * @param bool   $feed_mode Behave like a regular feed for users if true
+        * @param DOMDocument $doc       XML document
+        * @param array       $item      Data of the item that is to be posted
+        * @param array       $owner     Contact data of the poster
+        * @param bool        $toplevel  optional default false
+        * @param bool        $feed_mode Behave like a regular feed for users if true
         *
-        * @return object 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, $feed_mode = false)
        {
@@ -1572,9 +1591,9 @@ class OStatus
                        return $xml;
                }
 
-               if ($item["verb"] == ACTIVITY_LIKE) {
+               if ($item["verb"] == Activity::LIKE) {
                        return self::likeEntry($doc, $item, $owner, $toplevel);
-               } elseif (in_array($item["verb"], [ACTIVITY_FOLLOW, NAMESPACE_OSTATUS."/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, $feed_mode);
@@ -1584,10 +1603,11 @@ class OStatus
        /**
         * @brief Adds a source entry to the XML document
         *
-        * @param object $doc     XML document
-        * @param array  $contact Array of the contact that is added
+        * @param DOMDocument $doc     XML document
+        * @param array       $contact Array of the contact that is added
         *
-        * @return object Source element
+        * @return \DOMElement Source element
+        * @throws \Exception
         */
        private static function sourceEntry(DOMDocument $doc, array $contact)
        {
@@ -1609,6 +1629,8 @@ class OStatus
         * @param array  $owner Contact data of the poster
         *
         * @return array Contact array
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function contactEntry($url, array $owner)
        {
@@ -1632,7 +1654,7 @@ class OStatus
                }
 
                if (!DBA::isResult($r)) {
-                       $contact = owner;
+                       $contact = $owner;
                }
 
                if (!isset($contact["poll"])) {
@@ -1656,13 +1678,15 @@ class OStatus
        /**
         * @brief Adds an entry element with reshared content
         *
-        * @param object $doc           XML document
-        * @param array  $item          Data of the item that is to be posted
-        * @param array  $owner         Contact data of the poster
-        * @param string $repeated_guid guid
-        * @param bool   $toplevel      Is it for en entry element (false) or a feed entry (true)?
+        * @param DOMDocument $doc           XML document
+        * @param array       $item          Data of the item that is to be posted
+        * @param array       $owner         Contact data of the poster
+        * @param string      $repeated_guid guid
+        * @param bool        $toplevel      Is it for en entry element (false) or a feed entry (true)?
         *
-        * @return object Entry element
+        * @return bool Entry element
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel)
        {
@@ -1670,7 +1694,7 @@ class OStatus
                        Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
                }
 
-               $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
+               $entry = self::entryHeader($doc, $owner, $item, $toplevel);
 
                $condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false,
                        'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]];
@@ -1683,11 +1707,11 @@ class OStatus
 
                $title = $owner["nick"]." repeated a notice by ".$contact["nick"];
 
-               self::entryContent($doc, $entry, $item, $owner, $title, ACTIVITY_SHARE, false);
+               self::entryContent($doc, $entry, $item, $owner, $title, Activity::SHARE, false);
 
                $as_object = $doc->createElement("activity:object");
 
-               XML::addElement($doc, $as_object, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA."activity");
+               XML::addElement($doc, $as_object, "activity:object-type", ActivityNamespace::ACTIVITY_SCHEMA . "activity");
 
                self::entryContent($doc, $as_object, $repeated_item, $owner, "", "", false);
 
@@ -1720,12 +1744,14 @@ class OStatus
        /**
         * @brief Adds an entry element with a "like"
         *
-        * @param object $doc      XML document
-        * @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)?
+        * @param DOMDocument $doc      XML document
+        * @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 object 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)
        {
@@ -1733,24 +1759,21 @@ class OStatus
                        Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
                }
 
-               $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
+               $entry = self::entryHeader($doc, $owner, $item, $toplevel);
 
-               $verb = NAMESPACE_ACTIVITY_SCHEMA."favorite";
+               $verb = ActivityNamespace::ACTIVITY_SCHEMA . "favorite";
                self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false);
 
-               $as_object = $doc->createElement("activity:object");
-
                $parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);
+               if (DBA::isResult($parent)) {
+                       $as_object = $doc->createElement("activity:object");
 
-               if (!$parent) {
-                       $parent = [];
-               }
-
-               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);
+                       $entry->appendChild($as_object);
+               }
 
                self::entryFooter($doc, $entry, $item, $owner);
 
@@ -1760,16 +1783,16 @@ class OStatus
        /**
         * @brief Adds the person object element to the XML document
         *
-        * @param object $doc     XML document
-        * @param array  $owner   Contact data of the poster
-        * @param array  $contact Contact data of the target
+        * @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
         */
        private static function addPersonObject(DOMDocument $doc, array $owner, array $contact)
        {
                $object = $doc->createElement("activity:object");
-               XML::addElement($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON);
+               XML::addElement($doc, $object, "activity:object-type", Activity\ObjectType::PERSON);
 
                if ($contact['network'] == Protocol::PHANTOM) {
                        XML::addElement($doc, $object, "id", $contact['url']);
@@ -1805,12 +1828,14 @@ class OStatus
        /**
         * @brief Adds a follow/unfollow entry element
         *
-        * @param object $doc      XML document
-        * @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)?
+        * @param DOMDocument $doc      XML document
+        * @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 object Entry element
+        * @return \DOMElement Entry element
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function followEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
        {
@@ -1835,7 +1860,7 @@ class OStatus
                        $connect_id = 0;
                }
 
-               if ($item['verb'] == ACTIVITY_FOLLOW) {
+               if ($item['verb'] == Activity::FOLLOW) {
                        $message = L10n::t('%s is now following %s.');
                        $title = L10n::t('following');
                        $action = "subscription";
@@ -1852,7 +1877,7 @@ class OStatus
 
                $item["body"] = sprintf($message, $owner["nick"], $contact["nick"]);
 
-               self::entryHeader($doc, $entry, $owner, $item, $toplevel);
+               $entry = self::entryHeader($doc, $owner, $item, $toplevel);
 
                self::entryContent($doc, $entry, $item, $owner, $title);
 
@@ -1867,13 +1892,15 @@ class OStatus
        /**
         * @brief Adds a regular entry element
         *
-        * @param object $doc       XML document
-        * @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)?
-        * @param bool   $feed_mode Behave like a regular feed for users if true
+        * @param DOMDocument $doc       XML document
+        * @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)?
+        * @param bool        $feed_mode Behave like a regular feed for users if true
         *
-        * @return object Entry element
+        * @return \DOMElement Entry element
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel, $feed_mode)
        {
@@ -1881,9 +1908,19 @@ class OStatus
                        Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
                }
 
-               $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
+               if (!$toplevel) {
+                       if (!empty($item['title'])) {
+                               $title = BBCode::convert($item['title'], false, 7);
+                       } else {
+                               $title = sprintf("New note by %s", $owner["nick"]);
+                       }
+               } else {
+                       $title = sprintf("New comment by %s", $owner["nick"]);
+               }
+
+               $entry = self::entryHeader($doc, $owner, $item, $toplevel);
 
-               XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
+               XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::NOTE);
 
                self::entryContent($doc, $entry, $item, $owner, $title, '', true, $feed_mode);
 
@@ -1895,63 +1932,59 @@ class OStatus
        /**
         * @brief Adds a header element to the XML document
         *
-        * @param object $doc      XML document
-        * @param object $entry    The entry element where the elements are added
-        * @param array  $owner    Contact data of the poster
-        * @param bool   $toplevel Is it for en entry element (false) or a feed entry (true)?
+        * @param DOMDocument $doc      XML document
+        * @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 string The title for the element
+        * @return \DOMElement The entry element where the elements are added
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       private static function entryHeader(DOMDocument $doc, &$entry, array $owner, array $item, $toplevel)
+       private static function entryHeader(DOMDocument $doc, array $owner, array $item, $toplevel)
        {
-               /// @todo Check if this title stuff is really needed (I guess not)
                if (!$toplevel) {
                        $entry = $doc->createElement("entry");
-                       if (!empty($item['title'])) {
-                               $title = BBCode::convert($item['title'], false, 7);
-                       } else {
-                               $title = sprintf("New note by %s", $owner["nick"]);
-                       }
 
-                       if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
+                       if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
                                $contact = self::contactEntry($item['author-link'], $owner);
                                $author = self::addAuthor($doc, $contact, false);
                                $entry->appendChild($author);
                        }
                } else {
-                       $entry = $doc->createElementNS(NAMESPACE_ATOM1, "entry");
+                       $entry = $doc->createElementNS(ActivityNamespace::ATOM1, "entry");
 
-                       $entry->setAttribute("xmlns:thr", NAMESPACE_THREAD);
-                       $entry->setAttribute("xmlns:georss", NAMESPACE_GEORSS);
-                       $entry->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY);
-                       $entry->setAttribute("xmlns:media", NAMESPACE_MEDIA);
-                       $entry->setAttribute("xmlns:poco", NAMESPACE_POCO);
-                       $entry->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
-                       $entry->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
-                       $entry->setAttribute("xmlns:mastodon", NAMESPACE_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);
-
-                       $title = sprintf("New comment by %s", $owner["nick"]);
                }
-               return $title;
+
+               return $entry;
        }
 
        /**
         * @brief Adds elements to the XML document
         *
-        * @param object $doc       XML document
-        * @param object $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
-        * @param string $verb      The activity verb
-        * @param bool   $complete  Add the "status_net" element?
-        * @param bool   $feed_mode Behave like a regular feed for users if true
+        * @param DOMDocument $doc       XML document
+        * @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
+        * @param string      $verb      The activity verb
+        * @param bool        $complete  Add the "status_net" element?
+        * @param bool        $feed_mode Behave like a regular feed for users if true
         * @return void
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function entryContent(DOMDocument $doc, $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false)
+       private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false)
        {
                if ($verb == "") {
                        $verb = self::constructVerb($item);
@@ -1989,13 +2022,14 @@ class OStatus
        /**
         * @brief Adds the elements at the foot of an entry to the XML document
         *
-        * @param object $doc       XML document
-        * @param object $entry     The entry element where the elements are added
-        * @param array  $item      Data of the item that is to be posted
-        * @param array  $owner     Contact data of the poster
-        * @param bool   $complete  default true
-        * @param bool   $feed_mode Behave like a regular feed for users if true
+        * @param DOMDocument $doc       XML document
+        * @param object      $entry     The entry element where the elements are added
+        * @param array       $item      Data of the item that is to be posted
+        * @param array       $owner     Contact data of the poster
+        * @param bool        $complete  default true
+        * @param bool        $feed_mode Behave like a regular feed for users if true
         * @return void
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true, $feed_mode = false)
        {
@@ -2074,25 +2108,25 @@ class OStatus
                foreach ($mentioned as $mention) {
                        $condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($mention)];
                        $contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
-                       if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) ||
-                               ($contact['self'] && ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY))) {
+                       if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::TYPE_COMMUNITY) ||
+                               ($contact['self'] && ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY))) {
                                XML::addElement($doc, $entry, "link", "",
                                        [
                                                "rel" => "mentioned",
-                                               "ostatus:object-type" => ACTIVITY_OBJ_GROUP,
+                                               "ostatus:object-type" => Activity\ObjectType::GROUP,
                                                "href" => $mention]
                                );
                        } else {
                                XML::addElement($doc, $entry, "link", "",
                                        [
                                                "rel" => "mentioned",
-                                               "ostatus:object-type" => ACTIVITY_OBJ_PERSON,
+                                               "ostatus:object-type" => Activity\ObjectType::PERSON,
                                                "href" => $mention]
                                );
                        }
                }
 
-               if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
+               if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
                        XML::addElement($doc, $entry, "link", "", [
                                "rel" => "mentioned",
                                "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
@@ -2160,6 +2194,8 @@ class OStatus
         * @param boolean $feed_mode   Behave like a regular feed for users if true
         *
         * @return string XML feed
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false, $feed_mode = false)
        {
@@ -2191,22 +2227,22 @@ class OStatus
                $check_date = DateTimeFormat::utc($last_update);
                $authorid = Contact::getIdForURL($owner["url"], 0, true);
 
-               $condition = ["`uid` = ? AND `created` > ? AND NOT `deleted`
+               $condition = ["`uid` = ? AND `received` > ? AND NOT `deleted`
                        AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
                        $owner["uid"], $check_date, Protocol::OSTATUS, Protocol::DFRN];
 
                if ($filter === 'comments') {
                        $condition[0] .= " AND `object-type` = ? ";
-                       $condition[] = ACTIVITY_OBJ_COMMENT;
+                       $condition[] = Activity\ObjectType::COMMENT;
                }
 
-               if ($owner['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) {
+               if ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
                        $condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
                        $condition[] = $owner["id"];
                        $condition[] = $authorid;
                }
 
-               $params = ['order' => ['created' => true], 'limit' => $max_items];
+               $params = ['order' => ['received' => true], 'limit' => $max_items];
 
                if ($filter === 'posts') {
                        $ret = Item::selectThread([], $condition, $params);
@@ -2251,6 +2287,8 @@ class OStatus
         * @param array $owner Contact data of the poster
         *
         * @return string XML for the salmon
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function salmon(array $item, array $owner)
        {
@@ -2267,4 +2305,19 @@ class OStatus
 
                return trim($doc->saveXML());
        }
+
+       /**
+        * Checks if the given contact url does support OStatus
+        *
+        * @param string  $url    profile url
+        * @param boolean $update Update the profile
+        * @return boolean
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
+       public static function isSupportedByContactUrl($url, $update = false)
+       {
+               $probe = Probe::uri($url, Protocol::OSTATUS, 0, !$update);
+               return $probe['network'] == Protocol::OSTATUS;
+       }
 }