Use most recent last item date in Mastodon\Account

diff --git a/src/Api/Mastodon/Account.php b/src/Api/Mastodon/Account.php
index 389a13dd3afb9d20c74fd429ca5b46222cf544e4..ade6fc03dcbdeaebb55a3273724ad1793a1b036b 100644 (file)
--- a/src/Api/Mastodon/Account.php
+++ b/src/Api/Mastodon/Account.php
@@ -100,8 +100,11 @@ class Account
                $account->group           = ($publicContact['contact-type'] == Contact::TYPE_COMMUNITY);
                $account->discoverable    = !$publicContact['unsearchable'];
 
-               $last_item = $userContact['last-item'] ?? $publicContact['last-item'];
-               $account->last_status_at  = !empty($last_item) ? DateTimeFormat::utc($last_item, DateTimeFormat::ATOM) : null;
+               $publicContactLastItem = $publicContact['last-item'] ?: DBA::NULL_DATETIME;
+               $userContactLastItem = $userContact['last-item'] ?? DBA::NULL_DATETIME;
+
+               $lastItem = $userContactLastItem > $publicContactLastItem ? $userContactLastItem : $publicContactLastItem;
+               $account->last_status_at  = $lastItem != DBA::NULL_DATETIME ? DateTimeFormat::utc($lastItem, DateTimeFormat::ATOM) : null;
 
                return $account;
        }