X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBaseApi.php;h=b5fc8c8499254b97e74f2ab670cc8a6b984be71a;hb=f8018f8dfe0183ce7c8f7e8460e0d9fbd5b9395b;hp=82f0ad05968e87751648ed68eb0c92796ac8990f;hpb=1adb23d8fd115df594246dd58aed257a1c229f9f;p=friendica.git

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 82f0ad0596..b5fc8c8499 100644
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -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;
@@ -129,12 +130,17 @@ class BaseApi extends BaseModule
 			}
 		} else {
 			switch ($requested_order) {
+				case TimelineOrderByTypes::RECEIVED:
+				case TimelineOrderByTypes::CHANGED:
+				case TimelineOrderByTypes::EDITED:
 				case TimelineOrderByTypes::CREATED:
-					$order_field = 'created';
+				case TimelineOrderByTypes::COMMENTED:
+					$order_field = $requested_order;
 					break;
 				default:
-					$order_field = 'uri-id';
+					throw new \Exception("Unrecognized request order: $requested_order");
 			}
+
 			if (!empty($request['max_id'])) {
 				$condition = DBA::mergeConditions($condition, ["`$order_field` < ?", DateTimeFormat::convert($request['max_id'], DateTimeFormat::MYSQL)]);
 			}
@@ -163,8 +169,12 @@ class BaseApi extends BaseModule
 	{
 		$requested_order = $request['friendica_order'];
 		switch ($requested_order) {
+			case TimelineOrderByTypes::CHANGED:
 			case TimelineOrderByTypes::CREATED:
-				$order_field = 'created';
+			case TimelineOrderByTypes::COMMENTED:
+			case TimelineOrderByTypes::EDITED:
+			case TimelineOrderByTypes::RECEIVED:
+				$order_field = $requested_order;
 				break;
 			case TimelineOrderByTypes::ID:
 			default:
@@ -177,11 +187,58 @@ class BaseApi extends BaseModule
 			$params['order'] = [$order_field => true];
 		}
 
-		$params['limit']= $request['limit'];
+		$params['limit'] = $request['limit'];
 
 		return $params;
 	}
 
+	/**
+	 * Update the ID/time boundaries for this result set. Used for building Link Headers
+	 *
+	 * @param Status $status
+	 * @param array $post_item
+	 * @param string $order
+	 * @return void
+	 * @throws \Exception
+	 */
+	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->editedAt())) {
+						self::setBoundaries(new DateTime(DateTimeFormat::utc($status->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
 	 *
@@ -224,7 +281,7 @@ class BaseApi extends BaseModule
 	 * Get the "link" header with "next" and "prev" links
 	 * @return string
 	 */
-	protected static function getLinkHeader(bool $asDate): string
+	protected static function getLinkHeader(bool $asDate = false): string
 	{
 		if (empty(self::$boundaries)) {
 			return '';