API: added positiv list for quote support

src/Factory/Api/Mastodon/Status.php

@@ -198,6 +198,20 @@ class Status extends BaseFactory
 			$poll = null;
 		}
 
+		if ($display_quote) {
+			$quote = self::createQuote($item, $uid);
+
+			$item['body'] = BBCode::removeSharedData($item['body']);
+
+			if (!is_null($item['raw-body'])) {
+				$item['raw-body'] = BBCode::removeSharedData($item['raw-body']);
+			}
+		} else {
+			// We can always safely add attached activities. Real quotes are added to the body via "addSharedPost".
+			if (empty($item['quote-uri-id'])) {
+				$quote = self::createQuote($item, $uid);
+			}
+
 			$shared = $this->contentItem->getSharedPost($item, ['uri-id']);
 			if (!empty($shared)) {
 				$shared_uri_id = $shared['post']['uri-id'];
@@ -225,20 +239,6 @@ class Status extends BaseFactory
 				}
 			}
 
-		if ($display_quote) {
-			$quote = self::createQuote($item, $uid);
-
-			$item['body'] = BBCode::removeSharedData($item['body']);
-
-			if (!is_null($item['raw-body'])) {
-				$item['raw-body'] = BBCode::removeSharedData($item['raw-body']);
-			}
-		} else {
-			// We can always safely add attached activities. Real quotes are added to the body via "addSharedPost".
-			if (empty($item['quote-uri-id'])) {
-				$quote = self::createQuote($item, $uid);
-			}
-
 			$item['body'] = $this->contentItem->addSharedPost($item);
 
 			if (!is_null($item['raw-body'])) {

src/Module/Api/Mastodon/Accounts/Statuses.php

@@ -113,11 +113,13 @@ class Statuses extends BaseApi
 			$items = Post::selectForUser($uid, ['uri-id'], $condition, $params);
 		}
 
+		$display_quotes = self::appSupportsQuotes();
+
 		$statuses = [];
 		while ($item = Post::fetch($items)) {
 			self::setBoundaries($item['uri-id']);
 			try {
-				$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+				$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, true, true, $display_quotes);
 			} catch (\Throwable $th) {
 				Logger::info('Post not fetchable', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'error' => $th]);
 			}

src/Module/Api/Mastodon/Bookmarks.php

@@ -69,10 +69,12 @@ class Bookmarks extends BaseApi
 
 		$items = Post::selectThreadForUser($uid, ['uri-id'], $condition, $params);
 
+		$display_quotes = self::appSupportsQuotes();
+
 		$statuses = [];
 		while ($item = Post::fetch($items)) {
 			self::setBoundaries($item['uri-id']);
-			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, true, true, $display_quotes);
 		}
 		DBA::close($items);
 

src/Module/Api/Mastodon/Favourited.php

@@ -45,8 +45,9 @@ class Favourited extends BaseApi
 
 		$request = $this->getRequest([
 			'limit'      => 20,    // Maximum number of results to return. Defaults to 20.
-			'min_id'     => 0,     // Return results immediately newer than id
 			'max_id'     => 0,     // Return results older than id
+			'since_id'   => 0,     // Return results newer than this ID. Use HTTP Link header to paginate.
+			'min_id'     => 0,     // Return results immediately newer than id
 			'with_muted' => false, // Pleroma extension: return activities by muted (not by blocked!) users.
 		], $request);
 
@@ -58,6 +59,10 @@ class Favourited extends BaseApi
 			$condition = DBA::mergeConditions($condition, ["`thr-parent-id` < ?", $request['max_id']]);
 		}
 
