We now set the protocol in "gserver" on receiving as well

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

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index 451ed687b3b06f41f9c75da78cd69d3d3df9d91c..c7155b5393a13586a2b8fd6fe1fbc22550d3e6be 100644 (file)
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -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
         *
@@ -528,9 +545,11 @@ class Tag
         */
        public static function setGlobalTrendingHashtags(int $period, int $limit = 10)
        {
+               $block_sql = self::getBlockedSQL();
+
                $tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`
                        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 ?",
                        Item::PUBLIC, 0, $period, $limit);
 
@@ -571,9 +590,11 @@ class Tag
         */
        public static function setLocalTrendingHashtags(int $period, int $limit = 10)
        {
+               $block_sql = self::getBlockedSQL();
+
                $tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`
                        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 ?",
                        Item::PUBLIC, $period, $limit);