Function to return the avatar and header path for a given contact id

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 30fa41307d4103047b16b708c51f34a9546df290..fad1db3473d3209506669fe227aa54ccaca7d38f 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1662,6 +1662,28 @@ class Contact
                return DI::baseUrl() . $default;
        }
 
+       /**
+        * Get avatar link for given contact id
+        *
+        * @param integer $cid contact id
+        * @return string avatar link
+        */
+       public static function getAvatarForContact(int $cid):string
+       {
+               return DI::baseUrl() . '/photo/contact/'. $cid;
+       }
+
+       /**
+        * Get header link for given contact id
+        *
+        * @param integer $cid contact id
+        * @return string header link
+        */
+       public static function getHeaderForContact(int $cid):string
+       {
+               return DI::baseUrl() . '/photo/header/'. $cid;
+       }
+
        /**
         * Updates the avatar links in a contact only if needed
         *

diff --git a/src/Object/Api/Mastodon/Account.php b/src/Object/Api/Mastodon/Account.php
index 5104fde1f1170f9f19033d635386c813f84a8c3c..b34af795127778b21649a8ff64f8def4f2375473 100644 (file)
--- a/src/Object/Api/Mastodon/Account.php
+++ b/src/Object/Api/Mastodon/Account.php
@@ -26,7 +26,6 @@ use Friendica\BaseDataTransferObject;
 use Friendica\Collection\Api\Mastodon\Fields;
 use Friendica\Content\Text\BBCode;
 use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 
@@ -113,9 +112,9 @@ class Account extends BaseDataTransferObject
 
                $this->note            = BBCode::convert($publicContact['about'], false);
                $this->url             = $publicContact['url'];
-               $this->avatar          = (($userContact['photo'] ?? '') ?: $publicContact['photo']) ?: DI::baseUrl() . '/photo/contact/'. (($userContact['id'] ?? 0) ?: $publicContact['id']);
+               $this->avatar          = (($userContact['photo'] ?? '') ?: $publicContact['photo']) ?: Contact::getAvatarForContact(($userContact['id'] ?? 0) ?: $publicContact['id']);
                $this->avatar_static   = $this->avatar;
-               $this->header          = DI::baseUrl() . '/photo/header/'. (($userContact['id'] ?? 0) ?: $publicContact['id']);
+               $this->header          = Contact::getHeaderForContact(($userContact['id'] ?? 0) ?: $publicContact['id']);
                $this->header_static   = $this->header;
                $this->followers_count = $apcontact['followers_count'] ?? 0;
                $this->following_count = $apcontact['following_count'] ?? 0;