From 63b958dcc64ca3c1f734bbb413bdbb9baa48487a Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 15 Jan 2024 22:28:42 +0000 Subject: [PATCH] Centralized functionality to store and delete the check-full-text-search table --- .../Repository/UserDefinedChannel.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Content/Conversation/Repository/UserDefinedChannel.php b/src/Content/Conversation/Repository/UserDefinedChannel.php index a74bdb06d3..0452b6dd2b 100644 --- a/src/Content/Conversation/Repository/UserDefinedChannel.php +++ b/src/Content/Conversation/Repository/UserDefinedChannel.php @@ -189,9 +189,10 @@ class UserDefinedChannel extends \Friendica\BaseRepository $search .= '(' . $channel->fullTextSearch . ') '; } - $this->db->insert('check-full-text-search', ['pid' => getmypid(), 'searchtext' => $searchtext], Database::INSERT_UPDATE); + $this->insertCheckFullTextSearch($searchtext); $result = $this->inFulltext($search); - $this->db->delete('check-full-text-search', ['pid' => getmypid()]); + $this->deleteCheckFullTextSearch(); + return $result; } @@ -220,7 +221,7 @@ class UserDefinedChannel extends \Friendica\BaseRepository return []; } - $this->db->insert('check-full-text-search', ['pid' => getmypid(), 'searchtext' => $searchtext], Database::INSERT_UPDATE); + $this->insertCheckFullTextSearch($searchtext); $uids = []; @@ -264,10 +265,20 @@ class UserDefinedChannel extends \Friendica\BaseRepository $this->logger->debug('Matching channel found.', ['uid' => $channel->uid, 'label' => $channel->label, 'language' => $language, 'tags' => $tags, 'media_type' => $media_type, 'searchtext' => $searchtext]); } - $this->db->delete('check-full-text-search', ['pid' => getmypid()]); + $this->deleteCheckFullTextSearch(); return $uids; } + private function insertCheckFullTextSearch(string $searchtext) + { + $this->db->insert('check-full-text-search', ['pid' => getmypid(), 'searchtext' => $searchtext], Database::INSERT_UPDATE); + } + + private function deleteCheckFullTextSearch() + { + $this->db->delete('check-full-text-search', ['pid' => getmypid()]); + } + private function inCircle(int $circleId, int $uid, int $cid): bool { if ($cid == 0) {