Merge pull request #9884 from annando/update-in-maintenance

[friendica.git] / src / Model / ItemContent.php

diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php
index c4e77cf413794ec2d53c843f16f7d63918264cbd..304ab25d97516249b26b39e7369442428437c90f 100644 (file)
--- a/src/Model/ItemContent.php
+++ b/src/Model/ItemContent.php
@@ -29,17 +29,34 @@ use Friendica\DI;
 
 class ItemContent
 {
-       public static function getURIIdListBySearch(string $search, int $uid = 0, int $start = 0, int $limit = 100)
+       /**
+        * Search posts for given content
+        *
+        * @param string $search
+        * @param integer $uid
+        * @param integer $start
+        * @param integer $limit
+        * @param integer $last_uriid
+        * @return array
+        */
+       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 (`body`) AGAINST (? IN BOOLEAN MODE))
-                       AND (NOT `private` OR (`private` AND `uid` = ?))", $search, $uid];
+               $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` = ?))
+                       AND `uri-id` IN (SELECT `uri-id` FROM `post-view` 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]);
+               }
+
                $params = [
                        'order' => ['uri-id' => true],
                        'group_by' => ['uri-id'],
                        'limit' => [$start, $limit]
                ];
 
-               $tags = DBA::select('item', ['uri-id'], $condition, $params);
+               $tags = Post::select(['uri-id'], $condition, $params);
 
                $uriids = [];
                while ($tag = DBA::fetch($tags)) {
@@ -50,6 +67,15 @@ class ItemContent
                return $uriids;
        }
 
+       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` = ?))
+                       AND `uri-id` IN (SELECT `uri-id` FROM `post-view` WHERE `network` IN (?, ?, ?, ?))",
+                       $search, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
+               return Post::count($condition);
+       }
+
        /**
         * Convert a message into plaintext for connectors to other networks
         *