friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-11 21:39:38 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #10451 from annando/contact-path

Browse source 
Some more places changed to the new contact avatar path format
This commit is contained in:
Hypolite Petovan 2021-06-30 21:24:27 -04:00 committed by GitHub
parent 7a2038fc93 16de3454bc
commit c63dfa38c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/conversation.php
View file

@ -624,7 +624,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
'indent' => '', 'indent' => '',
'owner_name' => '', 'owner_name' => '',
'owner_url' => '', '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), 'plink' => Item::getPlink($item),
'edpost' => false, 'edpost' => false,
'isstarred' => 'unstarred', 'isstarred' => 'unstarred',

6
src/Module/Xrd.php
View file

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

5
src/Network/Probe.php
View file

@ -2222,8 +2222,9 @@ class Probe
$data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '', $data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'], 'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
'photo' => $profile['photo'], 'header' => $profile['header'], 'account-type' => $profile['contact-type'], 'photo' => Contact::getAvatarUrlForId($profile['id'], $profile['updated']),
'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY), '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'], 'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'],
'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'], 'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'], 'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],

6
src/Object/Post.php
View file

@ -69,7 +69,6 @@ class Post
private $thread = null; private $thread = null;
private $redirect_url = null; private $redirect_url = null;
private $owner_url = ''; private $owner_url = '';
private $owner_photo = '';
private $owner_name = ''; private $owner_name = '';
private $wall_to_wall = false; private $wall_to_wall = false;
private $threaded = false; private $threaded = false;
@ -474,7 +473,7 @@ class Post
'shiny' => $shiny, 'shiny' => $shiny,
'owner_self' => $item['author-link'] == Session::get('my_url'), 'owner_self' => $item['author-link'] == Session::get('my_url'),
'owner_url' => $this->getOwnerUrl(), '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(), 'owner_name' => $this->getOwnerName(),
'plink' => Item::getPlink($item), 'plink' => Item::getPlink($item),
'edpost' => $edpost, 'edpost' => $edpost,
@ -1007,7 +1006,6 @@ class Post
// Put this person as the wall owner of the wall-to-wall notice. // Put this person as the wall owner of the wall-to-wall notice.
$this->owner_url = Contact::magicLinkByContact($a->page_contact); $this->owner_url = Contact::magicLinkByContact($a->page_contact);
$this->owner_photo = $a->page_contact['thumb'];
$this->owner_name = $a->page_contact['name']; $this->owner_name = $a->page_contact['name'];
$this->wall_to_wall = true; $this->wall_to_wall = true;
} elseif ($this->getDataValue('owner-link')) { } 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. // 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->owner_name = $this->getDataValue('owner-name');
$this->wall_to_wall = true; $this->wall_to_wall = true;
@ -1041,7 +1038,6 @@ class Post
if (!$this->wall_to_wall) { if (!$this->wall_to_wall) {
$this->setTemplate('wall'); $this->setTemplate('wall');
$this->owner_url = ''; $this->owner_url = '';
$this->owner_photo = '';
$this->owner_name = ''; $this->owner_name = '';
} }
} }

4
src/Protocol/DFRN.php
View file

@ -51,6 +51,7 @@ use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images; use Friendica\Util\Images;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Proxy;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
@ -618,7 +619,8 @@ class DFRN
XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes); XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
$attributes = ["rel" => "photo", "type" => "image/jpeg", $attributes = ["rel" => "photo", "type" => "image/jpeg",
"media:width" => 300, "media:height" => 300, "href" => $owner['photo']]; "media:width" => Proxy::PIXEL_SMALL, "media:height" => Proxy::PIXEL_SMALL,
"href" => Contact::getAvatarUrlForId($owner['id'], Proxy::SIZE_SMALL, $owner['updated'])];
if (!$public || !$hide) { if (!$public || !$hide) {
$attributes["dfrn:updated"] = $picdate; $attributes["dfrn:updated"] = $picdate;

3
src/Protocol/Feed.php
View file

@ -39,6 +39,7 @@ use Friendica\Model\User;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\ParseUrl; use Friendica\Util\ParseUrl;
use Friendica\Util\Proxy;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
@ -957,7 +958,7 @@ class Feed
XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]); XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]);
XML::addElement($doc, $root, "title", $title); XML::addElement($doc, $root, "title", $title);
XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename'))); XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename')));
XML::addElement($doc, $root, "logo", $owner["photo"]); XML::addElement($doc, $root, "logo", Contact::getAvatarUrlForId($owner['id'], Proxy::SIZE_SMALL, $owner['updated']));
XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM)); XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
$author = self::addAuthor($doc, $owner); $author = self::addAuthor($doc, $owner);

14
src/Protocol/OStatus.php
View file

@ -1272,7 +1272,7 @@ class OStatus
XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]); XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]);
XML::addElement($doc, $root, "title", $title); XML::addElement($doc, $root, "title", $title);
XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename'))); XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename')));
XML::addElement($doc, $root, "logo", $owner["photo"]); XML::addElement($doc, $root, "logo", Contact::getAvatarUrlForId($owner['id'], ProxyUtils::SIZE_SMALL, $owner['updated']));
XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM)); XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
$author = self::addAuthor($doc, $owner, true); $author = self::addAuthor($doc, $owner, true);
@ -1427,18 +1427,18 @@ class OStatus
$attributes = [ $attributes = [
"rel" => "avatar", "rel" => "avatar",
"type" => "image/jpeg", // To-Do? "type" => "image/jpeg", // To-Do?
"media:width" => 300, "media:width" => ProxyUtils::PIXEL_SMALL,
"media:height" => 300, "media:height" => ProxyUtils::PIXEL_SMALL,
"href" => $owner["photo"]]; "href" => Contact::getAvatarUrlForId($owner['id'], ProxyUtils::SIZE_SMALL, $owner['updated'])];
XML::addElement($doc, $author, "link", "", $attributes); XML::addElement($doc, $author, "link", "", $attributes);
if (isset($owner["thumb"])) { if (isset($owner["thumb"])) {
$attributes = [ $attributes = [
"rel" => "avatar", "rel" => "avatar",
"type" => "image/jpeg", // To-Do? "type" => "image/jpeg", // To-Do?
"media:width" => 80, "media:width" => ProxyUtils::PIXEL_THUMB,
"media:height" => 80, "media:height" => ProxyUtils::PIXEL_THUMB,
"href" => $owner["thumb"]]; "href" => Contact::getAvatarUrlForId($owner['id'], ProxyUtils::SIZE_THUMB, $owner['updated'])];
XML::addElement($doc, $author, "link", "", $attributes); XML::addElement($doc, $author, "link", "", $attributes);
} }