Standards

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

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index c7155b5393a13586a2b8fd6fe1fbc22550d3e6be..1bc700c3f14f0215643db0cb899bcdcf430d33c6 100644 (file)
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -425,8 +425,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 +435,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'];
@@ -547,10 +547,10 @@ class Tag
        {
                $block_sql = self::getBlockedSQL();
 
-               $tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`
+               $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) $block_sql
-                       GROUP BY `term` ORDER BY `score` DESC LIMIT ?",
+                       GROUP BY `term` ORDER BY `authors` DESC, `score` DESC LIMIT ?",
                        Item::PUBLIC, 0, $period, $limit);
 
                if (DBA::isResult($tagsStmt)) {
@@ -592,10 +592,10 @@ class Tag
        {
                $block_sql = self::getBlockedSQL();
 
-               $tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`
+               $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) $block_sql
-                       GROUP BY `term` ORDER BY `score` DESC LIMIT ?",
+                       GROUP BY `term` ORDER BY `authors` DESC, `score` DESC LIMIT ?",
                        Item::PUBLIC, $period, $limit);
 
                if (DBA::isResult($tagsStmt)) {