Return only one result in case of exact match in Api\Mastodon\Search

src/Model/Contact.php

@@ -3420,8 +3420,7 @@ class Contact
 			["(NOT `unsearchable` OR `nurl` IN (SELECT `nurl` FROM `owner-view` WHERE `publish` OR `net-publish`))
 			AND (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", $search, $search, $search]);
 
-		$contacts = self::selectToArray([], $condition, $params);
+		return self::selectToArray([], $condition, $params);
-		return $contacts;
 	}
 
 	/**

src/Module/Api/Mastodon/Search.php

@@ -26,6 +26,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Module\BaseApi;
@@ -67,10 +68,24 @@ class Search extends BaseApi
 
 		if (empty($request['type']) || ($request['type'] == 'accounts')) {
 			$result['accounts'] = self::searchAccounts($uid, $request['q'], $request['resolve'], $limit, $request['offset'], $request['following']);
+
+			if (!is_array($result['accounts'])) {
+				// Curbing the search if we got an exact result
+				$request['type'] = 'accounts';
+				$result['accounts'] = [$result['accounts']];
+			}
 		}
+
 		if ((empty($request['type']) || ($request['type'] == 'statuses')) && (strpos($request['q'], '@') == false)) {
 			$result['statuses'] = self::searchStatuses($uid, $request['q'], $request['account_id'], $request['max_id'], $request['min_id'], $limit, $request['offset']);
+
+			if (!is_array($result['statuses'])) {
+				// Curbing the search if we got an exact result
+				$request['type'] = 'statuses';
+				$result['statuses'] = [$result['statuses']];
+			}
 		}
+
 		if ((empty($request['type']) || ($request['type'] == 'hashtags')) && (strpos($request['q'], '@') == false)) {
 			$result['hashtags'] = self::searchHashtags($request['q'], $request['exclude_unreviewed'], $limit, $request['offset'], $this->parameters['version']);
 		}
@@ -78,31 +93,59 @@ class Search extends BaseApi
 		System::jsonExit($result);
 	}
 
+	/**
+	 * @param int    $uid
+	 * @param string $q
+	 * @param bool   $resolve
+	 * @param int    $limit
+	 * @param int    $offset
+	 * @param bool   $following
+	 * @return array|\Friendica\Object\Api\Mastodon\Account Object if result is absolute (exact account match), list if not
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Friendica\Network\HTTPException\NotFoundException
+	 * @throws \ImagickException
+	 */
 	private static function searchAccounts(int $uid, string $q, bool $resolve, int $limit, int $offset, bool $following)
 	{
-		$accounts = [];
+		if (
-
+			(strrpos($q, '@') > 0 || Network::isValidHttpUrl($q))
-		if ((strrpos($q, '@') > 0) || Network::isValidHttpUrl($q)) {
+			&& $id = Contact::getIdForURL($q, 0, $resolve ? null : false)
-			$id = Contact::getIdForURL($q, 0, $resolve ? null : false);
+		) {
-
+			return DI::mstdnAccount()->createFromContactId($id, $uid);
-			if (!empty($id)) {
-				$accounts[] = DI::mstdnAccount()->createFromContactId($id, $uid);
-			}
 		}
 
-		if (empty($accounts)) {
+		$accounts = [];
-			$contacts = Contact::searchByName($q, '', $following ? $uid : 0, $limit, $offset);
+		foreach (Contact::searchByName($q, '', $following ? $uid : 0, $limit, $offset) as $contact) {
-			foreach ($contacts as $contact) {
+			$accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);
-				$accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);
-			}
-			DBA::close($contacts);
 		}
 
 		return $accounts;
 	}
 
+	/**
+	 * @param int    $uid
+	 * @param string $q
+	 * @param string $account_id
+	 * @param int    $max_id
+	 * @param int    $min_id
+	 * @param int    $limit
+	 * @param int    $offset
+	 * @return array|\Friendica\Object\Api\Mastodon\Status Object is result is absolute (exact post match), list if not
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Friendica\Network\HTTPException\NotFoundException
+	 * @throws \ImagickException
+	 */
 	private static function searchStatuses(int $uid, string $q, string $account_id, int $max_id, int $min_id, int $limit, int $offset)
 	{
+		if (Network::isValidHttpUrl($q)) {
+			$q = Network::convertToIdn($q);
+			// 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);
+			}
+		}
+
 		$params = ['order' => ['uri-id' => true], 'limit' => [$offset, $limit]];
 
 		if (substr($q, 0, 1) == '#') {
@@ -148,7 +191,7 @@ class Search extends BaseApi
 		return $statuses;
 	}
 
-	private static function searchHashtags(string $q, bool $exclude_unreviewed, int $limit, int $offset, int $version)
+	private static function searchHashtags(string $q, bool $exclude_unreviewed, int $limit, int $offset, int $version): array
 	{
 		$q = ltrim($q, '#');