+		if (!empty($request['since_id'])) {
+			$condition = DBA::mergeConditions($condition, ["`thr-parent-id` > ?", $request['since_id']]);
+		}
+
 		if (!empty($request['min_id'])) {
 			$condition = DBA::mergeConditions($condition, ["`thr-parent-id` > ?", $request['min_id']]);
 
@@ -66,10 +71,12 @@ class Favourited extends BaseApi
 
 		$items = Post::selectForUser($uid, ['thr-parent-id'], $condition, $params);
 
+		$display_quotes = self::appSupportsQuotes();
+
 		$statuses = [];
 		while ($item = Post::fetch($items)) {
 			self::setBoundaries($item['thr-parent-id']);
-			$statuses[] = DI::mstdnStatus()->createFromUriId($item['thr-parent-id'], $uid);
+			$statuses[] = DI::mstdnStatus()->createFromUriId($item['thr-parent-id'], $uid, true, true, $display_quotes);
 		}
 		DBA::close($items);
 

src/Module/Api/Mastodon/Search.php

@@ -142,7 +142,7 @@ class Search extends BaseApi
 			// If the user-specific search failed, we search and probe a public post
 			$item_id = Item::fetchByLink($q, $uid) ?: Item::fetchByLink($q);
 			if ($item_id && $item = Post::selectFirst(['uri-id'], ['id' => $item_id])) {
-				return DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+				return DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, true, true, self::appSupportsQuotes());
 			}
 		}
 
@@ -176,10 +176,12 @@ class Search extends BaseApi
 
 		$items = DBA::select($table, ['uri-id'], $condition, $params);
 
+		$display_quotes = self::appSupportsQuotes();
+
 		$statuses = [];
 		while ($item = Post::fetch($items)) {
 			self::setBoundaries($item['uri-id']);
-			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, true, true, $display_quotes);
 		}
 		DBA::close($items);
 

src/Module/Api/Mastodon/Statuses.php

@@ -88,7 +88,7 @@ class Statuses extends BaseApi
 		Item::update($item, ['id' => $post['id']]);
 		Item::updateDisplayCache($post['uri-id']);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($post['uri-id'], $uid));
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($post['uri-id'], $uid, true, true, self::appSupportsQuotes()));
 	}
 
 	protected function post(array $request = [])
@@ -269,7 +269,7 @@ class Statuses extends BaseApi
 		if (!empty($id)) {
 			$item = Post::selectFirst(['uri-id'], ['id' => $id]);
 			if (!empty($item['uri-id'])) {
-				System::jsonExit(DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid));
+				System::jsonExit(DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, true, true, self::appSupportsQuotes()));
 			}
 		}
 
@@ -308,7 +308,7 @@ class Statuses extends BaseApi
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, false));
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, false, true, self::appSupportsQuotes()));
 	}
 
 	private function getApp(): string

src/Module/Api/Mastodon/Statuses/Bookmark.php

@@ -65,6 +65,6 @@ class Bookmark extends BaseApi
 
 		Item::update(['starred' => true], ['id' => $item['id']]);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, true, true, self::appSupportsQuotes())->toArray());
 	}
 }

src/Module/Api/Mastodon/Statuses/Context.php

@@ -45,6 +45,9 @@ class Context extends BaseApi
 		}
 
 		$request = $this->getRequest([
+			'max_id'   => 0,  // Return results older than this id
+			'since_id' => 0,  // Return results newer than this id
+			'min_id'   => 0,  // Return results immediately newer than this id
 			'limit'    => 40, // Maximum number of results to return. Defaults to 40.
 		], $request);
 
@@ -55,17 +58,36 @@ class Context extends BaseApi
 
 		$parent = Post::selectFirst(['parent-uri-id'], ['uri-id' => $id]);
 		if (DBA::isResult($parent)) {
-			$posts = Post::selectPosts(['uri-id', 'thr-parent-id'],
+			$params    = ['order' => ['uri-id' => true]];
-				['parent-uri-id' => $parent['parent-uri-id'], 'gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT]]);
+			$condition = ['parent-uri-id' => $parent['parent-uri-id'], 'gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT]];
+
+			if (!empty($request['max_id'])) {
+				$condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $request['max_id']]);
+			}
+	
+			if (!empty($request['since_id'])) {
+				$condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $request['since_id']]);
+			}
+	
+			if (!empty($request['min_id'])) {
+				$condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $request['min_id']]);
+				$params['order'] = ['uri-id'];
+			}
+	
+			$posts = Post::selectPosts(['uri-id', 'thr-parent-id'], $condition, $params);
 			while ($post = Post::fetch($posts)) {
 				if ($post['uri-id'] == $post['thr-parent-id']) {
 					continue;
 				}
+				self::setBoundaries($post['uri-id']);
+
 				$parents[$post['uri-id']] = $post['thr-parent-id'];
 
 				$children[$post['thr-parent-id']][] = $post['uri-id'];
 			}
 			DBA::close($posts);
