X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=112a3f3fb12317e7f1cde3250fe577af0ac4c63c;hb=8e2910976f126ee7c728ba4716f317ac496f377b;hp=0262a4a9fddb581cb06b2d09a9abf04364a643c8;hpb=b9dba631aadf6c25a97b679808c684276b3dd76a;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 0262a4a9fd..112a3f3fb1 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -6,9 +6,7 @@ namespace Friendica\Model;
 
 use Friendica\App\BaseURL;
 use Friendica\Content\Pager;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Session;
@@ -29,7 +27,7 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 /**
- * @brief functions for interacting with a contact
+ * functions for interacting with a contact
  */
 class Contact
 {
@@ -174,7 +172,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Tests if the given contact is a follower
+	 * Tests if the given contact is a follower
 	 *
 	 * @param int $cid Either public contact id or user's contact id
 	 * @param int $uid User ID
@@ -199,7 +197,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Tests if the given contact url is a follower
+	 * Tests if the given contact url is a follower
 	 *
 	 * @param string $url Contact URL
 	 * @param int    $uid User ID
@@ -220,7 +218,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Tests if the given user follow the given contact
+	 * Tests if the given user follow the given contact
 	 *
 	 * @param int $cid Either public contact id or user's contact id
 	 * @param int $uid User ID
@@ -245,7 +243,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Tests if the given user follow the given contact url
+	 * Tests if the given user follow the given contact url
 	 *
 	 * @param string $url Contact URL
 	 * @param int    $uid User ID
@@ -266,32 +264,40 @@ class Contact
 	}
 
 	/**
-	 * @brief Get the basepath for a given contact link
+	 * Get the basepath for a given contact link
 	 *
 	 * @param string $url The contact link
+	 * @param boolean $dont_update Don't update the contact
 	 *
 	 * @return string basepath
-	 * @return boolean $dont_update Don't update the contact
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
 	public static function getBasepath($url, $dont_update = false)
 	{
-		$contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+		$contact = DBA::selectFirst('contact', ['id', 'baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+		if (!DBA::isResult($contact)) {
+			return '';
+		}
+
 		if (!empty($contact['baseurl'])) {
 			return $contact['baseurl'];
 		} elseif ($dont_update) {
 			return '';
 		}
 
-		self::updateFromProbeByURL($url, true);
+		// Update the existing contact
+		self::updateFromProbe($contact['id'], '', true);
 
-		$contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
-		if (!empty($contact['baseurl'])) {
-			return $contact['baseurl'];
+		// And fetch the result
+		$contact = DBA::selectFirst('contact', ['baseurl'], ['id' => $contact['id']]);
+		if (empty($contact['baseurl'])) {
+			Logger::info('No baseurl for contact', ['url' => $url]);
+			return '';
 		}
 
-		return '';
+		Logger::info('Found baseurl for contact', ['url' => $url, 'baseurl' => $contact['baseurl']]);
+		return $contact['baseurl'];
 	}
 
 	/**
@@ -306,13 +312,36 @@ class Contact
 		return Strings::compareLink(self::getBasepath($url, true), DI::baseUrl());
 	}
 
+	/**
+	 * Check if the given contact ID is on the same server
+	 *
+	 * @param string $url The contact link
+	 *
+	 * @return boolean Is it the same server?
+	 */
+	public static function isLocalById(int $cid)
+	{
+		$contact = DBA::selectFirst('contact', ['url', 'baseurl'], ['id' => $cid]);
+		if (!DBA::isResult($contact)) {
+			return false;
+		}
+
+		if (empty($contact['baseurl'])) {
+			$baseurl = self::getBasepath($contact['url'], true);
+		} else {
+			$baseurl = $contact['baseurl'];
+		}
+
+		return Strings::compareLink($baseurl, DI::baseUrl());
+	}
+
 	/**
 	 * Returns the public contact id of the given user id
 	 *
 	 * @param  integer $uid User ID
 	 *
 	 * @return integer|boolean Public contact id for given user id
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public static function getPublicIdByUserId($uid)
 	{
@@ -324,7 +353,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns the contact id for the user and the public contact id for a given contact id
+	 * Returns the contact id for the user and the public contact id for a given contact id
 	 *
 	 * @param int $cid Either public contact id or user's contact id
 	 * @param int $uid User ID
@@ -386,7 +415,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Block contact id for user id
+	 * Block contact id for user id
 	 *
 	 * @param int     $cid     Either public contact id or user's contact id
 	 * @param int     $uid     User ID
@@ -408,7 +437,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns "block" state for contact id and user id
+	 * 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
@@ -449,7 +478,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Ignore contact id for user id
+	 * Ignore contact id for user id
 	 *
 	 * @param int     $cid     Either public contact id or user's contact id
 	 * @param int     $uid     User ID
@@ -471,7 +500,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns "ignore" state for contact id and user id
+	 * 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
@@ -512,7 +541,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Set "collapsed" for contact id and user id
+	 * 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
@@ -530,7 +559,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns "collapsed" state for contact id and user id
+	 * 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
@@ -559,7 +588,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns a list of contacts belonging in a group
+	 * Returns a list of contacts belonging in a group
 	 *
 	 * @param int $gid
 	 * @return array
@@ -594,7 +623,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns the count of OStatus contacts in a group
+	 * Returns the count of OStatus contacts in a group
 	 *
 	 * @param int $gid
 	 * @return int
@@ -693,8 +722,8 @@ class Contact
 		}
 
 		$fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
-			'country-name', 'gender', 'pub_keywords', 'xmpp', 'net-publish'];
-		$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+			'country-name', 'pub_keywords', 'xmpp', 'net-publish'];
+		$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
 		if (!DBA::isResult($profile)) {
 			return;
 		}
@@ -704,7 +733,7 @@ class Contact
 		$fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
 			'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
 			'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
-			'gender' => $profile['gender'], 'contact-type' => $user['account-type'],
+			'gender' => '', 'contact-type' => $user['account-type'],
 			'xmpp' => $profile['xmpp']];
 
 		$avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
@@ -771,12 +800,12 @@ class Contact
 			// Update the profile
 			$fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
 				'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
-			DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+			DBA::update('profile', $fields, ['uid' => $uid]);
 		}
 	}
 
 	/**
-	 * @brief Marks a contact for removal
+	 * Marks a contact for removal
 	 *
 	 * @param int $id contact id
 	 * @return null
@@ -798,7 +827,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Sends an unfriend message. Does not remove the contact
+	 * Sends an unfriend message. Does not remove the contact
 	 *
 	 * @param array   $user     User unfriending
 	 * @param array   $contact  Contact unfriended
@@ -847,7 +876,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Marks a contact for archival after a communication issue delay
+	 * Marks a contact for archival after a communication issue delay
 	 *
 	 * Contact has refused to recognise us as a friend. We will start a countdown.
 	 * If they still don't recognise us in 32 days, the relationship is over,
@@ -889,7 +918,7 @@ class Contact
 			 */
 
 			/// @todo Check for contact vitality via probing
