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

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index bfcb95eb2e..b5fc8c8499 100644
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -129,7 +129,18 @@ class BaseApi extends BaseModule
 				$condition = DBA::mergeConditions($condition, ["`uri-id` > ?", intval($request['min_id'])]);
 			}
 		} else {
-			$order_field = $requested_order;
+			switch ($requested_order) {
+				case TimelineOrderByTypes::RECEIVED:
+				case TimelineOrderByTypes::CHANGED:
+				case TimelineOrderByTypes::EDITED:
+				case TimelineOrderByTypes::CREATED:
+				case TimelineOrderByTypes::COMMENTED:
+					$order_field = $requested_order;
+					break;
+				default:
+					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)]);
 			}
@@ -159,19 +170,11 @@ 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';
+				$order_field = $requested_order;
 				break;
 			case TimelineOrderByTypes::ID:
 			default:
@@ -218,8 +221,8 @@ class BaseApi extends BaseModule
 					}
 					break;
 				case TimelineOrderByTypes::EDITED:
-					if (!empty($status->friendicaExtension()->editedAt())) {
-						self::setBoundaries(new DateTime(DateTimeFormat::utc($status->friendicaExtension()->editedAt(), DateTimeFormat::JSON)));
+					if (!empty($status->editedAt())) {
+						self::setBoundaries(new DateTime(DateTimeFormat::utc($status->editedAt(), DateTimeFormat::JSON)));
 					}
 					break;
 				case TimelineOrderByTypes::RECEIVED: