Replaced "getDetailsByURL" with "getByURL/getByURLForUser"

[friendica.git] / src / Core / Search.php

diff --git a/src/Core/Search.php b/src/Core/Search.php
index 4742ac599359f1b9a6297a84264574bc04e67a58..26531a1a3089b11b955bc07ed1187568d4160d00 100644 (file)
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -77,7 +77,7 @@ class Search
                        // Ensure that we do have a contact entry
                        Contact::getIdForURL($user_data['url'] ?? '');
 
-                       $contactDetails = Contact::getDetailsByURL($user_data['url'] ?? '', local_user());
+                       $contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user(), [], false);
 
                        $result = new ContactResult(
                                $user_data['name'] ?? '',
@@ -100,7 +100,7 @@ class Search
        /**
         * Search in the global directory for occurrences of the search string
         *
-        * @see https://github.com/friendica/friendica-directory/blob/master/docs/Protocol.md#search
+        * @see https://github.com/friendica/friendica-directory/blob/stable/docs/Protocol.md#search
         *
         * @param string $search
         * @param int    $type specific type of searching
@@ -143,7 +143,7 @@ class Search
 
                foreach ($profiles as $profile) {
                        $profile_url = $profile['url'] ?? '';
-                       $contactDetails = Contact::getDetailsByURL($profile_url, local_user());
+                       $contactDetails = Contact::getByURLForUser($profile_url, local_user(), [], false);
 
                        $result = new ContactResult(
                                $profile['name'] ?? '',
@@ -232,7 +232,7 @@ class Search
                                continue;
                        }
 
-                       $contact = Contact::getDetailsByURL($row["nurl"], local_user());
+                       $contact = Contact::getByURLForUser($row["nurl"], local_user(), [], false);
 
                        if ($contact["name"] == "") {
                                $contact["name"] = end(explode("/", $urlParts["path"]));
@@ -311,4 +311,19 @@ class Search
        {
                return DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY);
        }
+
+       /**
+        * Return the search path (either fulltext search or tag search)
+        *
+        * @param string $search
+        * @return string search path
+        */
+       public static function getSearchPath(string $search)
+       {
+               if (substr($search, 0, 1) == '#') {
+                       return 'search?tag=' . urlencode(substr($search, 1));
+               } else {
+                       return 'search?q=' . urlencode($search);
+               }
+       }
 }