+
+			self::setLinkHeader();
 		} else {
 			$parent = DBA::selectFirst('mail', ['parent-uri-id'], ['uri-id' => $id, 'uid' => $uid]);
 			if (DBA::isResult($parent)) {
@@ -90,8 +112,10 @@ class Context extends BaseApi
 
 		asort($ancestors);
 
+		$display_quotes = self::appSupportsQuotes();
+
 		foreach (array_slice($ancestors, 0, $request['limit']) as $ancestor) {
-			$statuses['ancestors'][] = DI::mstdnStatus()->createFromUriId($ancestor, $uid);;
+			$statuses['ancestors'][] = DI::mstdnStatus()->createFromUriId($ancestor, $uid, true, true, $display_quotes);;
 		}
 
 		$descendants = self::getChildren($id, $children);
@@ -99,7 +123,7 @@ class Context extends BaseApi
 		asort($descendants);
 
 		foreach (array_slice($descendants, 0, $request['limit']) as $descendant) {
-			$statuses['descendants'][] = DI::mstdnStatus()->createFromUriId($descendant, $uid);
+			$statuses['descendants'][] = DI::mstdnStatus()->createFromUriId($descendant, $uid, true, true, $display_quotes);
 		}
 
 		System::jsonExit($statuses);

src/Module/Api/Mastodon/Statuses/Favourite.php

@@ -49,6 +49,6 @@ class Favourite extends BaseApi
 
 		Item::performActivity($item['id'], 'like', $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid,true, true, self::appSupportsQuotes())->toArray());
 	}
 }

src/Module/Api/Mastodon/Statuses/Mute.php

@@ -53,6 +53,6 @@ class Mute extends BaseApi
 
 		Post\ThreadUser::setIgnored($this->parameters['id'], $uid, true);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, true, true, self::appSupportsQuotes())->toArray());
 	}
 }

src/Module/Api/Mastodon/Statuses/Pin.php

@@ -48,6 +48,6 @@ class Pin extends BaseApi
 
 		Post\Collection::add($this->parameters['id'], Post\Collection::FEATURED, $item['author-id'], $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, true, true, self::appSupportsQuotes())->toArray());
 	}
 }

src/Module/Api/Mastodon/Statuses/Reblog.php

@@ -58,6 +58,6 @@ class Reblog extends BaseApi
 			Item::performActivity($item['id'], 'announce', $uid);
 		}
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, true, true, self::appSupportsQuotes())->toArray());
 	}
 }

src/Module/Api/Mastodon/Statuses/Unbookmark.php

@@ -65,6 +65,6 @@ class Unbookmark extends BaseApi
 
 		Item::update(['starred' => false], ['id' => $item['id']]);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, true, true, self::appSupportsQuotes())->toArray());
 	}
 }

src/Module/Api/Mastodon/Statuses/Unfavourite.php

@@ -49,6 +49,6 @@ class Unfavourite extends BaseApi
 
 		Item::performActivity($item['id'], 'unlike', $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, true, true, self::appSupportsQuotes())->toArray());
 	}
 }

src/Module/Api/Mastodon/Statuses/Unmute.php

@@ -53,6 +53,6 @@ class Unmute extends BaseApi
 
 		Post\ThreadUser::setIgnored($this->parameters['id'], $uid, false);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, true, true, self::appSupportsQuotes())->toArray());
 	}
 }

src/Module/Api/Mastodon/Statuses/Unpin.php

@@ -48,6 +48,6 @@ class Unpin extends BaseApi
 
 		Post\Collection::remove($this->parameters['id'], Post\Collection::FEATURED, $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, true, true, self::appSupportsQuotes())->toArray());
 	}
 }

