From: root <17hado.com@gmail.com> Date: Mon, 17 Dec 2018 04:41:55 +0000 (+0000) Subject: #6275 - q support hashtag search X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8de263df8b3035a6dc50086a5e30f5b5779b71d0;p=friendica.git #6275 - q support hashtag search --- diff --git a/doc/api.md b/doc/api.md index 58413b2e64..0f2243b5c1 100644 --- a/doc/api.md +++ b/doc/api.md @@ -751,7 +751,6 @@ Friendica doesn't allow showing followers of other users. #### Parameters * q: search query -* friendica_tag: search hashtag (optional; query condition only accept one of the two [ q | friendica_tag ] ) * page: the page number (starting at 1) to return * rpp: the number of statuses to return per page * count: alias for the rpp parameter diff --git a/include/api.php b/include/api.php index 9faba3b9cc..4bd9e34a3c 100644 --- a/include/api.php +++ b/include/api.php @@ -1521,7 +1521,9 @@ function api_search($type) if (api_user() === false || $user_info === false) { throw new ForbiddenException(); } - if (empty($_REQUEST['q']) && empty($_REQUEST['friendica_tag'])) { throw new BadRequestException("q or friendica_tag parameter is required."); } + if (empty($_REQUEST['q'])) { throw new BadRequestException("q parameter is required."); } + + $searchTerm = trim(rawurldecode($_REQUEST['q'])); $data = []; $count = 15; @@ -1530,31 +1532,18 @@ function api_search($type) } elseif (!empty($_REQUEST['count'])) { $count = $_REQUEST['count']; } - + $since_id = defaults($_REQUEST, 'since_id', 0); $max_id = defaults($_REQUEST, 'max_id', 0); $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0); $start = $page * $count; $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; - - if (!empty($_REQUEST['q'])) { - $condition = [ - "`id` > ? - AND (`uid` = 0 OR (`uid` = ? AND NOT `global`)) - AND `body` LIKE CONCAT('%',?,'%')", - $since_id, api_user(), $_REQUEST['q']]; - if ($max_id > 0) { - $condition[0] .= " AND `id` <= ?"; - $condition[] = $max_id; - } - } elseif (!empty($_REQUEST['friendica_tag'])) { - $condition = [ - "`oid` > ? + if (preg_match('/^\#([^#]+)/', $searchTerm, $matches) === 1 && isset($matches[1])) { + $searchTerm = $matches[1]; + $condition = ["`oid` > ? AND (`uid` = 0 OR (`uid` = ? AND NOT `global`)) AND `otype` = ? AND `type` = ? AND `term` = ?", - $since_id, local_user(), TERM_OBJ_POST, TERM_HASHTAG, - Strings::escapeTags(trim(rawurldecode($_REQUEST['friendica_tag']))) - ]; + $since_id, local_user(), TERM_OBJ_POST, TERM_HASHTAG, $searchTerm]; if ($max_id > 0) { $condition[0] .= " AND `oid` <= ?"; $condition[] = $max_id; @@ -1564,6 +1553,16 @@ function api_search($type) while($term = DBA::fetch($terms)){ $itemIds[] = $term['oid']; } DBA::close($terms); $condition = ['id' => empty($itemIds) ? [0] : $itemIds ]; + } else { + $condition = ["`id` > ? + AND (`uid` = 0 OR (`uid` = ? AND NOT `global`)) + AND `body` LIKE CONCAT('%',?,'%')", + $since_id, api_user(), $_REQUEST['q']]; + if ($max_id > 0) { + $condition[0] .= " AND `id` <= ?"; + $condition[] = $max_id; + } + } $statuses = Item::selectForUser(api_user(), [], $condition, $params); diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php index d328c4cb55..458d98599a 100644 --- a/tests/include/ApiTest.php +++ b/tests/include/ApiTest.php @@ -1390,20 +1390,6 @@ class ApiTest extends DatabaseTest } } - /** - * Test the api_search() function with friendica_tag - * @return void - */ - public function testApiSearchWithFriendicaTag() - { - $_REQUEST['friendica_tag'] = 'friendica'; - $result = api_search('json'); - foreach ($result['status'] as $status) { - $this->assertStatus($status); - $this->assertContains('#friendica', $status['text'], null, true); - } - } - /** * Test the api_search() function with an rpp parameter. * @return void