Add user contact data superseding to Mastodon\Account::create

diff --git a/src/Api/Mastodon/Account.php b/src/Api/Mastodon/Account.php
index 077b02f82d2bfbc682944628b23a21ddf14f4d55..389a13dd3afb9d20c74fd429ca5b46222cf544e4 100644 (file)
--- a/src/Api/Mastodon/Account.php
+++ b/src/Api/Mastodon/Account.php
@@ -66,10 +66,11 @@ class Account
         * @param BaseURL $baseUrl
         * @param array   $publicContact Full contact table record with uid = 0
         * @param array   $apcontact     Optional full apcontact table record
+        * @param array   $userContact   Optional full contact table record with uid = local_user()
         * @return Account
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function create(BaseURL $baseUrl, array $publicContact, array $apcontact = [])
+       public static function create(BaseURL $baseUrl, array $publicContact, array $apcontact = [], array $userContact = [])
        {
                $account = new Account();
                $account->id              = $publicContact['id'];
@@ -86,8 +87,8 @@ class Account
                $account->statuses_count  = $apcontact['statuses_count'] ?? 0;
                $account->note            = BBCode::convert($publicContact['about'], false);
                $account->url             = $publicContact['url'];
-               $account->avatar          = $publicContact['avatar'];
-               $account->avatar_static   = $publicContact['avatar'];
+               $account->avatar          = $userContact['avatar'] ?? $publicContact['avatar'];
+               $account->avatar_static   = $userContact['avatar'] ?? $publicContact['avatar'];
                // No header picture in Friendica
                $account->header          = '';
                $account->header_static   = '';
@@ -98,7 +99,9 @@ class Account
                $account->bot             = ($publicContact['contact-type'] == Contact::TYPE_NEWS);
                $account->group           = ($publicContact['contact-type'] == Contact::TYPE_COMMUNITY);
                $account->discoverable    = !$publicContact['unsearchable'];
-               $account->last_status_at  = !empty($publicContact['last-item']) ? DateTimeFormat::utc($publicContact['last-item'], DateTimeFormat::ATOM) : null;
+
+               $last_item = $userContact['last-item'] ?? $publicContact['last-item'];
+               $account->last_status_at  = !empty($last_item) ? DateTimeFormat::utc($last_item, DateTimeFormat::ATOM) : null;
 
                return $account;
        }

diff --git a/src/Module/Api/Mastodon/FollowRequests.php b/src/Module/Api/Mastodon/FollowRequests.php
index e1e70577b846a57978b021853e9c9677c1b36327..e31f023cde5924651417f97c3dfb36e14049e223 100644 (file)
--- a/src/Module/Api/Mastodon/FollowRequests.php
+++ b/src/Module/Api/Mastodon/FollowRequests.php
@@ -105,8 +105,9 @@ class FollowRequests extends Api
                        }
 
                        $publicContact = Contact::getById($cdata['public']);
+                       $userContact = Contact::getById($cdata['user']);
                        $apcontact = APContact::getByURL($publicContact['url'], false);
-                       $account = Mastodon\Account::create($baseUrl, $publicContact, $apcontact);
+                       $account = Mastodon\Account::create($baseUrl, $publicContact, $apcontact, $userContact);
 
                        // Not ideal, the same "account" can have multiple ids depending on the context
                        $account->id = $intro['id'];