clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10357 from annando/api-date 

API: Fix date format
This commit is contained in:
Hypolite Petovan 2021-06-01 20:07:44 -04:00 committed by GitHub
parent 6b374c01ce 5bd51b156a
commit 1088376172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Object/Api/Mastodon/Account.php
View File

@ -108,7 +108,7 @@ class Account extends BaseDataTransferObject
$userContactCreated = $userContact['created'] ?? DBA::NULL_DATETIME; $userContactCreated = $userContact['created'] ?? DBA::NULL_DATETIME;
$created = $userContactCreated < $publicContactCreated && ($userContactCreated != DBA::NULL_DATETIME) ? $userContactCreated : $publicContactCreated; $created = $userContactCreated < $publicContactCreated && ($userContactCreated != DBA::NULL_DATETIME) ? $userContactCreated : $publicContactCreated;
$this->created_at = DateTimeFormat::utc($created, DateTimeFormat::ATOM); $this->created_at = DateTimeFormat::utc($created, DateTimeFormat::API);
$this->note = BBCode::convert($publicContact['about'], false); $this->note = BBCode::convert($publicContact['about'], false);
$this->url = $publicContact['url']; $this->url = $publicContact['url'];

2
src/Object/Api/Mastodon/Notification.php
View File

@ -52,7 +52,7 @@ class Notification extends BaseDataTransferObject
{ {
$this->id = (string)$id; $this->id = (string)$id;
$this->type = $type; $this->type = $type;
$this->created_at = DateTimeFormat::utc($created_at, DateTimeFormat::ATOM); $this->created_at = DateTimeFormat::utc($created_at, DateTimeFormat::API);
$this->account = $account->toArray(); $this->account = $account->toArray();
if (!empty($status)) { if (!empty($status)) {

2
src/Object/Api/Mastodon/Status.php
View File

@ -100,7 +100,7 @@ class Status extends BaseDataTransferObject
public function __construct(array $item, Account $account, Counts $counts, UserAttributes $userAttributes, bool $sensitive, Application $application, array $mentions, array $tags, Card $card, array $attachments, array $reblog) public function __construct(array $item, Account $account, Counts $counts, UserAttributes $userAttributes, bool $sensitive, Application $application, array $mentions, array $tags, Card $card, array $attachments, array $reblog)
{ {
$this->id = (string)$item['uri-id']; $this->id = (string)$item['uri-id'];
$this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::ATOM); $this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::API);
if ($item['gravity'] == GRAVITY_COMMENT) { if ($item['gravity'] == GRAVITY_COMMENT) {
$this->in_reply_to_id = (string)$item['thr-parent-id']; $this->in_reply_to_id = (string)$item['thr-parent-id'];

2
src/Object/Api/Mastodon/Token.php
View File

@ -53,6 +53,6 @@ class Token extends BaseDataTransferObject
$this->access_token = $access_token; $this->access_token = $access_token;
$this->token_type = $token_type; $this->token_type = $token_type;
$this->scope = $scope; $this->scope = $scope;
$this->created_at = DateTimeFormat::utc($created_at, DateTimeFormat::ATOM); $this->created_at = DateTimeFormat::utc($created_at, DateTimeFormat::API);
} }
} }

1
src/Util/DateTimeFormat.php
View File

@ -34,6 +34,7 @@ class DateTimeFormat
const ATOM = 'Y-m-d\TH:i:s\Z'; const ATOM = 'Y-m-d\TH:i:s\Z';
const MYSQL = 'Y-m-d H:i:s'; const MYSQL = 'Y-m-d H:i:s';
const HTTP = 'D, d M Y H:i:s \G\M\T'; const HTTP = 'D, d M Y H:i:s \G\M\T';
const API = 'Y-m-d\TH:i:s.000\Z';
/** /**
* convert() shorthand for UTC. * convert() shorthand for UTC.