Some more places changed to the new contact avatar path format

diff --git a/include/conversation.php b/include/conversation.php
index 24bb7434cab75d8d75536cd29d4b276cd458e80e..4bd6ce600760b150578e566c601294086ed50774 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -624,7 +624,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'indent' => '',
                                        'owner_name' => '',
                                        'owner_url' => '',
-                                       'owner_photo' => DI::baseUrl()->remove($item['owner-avatar']),
+                                       'owner_photo' => DI::baseUrl()->remove(Contact::getAvatarUrlForUrl($item['owner-link'], $item['uid'], Proxy::SIZE_THUMB)),
                                        'plink' => Item::getPlink($item),
                                        'edpost' => false,
                                        'isstarred' => 'unstarred',

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index a58e915a768dcde39474e425477cbbee8b9ff2e3..d63fcb5eeb382a04f41cac88967614c80783b6f5 100644 (file)
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -25,8 +25,8 @@ use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Protocol\ActivityNamespace;
@@ -183,7 +183,7 @@ class Xrd extends BaseModule
                                [
                                        'rel'  => 'http://webfinger.net/rel/avatar',
                                        'type' => $avatar['type'],
-                                       'href' => $owner['photo'],
+                                       'href' => Contact::getAvatarUrlForUrl($owner['url'], $owner['uid']),
                                ],
                                [
                                        'rel'  => 'http://joindiaspora.com/seed_location',
@@ -239,7 +239,7 @@ class Xrd extends BaseModule
                        '$hcard_url'   => $baseURL . '/hcard/' . $owner['nickname'],
                        '$atom'        => $owner['poll'],
                        '$poco_url'    => $owner['poco'],
-                       '$photo'       => $owner['photo'],
+                       '$photo'       => Contact::getAvatarUrlForUrl($owner['url'], $owner['uid']),
                        '$type'        => $avatar['type'],
                        '$salmon'      => $baseURL . '/salmon/' . $owner['nickname'],
                        '$salmen'      => $baseURL . '/salmon/' . $owner['nickname'] . '/mention',

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index d6ae415d30b13aee085a22de4e7572c8e99d15af..e44a8d326ecf92bd16d1da9bdfb5fd2b0d756029 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -2222,8 +2222,9 @@ class Probe
 
                $data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
                        'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
-                       'photo' => $profile['photo'], 'header' => $profile['header'], 'account-type' => $profile['contact-type'],
-                       'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+                       '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'], 
                        'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
                        'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 57f2be4b51f45591d5dd58010558638d99f5d6a5..089556a1fa038b361e430f93d1b74f1ce1cead02 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -69,7 +69,6 @@ class Post
        private $thread = null;
        private $redirect_url = null;
        private $owner_url = '';
-       private $owner_photo = '';
        private $owner_name = '';
        private $wall_to_wall = false;
        private $threaded = false;
@@ -474,7 +473,7 @@ class Post
                        'shiny'           => $shiny,
                        'owner_self'      => $item['author-link'] == Session::get('my_url'),
                        'owner_url'       => $this->getOwnerUrl(),
-                       'owner_photo'     => DI::baseUrl()->remove($item['owner-avatar']),
+                       'owner_photo'     => DI::baseUrl()->remove(Contact::getAvatarUrlForUrl($item['owner-link'], $item['uid'], Proxy::SIZE_THUMB)),
                        'owner_name'      => $this->getOwnerName(),
                        'plink'           => Item::getPlink($item),
                        'edpost'          => $edpost,
@@ -1007,7 +1006,6 @@ class Post
                                        // Put this person as the wall owner of the wall-to-wall notice.
 
                                        $this->owner_url = Contact::magicLinkByContact($a->page_contact);
-                                       $this->owner_photo = $a->page_contact['thumb'];
                                        $this->owner_name = $a->page_contact['name'];
                                        $this->wall_to_wall = true;
                                } elseif ($this->getDataValue('owner-link')) {
@@ -1025,7 +1023,6 @@ class Post
                                                // But it could be somebody else with the same name. It just isn't highly likely.
 
 
-                                               $this->owner_photo = $this->getDataValue('owner-avatar');
                                                $this->owner_name = $this->getDataValue('owner-name');
                                                $this->wall_to_wall = true;
 
@@ -1041,7 +1038,6 @@ class Post
                if (!$this->wall_to_wall) {
                        $this->setTemplate('wall');
                        $this->owner_url = '';
-                       $this->owner_photo = '';
                        $this->owner_name = '';
                }
        }