]> git.mxchange.org Git - friendica.git/commitdiff
Use the general function ro create an avatar path
authorMichael <heluecht@pirati.ca>
Mon, 2 Aug 2021 22:28:42 +0000 (22:28 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 2 Aug 2021 22:28:42 +0000 (22:28 +0000)
src/Module/Delegation.php
src/Network/Probe.php

index e50fb7d5f3b128538b56b5521e2a0d2b2be2125c..abcc5679ee20893268306f1ad4f98fcbc3a20d39 100644 (file)
@@ -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']);
 
index d0aaaa7a0777f9cefda2af300b43344cd657ca55..1c0ecc3007f04e13e802e212d6a4db4d4d56c52e 100644 (file)
@@ -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'],