X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FTag.php;h=3020a2f2934839e0108779bda564314752e09bcb;hb=6dbbd081795fa1c8fe57db2248ac162efeeada88;hp=63a4ff492c662b32bf281db5614ba79235ef78c6;hpb=8a3995a740a109b2bcac9b88fee6ecc55dd97c85;p=friendica.git

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index 63a4ff492c..3020a2f293 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;
 
 /**
@@ -125,7 +126,9 @@ class Tag
 				// The contact wasn't found in the system (most likely some dead account)
 				// We ensure that we only store a single entry by overwriting the previous name
 				Logger::info('Contact not found, updating tag', ['url' => $url, 'name' => $name]);
-				DBA::update('tag', ['name' => substr($name, 0, 96)], ['url' => $url]);
+				if (!DBA::exists('tag', ['name' => substr($name, 0, 96), 'url' => $url])) {
+					DBA::update('tag', ['name' => substr($name, 0, 96)], ['url' => $url]);
+				}
 			}
 		}
 
@@ -407,7 +410,7 @@ class Tag
 
 		$searchpath = DI::baseUrl() . "/search?tag=";
 
-		$taglist = DBA::select('tag-view', ['type', 'name', 'url'],
+		$taglist = DBA::select('tag-view', ['type', 'name', 'url', 'cid'],
 			['uri-id' => $item['uri-id'], 'type' => [self::HASHTAG, self::MENTION, self::EXCLUSIVE_MENTION, self::IMPLICIT_MENTION]]);
 		while ($tag = DBA::fetch($taglist)) {
 			if ($tag['url'] == '') {
@@ -423,14 +426,18 @@ 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:
+					if (!empty($tag['cid'])) {
+						$tag['url'] = Contact::magicLinkById($tag['cid']);
+					} 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'];
@@ -451,12 +458,11 @@ class Tag
 	 */
 	public static function countByTag(string $search, int $uid = 0)
 	{
-		$condition = ["`name` = ? AND (NOT `private` OR (`private` AND `uid` = ?))
-			AND `uri-id` IN (SELECT `uri-id` FROM `post-view` WHERE `network` IN (?, ?, ?, ?))",
-			$search, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
-		$params = ['group_by' => ['uri-id']];
+		$condition = ["`name` = ? AND (`uid` = ? OR (`uid` = ? AND NOT `global`))
+			AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
+			$search, 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0];
 
-		return DBA::count('tag-search-view', $condition, $params);
+		return DBA::count('tag-search-view', $condition);
 	}
 
 	/**
@@ -471,9 +477,9 @@ class Tag
 	 */
 	public static function getURIIdListByTag(string $search, int $uid = 0, int $start = 0, int $limit = 100, int $last_uriid = 0)
 	{
-		$condition = ["`name` = ? AND (NOT `private` OR (`private` AND `uid` = ?))
-			AND `uri-id` IN (SELECT `uri-id` FROM `post-view` WHERE `network` IN (?, ?, ?, ?))",
-			$search, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
+		$condition = ["`name` = ? AND (`uid` = ? OR (`uid` = ? AND NOT `global`))
+			AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
+			$search, 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0];
 
 		if (!empty($last_uriid)) {
 			$condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $last_uriid]);
@@ -481,7 +487,6 @@ class Tag
 
 		$params = [
 			'order' => ['uri-id' => true],
-			'group_by' => ['uri-id'],
 			'limit' => [$start, $limit]
 		];
 
@@ -514,6 +519,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
 	 *
@@ -524,11 +546,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);
@@ -567,11 +599,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);