X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=03cd09fc5af7f97a620b529a45e1b6643410d799;hb=ab83d0dd27e46e733ecb49f25789bfb318852ac7;hp=c6a91edc8ba48119eaff9d1cf40877b551710f13;hpb=e0411743e228e241cd333f6911e450a47ffe5ec6;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index c6a91edc8b..03cd09fc5a 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1553,18 +1553,22 @@ class Contact
 	 */
 	public static function checkAvatarCache(int $cid)
 	{
-		$contact = DBA::selectFirst('contact', ['url', 'avatar', 'photo', 'thumb', 'micro'], ['id' => $cid, 'uid' => 0, 'self' => false]);
+		$contact = DBA::selectFirst('contact', ['url', 'network', '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']))) {
+		if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
+			if (!empty($contact['avatar']) && (empty($contact['photo']) || empty($contact['thumb']) || empty($contact['micro']))) {
+				Logger::info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
+				self::updateAvatar($cid, $contact['avatar'], true);
+				return;
+			}
+		} elseif (!empty($contact['photo']) || !empty($contact['thumb']) || !empty($contact['micro'])) {
+			Logger::info('Removing avatar cache', ['id' => $cid, 'contact' => $contact]);
+			self::updateAvatar($cid, $contact['avatar'], true);
 			return;
 		}
-
-		Logger::info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
-
-		self::updateAvatar($cid, $contact['avatar'], true);
 	}
 
 	/**
@@ -1868,54 +1872,61 @@ class Contact
 			$avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
 		}
 
-		if ($default_avatar && Proxy::isLocalImage($avatar)) {
-			$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
-				'photo' => $avatar,
-				'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB),
-				'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO)];
-			Logger::debug('Use default avatar', ['id' => $cid, 'uid' => $uid]);
-		}
+		if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
+			if ($default_avatar && Proxy::isLocalImage($avatar)) {
+				$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
+					'photo' => $avatar,
+					'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB),
+					'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO)];
+				Logger::debug('Use default avatar', ['id' => $cid, 'uid' => $uid]);
+			}
 
-		// Use the data from the self account
-		if (empty($fields)) {
-			$local_uid = User::getIdForURL($contact['url']);
-			if (!empty($local_uid)) {
-				$fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]);
-				Logger::debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+			// Use the data from the self account
+			if (empty($fields)) {
+				$local_uid = User::getIdForURL($contact['url']);
+				if (!empty($local_uid)) {
+					$fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]);
+					Logger::debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+				}
 			}
-		}
 
-		if (empty($fields)) {
-			$update = ($contact['avatar'] != $avatar) || $force;
-
-			if (!$update) {
-				$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::debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
-						$update = true;
+			if (empty($fields)) {
+				$update = ($contact['avatar'] != $avatar) || $force;
+
+				if (!$update) {
+					$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::debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+							$update = true;
+						}
 					}
 				}
-			}
 
-			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()];
-					$update = !empty($fields);
-					Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
-				} else {
-					$update = false;
+				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()];
+						$update = !empty($fields);
+						Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+					} else {
+						$update = false;
+					}
 				}
+			} else {
+				$update = ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
 			}
 		} else {
-			$update = ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
+			Photo::delete(['uid' => $uid, 'contact-id' => $cid, 'photo-type' => Photo::CONTACT_AVATAR]);
+			$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
+				'photo' => '', 'thumb' => '', 'micro' => ''];
+			$update = ($avatar != $contact['avatar'] . $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
 		}
 
 		if (!$update) {
@@ -2398,7 +2409,7 @@ class Contact
 		}
 
 		if (($network != '') && ($ret['network'] != $network)) {
-			Logger::log('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
+			Logger::notice('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
 			return $result;
 		}
 
@@ -2548,7 +2559,7 @@ class Contact
 				}
 			} elseif ($protocol == Protocol::DIASPORA) {
 				$ret = Diaspora::sendShare($owner, $contact);
-				Logger::log('share returns: ' . $ret);
+				Logger::notice('share returns: ' . $ret);
 			} elseif ($protocol == Protocol::ACTIVITYPUB) {
 				$activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id);
 				if (empty($activity_id)) {
@@ -2557,7 +2568,7 @@ class Contact
 				}
 
 				$ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid, $activity_id);
-				Logger::log('Follow returns: ' . $ret);
+				Logger::notice('Follow returns: ' . $ret);
 			}
 		}
 
@@ -2675,7 +2686,7 @@ class Contact
 		} else {
 			// send email notification to owner?
 			if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($url), 'uid' => $importer['uid'], 'pending' => true])) {
-				Logger::log('ignoring duplicated connection request from pending contact ' . $url);
+				Logger::notice('ignoring duplicated connection request from pending contact ' . $url);
 				return null;
 			}
 
@@ -2795,7 +2806,7 @@ class Contact
 		$contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition);
 
 		while ($contact = DBA::fetch($contacts)) {
-			Logger::log('update_contact_birthday: ' . $contact['bd']);
+			Logger::notice('update_contact_birthday: ' . $contact['bd']);
 
 			$nextbd = DateTimeFormat::utcNow('Y') . substr($contact['bd'], 4);