From 9f19adf8bbf72c054e56cf4ddff962aabeb0bca7 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 Aug 2021 22:28:42 +0000 Subject: [PATCH] Use the general function ro create an avatar path --- src/Module/Delegation.php | 7 ++++--- src/Network/Probe.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php index e50fb7d5f3..abcc5679ee 100644 --- a/src/Module/Delegation.php +++ b/src/Module/Delegation.php @@ -31,6 +31,7 @@ use Friendica\Model\Contact; use Friendica\Model\Notification; use Friendica\Model\User; use Friendica\Network\HTTPException\ForbiddenException; +use Friendica\Util\Proxy; /** * Switches current user between delegates/parent user @@ -122,12 +123,12 @@ class Delegation extends BaseModule //getting additinal information for each identity foreach ($identities as $key => $identity) { - $thumb = Contact::selectFirst(['thumb'], ['uid' => $identity['uid'], 'self' => true]); - if (!DBA::isResult($thumb)) { + $self = Contact::selectFirst(['id', 'updated'], ['uid' => $identity['uid'], 'self' => true]); + if (!DBA::isResult($self)) { continue; } - $identities[$key]['thumb'] = $thumb['thumb']; + $identities[$key]['thumb'] = Contact::getAvatarUrlForId($self['id'], Proxy::SIZE_THUMB, $self['updated']); $identities[$key]['selected'] = ($identity['nickname'] === DI::app()->user['nickname']); diff --git a/src/Network/Probe.php b/src/Network/Probe.php index d0aaaa7a07..1c0ecc3007 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -2220,7 +2220,7 @@ class Probe $data = [ 'name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '', 'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'], - 'photo' => Contact::getAvatarUrlForId($profile['id'], $profile['updated']), + 'photo' => Contact::getAvatarUrlForId($profile['id'], '', $profile['updated']), 'header' => $profile['header'] ? Contact::getHeaderUrlForId($profile['id'], $profile['updated']) : '', 'account-type' => $profile['contact-type'], 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY), 'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'],