return $Entities;
}
- public function select(array $condition, array $params = []): BaseCollection
+ public function select(array $condition, array $params = []): UserDefinedChannels
{
return $this->_select($condition, $params);
}
'full-text-search' => $Channel->fullTextSearch,
'media-type' => $Channel->mediaType,
'languages' => serialize($Channel->languages),
+ 'publish' => $Channel->publish,
];
if ($Channel->code) {
/**
* Checks, if one of the user defined channels matches with the given search text
- * @todo To increase the performance, this functionality should be replaced with a single SQL call.
+ * @todo Combine all the full text statements in a single search text to improve the performance.
+ * Add a "valid" field for the channel that is set when the full text statement doesn't contain errors.
*
* @param string $searchtext
* @param string $language
*/
public function match(string $searchtext, string $language, array $tags, int $media_type): bool
{
- $condition = ["`verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired` AND `user`.`uid` > ?", 0];
-
- $abandon_days = intval($this->config->get('system', 'account_abandon_days'));
- if (!empty($abandon_days)) {
- $condition = DBA::mergeConditions($condition, ["`last-activity` > ?", DateTimeFormat::utc('now - ' . $abandon_days . ' days')]);
- }
-
- $users = $this->db->selectToArray('user', ['uid'], $condition);
+ $users = $this->db->selectToArray('user', ['uid'], $this->getUserCondition());
if (empty($users)) {
return [];
}
- return !empty($this->getMatches($searchtext, $language, $tags, $media_type, 0, array_column($users, 'uid'), false));
+ $uids = array_column($users, 'uid');
+
+ $condition = ['uid' => $uids];
+ $condition = DBA::mergeConditions($condition, ["`languages` != ? AND `include-tags` = ? AND `full-text-search` = ? AND circle = ?", '', '', '', 0]);
+
+ foreach ($this->select($condition) as $channel) {
+ if (!empty($channel->languages) && in_array($language, $channel->languages)) {
+ return true;
+ }
+ }
+
+ return !empty($this->getMatches($searchtext, $language, $tags, $media_type, 0, 0, $uids, false));
}
/**
* @param array $tags
* @param int $media_type
* @param int $owner_id
+ * @param int $reshare_id
* @return array
*/
- public function getMatchingChannelUsers(string $searchtext, string $language, array $tags, int $media_type, int $owner_id): array
+ public function getMatchingChannelUsers(string $searchtext, string $language, array $tags, int $media_type, int $owner_id, int $reshare_id): array
{
- $users = $this->db->selectToArray('user', ['uid'], ["`account-type` = ? AND `uid` != ?", User::ACCOUNT_TYPE_RELAY, 0]);
+ $condition = $this->getUserCondition();
+ $condition = DBA::mergeConditions($condition, ["`account-type` IN (?, ?) AND `uid` != ?", User::ACCOUNT_TYPE_RELAY, User::ACCOUNT_TYPE_COMMUNITY, 0]);
+ $users = $this->db->selectToArray('user', ['uid'], $condition);
if (empty($users)) {
return [];
}
- return $this->getMatches($searchtext, $language, $tags, $media_type, $owner_id, array_column($users, 'uid'), true);
+ return $this->getMatches($searchtext, $language, $tags, $media_type, $owner_id, $reshare_id, array_column($users, 'uid'), true);
}
- private function getMatches(string $searchtext, string $language, array $tags, int $media_type, int $owner_id, array $channelUids, bool $relayMode): array
+ private function getMatches(string $searchtext, string $language, array $tags, int $media_type, int $owner_id, int $reshare_id, array $channelUids, bool $relayMode): array
{
if (!in_array($language, User::getLanguages())) {
$this->logger->debug('Unwanted language found. No matched channel found.', ['language' => $language, 'searchtext' => $searchtext]);
$condition = ['uid' => $channelUids];
if (!$relayMode) {
$condition = DBA::mergeConditions($condition, ["`full-text-search` != ?", '']);
+ } else {
+ $condition = DBA::mergeConditions($condition, ['publish' => true]);
}
foreach ($this->select($condition) as $channel) {
continue;
}
if (!empty($channel->circle) && ($channel->circle > 0) && !in_array($channel->uid, $uids)) {
- $account = Contact::selectFirstAccountUser(['id'], ['pid' => $owner_id, 'uid' => $channel->uid]);
- if (empty($account['id']) || !$this->db->exists('group_member', ['gid' => $channel->circle, 'contact-id' => $account['id']])) {
+ if (!$this->inCircle($channel->circle, $channel->uid, $owner_id) && !$this->inCircle($channel->circle, $channel->uid, $reshare_id)) {
continue;
}
}
continue;
}
if (!empty($channel->includeTags) && !in_array($channel->uid, $uids)) {
- if (empty($tags)) {
- continue;
- }
- $match = false;
- foreach (explode(',', $channel->includeTags) as $tag) {
- if (in_array($tag, $tags)) {
- $match = true;
- break;
- }
- }
- if (!$match) {
+ if (!$this->inTaglist($channel->includeTags, $tags)) {
continue;
}
}
- if (!empty($tags) && !empty($channel->excludeTags) && !in_array($channel->uid, $uids)) {
- $match = false;
- foreach (explode(',', $channel->excludeTags) as $tag) {
- if (in_array($tag, $tags)) {
- $match = true;
- break;
- }
- }
- if ($match) {
+ if (!empty($channel->excludeTags) && !in_array($channel->uid, $uids)) {
+ if ($this->inTaglist($channel->excludeTags, $tags)) {
continue;
}
}
}
}
if (!empty($channel->fullTextSearch) && !in_array($channel->uid, $uids)) {
- $channelsearchtext = $channel->fullTextSearch;
- foreach (Engagement::KEYWORDS as $keyword) {
- $channelsearchtext = preg_replace('~(' . $keyword . ':.[\w@\.-]+)~', '"$1"', $channelsearchtext);
- }
- if (!$this->db->exists('check-full-text-search', ["`pid` = ? AND MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE)", getmypid(), $channelsearchtext])) {
+ if (!$this->inFulltext($channel->fullTextSearch)) {
continue;
}
}
$this->db->delete('check-full-text-search', ['pid' => getmypid()]);
return $uids;
}
+
+ private function inCircle(int $circleId, int $uid, int $cid): bool
+ {
+ if ($cid == 0) {
+ return false;
+ }
+
+ $account = Contact::selectFirstAccountUser(['id'], ['pid' => $cid, 'uid' => $uid]);
+ if (empty($account['id'])) {
+ return false;
+ }
+ return $this->db->exists('group_member', ['gid' => $circleId, 'contact-id' => $account['id']]);
+ }
+
+ private function inTaglist(string $tagList, array $tags): bool
+ {
+ if (empty($tags)) {
+ return false;
+ }
+ array_walk($tags, function (&$value) {
+ $value = mb_strtolower($value);
+ });
+ foreach (explode(',', $tagList) as $tag) {
+ if (in_array($tag, $tags)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private function inFulltext(string $fullTextSearch): bool
+ {
+ foreach (Engagement::KEYWORDS as $keyword) {
+ $fullTextSearch = preg_replace('~(' . $keyword . ':.[\w@\.-]+)~', '"$1"', $fullTextSearch);
+ }
+ return $this->db->exists('check-full-text-search', ["`pid` = ? AND MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE)", getmypid(), $fullTextSearch]);
+ }
+
+ private function getUserCondition()
+ {
+ $condition = ["`verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired` AND `user`.`uid` > ?", 0];
+
+ $abandon_days = intval($this->config->get('system', 'account_abandon_days'));
+ if (!empty($abandon_days)) {
+ $condition = DBA::mergeConditions($condition, ["`last-activity` > ?", DateTimeFormat::utc('now - ' . $abandon_days . ' days')]);
+ }
+ return $condition;
+ }
}
projects / friendica.git / blobdiff