Move mod/ping to module class

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index a863a8847536f1b6984d659486ab7a57bfced747..3d3110fd8b702fa2458c6c1a2ff61fc775b68637 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -265,13 +265,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']);
@@ -310,17 +330,18 @@ class Photo extends BaseModule
                                }
                                return MPhoto::createPhotoForExternalResource($url, 0, $mimetext);
                        case "header":
-                               $contact = Contact::getById($id, ['uid', 'url', 'header']);
+                               $fields = ['uid', 'url', 'header', 'network', 'gsid'];
+                               $contact = Contact::getById($id, $fields);
                                if (empty($contact)) {
                                        return false;
                                }
                                If (($contact['uid'] != 0) && empty($contact['header'])) {
-                                       $contact = Contact::getByURL($contact['url'], false, ['header']);
+                                       $contact = Contact::getByURL($contact['url'], false, $fields);
                                }
                                if (!empty($contact['header'])) {
                                        $url = $contact['header'];
                                } else {
-                                       $url = DI::baseUrl() . '/images/blank.png';
+                                       $url = Contact::getDefaultHeader($contact);
                                }
                                return MPhoto::createPhotoForExternalResource($url);
                        case "banner":