head fixings

[friendica.git] / src / Module / Photo.php

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 6f58cb7f57caa8f741bc07078969f45511c08d38..f2765280b65940c3be960419d1fb989be29b6e81 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -32,6 +32,7 @@ use Friendica\Model\Profile;
 use Friendica\Core\Storage\Type\ExternalResource;
 use Friendica\Core\Storage\Type\SystemResource;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\NotModifiedException;
 use Friendica\Object\Image;
@@ -265,13 +266,33 @@ 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;
                                }
-                               If (($contact['uid'] != 0) && empty($contact['photo']) && empty($contact['avatar'])) {
+
+                               // 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 (!empty($contact['uid']) && empty($contact['photo']) && empty($contact['avatar'])) {
                                        $contact = Contact::getByURL($contact['url'], false, ['avatar', 'photo', 'xmpp', 'addr']);
                                }
+
                                if (!empty($contact['photo']) && !empty($contact['avatar'])) {
                                        // Fetch photo directly
                                        $resourceid = MPhoto::ridFromURI($contact['photo']);
@@ -288,7 +309,7 @@ class Photo extends BaseModule
                                }
                                $mimetext = '';
                                if (!empty($url)) {
-                                       $mime = ParseUrl::getContentType($url);
+                                       $mime = ParseUrl::getContentType($url, HttpClientAccept::IMAGE);
                                        if (!empty($mime)) {
                                                $mimetext = $mime[0] . '/' . $mime[1];
                                        } else {
@@ -297,6 +318,8 @@ class Photo extends BaseModule
                                        if (!empty($mimetext) && ($mime[0] != 'image') && ($mimetext != 'application/octet-stream')) {
                                                Logger::info('Unexpected Content-Type', ['mime' => $mimetext, 'url' => $url]);
                                                $mimetext = '';
+                                       } if (!empty($mimetext)) {
+                                               Logger::debug('Expected Content-Type', ['mime' => $mimetext, 'url' => $url]);
                                        }
                                }
                                if (empty($mimetext)) {