keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simply Timeline Home temporal endpoint to reuse min_id and max_id

Browse source
This commit is contained in:
Hank Grabowski 2023-02-22 11:02:52 -05:00
parent 818075d039
commit 9c5f3ae58f
3 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Api/Mastodon/Timelines/Home.php
View file

@ -45,17 +45,15 @@ class Home extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$request = $this->getRequest([ $request = $this->getRequest([
'max_id' => 0, // Return results older than id 'max_id' => '0', // Return results older than id
'since_id' => 0, // Return results newer than id 'since_id' => 0, // Return results newer than id
'min_id' => 0, // Return results immediately newer than id 'min_id' => '0', // Return results immediately newer than id
'limit' => 20, // Maximum number of results to return. Defaults to 20. 'limit' => 20, // Maximum number of results to return. Defaults to 20.
'local' => false, // Return only local statuses? 'local' => false, // Return only local statuses?
'with_muted' => false, // Pleroma extension: return activities by muted (not by blocked!) users. 'with_muted' => false, // Pleroma extension: return activities by muted (not by blocked!) users.
'only_media' => false, // Show only statuses with media attached? Defaults to false. 'only_media' => false, // Show only statuses with media attached? Defaults to false.
'remote' => false, // Show only remote statuses? Defaults to false. 'remote' => false, // Show only remote statuses? Defaults to false.
'exclude_replies' => false, // Don't show comments 'exclude_replies' => false, // Don't show comments
'min_time' => '',
'max_time' => '',
'friendica_order' => TimelineOrderByTypes::ID, 'friendica_order' => TimelineOrderByTypes::ID,
], $request); ], $request);
@ -91,7 +89,7 @@ class Home extends BaseApi
try { try {
$status = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, $display_quotes); $status = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, $display_quotes);
switch ($request['friendica_order']) { switch ($request['friendica_order']) {
case TimelineOrderByTypes::CREATED_AT: case TimelineOrderByTypes::CREATED:
self::setBoundaries($status->createdAtTimestamp()); self::setBoundaries($status->createdAtTimestamp());
break; break;
case TimelineOrderByTypes::ID: case TimelineOrderByTypes::ID:

22
src/Module/BaseApi.php
View file

@ -118,31 +118,31 @@ class BaseApi extends BaseModule
$requested_order = $request['friendica_order']; $requested_order = $request['friendica_order'];
if ($requested_order == TimelineOrderByTypes::ID) { if ($requested_order == TimelineOrderByTypes::ID) {
if (!empty($request['max_id'])) { if (!empty($request['max_id'])) {
$condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $request['max_id']]); $condition = DBA::mergeConditions($condition, ["`uri-id` < ?", intval($request['max_id'])]);
} }
if (!empty($request['since_id'])) { if (!empty($request['since_id'])) {
$condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $request['since_id']]); $condition = DBA::mergeConditions($condition, ["`uri-id` > ?", intval($request['since_id'])]);
} }
if (!empty($request['min_id'])) { if (!empty($request['min_id'])) {
$condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $request['min_id']]); $condition = DBA::mergeConditions($condition, ["`uri-id` > ?", intval($request['min_id'])]);
} }
} else { } else {
switch ($requested_order) { switch ($requested_order) {
case TimelineOrderByTypes::CREATED_AT: case TimelineOrderByTypes::CREATED:
$order_field = 'created'; $order_field = 'created';
break; break;
default: default:
$order_field = 'uri-id'; $order_field = 'uri-id';
} }
if (!empty($request['max_time'])) { if (!empty($request['max_id'])) {
$condition = DBA::mergeConditions($condition, ["`$order_field` < ?", DateTimeFormat::convert($request['max_time'], DateTimeFormat::MYSQL)]); $condition = DBA::mergeConditions($condition, ["`$order_field` < ?", DateTimeFormat::convert($request['max_id'], DateTimeFormat::MYSQL)]);
} }
if (!empty($request['min_time'])) { if (!empty($request['min_id'])) {
$condition = DBA::mergeConditions($condition, ["`$order_field` > ?", DateTimeFormat::convert($request['min_time'], DateTimeFormat::MYSQL)]); $condition = DBA::mergeConditions($condition, ["`$order_field` > ?", DateTimeFormat::convert($request['min_id'], DateTimeFormat::MYSQL)]);
$params['order'] = [$order_field]; $params['order'] = [$order_field];
} }
@ -204,8 +204,6 @@ class BaseApi extends BaseModule
unset($request['min_id']); unset($request['min_id']);
unset($request['max_id']); unset($request['max_id']);
unset($request['since_id']); unset($request['since_id']);
unset($request['min_time']);
unset($request['max_time']);
$prev_request = $next_request = $request; $prev_request = $next_request = $request;
@ -214,8 +212,8 @@ class BaseApi extends BaseModule
$max_date->setTimestamp(self::$boundaries['max']); $max_date->setTimestamp(self::$boundaries['max']);
$min_date = new DateTime(); $min_date = new DateTime();
$min_date->setTimestamp(self::$boundaries['min']); $min_date->setTimestamp(self::$boundaries['min']);
$prev_request['min_time'] = $max_date->format(DateTimeFormat::JSON); $prev_request['min_id'] = $max_date->format(DateTimeFormat::JSON);
$next_request['max_time'] = $min_date->format(DateTimeFormat::JSON); $next_request['max_id'] = $min_date->format(DateTimeFormat::JSON);
} else { } else {
$prev_request['min_id'] = self::$boundaries['max']; $prev_request['min_id'] = self::$boundaries['max'];
$next_request['max_id'] = self::$boundaries['min']; $next_request['max_id'] = self::$boundaries['min'];

2
src/Object/Api/Mastodon/TimelineOrderByTypes.php
View file

@ -28,5 +28,5 @@ namespace Friendica\Object\Api\Mastodon;
abstract class TimelineOrderByTypes abstract class TimelineOrderByTypes
{ {
const ID = 'id'; const ID = 'id';
const CREATED_AT = 'created_at'; const CREATED = 'created';
} }