bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Apply suggestions from code review

Browse source 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
This commit is contained in:
Michael Vogel 2021-06-25 20:00:59 +02:00 committed by GitHub
parent ed4a18f079
commit d9d30d9555
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Model/Contact.php
View file

@ -1668,9 +1668,9 @@ class Contact
* @param integer $cid contact id
* @return string avatar link
*/
public static function getAvatarForContact(int $cid):string
public static function getAvatarUrlForId(int $cid):string
{
return DI::baseUrl() . '/photo/contact/'. $cid;
return DI::baseUrl() . '/photo/contact/' . $cid;
}
/**
@ -1679,9 +1679,9 @@ class Contact
* @param integer $cid contact id
* @return string header link
*/
public static function getHeaderForContact(int $cid):string
public static function getHeaderUrlForId(int $cid):string
{
return DI::baseUrl() . '/photo/header/'. $cid;
return DI::baseUrl() . '/photo/header/' . $cid;
}
/**

4
src/Object/Api/Mastodon/Account.php
View file

@ -112,9 +112,9 @@ class Account extends BaseDataTransferObject
$this->note = BBCode::convert($publicContact['about'], false);
$this->url = $publicContact['url'];
$this->avatar = (($userContact['photo'] ?? '') ?: $publicContact['photo']) ?: Contact::getAvatarForContact(($userContact['id'] ?? 0) ?: $publicContact['id']);
$this->avatar = $userContact['photo'] ?? '' ?: $publicContact['photo'] ?: Contact::getAvatarUrlForId($userContact['id'] ?? 0 ?: $publicContact['id']);
$this->avatar_static = $this->avatar;
$this->header = Contact::getHeaderForContact(($userContact['id'] ?? 0) ?: $publicContact['id']);
$this->header = Contact::getHeaderUrlForId($userContact['id'] ?? 0 ?: $publicContact['id']);
$this->header_static = $this->header;
$this->followers_count = $apcontact['followers_count'] ?? 0;
$this->following_count = $apcontact['following_count'] ?? 0;