X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=2afe91d134cd8109056069d61a5b6e5f9d7ec4f1;hb=48087136680d345e9222c974ae983262b319d308;hp=f563244120af721f78d8ca8b5d8b4e901048f688;hpb=77906627c5bb57d404d40702f89c205d1faa9542;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index f563244120..2afe91d134 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1660,6 +1660,59 @@ class Contact
 		return $contact;
 	}
 
+	/**
+	 * Fetch the default header for the given contact
+	 *
+	 * @param array $contact  contact array
+	 * @return string avatar URL
+	 */
+	public static function getDefaultHeader(array $contact): string
+	{
+		if (!empty($contact['header'])) {
+			return $contact['header'];
+		}
+
+		if (!empty($contact['gsid'])) {
+			// Use default banners for certain platforms
+			$gserver = DBA::selectFirst('gserver', ['platform'], ['id' => $contact['gsid']]);
+			$platform = strtolower($gserver['platform'] ?? '');
+		} else {
+			$platform = '';
+		}
+
+		switch ($platform) {
+			case 'friendica':
+			case 'friendika':
+				/**
+				 * Picture credits
+				 * @author  Lostinlight <https://mastodon.xyz/@lightone>
+				 * @license CC0 https://creativecommons.org/share-your-work/public-domain/cc0/
+				 * @link    https://gitlab.com/lostinlight/per_aspera_ad_astra/-/blob/master/friendica-404/friendica-promo-bubbles.jpg
+				 */
+				$header = DI::baseUrl() . '/images/friendica-banner.jpg';
+				break;
+			case 'diaspora':
+				/**
+				 * Picture credits
+				 * @author  John Liu <https://www.flickr.com/photos/8047705@N02/>
+				 * @license CC BY 2.0 https://creativecommons.org/licenses/by/2.0/
+				 * @link    https://www.flickr.com/photos/8047705@N02/5572197407
+				 */
+				$header = DI::baseUrl() . '/images/diaspora-banner.jpg';
+				break;
+			default:
+				/**
+				 * Use a random picture. 
+				 * The service provides random pictures from Unsplash.
+				 * @license https://unsplash.com/license
+				 */
+				$header = 'https://picsum.photos/seed/' . hash('ripemd128', $contact['url']) . '/960/300';
+				break;
+		}
+
+		return $header;
+	}
+
 	/**
 	 * Fetch the default avatar for the given contact and size
 	 *
@@ -1860,7 +1913,14 @@ class Contact
 			$avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
 		}
 
-		if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
+		$cache_avatar = DI::config()->get('system', 'cache_contact_avatar');
+
+		// Local contact avatars don't need to be cached
+		if ($cache_avatar && Network::isLocalLink($contact['url'])) {
+			$cache_avatar = !DBA::exists('contact', ['nurl' => $contact['nurl'], 'self' => true]);
+		}
+
+		if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || $cache_avatar) {
 			if ($default_avatar && Proxy::isLocalImage($avatar)) {
 				$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
 					'photo' => $avatar,
@@ -2106,7 +2166,7 @@ class Contact
 		// These fields aren't updated by this routine:
 		// 'sensitive'
 
-		$fields = ['uid', 'uri-id', 'gsid', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
+		$fields = ['uid', 'uri-id', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
 			'manually-approve', 'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
 			'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item', 'xmpp', 'matrix'];
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
@@ -2138,9 +2198,6 @@ class Contact
 		$uriid = $contact['uri-id'];
 		unset($contact['uri-id']);
 
-		$gsid = $contact['gsid'];
-		unset($contact['gsid']);
-
 		$pubkey = $contact['pubkey'];
 		unset($contact['pubkey']);
 
@@ -2228,30 +2285,6 @@ class Contact
 			self::updateAvatar($id, $ret['photo'], $update);
 		}
 
-		if (empty($ret['header']) && !empty($gsid)) {
-			$gserver = DBA::selectFirst('gserver', ['platform'], ['id' => $gsid]);
-			switch (strtolower($gserver['platform'] ?? '')) {
-				case 'friendica':
-				case 'friendika':
-					/**
-					 * Picture credits
-					 * @author  Lostinlight <https://gitlab.com/lostinlight>
-					 * @link    https://gitlab.com/lostinlight/per_aspera_ad_astra/-/blob/master/friendica-404/friendica-promo-bubbles.jpg
-					 */
-					$ret['header'] = DI::baseUrl() . '/images/friendica-banner.jpg';
-					break;
-				case 'diaspora':
-					/**
-					 * Picture credits
-					 * @author  John Liu <https://www.flickr.com/photos/8047705@N02/>
-					 * @license CC BY 2.0 https://creativecommons.org/licenses/by/2.0/
-					 * @link    https://www.flickr.com/photos/8047705@N02/5572197407
-					 */
-					$ret['header'] = DI::baseUrl() . '/images/diaspora-banner.jpg';
-					break;
-				}
-		}
-
 		$uriid = ItemURI::insert(['uri' => $ret['url'], 'guid' => $guid]);
 
 		if (!$update) {