X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=392f7776154b863f1f1bfe54998907450fd40526;hb=8b3a9fc58a969a3d9202f6858d5228f3a28be1ef;hp=4e2b0e5a24b8c1ff3b1bad4b3151c870ccdafc87;hpb=5bc0480fc277e7ec8312de21fc7b0e2a07b03236;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 4e2b0e5a24..392f777615 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -34,11 +34,15 @@ use Friendica\Core\Worker;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
+use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\HTTPSignature;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy;
@@ -106,7 +110,7 @@ class Contact
 	 */
 
 	 const MIRROR_DEACTIVATED = 0;
-	 const MIRROR_FORWARDED = 1;
+	 const MIRROR_FORWARDED = 1; // Deprecated, now does the same like MIRROR_OWN_POST
 	 const MIRROR_OWN_POST = 2;
 	 const MIRROR_NATIVE_RESHARE = 3;
 
@@ -136,6 +140,18 @@ class Contact
 		return $contact;
 	}
 
+	/**
+	 * @param array $fields    Array of selected fields, empty for all
+	 * @param array $condition Array of fields for condition
+	 * @param array $params    Array of several parameters
+	 * @return array
+	 * @throws \Exception
+	 */
+	public static function selectAccountToArray(array $fields = [], array $condition = [], array $params = []): array
+	{
+		return DBA::selectToArray('account-user-view', $fields, $condition, $params);
+	}
+
 	/**
 	 * @param array $fields    Array of selected fields, empty for all
 	 * @param array $condition Array of fields for condition
@@ -729,7 +745,6 @@ class Contact
 			'notify'      => DI::baseUrl() . '/dfrn_notify/'  . $user['nickname'],
 			'poll'        => DI::baseUrl() . '/dfrn_poll/'    . $user['nickname'],
 			'confirm'     => DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
-			'poco'        => DI::baseUrl() . '/poco/'         . $user['nickname'],
 			'name-date'   => DateTimeFormat::utcNow(),
 			'uri-date'    => DateTimeFormat::utcNow(),
 			'avatar-date' => DateTimeFormat::utcNow(),
@@ -811,7 +826,6 @@ class Contact
 			'notify'       => DI::baseUrl() . '/dfrn_notify/' . $user['nickname'],
 			'poll'         => DI::baseUrl() . '/dfrn_poll/'. $user['nickname'],
 			'confirm'      => DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
-			'poco'         => DI::baseUrl() . '/poco/' . $user['nickname'],
 		];
 
 
@@ -1116,40 +1130,26 @@ class Contact
 	 * Returns the data array for the photo menu of a given contact
 	 *
 	 * @param array $contact contact
-	 * @param int   $uid     optional, default 0
+	 * @param int   $uid     Visitor user id
 	 * @return array
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function photoMenu(array $contact, int $uid = 0): array
+	public static function photoMenu(array $contact, int $uid): array
 	{
-		$pm_url = '';
-		$status_link = '';
-		$photos_link = '';
-
-		if ($uid == 0) {
-			$uid = DI::userSession()->getLocalUserId();
+		// Anonymous visitor
+		if (!$uid) {
+			return ['profile' => [DI::l10n()->t('View Profile'), self::magicLinkByContact($contact), true]];
 		}
 
-		if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
-			if ($uid == 0) {
-				$profile_link = self::magicLinkByContact($contact);
-				$menu = ['profile' => [DI::l10n()->t('View Profile'), $profile_link, true]];
-
-				return $menu;
-			}
-
-			// Look for our own contact if the uid doesn't match and isn't public
-			$contact_own = DBA::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
-			if (DBA::isResult($contact_own)) {
-				return self::photoMenu($contact_own, $uid);
-			}
-		}
+		$pm_url      = '';
+		$status_link = '';
+		$photos_link = '';
 
 		$sparkle = false;
 		if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
-			$sparkle = true;
-			$profile_link = DI::baseUrl() . '/redir/' . $contact['id'];
+			$sparkle      = true;
+			$profile_link = 'contact/redir/' . $contact['id'];
 		} else {
 			$profile_link = $contact['url'];
 		}
@@ -1159,25 +1159,24 @@ class Contact
 		}
 
 		if ($sparkle) {
-			$status_link = $profile_link . '/status';
-			$photos_link = str_replace('/profile/', '/photos/', $profile_link);
+			$status_link  = $profile_link . '/status';
+			$photos_link  = $profile_link . '/photos';
 			$profile_link = $profile_link . '/profile';
 		}
 
 		if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) {
-			$pm_url = DI::baseUrl() . '/message/new/' . $contact['id'];
+			$pm_url = 'message/new/' . $contact['id'];
 		}
 
-		$contact_url = DI::baseUrl() . '/contact/' . $contact['id'];
+		$contact_url = 'contact/' . $contact['id'];
+		$posts_link = 'contact/' . $contact['id'] . '/conversations';
 
-		$posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
-
-		$follow_link = '';
+		$follow_link   = '';
 		$unfollow_link = '';
 		if (!$contact['self'] && Protocol::supportsFollow($contact['network'])) {
 			if ($contact['uid'] && in_array($contact['rel'], [self::SHARING, self::FRIEND])) {
 				$unfollow_link = 'contact/unfollow?url=' . urlencode($contact['url']) . '&auto=1';
-			} elseif(!$contact['pending']) {
+			} elseif (!$contact['pending']) {
 				$follow_link = 'contact/follow?url=' . urlencode($contact['url']) . '&auto=1';
 			}
 		}
@@ -1188,27 +1187,27 @@ class Contact
 		 */
 		if (empty($contact['uid'])) {
 			$menu = [
-				'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],
+				'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'  => [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],
-				'pm'      => [DI::l10n()->t('Send PM')       , $pm_url           , false],
-				'follow'  => [DI::l10n()->t('Connect/Follow'), $follow_link      , true],
-				'unfollow'=> [DI::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],
+				'pm'       => [DI::l10n()->t('Send PM')       , $pm_url       , false],
+				'follow'   => [DI::l10n()->t('Connect/Follow'), $follow_link  , true ],
+				'unfollow' => [DI::l10n()->t('Unfollow')      , $unfollow_link, true ],
 			];
 
 			if (!empty($contact['pending'])) {
 				try {
-					$intro = DI::intro()->selectForContact($contact['id']);
+					$intro          = DI::intro()->selectForContact($contact['id']);
 					$menu['follow'] = [DI::l10n()->t('Approve'), 'notifications/intros/' . $intro->id, true];
 				} catch (IntroductionNotFoundException $exception) {
 					DI::logger()->error('Pending contact doesn\'t have an introduction.', ['exception' => $exception]);
@@ -1385,7 +1384,21 @@ class Contact
 		}
 
 		if ($data['network'] == Protocol::DIASPORA) {
-			FContact::updateFromProbeArray($data);
+			try {
+				DI::dsprContact()->updateFromProbeArray($data);
+			} catch (HTTPException\NotFoundException $e) {
+				Logger::notice($e->getMessage(), ['url' => $url, 'data' => $data]);
+			} catch (\InvalidArgumentException $e) {
+				Logger::notice($e->getMessage(), ['url' => $url, 'data' => $data]);
+			}
+		} elseif (!empty($data['networks'][Protocol::DIASPORA])) {
+			try {
+				DI::dsprContact()->updateFromProbeArray($data['networks'][Protocol::DIASPORA]);
+			} catch (HTTPException\NotFoundException $e) {
+				Logger::notice($e->getMessage(), ['url' => $url, 'data' => $data['networks'][Protocol::DIASPORA]]);
+			} catch (\InvalidArgumentException $e) {
+				Logger::notice($e->getMessage(), ['url' => $url, 'data' => $data['networks'][Protocol::DIASPORA]]);
+			}
 		}
 
 		self::updateFromProbeArray($contact_id, $data);
@@ -2047,9 +2060,10 @@ class Contact
 	 * @param integer $cid     contact id
 	 * @param string  $size    One of the Proxy::SIZE_* constants
 	 * @param string  $updated Contact update date
+	 * @param bool    $static  If "true" a parameter is added to convert the avatar to a static one
 	 * @return string avatar link
 	 */
-	public static function getAvatarUrlForId(int $cid, string $size = '', string $updated = '', string $guid = ''): string
+	public static function getAvatarUrlForId(int $cid, string $size = '', string $updated = '', string $guid = '', bool $static = false): string
 	{
 		// We have to fetch the "updated" variable when it wasn't provided
 		// The parameter can be provided to improve performance
@@ -2079,7 +2093,15 @@ class Contact
 				$url .= Proxy::PIXEL_LARGE . '/';
 				break;
 		}
-		return $url . ($guid ?: $cid) . ($updated ? '?ts=' . strtotime($updated) : '');
+		$query_params = [];
+		if ($updated) {
+			$query_params['ts'] = strtotime($updated);
+		}
+		if ($static) {
+			$query_params['static'] = true;
+		}
+
+		return $url . ($guid ?: $cid) . (!empty($query_params) ? '?' . http_build_query($query_params) : '');
 	}
 
 	/**
@@ -2104,9 +2126,10 @@ class Contact
 	 * @param integer $cid     contact id
 	 * @param string  $size    One of the Proxy::SIZE_* constants
 	 * @param string  $updated Contact update date
+	 * @param bool    $static  If "true" a parameter is added to convert the header to a static one
 	 * @return string header link
 	 */
-	public static function getHeaderUrlForId(int $cid, string $size = '', string $updated = '', string $guid = ''): string
+	public static function getHeaderUrlForId(int $cid, string $size = '', string $updated = '', string $guid = '', bool $static = false): string
 	{
 		// We have to fetch the "updated" variable when it wasn't provided
 		// The parameter can be provided to improve performance
@@ -2137,7 +2160,15 @@ class Contact
 				break;
 		}
 
-		return $url . ($guid ?: $cid) . ($updated ? '?ts=' . strtotime($updated) : '');
+		$query_params = [];
+		if ($updated) {
+			$query_params['ts'] = strtotime($updated);
+		}
+		if ($static) {
+			$query_params['static'] = true;
+		}
+
+		return $url . ($guid ?: $cid) . (!empty($query_params) ? '?' . http_build_query($query_params) : '');
 	}
 
 	/**
@@ -2155,7 +2186,7 @@ class Contact
 	 */
 	public static function updateAvatar(int $cid, string $avatar, bool $force = false, bool $create_cache = false)
 	{
-		$contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'xmpp', 'addr', 'nurl', 'url', 'network', 'uri-id'],
+		$contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'blurhash', 'xmpp', 'addr', 'nurl', 'url', 'network', 'uri-id'],
 			['id' => $cid, 'self' => false]);
 		if (!DBA::isResult($contact)) {
 			return;
@@ -2165,8 +2196,19 @@ class Contact
 
 		// Only update the cached photo links of public contacts when they already are cached
 		if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro']) && !$create_cache) {
-			if ($contact['avatar'] != $avatar) {
-				self::update(['avatar' => $avatar], ['id' => $cid]);
+			if (($contact['avatar'] != $avatar) || empty($contact['blurhash'])) {
+				$update_fields = ['avatar' => $avatar];
+				$fetchResult = HTTPSignature::fetchRaw($avatar, 0, [HttpClientOptions::ACCEPT_CONTENT => [HttpClientAccept::IMAGE]]);
+
+				$img_str = $fetchResult->getBody();
+				if (!empty($img_str)) {
+					$image = new Image($img_str, Images::getMimeTypeByData($img_str));
+					if ($image->isValid()) {
+						$update_fields['blurhash'] = $image->getBlurHash();
+					}
+				}
+
+				self::update($update_fields, ['id' => $cid]);
 				Logger::info('Only update the avatar', ['id' => $cid, 'avatar' => $avatar, 'contact' => $contact]);
 			}
 			return;
@@ -2237,7 +2279,7 @@ class Contact
 				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()];
+						$fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'blurhash' => $photos[3], 'avatar-date' => DateTimeFormat::utcNow()];
 						$update = !empty($fields);
 						Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
 					} else {
@@ -2455,13 +2497,27 @@ class Contact
 			return false;
 		}
 
