X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCore%2FSearch.php;h=98517361ea34c48a373fcc50380719800a88d9c6;hb=f23ecaff6af1982112469f90d6bcdf0408b0f22e;hp=3c0ace3db5468d62486f7cfc2d1236a75b9b87c1;hpb=6b914ccc0f74b1829a607a50b1516558210380a4;p=friendica.git

diff --git a/src/Core/Search.php b/src/Core/Search.php
index 3c0ace3db5..98517361ea 100644
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -29,6 +29,7 @@ use Friendica\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
+use GuzzleHttp\Psr7\Uri;
 
 /**
  * Specific class to perform searches for different systems. Currently:
@@ -41,7 +42,7 @@ class Search
 	const DEFAULT_DIRECTORY = 'https://dir.friendica.social';
 
 	const TYPE_PEOPLE = 0;
-	const TYPE_FORUM  = 1;
+	const TYPE_GROUP  = 1;
 	const TYPE_ALL    = 2;
 
 	/**
@@ -54,40 +55,42 @@ class Search
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function getContactsFromProbe(string $user): ResultList
+	public static function getContactsFromProbe(string $user, $only_group = false): ResultList
 	{
-		$emptyResultList = new ResultList(1, 0, 1);
+		$emptyResultList = new ResultList();
 
-		if ((filter_var($user, FILTER_VALIDATE_EMAIL) && Network::isEmailDomainValid($user)) ||
-		    (substr(Strings::normaliseLink($user), 0, 7) == 'http://')) {
-
-			$user_data = Contact::getByURL($user);
-			if (empty($user_data)) {
-				return $emptyResultList;
-			}
-
-			if (!in_array($user_data['network'], Protocol::FEDERATED)) {
-				return $emptyResultList;
-			}
+		if (empty(parse_url($user, PHP_URL_SCHEME)) && !(filter_var($user, FILTER_VALIDATE_EMAIL) || Network::isEmailDomainValid($user))) {
+			return $emptyResultList;
+		}
 
-			$contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', DI::userSession()->getLocalUserId());
+		$user_data = Contact::getByURL($user);
+		if (empty($user_data)) {
+			return $emptyResultList;
+		}
 
-			$result = new ContactResult(
-				$user_data['name'] ?? '',
-				$user_data['addr'] ?? '',
-				($contactDetails['addr'] ?? '') ?: ($user_data['url'] ?? ''),
-				$user_data['url'] ?? '',
-				$user_data['photo'] ?? '',
-				$user_data['network'] ?? '',
-				$contactDetails['id'] ?? 0,
-				$user_data['id'] ?? 0,
-				$user_data['tags'] ?? ''
-			);
+		if ($only_group && ($user_data['contact-type'] != Contact::TYPE_COMMUNITY)) {
+			return $emptyResultList;
+		}
 
-			return new ResultList(1, 1, 1, [$result]);
-		} else {
+		if (!Protocol::supportsProbe($user_data['network'])) {
 			return $emptyResultList;
 		}
+
+		$contactDetails = Contact::getByURLForUser($user_data['url'], DI::userSession()->getLocalUserId());
+
+		$result = new ContactResult(
+			$user_data['name'],
+			$user_data['addr'],
+			$user_data['addr'] ?: $user_data['url'],
+			new Uri($user_data['url']),
+			$user_data['photo'],
+			$user_data['network'],
+			$contactDetails['cid'] ?? 0,
+			$user_data['id'],
+			$user_data['keywords']
+		);
+
+		return new ResultList(1, 1, 1, [$result]);
 	}
 
 	/**
@@ -109,8 +112,8 @@ class Search
 		$searchUrl = $server . '/search';
 
 		switch ($type) {
-			case self::TYPE_FORUM:
-				$searchUrl .= '/forum';
+			case self::TYPE_GROUP:
+				$searchUrl .= '/group';
 				break;
 			case self::TYPE_PEOPLE:
 				$searchUrl .= '/people';
@@ -128,7 +131,7 @@ class Search
 
 		$resultList = new ResultList(
 			($results['page']         ?? 0) ?: 1,
-			 $results['count']        ?? 0,
+			$results['count']        ?? 0,
 			($results['itemsperpage'] ?? 0) ?: 30
 		);
 
@@ -142,11 +145,11 @@ class Search
 				$profile['name'] ?? '',
 				$profile['addr'] ?? '',
 				($contactDetails['addr'] ?? '') ?: $profile_url,
-				$profile_url,
+				new Uri($profile_url),
 				$profile['photo'] ?? '',
 				Protocol::DFRN,
 				$contactDetails['cid'] ?? 0,
-				0,
+				$contactDetails['zid'] ?? 0,
 				$profile['tags'] ?? ''
 			);
 
@@ -171,20 +174,20 @@ class Search
 	{
 		Logger::info('Searching', ['search' => $search, 'type' => $type, 'start' => $start, 'itempage' => $itemPage]);
 
-		$contacts = Contact::searchByName($search, $type == self::TYPE_FORUM ? 'community' : '');
+		$contacts = Contact::searchByName($search, $type == self::TYPE_GROUP ? 'community' : '', true);
 
-		$resultList = new ResultList($start, $itemPage, count($contacts));
+		$resultList = new ResultList($start, count($contacts), $itemPage);
 
 		foreach ($contacts as $contact) {
 			$result = new ContactResult(
 				$contact['name'],
 				$contact['addr'],
-				$contact['addr'],
-				$contact['url'],
+				$contact['addr'] ?: $contact['url'],
+				new Uri($contact['url']),
 				$contact['photo'],
 				$contact['network'],
-				$contact['cid'] ?? 0,
-				$contact['zid'] ?? 0,
+				0,
+				$contact['pid'],
 				$contact['keywords']
 			);
 
@@ -226,7 +229,7 @@ class Search
 
 		// check if searching in the local global contact table is enabled
 		if (DI::config()->get('system', 'poco_local_search')) {
-			$return = Contact::searchByName($search, $mode);
+			$return = Contact::searchByName($search, $mode, true);
 		} else {
 			$p = $page > 1 ? 'p=' . $page : '';
 			$curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), HttpClientAccept::JSON);
@@ -237,7 +240,9 @@ class Search
 					$return = array_map(function ($result) {
 						static $contactType = [
 							'People'       => Contact::TYPE_PERSON,
+							// Kept for backward compatibility
 							'Forum'        => Contact::TYPE_COMMUNITY,
+							'Group'        => Contact::TYPE_COMMUNITY,
 							'Organization' => Contact::TYPE_ORGANISATION,
 							'News'         => Contact::TYPE_NEWS,
 						];