X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModule%2FSearch%2FIndex.php;h=1a7d4bf61f41b63b453bc498308166d73c50e53a;hb=15581ba91f78e8019ba0f1c674df12cc3d5b1eb7;hp=27074fa82a0e9308b39af7e1c5dcf8940ff1d1e1;hpb=ede69a86733286c97a931563b1c31bd3e4ba25f9;p=friendica.git

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 27074fa82a..1a7d4bf61f 100644
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,11 +28,13 @@ use Friendica\Content\Widget;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\Core\Search;
 use Friendica\Core\Session;
 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\BaseSearch;
 use Friendica\Network\HTTPException;
@@ -80,7 +82,7 @@ class Index extends BaseSearch
 		}
 
 		if (local_user()) {
-			DI::page()['aside'] .= Widget\SavedSearches::getHTML('search?q=' . urlencode($search), $search);
+			DI::page()['aside'] .= Widget\SavedSearches::getHTML(Search::getSearchPath($search), $search);
 		}
 
 		Nav::setSelected('search');
@@ -130,6 +132,14 @@ class Index extends BaseSearch
 			}
 		}
 
+		// Don't perform a fulltext or tag search on search results that look like an URL
+		// Tags don't look like an URL and the fulltext search does only work with natural words
+		if (parse_url($search, PHP_URL_SCHEME) && parse_url($search, PHP_URL_HOST)) {
+			Logger::info('Skipping tag and fulltext search since the search looks like a URL.', ['q' => $search]);
+			notice(DI::l10n()->t('No results.'));
+			return $o;
+		}
+
 		$tag = $tag || DI::config()->get('system', 'only_tag_search');
 
 		// Here is the way permissions work in the search module...
@@ -145,40 +155,39 @@ class Index extends BaseSearch
 				DI::config()->get('system', 'itemspage_network'));
 		}
 
+		$last_uriid = isset($_GET['last_uriid']) ? intval($_GET['last_uriid']) : 0;
+
 		$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
 		if ($tag) {
 			Logger::info('Start tag search.', ['q' => $search]);
-			$uriids = Tag::getURIIdListByTag($search, local_user(), $pager->getStart(), $pager->getItemsPerPage());
-
-			if (!empty($uriids)) {
-				$params = ['order' => ['id' => true], 'group_by' => ['uri-id']];
-				$items = Item::selectForUser(local_user(), [], ['uri-id' => $uriids], $params);
-				$r = Item::inArray($items);
-			} else {
-				$r = [];
-			}
+			$uriids = Tag::getURIIdListByTag($search, local_user(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid);
+			$count = Tag::countByTag($search, local_user());
 		} else {
 			Logger::info('Start fulltext search.', ['q' => $search]);
+			$uriids = Post\Content::getURIIdListBySearch($search, local_user(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid);
+			$count = Post\Content::countBySearch($search, local_user());
+		}
 
-			$condition = [
-				"(`uid` = 0 OR (`uid` = ? AND NOT `global`))
-				AND `body` LIKE CONCAT('%',?,'%')",
-				local_user(), $search
-			];
-			$params = [
-				'order' => ['id' => true],
-				'limit' => [$pager->getStart(), $pager->getItemsPerPage()]
-			];
-			$items = Item::selectForUser(local_user(), [], $condition, $params);
-			$r = Item::inArray($items);
+		if (!empty($uriids)) {
+			$condition = ["(`uid` = ? OR (`uid` = ? AND NOT `global`))", 0, local_user()];
+			$condition = DBA::mergeConditions($condition, ['uri-id' => $uriids]);
+			$params = ['order' => ['id' => true]];
+			$items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
 		}
 
-		if (!DBA::isResult($r)) {
-			info(DI::l10n()->t('No results.'));
+		if (empty($items)) {
+			if (empty($last_uriid)) {
+				notice(DI::l10n()->t('No results.'));
+			}
 			return $o;
 		}
 
+		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+			$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
+			$o .= Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]);
+		}
+
 		if ($tag) {
 			$title = DI::l10n()->t('Items tagged with: %s', $search);
 		} else {
@@ -191,9 +200,14 @@ class Index extends BaseSearch
 
 		Logger::info('Start Conversation.', ['q' => $search]);
 
-		$o .= conversation(DI::app(), $r, 'search', false, false, 'commented', local_user());
+		$o .= conversation(DI::app(), $items, 'search', false, false, 'commented', local_user());
+
+		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+			$o .= HTML::scrollLoader();
+		} else {
+			$o .= $pager->renderMinimal($count);
+		}
 
-		$o .= $pager->renderMinimal(count($r));
 
 		return $o;
 	}
@@ -236,13 +250,13 @@ class Index extends BaseSearch
 		} else {
 			// Cheaper local lookup for anonymous users, no probe
 			if ($isAddr) {
-				$contact = Contact::selectFirst(['id' => 'cid'], ['addr' => $search, 'uid' => 0]);
+				$contact = Contact::selectFirst(['id'], ['addr' => $search, 'uid' => 0]);
 			} else {
-				$contact = Contact::getDetailsByURL($search, 0, ['cid' => 0]);
+				$contact = Contact::getByURL($search, null, ['id']) ?: ['id' => 0];
 			}
 
 			if (DBA::isResult($contact)) {
-				$contact_id = $contact['cid'];
+				$contact_id = $contact['id'];
 			}
 		}
 
@@ -276,7 +290,7 @@ class Index extends BaseSearch
 		}
 
 		if (!empty($item_id)) {
-			$item = Item::selectFirst(['guid'], ['id' => $item_id]);
+			$item = Post::selectFirst(['guid'], ['id' => $item_id]);
 			if (DBA::isResult($item)) {
 				DI::baseUrl()->redirect('display/' . $item['guid']);
 			}