From c7b3c071c7ab0faccfcb6a6540bfea0b43b5947d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 1 Feb 2022 19:12:33 +0000
Subject: [PATCH] Issue 11034: Use the profile photo for local users

---
 src/Module/Photo.php                          | 21 ++++++++++++++++++-
 view/templates/profile/vcard.tpl              |  7 ++-----
 .../duepuntozero/templates/profile/vcard.tpl  |  2 +-
 view/theme/frio/templates/profile/vcard.tpl   |  9 --------
 .../theme/quattro/templates/profile/vcard.tpl |  2 +-
 view/theme/vier/templates/profile/vcard.tpl   |  6 +-----
 6 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 6f58cb7f57..c67520b554 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -265,10 +265,29 @@ class Photo extends BaseModule
 
 				return MPhoto::createPhotoForExternalResource($link['url'], (int)local_user(), $link['mimetype']);
 			case "contact":
-				$contact = Contact::getById($id, ['uid', 'url', 'avatar', 'photo', 'xmpp', 'addr']);
+				$contact = Contact::getById($id, ['uid', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr']);
 				if (empty($contact)) {
 					return false;
 				}
+
+				// For local users directly use the photo record that is marked as the profile
+				if (Network::isLocalLink($contact['url'])) {
+					$contact = Contact::selectFirst(['uid', 'url', 'avatar', 'photo', 'xmpp', 'addr'], ['nurl' => $contact['nurl'], 'self' => true]);
+					if (!empty($contact)) {
+						if ($customsize <= Proxy::PIXEL_MICRO) {
+							$scale = 6;
+						} elseif ($customsize <= Proxy::PIXEL_THUMB) {
+							$scale = 5;
+						} else {
+							$scale = 4;
+						}
+						$photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $contact['uid'], "profile" => 1]);
+						if (!empty($photo)) {
+							return $photo;
+						}
+					}
+				}
+
 				If (($contact['uid'] != 0) && empty($contact['photo']) && empty($contact['avatar'])) {
 					$contact = Contact::getByURL($contact['url'], false, ['avatar', 'photo', 'xmpp', 'addr']);
 				}
diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
index bc39dcce4b..fed6fb251a 100644
--- a/view/templates/profile/vcard.tpl
+++ b/view/templates/profile/vcard.tpl
@@ -5,11 +5,8 @@
 	
 	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 	
-	{{if $profile.picdate}}
-		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
-	{{else}}
-		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
-	{{/if}}
+	<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
+
 	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 	{{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
 	{{if $location}}
diff --git a/view/theme/duepuntozero/templates/profile/vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl
index cba78da6af..c6af35ba00 100644
--- a/view/theme/duepuntozero/templates/profile/vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile/vcard.tpl
@@ -5,7 +5,7 @@
 	
 	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 	
-	<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+	<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></div>
 
 	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 
diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl
index ba66882e2e..b91c14168b 100644
--- a/view/theme/frio/templates/profile/vcard.tpl
+++ b/view/theme/frio/templates/profile/vcard.tpl
@@ -1,12 +1,7 @@
 <div class="vcard h-card widget">
 
 	<div id="profile-photo-wrapper">
-		{{if $profile.picdate}}
-		<a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a>
-		{{else}}
 		<a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
-		{{/if}}
-
 		<div class="tool visible-lg visible-md">
 			{{if $profile.edit}}
 			<div class="action">
@@ -21,11 +16,7 @@
 	<div id="vcard-short-info-wrapper" style="display: none;">
 		<div id="vcard-short-info" class="media" style="display: none">
 			<div id="vcard-short-photo-wrapper" class="pull-left">
-				{{if $profile.picdate}}
-				<img class="media-object" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a>
-				{{else}}
 				<img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name}}"></a>
-				{{/if}}
 			</div>
 
 			<div id="vcard-short-desc" class="media-body">
diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl
index dc5b0c7d1f..e66334dc21 100644
--- a/view/theme/quattro/templates/profile/vcard.tpl
+++ b/view/theme/quattro/templates/profile/vcard.tpl
@@ -17,7 +17,7 @@
 
 	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
-	<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+	<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}" /></div>
 
 	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 
diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl
index c15e7940d3..01e75580df 100644
--- a/view/theme/vier/templates/profile/vcard.tpl
+++ b/view/theme/vier/templates/profile/vcard.tpl
@@ -11,11 +11,7 @@
 
 	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
-	{{if $profile.picdate}}
-		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
-	{{else}}
-		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
-	{{/if}}
+	<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
 
 	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 	{{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}