X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FTag.php;h=17a68f120f4b5ab643277ac387571410b6d93944;hb=48087136680d345e9222c974ae983262b319d308;hp=451ed687b3b06f41f9c75da78cd69d3d3df9d91c;hpb=5b655a9768f36c0f75a1c1a98426e5bb8802a5a8;p=friendica.git

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index 451ed687b3..17a68f120f 100644
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,13 +22,14 @@
 namespace Friendica\Model;
 
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
 /**
@@ -206,22 +207,40 @@ class Tag
 	}
 
 	/**
-	 * Store tags and mentions from the body
+	 * Get tags and mentions from the body
 	 * 
-	 * @param integer $uriid   URI-Id
 	 * @param string  $body    Body of the post
 	 * @param string  $tags    Accepted tags
-	 * @param boolean $probing Perform a probing for contacts, adding them if needed
+	 *
+	 * @return array Tag list
 	 */
-	public static function storeFromBody(int $uriid, string $body, string $tags = null, $probing = true)
+	public static function getFromBody(string $body, string $tags = null)
 	{
 		if (is_null($tags)) {
 			$tags =  self::TAG_CHARACTER[self::HASHTAG] . self::TAG_CHARACTER[self::MENTION] . self::TAG_CHARACTER[self::EXCLUSIVE_MENTION];
 		}
 
+		if (!preg_match_all("/([" . $tags . "])\[url\=([^\[\]]*)\]([^\[\]]*)\[\/url\]/ism", $body, $result, PREG_SET_ORDER)) {
+			return [];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Store tags and mentions from the body
+	 * 
+	 * @param integer $uriid   URI-Id
+	 * @param string  $body    Body of the post
+	 * @param string  $tags    Accepted tags
+	 * @param boolean $probing Perform a probing for contacts, adding them if needed
+	 */
+	public static function storeFromBody(int $uriid, string $body, string $tags = null, $probing = true)
+	{
 		Logger::info('Check for tags', ['uri-id' => $uriid, 'hash' => $tags, 'callstack' => System::callstack()]);
 
-		if (!preg_match_all("/([" . $tags . "])\[url\=([^\[\]]*)\]([^\[\]]*)\[\/url\]/ism", $body, $result, PREG_SET_ORDER)) {
+		$result = self::getFromBody($body, $tags);
+		if (empty($result)) {
 			return;
 		}
 
@@ -425,8 +444,8 @@ class Tag
 						$item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);
 					}
 
-					$return['hashtags'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank" rel="noopener noreferrer">' . htmlspecialchars($tag['name']) . '</a>';
-					$return['tags'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank" rel="noopener noreferrer">' . htmlspecialchars($tag['name']) . '</a>';
+					$return['hashtags'][] = '<bdi>' . $prefix . '<a href="' . $tag['url'] . '" target="_blank" rel="noopener noreferrer">' . htmlspecialchars($tag['name']) . '</a></bdi>';
+					$return['tags'][] = '<bdi>' . $prefix . '<a href="' . $tag['url'] . '" target="_blank" rel="noopener noreferrer">' . htmlspecialchars($tag['name']) . '</a></bdi>';
 					break;
 				case self::MENTION:
 				case self::EXCLUSIVE_MENTION:
@@ -435,8 +454,8 @@ class Tag
 					} else {
 						$tag['url'] = Contact::magicLink($tag['url']);
 					}
-					$return['mentions'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank" rel="noopener noreferrer">' . htmlspecialchars($tag['name']) . '</a>';
-					$return['tags'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank" rel="noopener noreferrer">' . htmlspecialchars($tag['name']) . '</a>';
+					$return['mentions'][] = '<bdi>' . $prefix . '<a href="' . $tag['url'] . '" target="_blank" rel="noopener noreferrer">' . htmlspecialchars($tag['name']) . '</a></bdi>';
+					$return['tags'][] = '<bdi>' . $prefix . '<a href="' . $tag['url'] . '" target="_blank" rel="noopener noreferrer">' . htmlspecialchars($tag['name']) . '</a></bdi>';
 					break;
 				case self::IMPLICIT_MENTION:
 					$return['implicit_mentions'][] = $prefix . $tag['name'];
@@ -518,6 +537,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,11 +564,21 @@ class Tag
 	 */
 	public static function setGlobalTrendingHashtags(int $period, int $limit = 10)
 	{
-		$tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`
+		// Get a uri-id that is at least X hours old.
+		// We use the uri-id in the query for the hash tags since this is much faster
+		$post = Post::selectFirstThread(['uri-id'], ["`uid` = ? AND `received` < ?", 0, DateTimeFormat::utc('now - ' . $period . ' hour')],
+			['order' => ['received' => true]]);
+		if (empty($post['uri-id'])) {
+			return [];
+		}
+
+		$block_sql = self::getBlockedSQL();
+
+		$tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`, COUNT(DISTINCT(`author-id`)) as `authors`
 			FROM `tag-search-view`
-			WHERE `private` = ? AND `uid` = ? AND `received` > DATE_SUB(NOW(), INTERVAL ? HOUR)
-			GROUP BY `term` ORDER BY `score` DESC LIMIT ?",
-			Item::PUBLIC, 0, $period, $limit);
+			WHERE `private` = ? AND `uid` = ? AND `uri-id` > ? $block_sql
+			GROUP BY `term` ORDER BY `authors` DESC, `score` DESC LIMIT ?",
+			Item::PUBLIC, 0, $post['uri-id'], $limit);
 
 		if (DBA::isResult($tagsStmt)) {
 			$tags = DBA::toArray($tagsStmt);
@@ -571,11 +617,21 @@ class Tag
 	 */
 	public static function setLocalTrendingHashtags(int $period, int $limit = 10)
 	{
-		$tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`
+		// Get a uri-id that is at least X hours old.
+		// We use the uri-id in the query for the hash tags since this is much faster
+		$post = Post::selectFirstThread(['uri-id'], ["`uid` = ? AND `received` < ?", 0, DateTimeFormat::utc('now - ' . $period . ' hour')],
+			['order' => ['received' => true]]);
+		if (empty($post['uri-id'])) {
+			return [];
+		}
+
+		$block_sql = self::getBlockedSQL();
+
+		$tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`, COUNT(DISTINCT(`author-id`)) as `authors`
 			FROM `tag-search-view`
-			WHERE `private` = ? AND `wall` AND `origin` AND `received` > DATE_SUB(NOW(), INTERVAL ? HOUR)
-			GROUP BY `term` ORDER BY `score` DESC LIMIT ?",
-			Item::PUBLIC, $period, $limit);
+			WHERE `private` = ? AND `wall` AND `origin` AND `uri-id` > ? $block_sql
+			GROUP BY `term` ORDER BY `authors` DESC, `score` DESC LIMIT ?",
+			Item::PUBLIC, $post['uri-id'], $limit);
 
 		if (DBA::isResult($tagsStmt)) {
 			$tags = DBA::toArray($tagsStmt);