]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Avoid double probing
[friendica.git] / src / Model / Contact.php
index 15e4e57035c3f3ecb255e80a2d978efb010e9aec..18f0b020e26a426d8a2ea64a75755d20187c0586 100644 (file)
@@ -21,6 +21,8 @@
 
 namespace Friendica\Model;
 
+use DOMDocument;
+use DOMXPath;
 use Friendica\App\BaseURL;
 use Friendica\Content\Pager;
 use Friendica\Core\Hook;
@@ -43,6 +45,7 @@ use Friendica\Protocol\Salmon;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy;
 use Friendica\Util\Strings;
 
 /**
@@ -87,7 +90,7 @@ class Contact
        /**
         * Account types
         *
-        * TYPE_UNKNOWN - the account has been imported from gcontact where this is the default type value
+        * TYPE_UNKNOWN - unknown type
         *
         * TYPE_PERSON - the account belongs to a person
         *      Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE
@@ -194,19 +197,35 @@ class Contact
         * Fetches a contact by a given url
         *
         * @param string  $url    profile url
-        * @param integer $uid    User ID of the contact
-        * @param array   $fields Field list
         * @param boolean $update true = always update, false = never update, null = update when not found or outdated
+        * @param array   $fields Field list
+        * @param integer $uid    User ID of the contact
         * @return array contact array
         */
        public static function getByURL(string $url, $update = null, array $fields = [], int $uid = 0)
        {
                if ($update || is_null($update)) {
-                       $cid = self::getIdForURL($url, $uid, !($update ?? false));
+                       $cid = self::getIdForURL($url, $uid, $update);
                        if (empty($cid)) {
                                return [];
                        }
-                       return self::getById($cid, $fields);
+
+                       $contact = self::getById($cid, $fields);
+                       if (empty($contact)) {
+                               return [];
+                       }
+                       return $contact;
+               }
+
+               // Add internal fields
+               $removal = [];
+               if (!empty($fields)) {
+                       foreach (['id', 'updated', 'network'] as $internal) {
+                               if (!in_array($internal, $fields)) {
+                                       $fields[] = $internal;
+                                       $removal[] = $internal;
+                               }
+                       }
                }
 
                // We first try the nurl (http://server.tld/nick), most common case
@@ -225,6 +244,22 @@ class Contact
                        $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid];
                        $contact = DBA::selectFirst('contact', $fields, $condition, $options);
                }
+               
+               if (!DBA::isResult($contact)) {
+                       return [];
+               }
+
+               // Update the contact in the background if needed
+               if ((($contact['updated'] < DateTimeFormat::utc('now -7 days')) || empty($contact['avatar'])) &&
+                       in_array($contact['network'], Protocol::FEDERATED)) {
+                       Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id'], ($uid == 0 ? 'force' : ''));
+               }
+
+               // Remove the internal fields
+               foreach ($removal as $internal) {
+                       unset($contact[$internal]);
+               }
+
                return $contact;
        }
 
@@ -234,8 +269,8 @@ class Contact
         *
         * @param string  $url    profile url
         * @param integer $uid    User ID of the contact
-        * @param array   $fields Field list
         * @param boolean $update true = always update, false = never update, null = update when not found or outdated
+        * @param array   $fields Field list
         * @return array contact array
         */
        public static function getByURLForUser(string $url, int $uid = 0, $update = false, array $fields = [])
