Merge pull request #13121 from MrPetovan/task/13114-rename-group-to-circle

[friendica.git] / src / Module / Search / Index.php

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index f4e1db614838f430f1b370c5481c3336b39aab01..167389684240469ccdae63db5210983f24ae2426 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,7 @@
 namespace Friendica\Module\Search;
 
 use Friendica\App;
+use Friendica\Content\Conversation;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
@@ -105,7 +106,7 @@ class Index extends BaseSearch
                        $search = '#' . trim(rawurldecode($_GET['tag']));
                }
 
-               // contruct a wrapper for the search header
+               // construct a wrapper for the search header
                $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('content_wrapper.tpl'), [
                        'name' => 'search-header',
                        '$title' => DI::l10n()->t('Search'),
@@ -120,27 +121,27 @@ class Index extends BaseSearch
                if (strpos($search, '#') === 0) {
                        $tag = true;
                        $search = substr($search, 1);
-               }
-
-               self::tryRedirectToProfile($search);
-
-               if (strpos($search, '@') === 0 || strpos($search, '!') === 0) {
-                       return self::performContactSearch($search);
-               }
+               } else {
+                       if (strpos($search, '@') === 0 || strpos($search, '!') === 0) {
+                               return self::performContactSearch($search);
+                       }
 
-               self::tryRedirectToPost($search);
-
-               if (!empty($_GET['search-option'])) {
-                       switch ($_GET['search-option']) {
-                               case 'fulltext':
-                                       break;
-                               case 'tags':
-                                       $tag = true;
-                                       break;
-                               case 'contacts':
-                                       return self::performContactSearch($search, '@');
-                               case 'forums':
-                                       return self::performContactSearch($search, '!');
+                       self::tryRedirectToPost($search);
+
+                       self::tryRedirectToProfile($search);
+
+                       if (!empty($_GET['search-option'])) {
+                               switch ($_GET['search-option']) {
+                                       case 'fulltext':
+                                               break;
+                                       case 'tags':
+                                               $tag = true;
+                                               break;
+                                       case 'contacts':
+                                               return self::performContactSearch($search, '@');
+                                       case 'forums':
+                                               return self::performContactSearch($search, '!');
+                               }
                        }
                }
 
@@ -212,7 +213,7 @@ class Index extends BaseSearch
 
                Logger::info('Start Conversation.', ['q' => $search]);
 
-               $o .= DI::conversation()->create($items, 'search', false, false, 'commented', DI::userSession()->getLocalUserId());
+               $o .= DI::conversation()->create($items, Conversation::MODE_SEARCH, false, false, 'commented', DI::userSession()->getLocalUserId());
 
                if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'infinite_scroll')) {
                        $o .= HTML::scrollLoader();