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

Add additional Mastodon timeline sorting date types and data to output

Browse Source
This commit is contained in:
Hank Grabowski
2023-02-28 10:36:11 -05:00
parent 1adb23d8fd
commit 1f6578229e
6 changed files with 138 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Module/Api/Mastodon/Timelines/Home.php
View File

@@ -89,14 +89,7 @@ class Home extends BaseApi
while ($item = Post::fetch($items)) {
try {
$status = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, $display_quotes);
switch ($request['friendica_order']) {
case TimelineOrderByTypes::CREATED:
self::setBoundaries($status->createdAtTimestamp());
break;
case TimelineOrderByTypes::ID:
default:
self::setBoundaries($item['uri-id']);
}
$this->updateBoundaries($status, $item, $request['friendica_order']);
$statuses[] = $status;
} catch (\Throwable $th) {
Logger::info('Post not fetchable', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'error' => $th]);

59
src/Module/BaseApi.php
View File

@@ -37,6 +37,7 @@ use Friendica\Model\User;
use Friendica\Module\Api\ApiResponse;
use Friendica\Module\Special\HTTPException as ModuleHTTPException;
use Friendica\Network\HTTPException;
use Friendica\Object\Api\Mastodon\Status;
use Friendica\Object\Api\Mastodon\TimelineOrderByTypes;
use Friendica\Security\BasicAuth;
use Friendica\Security\OAuth;
@@ -128,13 +129,7 @@ class BaseApi extends BaseModule
$condition = DBA::mergeConditions($condition, ["`uri-id` > ?", intval($request['min_id'])]);
}
} else {
switch ($requested_order) {
case TimelineOrderByTypes::CREATED:
$order_field = 'created';
break;
default:
$order_field = 'uri-id';
}
$order_field = $requested_order;
if (!empty($request['max_id'])) {
$condition = DBA::mergeConditions($condition, ["`$order_field` < ?", DateTimeFormat::convert($request['max_id'], DateTimeFormat::MYSQL)]);
}
@@ -163,9 +158,21 @@ class BaseApi extends BaseModule
{
$requested_order = $request['friendica_order'];
switch ($requested_order) {
case TimelineOrderByTypes::CHANGED:
$order_field = 'changed';
break;
case TimelineOrderByTypes::CREATED:
$order_field = 'created';
break;
case TimelineOrderByTypes::COMMENTED:
$order_field = 'commented';
break;
case TimelineOrderByTypes::EDITED:
$order_field = 'edited';
break;
case TimelineOrderByTypes::RECEIVED:
$order_field = 'received';
break;
case TimelineOrderByTypes::ID:
default:
$order_field = 'uri-id';
@@ -182,6 +189,44 @@ class BaseApi extends BaseModule
return $params;
}
protected function updateBoundaries(Status $status, array $post_item, string $order) {
;
try {
switch ($order) {
case TimelineOrderByTypes::CHANGED:
if (!empty($status->friendicaExtension()->changedAt())){
self::setBoundaries(new DateTime(DateTimeFormat::utc($status->friendicaExtension()->changedAt(), DateTimeFormat::JSON)));
}
break;
case TimelineOrderByTypes::CREATED:
if (!empty($status->createdAt())){
self::setBoundaries(new DateTime(DateTimeFormat::utc($status->createdAt(), DateTimeFormat::JSON)));
}
break;
case TimelineOrderByTypes::COMMENTED:
if (!empty($status->friendicaExtension()->commentedAt())){
self::setBoundaries(new DateTime(DateTimeFormat::utc($status->friendicaExtension()->commentedAt(), DateTimeFormat::JSON)));
}
break;
case TimelineOrderByTypes::EDITED:
if (!empty($status->friendicaExtension()->editedAt())){
self::setBoundaries(new DateTime(DateTimeFormat::utc($status->friendicaExtension()->editedAt(), DateTimeFormat::JSON)));
}
break;
case TimelineOrderByTypes::RECEIVED:
if (!empty($status->friendicaExtension()->receivedAt())){
self::setBoundaries(new DateTime(DateTimeFormat::utc($status->friendicaExtension()->receivedAt(), DateTimeFormat::JSON)));
}
break;
case TimelineOrderByTypes::ID:
default:
self::setBoundaries($post_item['uri-id']);
}
} catch (\Exception $e) {
Logger::debug('Error processing page boundary calculation, skipping', ['error' => $e]);
}
}
/**
* Processes data from GET requests and sets defaults
*