src/Module/Api/Mastodon/Statuses/Unreblog.php

@@ -64,6 +64,6 @@ class Unreblog extends BaseApi
 			Item::performActivity($item['id'], 'unannounce', $uid);
 		}
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, true, true, self::appSupportsQuotes())->toArray());
 	}
 }

src/Module/Api/Mastodon/Timelines/Home.php

@@ -21,6 +21,7 @@
 
 namespace Friendica\Module\Api\Mastodon\Timelines;
 
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -91,10 +92,12 @@ class Home extends BaseApi
 
 		$items = Post::selectForUser($uid, ['uri-id'], $condition, $params);
 
+		$display_quotes = self::appSupportsQuotes();
+
 		$statuses = [];
 		while ($item = Post::fetch($items)) {
 			self::setBoundaries($item['uri-id']);
-			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, true, true, $display_quotes);
 		}
 		DBA::close($items);
 

src/Module/Api/Mastodon/Timelines/ListTimeline.php

@@ -96,10 +96,12 @@ class ListTimeline extends BaseApi
 
 		$items = Post::selectForUser($uid, ['uri-id'], $condition, $params);
 
+		$display_quotes = self::appSupportsQuotes();
+
 		$statuses = [];
 		while ($item = Post::fetch($items)) {
 			self::setBoundaries($item['uri-id']);
-			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, true, true, $display_quotes);
 		}
 		DBA::close($items);
 

src/Module/Api/Mastodon/Timelines/PublicTimeline.php

@@ -97,11 +97,13 @@ class PublicTimeline extends BaseApi
 
 		$items = Post::selectPostsForUser($uid, ['uri-id'], $condition, $params);
 
+		$display_quotes = self::appSupportsQuotes();
+
 		$statuses = [];
 		while ($item = Post::fetch($items)) {
 			self::setBoundaries($item['uri-id']);
 			try {
-				$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+				$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, true, true, $display_quotes);
 			} catch (\Throwable $th) {
 				Logger::info('Post not fetchable', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'error' => $th]);
 			}

src/Module/Api/Mastodon/Timelines/Tag.php

@@ -105,10 +105,12 @@ class Tag extends BaseApi
 
 		$items = DBA::select('tag-search-view', ['uri-id'], $condition, $params);
 
+		$display_quotes = self::appSupportsQuotes();
+
 		$statuses = [];
 		while ($item = Post::fetch($items)) {
 			self::setBoundaries($item['uri-id']);
-			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, true, true, $display_quotes);
 		}
 		DBA::close($items);
 

src/Module/Api/Mastodon/Trends/Statuses.php

@@ -48,10 +48,12 @@ class Statuses extends BaseApi
 		$condition = ["NOT `private` AND `commented` > ? AND `created` > ?", DateTimeFormat::utc('now -1 day'), DateTimeFormat::utc('now -1 week')];
 		$condition = DBA::mergeConditions($condition, ['network' => Protocol::FEDERATED]);
 
+		$display_quotes = self::appSupportsQuotes();
+
 		$trending = [];
 		$statuses = Post::selectPostThread(['uri-id'], $condition, ['limit' => $request['limit'], 'order' => ['total-actors' => true]]);
 		while ($status = Post::fetch($statuses)) {
-			$trending[] = DI::mstdnStatus()->createFromUriId($status['uri-id'], $uid);
+			$trending[] = DI::mstdnStatus()->createFromUriId($status['uri-id'], $uid, true, true, $display_quotes);
 		}
 		DBA::close($statuses);
 

src/Module/BaseApi.php

@@ -180,6 +180,17 @@ class BaseApi extends BaseModule
 		}
 	}
 
+	/**
+	 * Check if the app is known to support quoted posts
+	 *
+	 * @return bool
+	 */
+	public static function appSupportsQuotes(): bool
+	{
+		$token = self::getCurrentApplication();
+		return (!empty($token['name']) && in_array($token['name'], ['Fedilab']));
+	}
+
 	/**
 	 * Get current application token
 	 *