-			$archival_days = Config::get('system', 'archival_days', 32);
+			$archival_days = DI::config()->get('system', 'archival_days', 32);
 
 			$expiry = $contact['term-date'] . ' + ' . $archival_days . ' days ';
 			if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) {
@@ -905,7 +934,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Cancels the archival countdown
+	 * Cancels the archival countdown
 	 *
 	 * @see   Contact::markForArchival()
 	 *
@@ -948,7 +977,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Get contact data for a given profile link
+	 * Get contact data for a given profile link
 	 *
 	 * The function looks at several places (contact table and gcontact table) for the contact
 	 * It caches its result for the same script execution to prevent duplicate calls
@@ -1095,7 +1124,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Get contact data for a given address
+	 * Get contact data for a given address
 	 *
 	 * The function looks at several places (contact table and gcontact table) for the contact
 	 *
@@ -1153,7 +1182,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns the data array for the photo menu of a given contact
+	 * Returns the data array for the photo menu of a given contact
 	 *
 	 * @param array $contact contact
 	 * @param int   $uid     optional, default 0
@@ -1176,7 +1205,7 @@ class Contact
 		if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
 			if ($uid == 0) {
 				$profile_link = self::magicLink($contact['url']);
-				$menu = ['profile' => [L10n::t('View Profile'), $profile_link, true]];
+				$menu = ['profile' => [DI::l10n()->t('View Profile'), $profile_link, true]];
 
 				return $menu;
 			}
@@ -1201,9 +1230,9 @@ class Contact
 		}
 
 		if ($sparkle) {
-			$status_link = $profile_link . '?tab=status';
+			$status_link = $profile_link . '/status';
 			$photos_link = str_replace('/profile/', '/photos/', $profile_link);
-			$profile_link = $profile_link . '?tab=profile';
+			$profile_link = $profile_link . '/profile';
 		}
 
 		if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) {
@@ -1238,30 +1267,30 @@ class Contact
 		 */
 		if (empty($contact['uid'])) {
 			$menu = [
-				'profile' => [L10n::t('View Profile')  , $profile_link , true],
-				'network' => [L10n::t('Network Posts') , $posts_link   , false],
-				'edit'    => [L10n::t('View Contact')  , $contact_url  , false],
-				'follow'  => [L10n::t('Connect/Follow'), $follow_link  , true],
-				'unfollow'=> [L10n::t('UnFollow')      , $unfollow_link, true],
+				'profile' => [DI::l10n()->t('View Profile')  , $profile_link , true],
+				'network' => [DI::l10n()->t('Network Posts') , $posts_link   , false],
+				'edit'    => [DI::l10n()->t('View Contact')  , $contact_url  , false],
+				'follow'  => [DI::l10n()->t('Connect/Follow'), $follow_link  , true],
+				'unfollow'=> [DI::l10n()->t('UnFollow')      , $unfollow_link, true],
 			];
 		} else {
 			$menu = [
-				'status'  => [L10n::t('View Status')   , $status_link      , true],
-				'profile' => [L10n::t('View Profile')  , $profile_link     , true],
-				'photos'  => [L10n::t('View Photos')   , $photos_link      , true],
-				'network' => [L10n::t('Network Posts') , $posts_link       , false],
-				'edit'    => [L10n::t('View Contact')  , $contact_url      , false],
-				'drop'    => [L10n::t('Drop Contact')  , $contact_drop_link, false],
-				'pm'      => [L10n::t('Send PM')       , $pm_url           , false],
-				'poke'    => [L10n::t('Poke')          , $poke_link        , false],
-				'follow'  => [L10n::t('Connect/Follow'), $follow_link      , true],
-				'unfollow'=> [L10n::t('UnFollow')      , $unfollow_link    , true],
+				'status'  => [DI::l10n()->t('View Status')   , $status_link      , true],
+				'profile' => [DI::l10n()->t('View Profile')  , $profile_link     , true],
+				'photos'  => [DI::l10n()->t('View Photos')   , $photos_link      , true],
+				'network' => [DI::l10n()->t('Network Posts') , $posts_link       , false],
+				'edit'    => [DI::l10n()->t('View Contact')  , $contact_url      , false],
+				'drop'    => [DI::l10n()->t('Drop Contact')  , $contact_drop_link, false],
+				'pm'      => [DI::l10n()->t('Send PM')       , $pm_url           , false],
+				'poke'    => [DI::l10n()->t('Poke')          , $poke_link        , false],
+				'follow'  => [DI::l10n()->t('Connect/Follow'), $follow_link      , true],
+				'unfollow'=> [DI::l10n()->t('UnFollow')      , $unfollow_link    , true],
 			];
 
 			if (!empty($contact['pending'])) {
 				$intro = DBA::selectFirst('intro', ['id'], ['contact-id' => $contact['id']]);
 				if (DBA::isResult($intro)) {
-					$menu['follow'] = [L10n::t('Approve'), 'notifications/intros/' . $intro['id'], true];
+					$menu['follow'] = [DI::l10n()->t('Approve'), 'notifications/intros/' . $intro['id'], true];
 				}
 			}
 		}
@@ -1282,7 +1311,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns ungrouped contact count or list for user
+	 * Returns ungrouped contact count or list for user
 	 *
 	 * Returns either the total number of ungrouped contacts for the given user
 	 * id or a paginated list of ungrouped contacts.
@@ -1393,7 +1422,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Fetch the contact id for a given URL and user
+	 * Fetch the contact id for a given URL and user
 	 *
 	 * First lookup in the contact table to find a record matching either `url`, `nurl`,
 	 * `addr` or `alias`.
@@ -1631,7 +1660,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Checks if the contact is archived
+	 * Checks if the contact is archived
 	 *
 	 * @param int $cid contact id
 	 *
@@ -1675,7 +1704,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Checks if the contact is blocked
+	 * Checks if the contact is blocked
 	 *
 	 * @param int $cid contact id
 	 *
@@ -1701,7 +1730,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Checks if the contact is hidden
+	 * Checks if the contact is hidden
 	 *
 	 * @param int $cid contact id
 	 *
@@ -1722,7 +1751,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns posts from a given contact url
+	 * Returns posts from a given contact url
 	 *
 	 * @param string $contact_url Contact URL
 	 *
@@ -1785,7 +1814,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns the account type name
+	 * Returns the account type name
 	 *
 	 * The function can be called with either the user or the contact array
 	 *
@@ -1820,15 +1849,15 @@ class Contact
 
 		switch ($type) {
 			case self::TYPE_ORGANISATION:
-				$account_type = L10n::t("Organisation");
+				$account_type = DI::l10n()->t("Organisation");
 				break;
 
 			case self::TYPE_NEWS:
-				$account_type = L10n::t('News');
+				$account_type = DI::l10n()->t('News');
 				break;
 
 			case self::TYPE_COMMUNITY:
-				$account_type = L10n::t("Forum");
+				$account_type = DI::l10n()->t("Forum");
 				break;
 
 			default:
@@ -1840,7 +1869,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Blocks a contact
+	 * Blocks a contact
 	 *
 	 * @param int $cid
 	 * @return bool
@@ -1854,7 +1883,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Unblocks a contact
+	 * Unblocks a contact
 	 *
 	 * @param int $cid
 	 * @return bool
@@ -1868,7 +1897,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Updates the avatar links in a contact only if needed
+	 * 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
@@ -1888,6 +1917,14 @@ class Contact
 			$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;
+			}
+		}
+
 		if (($contact["avatar"] != $avatar) || $force) {
 			$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
 
@@ -1910,8 +1947,8 @@ class Contact
 		return $data;
 	}
 
-        /**
-	 * @brief Helper function for "updateFromProbe". Updates personal and public contact
+	/**
+	 * Helper function for "updateFromProbe". Updates personal and public contact
 	 *
 	 * @param integer $id      contact id
 	 * @param integer $uid     user id
@@ -1969,8 +2006,8 @@ class Contact
 		DBA::update('contact', $fields, $condition);
 	}
 
-        /**
-	 * @brief Remove duplicated contacts
+	/**
+	 * Remove duplicated contacts
 	 *
 	 * @param string  $nurl  Normalised contact url
 	 * @param integer $uid   User id
@@ -2110,6 +2147,12 @@ class Contact
 			if ($force) {
 				self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]);
 			}
+
+			// Update the public contact
+			if ($uid != 0) {
+				self::updateFromProbeByURL($ret['url']);
+			}
+
 			return true;
 		}
 
@@ -2190,6 +2233,7 @@ class Contact
 
 	/**
 	 * Takes a $uid and a url/handle and adds a new contact
+	 *
 	 * Currently if the contact is DFRN, interactive needs to be true, to redirect to the
 	 * dfrn_request page.
 	 *
@@ -2199,7 +2243,7 @@ class Contact
 	 * $return['success'] boolean true if successful
 	 * $return['message'] error text if success is false.
 	 *
-	 * @brief Takes a $uid and a url/handle and adds a new contact
+	 * Takes a $uid and a url/handle and adds a new contact
 	 * @param int    $uid
 	 * @param string $url
 	 * @param bool   $interactive
@@ -2212,23 +2256,23 @@ class Contact
 	{
 		$result = ['cid' => -1, 'success' => false, 'message' => ''];
 
-		$a = \get_app();
+		$a = DI::app();
 
 		// remove ajax junk, e.g. Twitter
 		$url = str_replace('/#!/', '/', $url);
 
 		if (!Network::isUrlAllowed($url)) {
-			$result['message'] = L10n::t('Disallowed profile URL.');
+			$result['message'] = DI::l10n()->t('Disallowed profile URL.');
 			return $result;
 		}
 
 		if (Network::isUrlBlocked($url)) {
-			$result['message'] = L10n::t('Blocked domain');
+			$result['message'] = DI::l10n()->t('Blocked domain');
 			return $result;
 		}
 
 		if (!$url) {
-			$result['message'] = L10n::t('Connect URL missing.');
+			$result['message'] = DI::l10n()->t('Connect URL missing.');
 			return $result;
 		}
 
@@ -2237,7 +2281,7 @@ class Contact
 		Hook::callAll('follow', $arr);
 
 		if (empty($arr)) {
-			$result['message'] = L10n::t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.');
+			$result['message'] = DI::l10n()->t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.');
 			return $result;
 		}
 
@@ -2277,9 +2321,9 @@ class Contact
 
 				// NOTREACHED
 			}
-		} elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
-			$result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL;
-			$result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
+		} elseif (DI::config()->get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
+			$result['message'] = DI::l10n()->t('This site is not configured to allow communications with other networks.') . EOL;
+			$result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL;
 			return $result;
 		}
 
@@ -2290,30 +2334,30 @@ class Contact
 
 		// do we have enough information?
 		if (empty($ret['name']) || empty($ret['poll']) || (empty($ret['url']) && empty($ret['addr']))) {
-			$result['message'] .= L10n::t('The profile address specified does not provide adequate information.') . EOL;
+			$result['message'] .= DI::l10n()->t('The profile address specified does not provide adequate information.') . EOL;
 			if (empty($ret['poll'])) {
-				$result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
+				$result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL;
 			}
 			if (empty($ret['name'])) {
-				$result['message'] .= L10n::t('An author or name was not found.') . EOL;
+				$result['message'] .= DI::l10n()->t('An author or name was not found.') . EOL;
 			}
 			if (empty($ret['url'])) {
-				$result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL;
+				$result['message'] .= DI::l10n()->t('No browser URL could be matched to this address.') . EOL;
 			}
 			if (strpos($url, '@') !== false) {
-				$result['message'] .= L10n::t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
-				$result['message'] .= L10n::t('Use mailto: in front of address to force email check.') . EOL;
+				$result['message'] .= DI::l10n()->t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
+				$result['message'] .= DI::l10n()->t('Use mailto: in front of address to force email check.') . EOL;
 			}
 			return $result;
 		}
 
-		if ($protocol === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) {
-			$result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
+		if ($protocol === Protocol::OSTATUS && DI::config()->get('system', 'ostatus_disabled')) {
+			$result['message'] .= DI::l10n()->t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
 			$ret['notify'] = '';
 		}
 
 		if (!$ret['notify']) {
-			$result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
+			$result['message'] .= DI::l10n()->t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
 		}
 
 		$writeable = ((($protocol === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
@@ -2374,7 +2418,7 @@ class Contact
 
 		$contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
 		if (!DBA::isResult($contact)) {
-			$result['message'] .= L10n::t('Unable to retrieve contact information.') . EOL;
+			$result['message'] .= DI::l10n()->t('Unable to retrieve contact information.') . EOL;
 			return $result;
 		}
 
@@ -2429,7 +2473,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Updated contact's SSL policy
+	 * Updated contact's SSL policy
 	 *
 	 * @param array  $contact    Contact array
 	 * @param string $new_policy New policy, valid: self,full
@@ -2595,7 +2639,7 @@ class Contact
 						'to_email'     => $user['email'],
 						'uid'          => $user['uid'],
 						'link'         => DI::baseUrl() . '/notifications/intro',
-						'source_name'  => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')),
+						'source_name'  => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : DI::l10n()->t('[Name Withheld]')),
 						'source_link'  => $contact_record['url'],
 						'source_photo' => $contact_record['photo'],
 						'verb'         => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
@@ -2632,7 +2676,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Create a birthday event.
+	 * Create a birthday event.
 	 *
 	 * Update the year and the birthday.
 	 */
