Replaced "api_date"

diff --git a/include/api.php b/include/api.php
index 0536e7a75df7b88ae7dc07e6a0633a052d6cfdcf..929900f49fef2c4e3308ea88276a4696e38a238e 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -103,19 +103,6 @@ function api_source()
        return "api";
 }
 
-/**
- * Format date for API
- *
- * @param string $str Source date, as UTC
- * @return string Date in UTC formatted as "D M d H:i:s +0000 Y"
- * @throws Exception
- */
-function api_date($str)
-{
-       // Wed May 23 06:01:13 +0000 2007
-       return DateTimeFormat::utc($str, "D M d H:i:s +0000 Y");
-}
-
 /**
  * Register a function to be the endpoint for defined API path.
  *
@@ -288,7 +275,7 @@ function api_rss_extra($arr, $user_info)
                'alternate'    => $user_info['url'],
                'self'         => DI::baseUrl() . "/" . DI::args()->getQueryString(),
                'base'         => DI::baseUrl(),
-               'updated'      => api_date(null),
+               'updated'      => DateTimeFormat::utc(null, DateTimeFormat::API),
                'atom_updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
                'language'     => $user_info['lang'],
                'logo'         => DI::baseUrl() . "/images/friendica-32.png",
@@ -1925,7 +1912,7 @@ function api_format_messages($item, $recipient, $sender)
                'sender_id'             => $sender['id'],
                'text'                  => "",
                'recipient_id'          => $recipient['id'],
-               'created_at'            => api_date($item['created'] ?? DateTimeFormat::utcNow()),
+               'created_at'            => DateTimeFormat::utc($item['created'] ?? DateTimeFormat::utcNow(), DateTimeFormat::API),
                'sender_screen_name'    => $sender['screen_name'],
                'recipient_screen_name' => $recipient['screen_name'],
                'sender'                => $sender,
@@ -2459,7 +2446,7 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
        $status = [
                'text'          => $converted["text"],
                'truncated' => false,
-               'created_at'=> api_date($item['created']),
+               'created_at'=> DateTimeFormat::utc($item['created'], DateTimeFormat::API),
                'in_reply_to_status_id' => $in_reply_to['status_id'],
                'in_reply_to_status_id_str' => $in_reply_to['status_id_str'],
                'source'    => (($item['app']) ? $item['app'] : 'web'),
@@ -2558,7 +2545,7 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
                $retweeted_status['text'] = $rt_converted["text"];
                $retweeted_status['statusnet_html'] = $rt_converted["html"];
                $retweeted_status['friendica_html'] = $rt_converted["html"];
-               $retweeted_status['created_at'] =  api_date($retweeted_item['created']);
+               $retweeted_status['created_at'] =  DateTimeFormat::utc($retweeted_item['created'], DateTimeFormat::API);
 
                if (!empty($quoted_status)) {
                        $retweeted_status['quoted_status'] = $quoted_status;

diff --git a/src/Module/Api/Twitter/Account/RateLimitStatus.php b/src/Module/Api/Twitter/Account/RateLimitStatus.php
index e38ffb061a830778a46aa7e9b325bce86f5a6aab..9a275cecb989a77b2b98eb6821e3d08de4a6ff36 100644 (file)
--- a/src/Module/Api/Twitter/Account/RateLimitStatus.php
+++ b/src/Module/Api/Twitter/Account/RateLimitStatus.php
@@ -48,7 +48,7 @@ class RateLimitStatus extends BaseApi
                                'reset_time_in_seconds' => strtotime('now + 1 hour'),
                                'remaining_hits'        => '150',
                                'hourly_limit'          => '150',
-                               'reset_time'            => api_date(DateTimeFormat::utc('now + 1 hour', DateTimeFormat::ATOM)),
+                               'reset_time'            => DateTimeFormat::utc('now + 1 hour', DateTimeFormat::API),
                        ];
                }
 

diff --git a/src/Object/Api/Twitter/User.php b/src/Object/Api/Twitter/User.php
index 8972d7583701e1fa89c3d10bcbb1bbd8a31aefee..75263e9b77042bf8dda67502e62fd5c099213c64 100644 (file)
--- a/src/Object/Api/Twitter/User.php
+++ b/src/Object/Api/Twitter/User.php
@@ -26,6 +26,7 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy;
 
 /**
@@ -124,7 +125,7 @@ class User extends BaseDataTransferObject
                $this->followers_count         = $apcontact['followers_count'] ?? 0;
                $this->friends_count           = $apcontact['following_count'] ?? 0;
                $this->listed_count            = 0;
-               $this->created_at              = api_date($publicContact['created']);
+               $this->created_at              = DateTimeFormat::utc($publicContact['created'], DateTimeFormat::API);
                $this->favourites_count        = 0;
                $this->verified                = $uid != 0;
                $this->statuses_count          = $apcontact['statuses_count'] ?? 0;

diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php
index cf3216a152c8c5ebc3b2cfdf8758f719feeeaf46..141fa37f6c3b70c7e87cc855cb5f189b3c55b8f4 100644 (file)
--- a/src/Util/DateTimeFormat.php
+++ b/src/Util/DateTimeFormat.php
@@ -35,6 +35,7 @@ class DateTimeFormat
        const MYSQL = 'Y-m-d H:i:s';
        const HTTP  = 'D, d M Y H:i:s \G\M\T';
        const JSON  = 'Y-m-d\TH:i:s.v\Z';
+       const API   = 'D M d H:i:s +0000 Y';
 
        static $localTimezone = 'UTC';
 

diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index a63daee93324e37468890a46ee8f585fd0b1334c..f4ac58d04427c592701f05865ab0137e488df336 100644 (file)
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -275,7 +275,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiDate()
        {
-               self::assertEquals('Wed Oct 10 00:00:00 +0000 1990', api_date('1990-10-10'));
+               self::assertEquals('Wed Oct 10 00:00:00 +0000 1990', DateTimeFormat::utc('1990-10-10', DateTimeFormat::API));
        }
 
        /**