-		$ret = Probe::uri($contact['url'], $network, $contact['uid']);
+		$data = Probe::uri($contact['url'], $network, $contact['uid']);
 
-		if ($ret['network'] == Protocol::DIASPORA) {
-			FContact::updateFromProbeArray($ret);
+		if ($data['network'] == Protocol::DIASPORA) {
+			try {
+				DI::dsprContact()->updateFromProbeArray($data);
+			} catch (HTTPException\NotFoundException $e) {
+				Logger::notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
+			} catch (\InvalidArgumentException $e) {
+				Logger::notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
+			}
+		} elseif (!empty($data['networks'][Protocol::DIASPORA])) {
+			try {
+				DI::dsprContact()->updateFromProbeArray($data['networks'][Protocol::DIASPORA]);
+			} catch (HTTPException\NotFoundException $e) {
+				Logger::notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
+			} catch (\InvalidArgumentException $e) {
+				Logger::notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
+			}
 		}
 
-		return self::updateFromProbeArray($id, $ret);
+		return self::updateFromProbeArray($id, $data);
 	}
 
 	/**
@@ -2643,7 +2699,7 @@ class Contact
 		}
 
 		$update = false;
-		$guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url'], parse_url($ret['url'], PHP_URL_HOST));
+		$guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url']);
 
 		// make sure to not overwrite existing values with blank entries except some technical fields
 		$keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl'];
@@ -2860,15 +2916,8 @@ class Contact
 		}
 
 		// check if we already have a contact
-		// the poll url is more reliable than the profile url, as we may have
-		// indirect links or webfinger links
-
-		$condition = ['uid' => $uid, 'poll' => [$ret['poll'], Strings::normaliseLink($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
-		$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
-		if (!DBA::isResult($contact)) {
-			$condition = ['uid' => $uid, 'nurl' => Strings::normaliseLink($ret['url']), 'network' => $ret['network'], 'pending' => false];
-			$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
-		}
+		$condition = ['uid' => $uid, 'nurl' => Strings::normaliseLink($ret['url'])];
+		$contact = DBA::selectFirst('contact', ['id', 'rel', 'url', 'pending', 'hub-verify'], $condition);
 
 		$protocol = self::getProtocol($ret['url'], $ret['network']);
 
@@ -2924,7 +2973,13 @@ class Contact
 			// update contact
 			$new_relation = (in_array($contact['rel'], [self::FOLLOWER, self::FRIEND]) ? self::FRIEND : self::SHARING);
 
-			$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
+			$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false, 'network' => $ret['network']];
+
+			if ($contact['pending'] && !empty($contact['hub-verify'])) {
+				ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid);
+				$fields['pending'] = false;
+			}
+
 			self::update($fields, ['id' => $contact['id']]);
 		} else {
 			$new_relation = (in_array($protocol, [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
@@ -3156,11 +3211,14 @@ class Contact
 			return;
 		}
 
+		Worker::add(Worker::PRIORITY_LOW, 'ContactDiscoveryForUser', $contact['uid']);
+
 		self::clearFollowerFollowingEndpointCache($contact['uid']);
 
 		$cdata = self::getPublicAndUserContactID($contact['id'], $contact['uid']);
-
-		DI::notification()->deleteForUserByVerb($contact['uid'], Activity::FOLLOW, ['actor-id' => $cdata['public']]);
+		if (!empty($cdata['public'])) {
+			DI::notification()->deleteForUserByVerb($contact['uid'], Activity::FOLLOW, ['actor-id' => $cdata['public']]);
+		}
 	}
 
 	/**
@@ -3179,6 +3237,8 @@ class Contact
 		} else {
 			self::update(['rel' => self::FOLLOWER], ['id' => $contact['id']]);
 		}
+
+		Worker::add(Worker::PRIORITY_LOW, 'ContactDiscoveryForUser', $contact['uid']);
 	}
 
 	/**
@@ -3324,7 +3384,7 @@ class Contact
 			return $destination;
 		}
 
-		$redirect = 'redir/' . $contact['id'];
+		$redirect = 'contact/redir/' . $contact['id'];
 
 		if (($url != '') && !Strings::compareLink($contact['url'], $url)) {
 			$redirect .= '?url=' . $url;
@@ -3422,8 +3482,7 @@ class Contact
 			["(NOT `unsearchable` OR `nurl` IN (SELECT `nurl` FROM `owner-view` WHERE `publish` OR `net-publish`))
 			AND (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", $search, $search, $search]);
 
-		$contacts = self::selectToArray([], $condition, $params);
-		return $contacts;
+		return self::selectToArray([], $condition, $params);
 	}
 
 	/**
@@ -3478,4 +3537,17 @@ class Contact
 
 		return [];
 	}
+
+	/**
+	 * Checks, if contacts with the given condition exists
+	 *
+	 * @param array $condition
+	 *
+	 * @return bool
+	 * @throws \Exception
+	 */
+	public static function exists(array $condition): bool
+	{
+		return DBA::exists('contact', $condition);
+	}
 }