diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php index 5268c49e9..ad402cece 100644 --- a/src/Model/ItemContent.php +++ b/src/Model/ItemContent.php @@ -42,7 +42,9 @@ class ItemContent public static function getURIIdListBySearch(string $search, int $uid = 0, int $start = 0, int $limit = 100, int $last_uriid = 0) { $condition = ["`uri-id` IN (SELECT `uri-id` FROM `item-content` WHERE MATCH (`title`, `content-warning`, `body`) AGAINST (? IN BOOLEAN MODE)) - AND (NOT `private` OR (`private` AND `uid` = ?))", $search, $uid]; + AND (NOT `private` OR (`private` AND `uid` = ?)) + AND `uri-id` IN (SELECT `uri-id` FROM `item` WHERE `network` IN (?, ?, ?, ?))", + $search, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; if (!empty($last_uriid)) { $condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $last_uriid]); @@ -68,7 +70,9 @@ class ItemContent public static function countBySearch(string $search, int $uid = 0) { $condition = ["`uri-id` IN (SELECT `uri-id` FROM `item-content` WHERE MATCH (`title`, `content-warning`, `body`) AGAINST (? IN BOOLEAN MODE)) - AND (NOT `private` OR (`private` AND `uid` = ?))", $search, $uid]; + AND (NOT `private` OR (`private` AND `uid` = ?)) + AND `uri-id` IN (SELECT `uri-id` FROM `item` WHERE `network` IN (?, ?, ?, ?))", + $search, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; return DBA::count('item', $condition); } diff --git a/src/Model/Tag.php b/src/Model/Tag.php index 2bdbbc8ac..fb7f05ad7 100644 --- a/src/Model/Tag.php +++ b/src/Model/Tag.php @@ -24,6 +24,7 @@ namespace Friendica\Model; use Friendica\Content\Text\BBCode; use Friendica\Core\Cache\Duration; use Friendica\Core\Logger; +use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Database\Database; use Friendica\Database\DBA; @@ -450,7 +451,9 @@ class Tag */ public static function countByTag(string $search, int $uid = 0) { - $condition = ["`name` = ? AND (NOT `private` OR (`private` AND `uid` = ?))", $search, $uid]; + $condition = ["`name` = ? AND (NOT `private` OR (`private` AND `uid` = ?)) + AND `uri-id` IN (SELECT `uri-id` FROM `item` WHERE `network` IN (?, ?, ?, ?))", + $search, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; $params = ['group_by' => ['uri-id']]; return DBA::count('tag-search-view', $condition, $params); @@ -468,7 +471,9 @@ class Tag */ public static function getURIIdListByTag(string $search, int $uid = 0, int $start = 0, int $limit = 100, int $last_uriid = 0) { - $condition = ["`name` = ? AND (NOT `private` OR (`private` AND `uid` = ?))", $search, $uid]; + $condition = ["`name` = ? AND (NOT `private` OR (`private` AND `uid` = ?)) + AND `uri-id` IN (SELECT `uri-id` FROM `item` WHERE `network` IN (?, ?, ?, ?))", + $search, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; if (!empty($last_uriid)) { $condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $last_uriid]); diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php index 5f776577e..67534a61a 100644 --- a/src/Module/Search/Index.php +++ b/src/Module/Search/Index.php @@ -175,7 +175,9 @@ class Index extends BaseSearch } if (empty($items)) { - notice(DI::l10n()->t('No results.')); + if (empty($last_uriid)) { + notice(DI::l10n()->t('No results.')); + } return $o; }