GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[SEARCH] Exclude message scope

Browse Source
This commit is contained in:
Alexei Sorokin 2020-08-13 22:59:41 +03:00
parent 2f845e98e8
commit 255d395f1d
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/search/search_engines.php
View File

@ -93,6 +93,8 @@ class PostgreSQLSearch extends SearchEngine
)); ));
return true; return true;
} elseif ($this->table === 'notice') { } elseif ($this->table === 'notice') {
// Don't show direct messages.
$this->target->whereAdd('notice.scope <> ' . Notice::MESSAGE_SCOPE);
// Don't show imported notices // Don't show imported notices
$this->target->whereAdd('notice.is_local <> ' . Notice::GATEWAY); $this->target->whereAdd('notice.is_local <> ' . Notice::GATEWAY);
@ -131,6 +133,8 @@ class MySQLSearch extends SearchEngine
} }
return true; return true;
} elseif ($this->table === 'notice') { } elseif ($this->table === 'notice') {
// Don't show direct messages.
$this->target->whereAdd('notice.scope <> ' . Notice::MESSAGE_SCOPE);
// Don't show imported notices // Don't show imported notices
$this->target->whereAdd('notice.is_local <> ' . Notice::GATEWAY); $this->target->whereAdd('notice.is_local <> ' . Notice::GATEWAY);
@ -172,7 +176,15 @@ class SQLLikeSearch extends SearchEngine
$this->table $this->table
); );
} elseif ($this->table === 'notice') { } elseif ($this->table === 'notice') {
$qry = sprintf('content LIKE \'%%%1$s%%\'', $this->target->escape($q, true)); // Don't show direct messages.
$this->target->whereAdd('notice.scope <> ' . Notice::MESSAGE_SCOPE);
// Don't show imported notices
$this->target->whereAdd('notice.is_local <> ' . Notice::GATEWAY);
$qry = sprintf(
'notice.content LIKE \'%%%1$s%%\'',
$this->target->escape($q, true)
);
} else { } else {
throw new ServerException('Unknown table: ' . $this->table); throw new ServerException('Unknown table: ' . $this->table);
} }