@@ -271,7 +306,7 @@ class Contact
         */
        public static function isFollower($cid, $uid)
        {
-               if (self::isBlockedByUser($cid, $uid)) {
+               if (Contact\User::isBlocked($cid, $uid)) {
                        return false;
                }
 
@@ -296,7 +331,7 @@ class Contact
         */
        public static function isFollowerByURL($url, $uid)
        {
-               $cid = self::getIdForURL($url, $uid, true);
+               $cid = self::getIdForURL($url, $uid, false);
 
                if (empty($cid)) {
                        return false;
@@ -317,7 +352,7 @@ class Contact
         */
        public static function isSharing($cid, $uid)
        {
-               if (self::isBlockedByUser($cid, $uid)) {
+               if (Contact\User::isBlocked($cid, $uid)) {
                        return false;
                }
 
@@ -342,7 +377,7 @@ class Contact
         */
        public static function isSharingByURL($url, $uid)
        {
-               $cid = self::getIdForURL($url, $uid, true);
+               $cid = self::getIdForURL($url, $uid, false);
 
                if (empty($cid)) {
                        return false;
@@ -437,7 +472,7 @@ class Contact
                if (!DBA::isResult($self)) {
                        return false;
                }
-               return self::getIdForURL($self['url'], 0, true);
+               return self::getIdForURL($self['url'], 0, false);
        }
 
        /**
@@ -467,14 +502,14 @@ class Contact
                }
 
                if ($contact['uid'] != 0) {
-                       $pcid = Contact::getIdForURL($contact['url'], 0, true, ['url' => $contact['url']]);
+                       $pcid = Contact::getIdForURL($contact['url'], 0, false, ['url' => $contact['url']]);
                        if (empty($pcid)) {
                                return [];
                        }
                        $ucid = $contact['id'];
                } else {
                        $pcid = $contact['id'];
-                       $ucid = Contact::getIdForURL($contact['url'], $uid, true);
+                       $ucid = Contact::getIdForURL($contact['url'], $uid, false);
                }
 
                return ['public' => $pcid, 'user' => $ucid];
@@ -502,179 +537,6 @@ class Contact
                }
        }
 
-       /**
-        * Block contact id for user id
-        *
-        * @param int     $cid     Either public contact id or user's contact id
-        * @param int     $uid     User ID
-        * @param boolean $blocked Is the contact blocked or unblocked?
-        * @throws \Exception
-        */
-       public static function setBlockedForUser($cid, $uid, $blocked)
-       {
-               $cdata = self::getPublicAndUserContacID($cid, $uid);
-               if (empty($cdata)) {
-                       return;
-               }
-
-               if ($cdata['user'] != 0) {
-                       DBA::update('contact', ['blocked' => $blocked], ['id' => $cdata['user'], 'pending' => false]);
-               }
-
-               DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
-       }
-
-       /**
-        * Returns "block" state for contact id and user id
-        *
-        * @param int $cid Either public contact id or user's contact id
-        * @param int $uid User ID
-        *
-        * @return boolean is the contact id blocked for the given user?
-        * @throws \Exception
-        */
-       public static function isBlockedByUser($cid, $uid)
-       {
-               $cdata = self::getPublicAndUserContacID($cid, $uid);
-               if (empty($cdata)) {
-                       return;
-               }
-
-               $public_blocked = false;
-
-               if (!empty($cdata['public'])) {
-                       $public_contact = DBA::selectFirst('user-contact', ['blocked'], ['cid' => $cdata['public'], 'uid' => $uid]);
-                       if (DBA::isResult($public_contact)) {
-                               $public_blocked = $public_contact['blocked'];
-                       }
-               }
-
-               $user_blocked = $public_blocked;
-
-               if (!empty($cdata['user'])) {
-                       $user_contact = DBA::selectFirst('contact', ['blocked'], ['id' => $cdata['user'], 'pending' => false]);
-                       if (DBA::isResult($user_contact)) {
-                               $user_blocked = $user_contact['blocked'];
-                       }
-               }
-
-               if ($user_blocked != $public_blocked) {
-                       DBA::update('user-contact', ['blocked' => $user_blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
-               }
-
-               return $user_blocked;
-       }
-
-       /**
-        * Ignore contact id for user id
-        *
-        * @param int     $cid     Either public contact id or user's contact id
-        * @param int     $uid     User ID
-        * @param boolean $ignored Is the contact ignored or unignored?
-        * @throws \Exception
-        */
-       public static function setIgnoredForUser($cid, $uid, $ignored)
-       {
-               $cdata = self::getPublicAndUserContacID($cid, $uid);
-               if (empty($cdata)) {
-                       return;
-               }
-
-               if ($cdata['user'] != 0) {
-                       DBA::update('contact', ['readonly' => $ignored], ['id' => $cdata['user'], 'pending' => false]);
-               }
-
-               DBA::update('user-contact', ['ignored' => $ignored], ['cid' => $cdata['public'], 'uid' => $uid], true);
-       }
-
-       /**
-        * Returns "ignore" state for contact id and user id
-        *
-        * @param int $cid Either public contact id or user's contact id
-        * @param int $uid User ID
-        *
-        * @return boolean is the contact id ignored for the given user?
-        * @throws \Exception
-        */
-       public static function isIgnoredByUser($cid, $uid)
-       {
-               $cdata = self::getPublicAndUserContacID($cid, $uid);
-               if (empty($cdata)) {
-                       return;
-               }
-
-               $public_ignored = false;
-
-               if (!empty($cdata['public'])) {
-                       $public_contact = DBA::selectFirst('user-contact', ['ignored'], ['cid' => $cdata['public'], 'uid' => $uid]);
-                       if (DBA::isResult($public_contact)) {
-                               $public_ignored = $public_contact['ignored'];
-                       }
-               }
-
-               $user_ignored = $public_ignored;
-
-               if (!empty($cdata['user'])) {
-                       $user_contact = DBA::selectFirst('contact', ['readonly'], ['id' => $cdata['user'], 'pending' => false]);
-                       if (DBA::isResult($user_contact)) {
-                               $user_ignored = $user_contact['readonly'];
-                       }
-               }
-
-               if ($user_ignored != $public_ignored) {
-                       DBA::update('user-contact', ['ignored' => $user_ignored], ['cid' => $cdata['public'], 'uid' => $uid], true);
-               }
-
-               return $user_ignored;
-       }
-
-       /**
-        * Set "collapsed" for contact id and user id
-        *
-        * @param int     $cid       Either public contact id or user's contact id
-        * @param int     $uid       User ID
-        * @param boolean $collapsed are the contact's posts collapsed or uncollapsed?
-        * @throws \Exception
-        */
-       public static function setCollapsedForUser($cid, $uid, $collapsed)
-       {
-               $cdata = self::getPublicAndUserContacID($cid, $uid);
-               if (empty($cdata)) {
-                       return;
-               }
-
-               DBA::update('user-contact', ['collapsed' => $collapsed], ['cid' => $cdata['public'], 'uid' => $uid], true);
-       }
-
-       /**
-        * Returns "collapsed" state for contact id and user id
-        *
-        * @param int $cid Either public contact id or user's contact id
-        * @param int $uid User ID
-        *
-        * @return boolean is the contact id blocked for the given user?
-        * @throws HTTPException\InternalServerErrorException
-        * @throws \ImagickException
-        */
-       public static function isCollapsedByUser($cid, $uid)
-       {
-               $cdata = self::getPublicAndUserContacID($cid, $uid);
-               if (empty($cdata)) {
-                       return;
-               }
-
-               $collapsed = false;
-
-               if (!empty($cdata['public'])) {
-                       $public_contact = DBA::selectFirst('user-contact', ['collapsed'], ['cid' => $cdata['public'], 'uid' => $uid]);
-                       if (DBA::isResult($public_contact)) {
-                               $collapsed = $public_contact['collapsed'];
-                       }
-               }
-
-               return $collapsed;
-       }
-
        /**
         * Returns a list of contacts belonging in a group
         *
@@ -988,7 +850,6 @@ class Contact
                                 */
                                DBA::update('contact', ['archive' => true], ['id' => $contact['id']]);
                                DBA::update('contact', ['archive' => true], ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
-                               GContact::updateFromPublicContactURL($contact['url']);
                        }
                }
        }
@@ -1006,7 +867,7 @@ class Contact
        {
                // Always unarchive the relay contact entry
                if (!empty($contact['batch']) && !empty($contact['term-date']) && ($contact['term-date'] > DBA::NULL_DATETIME)) {
-                       $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
+                       $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
                        $condition = ['uid' => 0, 'network' => Protocol::FEDERATED, 'batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
                        DBA::update('contact', $fields, $condition);
                }
@@ -1030,10 +891,9 @@ class Contact
                }
 
                // It's a miracle. Our dead contact has inexplicably come back to life.
-               $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
+               $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
                DBA::update('contact', $fields, ['id' => $contact['id']]);
                DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
-               GContact::updateFromPublicContactURL($contact['url']);
        }
 
        /**
@@ -1236,12 +1096,8 @@ class Contact
 
                $fields = ['url', 'addr', 'alias', 'notify', 'name', 'nick',
                        'photo', 'keywords', 'location', 'about', 'network'];
-               $data = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]);
-
-               if (!DBA::isResult($data)) {
-                       $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
-                       $data = DBA::selectFirst('contact', $fields, $condition);
-               }
+               $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
+               $data = DBA::selectFirst('contact', $fields, $condition);
 
                if (DBA::isResult($data)) {
                        $data["pubkey"] = '';
@@ -1300,15 +1156,14 @@ class Contact
         *
         * @param string  $url       Contact URL
         * @param integer $uid       The user id for the contact (0 = public contact)
-        * @param boolean $no_update Don't update the contact
+        * @param boolean $update    true = always update, false = never update, null = update when not found or outdated
         * @param array   $default   Default value for creating the contact when every else fails
-        * @param boolean $in_loop   Internally used variable to prevent an endless loop
         *
         * @return integer Contact ID
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false)
+       public static function getIdForURL($url, $uid = 0, $update = null, $default = [])
        {
                Logger::info('Get contact data', ['url' => $url, 'user' => $uid]);
 
@@ -1322,17 +1177,8 @@ class Contact
 
                if (!empty($contact)) {
                        $contact_id = $contact["id"];
-                       $update_contact = false;
 
-                       // Update the contact every 7 days (Don't update mail or feed contacts)
-                       if (in_array($contact['network'], Protocol::FEDERATED)) {
-                               $update_contact = ($contact['updated'] < DateTimeFormat::utc('now -7 days'));
-
-                               // We force the update if the avatar is empty
-                               if (empty($contact['avatar'])) {
-                                       $update_contact = true;
-                               }
-                       } elseif (empty($default) && in_array($contact['network'], [Protocol::MAIL, Protocol::PHANTOM]) && ($uid == 0)) {
+                       if (empty($default) && in_array($contact['network'], [Protocol::MAIL, Protocol::PHANTOM]) && ($uid == 0)) {
                                // Update public mail accounts via their user's accounts
                                $fields = ['network', 'addr', 'name', 'nick', 'avatar', 'photo', 'thumb', 'micro'];
                                $mailcontact = DBA::selectFirst('contact', $fields, ["`addr` = ? AND `network` = ? AND `uid` != 0", $url, Protocol::MAIL]);
@@ -1345,12 +1191,7 @@ class Contact
                                }
                        }
 
-                       // Update the contact in the background if needed but it is called by the frontend
-                       if ($update_contact && $no_update && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
-                               Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
-                       }
-
-                       if (!$update_contact || $no_update) {
+                       if (empty($update)) {
                                return $contact_id;
                        }
                } elseif ($uid != 0) {
@@ -1358,11 +1199,11 @@ class Contact
                        return 0;
                }
 
-               if ($no_update && empty($default)) {
+               if (!$update && empty($default)) {
                        // When we don't want to update, we look if we know this contact in any way
                        $data = self::getProbeDataFromDatabase($url, $contact_id);
                        $background_update = true;
-               } elseif ($no_update && !empty($default['network'])) {
+               } elseif (!$update && !empty($default['network'])) {
                        // If there are default values, take these
                        $data = $default;
                        $background_update = false;
@@ -1371,16 +1212,16 @@ class Contact
                        $background_update = false;
                }
 
-               if (empty($data)) {
+               if ((empty($data) && is_null($update)) || $update) {
                        $data = Probe::uri($url, "", $uid);
                }
 
                // Take the default values when probing failed
-               if (!empty($default) && !in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) {
+               if (!empty($default) && (empty($data['network']) || !in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO])))) {
                        $data = array_merge($data, $default);
                }
 
-               if (empty($data) || ($data['network'] == Protocol::PHANTOM)) {
+               if (empty($data['network']) || ($data['network'] == Protocol::PHANTOM)) {
                        Logger::info('No valid network found', ['url' => $url, 'data' => $data, 'callstack' => System::callstack(20)]);
                        return 0;
                }
@@ -1393,8 +1234,16 @@ class Contact
                        $data['gsid'] = GServer::getID($data['baseurl']);
                }
 
-               if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $data['url']) && !$in_loop) {
-                       $contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
+               if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $data['url'])) {
+                       $contact = self::getByURL($data['alias'], false, ['id']);
+                       if (!empty($contact['id'])) {
+                               $contact_id = $contact['id'];
+                       }
+               }
+
+               if ($uid == 0) {
+                       $data['last-item'] = Probe::getLastUpdate($data);
+                       Logger::info('Fetched last item', ['url' => $url, 'probed_url' => $data['url'], 'last-item' => $data['last-item'], 'callstack' => System::callstack(20)]);
                }
 
                if (!$contact_id) {
@@ -1409,7 +1258,6 @@ class Contact
                                'poll'      => $data['poll'] ?? '',
                                'name'      => $data['name'] ?? '',
                                'nick'      => $data['nick'] ?? '',
-                               'photo'     => $data['photo'] ?? '',
                                'keywords'  => $data['keywords'] ?? '',
                                'location'  => $data['location'] ?? '',
                                'about'     => $data['about'] ?? '',
@@ -1431,6 +1279,10 @@ class Contact
                                'readonly'  => 0,
                                'pending'   => 0];
 
+                       if (!empty($data['last-item'])) {
+                               $fields['last-item'] = $data['last-item'];
+                       }
+
                        $condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false];
 
                        // Before inserting we do check if the entry does exist now.
@@ -1455,7 +1307,7 @@ class Contact
                }
 
                if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) {
-                       self::updateAvatar($data['photo'], $uid, $contact_id);
+                       self::updateAvatar($contact_id, $data['photo']);
                }
 
                if (in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) {
@@ -1465,17 +1317,9 @@ class Contact
                        } else {
                                // Else do a direct update
                                self::updateFromProbe($contact_id, '', false);
-
-                               // Update the gcontact entry
-                               if ($uid == 0) {
-                                       GContact::updateFromPublicContactID($contact_id);
-                                       if (($data['network'] == Protocol::ACTIVITYPUB) && in_array(DI::config()->get('system', 'gcontact_discovery'), [GContact::DISCOVERY_DIRECT, GContact::DISCOVERY_RECURSIVE])) {
-                                               GContact::discoverFollowers($data['url']);
-                                       }
-                               }
                        }
                } else {
-                       $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl', 'gsid'];
+                       $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl', 'gsid', 'last-item'];
                        $contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
 
                        // This condition should always be true
@@ -1486,7 +1330,8 @@ class Contact
                        $updated = [
                                'url' => $data['url'],
                                'nurl' => Strings::normaliseLink($data['url']),
-                               'updated' => DateTimeFormat::utcNow()
+                               'updated' => DateTimeFormat::utcNow(),
+                               'failed' => false
                        ];
 
                        $fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl', 'gsid'];
@@ -1495,6 +1340,10 @@ class Contact
                                $updated[$field] = ($data[$field] ?? '') ?: $contact[$field];
                        }
 
+                       if (!empty($data['last-item']) && ($contact['last-item'] < $data['last-item'])) {
+                               $updated['last-item'] = $data['last-item'];
+                       }
+
                        if (($updated['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
                                $updated['uri-date'] = DateTimeFormat::utcNow();
                        }
@@ -1695,7 +1544,6 @@ class Contact
                // There are several fields that indicate that the contact or user is a forum
                // "page-flags" is a field in the user table,
                // "forum" and "prv" are used in the contact table. They stand for User::PAGE_FLAGS_COMMUNITY and User::PAGE_FLAGS_PRVGROUP.
-               // "community" is used in the gcontact table and is true if the contact is User::PAGE_FLAGS_COMMUNITY or User::PAGE_FLAGS_PRVGROUP.
                if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_COMMUNITY))
                        || (isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_PRVGROUP))
                        || (isset($contact['forum']) && intval($contact['forum']))
@@ -1765,12 +1613,146 @@ class Contact
                return $return;
        }
 
+       /**
+        * Ensure that cached avatar exist
+        *
+        * @param integer $cid
+        */
+       public static function checkAvatarCache(int $cid)
+       {
+               $contact = DBA::selectFirst('contact', ['url', 'avatar', 'photo', 'thumb', 'micro'], ['id' => $cid, 'uid' => 0, 'self' => false]);
+               if (!DBA::isResult($contact)) {
+                       return;
+               }
+
+               if (empty($contact['avatar']) || (!empty($contact['photo']) && !empty($contact['thumb']) && !empty($contact['micro']))) {
+                       return;
+               }
+
+               Logger::info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
+
+               self::updateAvatar($cid, $contact['avatar'], true);
+       }
+
+       /**
+        * Return the photo path for a given contact array in the given size
+        *
+        * @param array $contact  contact array
+        * @param string $field   Fieldname of the photo in the contact array
+        * @param string $default Default path when no picture had been found
+        * @param string $size    Size of the avatar picture
+        * @param string $avatar  Avatar path that is displayed when no photo had been found
+        * @return string photo path
+        */
+       private static function getAvatarPath(array $contact, string $field, string $default, string $size, string $avatar)
+       {
+               if (!empty($contact)) {
+                       $contact = self::checkAvatarCacheByArray($contact);
+                       if (!empty($contact[$field])) {
+                               $avatar = $contact[$field];
+                       }
+               }
+
+               if (empty($avatar)) {
+                       return $default;
+               }
+
+               if (Proxy::isLocalImage($avatar)) {
+                       return $avatar;
+               } else {
+                       return Proxy::proxifyUrl($avatar, false, $size);
+               }
+       }
+
+       /**
+        * Return the photo path for a given contact array
+        *
+        * @param array $contact Contact array
+        * @param string $avatar  Avatar path that is displayed when no photo had been found
+        * @return string photo path
+        */
+       public static function getPhoto(array $contact, string $avatar = '')
+       {
+               return self::getAvatarPath($contact, 'photo', DI::baseUrl() . '/images/person-300.jpg', Proxy::SIZE_SMALL, $avatar);
+       }
+
+       /**
+        * Return the photo path (thumb size) for a given contact array
+        *
+        * @param array $contact Contact array
+        * @param string $avatar  Avatar path that is displayed when no photo had been found
+        * @return string photo path
+        */
+       public static function getThumb(array $contact, string $avatar = '')
+       {
+               return self::getAvatarPath($contact, 'thumb', DI::baseUrl() . '/images/person-80.jpg', Proxy::SIZE_THUMB, $avatar);
+       }
+
+       /**
+        * Return the photo path (micro size) for a given contact array
+        *
+        * @param array $contact Contact array
+        * @param string $avatar  Avatar path that is displayed when no photo had been found
+        * @return string photo path
+        */
+       public static function getMicro(array $contact, string $avatar = '')
+       {
+               return self::getAvatarPath($contact, 'micro', DI::baseUrl() . '/images/person-48.jpg', Proxy::SIZE_MICRO, $avatar);
+       }
+
+       /**
+        * Check the given contact array for avatar cache fields
+        *
+        * @param array $contact
+        * @return array contact array with avatar cache fields
+        */
+       private static function checkAvatarCacheByArray(array $contact)
+       {
+               $update = false;
+               $contact_fields = [];
+               $fields = ['photo', 'thumb', 'micro'];
+               foreach ($fields as $field) {
+                       if (isset($contact[$field])) {
+                               $contact_fields[] = $field;
+                       }
+                       if (isset($contact[$field]) && empty($contact[$field])) {
+                               $update = true;
+                       }
+               }
+
+               if (!$update) {
+                       return $contact;
+               }
+
+               if (!empty($contact['id']) && !empty($contact['avatar'])) {
+                       self::updateAvatar($contact['id'], $contact['avatar'], true);
+
+                       $new_contact = self::getById($contact['id'], $contact_fields);
+                       if (DBA::isResult($new_contact)) {
+                               // We only update the cache fields
+                               $contact = array_merge($contact, $new_contact);
+                       }
+               }
+
+               /// add the default avatars if the fields aren't filled
+               if (isset($contact['photo']) && empty($contact['photo'])) {
+                       $contact['photo'] = DI::baseUrl() . '/images/person-300.jpg';
+               }
+               if (isset($contact['thumb']) && empty($contact['thumb'])) {
+                       $contact['thumb'] = DI::baseUrl() . '/images/person-80.jpg';
+               }
+               if (isset($contact['micro']) && empty($contact['micro'])) {
+                       $contact['micro'] = DI::baseUrl() . '/images/person-48.jpg';
+               }
+
+               return $contact;
+       }
+
        /**
         * Updates the avatar links in a contact only if needed
         *
-        * @param string $avatar Link to avatar picture
-        * @param int    $uid    User id of contact owner
         * @param int    $cid    Contact id
+        * @param string $avatar Link to avatar picture
         * @param bool   $force  force picture update
         *
         * @return void
@@ -1778,41 +1760,51 @@ class Contact
         * @throws HTTPException\NotFoundException
         * @throws \ImagickException
         */
-       public static function updateAvatar($avatar, $uid, $cid, $force = false)
+       public static function updateAvatar(int $cid, string $avatar, bool $force = false)
        {
-               $contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]);
+               $contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]);
                if (!DBA::isResult($contact)) {
                        return;
                }
 
+               $uid = $contact['uid'];
+
+               // Only update the cached photo links of public contacts when they already are cached
+               if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro'])) {
+                       if ($contact['avatar'] != $avatar) {
+                               DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]);
+                               Logger::info('Only update the avatar', ['id' => $cid, 'avatar' => $avatar, 'contact' => $contact]);
+                       }
+                       return;
+               }
+
                $data = [
                        $contact['photo'] ?? '',
                        $contact['thumb'] ?? '',
                        $contact['micro'] ?? '',
                ];
 
-               foreach ($data as $image_uri) {
-                       $image_rid = Photo::ridFromURI($image_uri);
-                       if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
-                               Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
-                               $force = true;
+               $update = ($contact['avatar'] != $avatar) || $force;
+
+               if (!$update) {
+                       foreach ($data as $image_uri) {
+                               $image_rid = Photo::ridFromURI($image_uri);
+                               if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
+                                       Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+                                       $update = true;
+                               }
                        }
                }
 
-               if (($contact["avatar"] != $avatar) || $force) {
+               if ($update) {
                        $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
-
                        if ($photos) {
                                $fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
                                DBA::update('contact', $fields, ['id' => $cid]);
-
-                               // Update the public contact (contact id = 0)
-                               if ($uid != 0) {
-                                       $pcontact = DBA::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
-                                       if (DBA::isResult($pcontact)) {
-                                               DBA::update('contact', $fields, ['id' => $pcontact['id']]);
-                                       }
-                               }
+                       } elseif (empty($contact['avatar'])) {
+                               // Ensure that the avatar field is set
+                               DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]);                          
+                               Logger::info('Failed profile import', ['id' => $cid, 'force' => $force, 'avatar' => $avatar, 'contact' => $contact]);
                        }
                }
        }
