Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 03:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10024 from annando/block-tags

Browse source 
Block tags from the trending tags
This commit is contained in:
Hypolite Petovan 2021-03-09 18:14:41 -05:00 committed by GitHub
commit df547ba73f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Model/Tag.php
View file

@ -518,6 +518,23 @@ class Tag
} }
} }
/**
* Fetch the blocked tags as SQL
*
* @return string
*/
private static function getBlockedSQL()
{
$blocked_txt = DI::config()->get('system', 'blocked_tags');
if (empty($blocked_txt)) {
return '';
}
$blocked = explode(',', $blocked_txt);
array_walk($blocked, function(&$value) { $value = "'" . DBA::escape(trim($value)) . "'";});
return " AND NOT `name` IN (" . implode(',', $blocked) . ")";
}
/** /**
* Creates a list of the most frequent global hashtags over the given period * Creates a list of the most frequent global hashtags over the given period
* *
@ -528,9 +545,11 @@ class Tag
*/ */
public static function setGlobalTrendingHashtags(int $period, int $limit = 10) public static function setGlobalTrendingHashtags(int $period, int $limit = 10)
{ {
$block_sql = self::getBlockedSQL();
$tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score` $tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`
FROM `tag-search-view` FROM `tag-search-view`
WHERE `private` = ? AND `uid` = ? AND `received` > DATE_SUB(NOW(), INTERVAL ? HOUR) WHERE `private` = ? AND `uid` = ? AND `received` > DATE_SUB(NOW(), INTERVAL ? HOUR) $block_sql
GROUP BY `term` ORDER BY `score` DESC LIMIT ?", GROUP BY `term` ORDER BY `score` DESC LIMIT ?",
Item::PUBLIC, 0, $period, $limit); Item::PUBLIC, 0, $period, $limit);
@ -571,9 +590,11 @@ class Tag
*/ */
public static function setLocalTrendingHashtags(int $period, int $limit = 10) public static function setLocalTrendingHashtags(int $period, int $limit = 10)
{ {
$block_sql = self::getBlockedSQL();
$tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score` $tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`
FROM `tag-search-view` FROM `tag-search-view`
WHERE `private` = ? AND `wall` AND `origin` AND `received` > DATE_SUB(NOW(), INTERVAL ? HOUR) WHERE `private` = ? AND `wall` AND `origin` AND `received` > DATE_SUB(NOW(), INTERVAL ? HOUR) $block_sql
GROUP BY `term` ORDER BY `score` DESC LIMIT ?", GROUP BY `term` ORDER BY `score` DESC LIMIT ?",
Item::PUBLIC, $period, $limit); Item::PUBLIC, $period, $limit);

4
static/defaults.config.php
View file

@ -121,6 +121,10 @@ return [
// Deny public access to the local user directory. // Deny public access to the local user directory.
'block_local_dir' => false, 'block_local_dir' => false,
// blocked_tags (String)
// Comma separated list of hash tags that shouldn't be displayed in the trending tags
'blocked_tags' => '',
// community_no_sharer (Boolean) // community_no_sharer (Boolean)
// Don't display sharing accounts on the global community // Don't display sharing accounts on the global community
'community_no_sharer' => false, 'community_no_sharer' => false,