Fetch photo fields, ensuring that they are filled

[friendica.git] / mod / common.php

diff --git a/mod/common.php b/mod/common.php
index 0ccad423878a3879edbfb1cb292ed64b7edad448..b59b36ee7d79267be9cff33bd8ddd0c7404d188b 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -26,8 +26,8 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
+use Friendica\Model\Contact;
 use Friendica\Module;
-use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
 function common_content(App $a)
@@ -40,7 +40,7 @@ function common_content(App $a)
        $zcid = 0;
 
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -57,7 +57,7 @@ function common_content(App $a)
 
                if (DBA::isResult($contact)) {
                        DI::page()['aside'] = "";
-                       Model\Profile::load($a, "", Model\Contact::getDetailsByURL($contact["url"]));
+                       Model\Profile::load($a, "", Model\Contact::getByURL($contact["url"], false));
                }
        } else {
                $contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
@@ -103,7 +103,7 @@ function common_content(App $a)
        }
 
        if ($total < 1) {
-               notice(DI::l10n()->t('No contacts in common.') . EOL);
+               notice(DI::l10n()->t('No contacts in common.'));
                return $o;
        }
 
@@ -124,7 +124,7 @@ function common_content(App $a)
        $entries = [];
        foreach ($common_friends as $common_friend) {
                //get further details of the contact
-               $contact_details = Model\Contact::getDetailsByURL($common_friend['url'], $uid);
+               $contact_details = Model\Contact::getByURLForUser($common_friend['url'], $uid);
 
                // $rr['id'] is needed to use contact_photo_menu()
                /// @TODO Adding '/" here avoids E_NOTICE on missing constants
@@ -136,7 +136,7 @@ function common_content(App $a)
                        'url'          => Model\Contact::magicLink($common_friend['url']),
                        'itemurl'      => ($contact_details['addr'] ?? '') ?: $common_friend['url'],
                        'name'         => $contact_details['name'],
-                       'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
+                       'thumb'        => Contact::getThumb($contact_details),
                        'img_hover'    => $contact_details['name'],
                        'details'      => $contact_details['location'],
                        'tags'         => $contact_details['keywords'],