friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Change timestamp to be DateTime object not integers in Mastodon Timeline API

This commit is contained in:
Hank Grabowski 2023-02-28 08:20:08 -05:00
parent 6ffd3a3f8c
commit 1adb23d8fd
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Module/BaseApi.php
View File

@ -112,7 +112,7 @@ class BaseApi extends BaseModule
* @return array paging data condition parameters data * @return array paging data condition parameters data
* @throws \Exception * @throws \Exception
*/ */
public function addPagingConditions(array $request, array $condition): array protected function addPagingConditions(array $request, array $condition): array
{ {
$requested_order = $request['friendica_order']; $requested_order = $request['friendica_order'];
if ($requested_order == TimelineOrderByTypes::ID) { if ($requested_order == TimelineOrderByTypes::ID) {
@ -139,9 +139,9 @@ class BaseApi extends BaseModule
$condition = DBA::mergeConditions($condition, ["`$order_field` < ?", DateTimeFormat::convert($request['max_id'], DateTimeFormat::MYSQL)]); $condition = DBA::mergeConditions($condition, ["`$order_field` < ?", DateTimeFormat::convert($request['max_id'], DateTimeFormat::MYSQL)]);
} }
if (!empty($request['since_id'])) { if (!empty($request['since_id'])) {
$condition = DBA::mergeConditions($condition, ["`$order_field` > ?", DateTimeFormat::convert($request['since_id'], DateTimeFormat::MYSQL)]); $condition = DBA::mergeConditions($condition, ["`$order_field` > ?", DateTimeFormat::convert($request['since_id'], DateTimeFormat::MYSQL)]);
} }
if (!empty($request['min_id'])) { if (!empty($request['min_id'])) {
$condition = DBA::mergeConditions($condition, ["`$order_field` > ?", DateTimeFormat::convert($request['min_id'], DateTimeFormat::MYSQL)]); $condition = DBA::mergeConditions($condition, ["`$order_field` > ?", DateTimeFormat::convert($request['min_id'], DateTimeFormat::MYSQL)]);
@ -159,7 +159,7 @@ class BaseApi extends BaseModule
* @return array ordering data added to the params blocks that was passed in * @return array ordering data added to the params blocks that was passed in
* @throws \Exception * @throws \Exception
*/ */
public function buildOrderAndLimitParams(array $request, array $params = []): array protected function buildOrderAndLimitParams(array $request, array $params = []): array
{ {
$requested_order = $request['friendica_order']; $requested_order = $request['friendica_order'];
switch ($requested_order) { switch ($requested_order) {
@ -171,7 +171,7 @@ class BaseApi extends BaseModule
$order_field = 'uri-id'; $order_field = 'uri-id';
} }
if(!empty($request['min_id'])) { if (!empty($request['min_id'])) {
$params['order'] = [$order_field]; $params['order'] = [$order_field];
} else { } else {
$params['order'] = [$order_field => true]; $params['order'] = [$order_field => true];
@ -204,9 +204,9 @@ class BaseApi extends BaseModule
/** /**
* Set boundaries for the "link" header * Set boundaries for the "link" header
* @param array $boundaries * @param array $boundaries
* @param int $id * @param int|\DateTime $id
*/ */
protected static function setBoundaries(int $id) protected static function setBoundaries($id)
{ {
if (!isset(self::$boundaries['min'])) { if (!isset(self::$boundaries['min'])) {
self::$boundaries['min'] = $id; self::$boundaries['min'] = $id;
@ -239,10 +239,8 @@ class BaseApi extends BaseModule
$prev_request = $next_request = $request; $prev_request = $next_request = $request;
if ($asDate) { if ($asDate) {
$max_date = new DateTime(); $max_date = self::$boundaries['max'];
$max_date->setTimestamp(self::$boundaries['max']); $min_date = self::$boundaries['min'];
$min_date = new DateTime();
$min_date->setTimestamp(self::$boundaries['min']);
$prev_request['min_id'] = $max_date->format(DateTimeFormat::JSON); $prev_request['min_id'] = $max_date->format(DateTimeFormat::JSON);
$next_request['max_id'] = $min_date->format(DateTimeFormat::JSON); $next_request['max_id'] = $min_date->format(DateTimeFormat::JSON);
} else { } else {

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

@ -156,12 +156,12 @@ class Status extends BaseDataTransferObject
/** /**
* Returns the current created_at DateTime as an integer timestamp * Returns the current created_at DateTime as an integer timestamp
* @return int * @return \DateTime
* @throws \Exception * @throws \Exception
*/ */
public function createdAtTimestamp(): int public function createdAtTimestamp(): \DateTime
{ {
$result = strtotime($this->created_at); $result = new \DateTime($this->created_at);
if (!$result) { if (!$result) {
throw new \Exception('Unknown date-time format'); throw new \Exception('Unknown date-time format');
} }