Apply suggestions from code review

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index fad1db3473d3209506669fe227aa54ccaca7d38f..dc784827866c87ef964b5476f252d90f267a8a6a 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -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;
        }
 
        /**

diff --git a/src/Object/Api/Mastodon/Account.php b/src/Object/Api/Mastodon/Account.php
index b34af795127778b21649a8ff64f8def4f2375473..2ea9da70482358bd4b232e66e4618c2f9bd5095f 100644 (file)
--- a/src/Object/Api/Mastodon/Account.php
+++ b/src/Object/Api/Mastodon/Account.php
@@ -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;