@@ -2674,30 +2718,27 @@ class Contact
 	 * Remove the unavailable contact ids from the provided list
 	 *
 	 * @param array $contact_ids Contact id list
+	 * @return array
 	 * @throws \Exception
 	 */
-	public static function pruneUnavailable(array &$contact_ids)
+	public static function pruneUnavailable(array $contact_ids)
 	{
 		if (empty($contact_ids)) {
-			return;
-		}
-
-		$str = DBA::escape(implode(',', $contact_ids));
-
-		$stmt = DBA::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
-
-		$return = [];
-		while($contact = DBA::fetch($stmt)) {
-			$return[] = $contact['id'];
+			return [];
 		}
 
-		DBA::close($stmt);
+		$contacts = Contact::selectToArray(['id'], [
+			'id'      => $contact_ids,
+			'blocked' => false,
+			'pending' => false,
+			'archive' => false,
+		]);
 
-		$contact_ids = $return;
+		return array_column($contacts, 'id');
 	}
 
 	/**
-	 * @brief Returns a magic link to authenticate remote visitors
+	 * Returns a magic link to authenticate remote visitors
 	 *
 	 * @todo  check if the return is either a fully qualified URL or a relative path to Friendica basedir
 	 *
@@ -2726,7 +2767,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns a magic link to authenticate remote visitors
+	 * Returns a magic link to authenticate remote visitors
 	 *
 	 * @param integer $cid The contact id of the target contact profile
 	 * @param string  $url An url that we will be redirected to after the authentication
@@ -2743,7 +2784,7 @@ class Contact
 	}
 
 	/**
-	 * @brief Returns a magic link to authenticate remote visitors
+	 * Returns a magic link to authenticate remote visitors
 	 *
 	 * @param array  $contact The contact array with "uid", "network" and "url"
 	 * @param string $url     An url that we will be redirected to after the authentication