@@ -1839,9 +1831,6 @@ class Contact
                        return;
                }
 
-               // Update the corresponding gcontact entry
-               GContact::updateFromPublicContactID($id);
-
                // Archive or unarchive the contact. We only need to do this for the public contact.
                // The archive/unarchive function will update the personal contacts by themselves.
                $contact = DBA::selectFirst('contact', [], ['id' => $id]);
@@ -1929,7 +1918,7 @@ class Contact
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function updateFromProbe($id, $network = '', $force = false)
+       public static function updateFromProbe(int $id, string $network = '', bool $force = false)
        {
                /*
                  Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
@@ -1964,7 +1953,7 @@ class Contact
                // We check after the probing to be able to correct falsely detected contact types.
                if (($contact['contact-type'] == self::TYPE_RELAY) &&
                        (!Strings::compareLink($ret['url'], $contact['url']) || in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]))) {
-                       self::updateContact($id, $uid, $contact['url'], ['last-update' => $updated, 'success_update' => $updated]);
+                       self::updateContact($id, $uid, $contact['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
                        Logger::info('Not updating relais', ['id' => $id, 'url' => $contact['url']]);
                        return true;
                }
@@ -1972,11 +1961,15 @@ class Contact
                // If Probe::uri fails the network code will be different ("feed" or "unkn")
                if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) {
                        if ($force && ($uid == 0)) {
-                               self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'failure_update' => $updated]);
+                               self::updateContact($id, $uid, $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
                        }
                        return false;
                }
 
+               if (Contact\Relation::isDiscoverable($ret['url'])) {
+                       Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
+               }
+
                if (isset($ret['hide']) && is_bool($ret['hide'])) {
                        $ret['unsearchable'] = $ret['hide'];
                }
@@ -2011,12 +2004,12 @@ class Contact
                }
 
                if (!empty($ret['photo']) && ($ret['network'] != Protocol::FEED)) {
-                       self::updateAvatar($ret['photo'], $uid, $id, $update || $force);
+                       self::updateAvatar($id, $ret['photo'], $update || $force);
                }
 
                if (!$update) {
                        if ($force) {
-                               self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]);
+                               self::updateContact($id, $uid, $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
                        }
 
                        // Update the public contact
@@ -2046,6 +2039,7 @@ class Contact
                if ($force && ($uid == 0)) {
                        $ret['last-update'] = $updated;
                        $ret['success_update'] = $updated;
+                       $ret['failed'] = false;
                }
 
                unset($ret['photo']);
@@ -2300,7 +2294,7 @@ class Contact
                Group::addMember(User::getDefaultGroup($user['uid'], $contact["network"]), $contact_id);
 
                // Update the avatar
-               self::updateAvatar($ret['photo'], $user['uid'], $contact_id);
+               self::updateAvatar($contact_id, $ret['photo']);
 
                // pull feed and consume it, which should subscribe to the hub.
 
@@ -2436,7 +2430,7 @@ class Contact
 
                        // Contact is blocked at user-level
                        if (!empty($contact['id']) && !empty($importer['id']) &&
-                               self::isBlockedByUser($contact['id'], $importer['id'])) {
+                               Contact\User::isBlocked($contact['id'], $importer['id'])) {
                                return false;
                        }
 
@@ -2468,7 +2462,6 @@ class Contact
                                'nurl'     => Strings::normaliseLink($url),
                                'name'     => $name,
                                'nick'     => $nick,
-                               'photo'    => $photo,
                                'network'  => $network,
                                'rel'      => self::FOLLOWER,
                                'blocked'  => 0,
@@ -2482,7 +2475,7 @@ class Contact
                        // Ensure to always have the correct network type, independent from the connection request method
                        self::updateFromProbe($contact_id, '', true);
 
-                       Contact::updateAvatar($photo, $importer["uid"], $contact_id, true);
+                       self::updateAvatar($contact_id, $photo, true);
 
                        $contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo'], ['id' => $contact_id]);
 
@@ -2751,4 +2744,100 @@ class Contact
 
                return in_array($protocol, [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]) && !$self;
        }
+
+       /**
+        * Search contact table by nick or name
+        *
+        * @param string $search Name or nick
+        * @param string $mode   Search mode (e.g. "community")
+        *
+        * @return array with search results
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       public static function searchByName($search, $mode = '')
+       {
+               if (empty($search)) {
+                       return [];
+               }
+
+               // check supported networks
+               if (DI::config()->get('system', 'diaspora_enabled')) {
+                       $diaspora = Protocol::DIASPORA;
+               } else {
+                       $diaspora = Protocol::DFRN;
+               }
+
+               if (!DI::config()->get('system', 'ostatus_disabled')) {
+                       $ostatus = Protocol::OSTATUS;
+               } else {
+                       $ostatus = Protocol::DFRN;
+               }
+
+               // check if we search only communities or every contact
+               if ($mode === 'community') {
+                       $extra_sql = sprintf(' AND `contact-type` = %d', Contact::TYPE_COMMUNITY);
+               } else {
+                       $extra_sql = '';
+               }
+
+               $search .= '%';
+
+               $results = DBA::p("SELECT * FROM `contact`
+                       WHERE NOT `unsearchable` AND `network` IN (?, ?, ?, ?) AND
+                               NOT `failed` AND `uid` = ? AND
+                               (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql
+                               ORDER BY `nurl` DESC LIMIT 1000",
+                       Protocol::DFRN, Protocol::ACTIVITYPUB, $ostatus, $diaspora, 0, $search, $search, $search
+               );
+
+               $contacts = DBA::toArray($results);
+               return $contacts;
+       }
+
+       /**
+        * Add public contacts from an array
+        *
+        * @param array $urls
+        * @return array result "count", "added" and "updated"
+        */
+       public static function addByUrls(array $urls)
+       {
+               $added = 0;
+               $updated = 0;
+               $count = 0;
+
+               foreach ($urls as $url) {
+                       $contact = Contact::getByURL($url, false, ['id']); 
+                       if (empty($contact['id'])) {
+                               Worker::add(PRIORITY_LOW, 'AddContact', 0, $url);
+                               ++$added;
+                       } else {
+                               Worker::add(PRIORITY_LOW, 'UpdateContact', $contact['id']);
+                               ++$updated;
+                       }
+                       ++$count;
+               }
+
+               return ['count' => $count, 'added' => $added, 'updated' => $updated];
+       }
+
+       /**
+        * Returns a random, global contact of the current node
+        *
+        * @return string The profile URL
+        * @throws Exception
+        */
+       public static function getRandomUrl()
+       {
+               $r = DBA::selectFirst('contact', ['url'], [
+                       "`uid` = ? AND `network` = ? AND NOT `failed` AND `last-item` > ?",
+                       0, Protocol::DFRN, DateTimeFormat::utc('now - 1 month'),
+               ], ['order' => ['RAND()']]);
+
+               if (DBA::isResult($r)) {
+                       return $r['url'];
+               }
+
+               return '';
+       }
 }