X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FTag.php;h=17a68f120f4b5ab643277ac387571410b6d93944;hb=3b6c40e2e6ad59f09daef08cf09366c844edd23a;hp=c7155b5393a13586a2b8fd6fe1fbc22550d3e6be;hpb=df547ba73fe6bc719216758981f66e17c5fe7eb9;p=friendica.git
diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index c7155b5393..17a68f120f 100644
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -1,6 +1,6 @@
$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 . '' . htmlspecialchars($tag['name']) . '';
- $return['tags'][] = $prefix . '' . htmlspecialchars($tag['name']) . '';
+ $return['hashtags'][] = '' . $prefix . '' . htmlspecialchars($tag['name']) . '';
+ $return['tags'][] = '' . $prefix . '' . htmlspecialchars($tag['name']) . '';
break;
case self::MENTION:
case self::EXCLUSIVE_MENTION:
@@ -435,8 +454,8 @@ class Tag
} else {
$tag['url'] = Contact::magicLink($tag['url']);
}
- $return['mentions'][] = $prefix . '' . htmlspecialchars($tag['name']) . '';
- $return['tags'][] = $prefix . '' . htmlspecialchars($tag['name']) . '';
+ $return['mentions'][] = '' . $prefix . '' . htmlspecialchars($tag['name']) . '';
+ $return['tags'][] = '' . $prefix . '' . htmlspecialchars($tag['name']) . '';
break;
case self::IMPLICIT_MENTION:
$return['implicit_mentions'][] = $prefix . $tag['name'];
@@ -545,13 +564,21 @@ class Tag
*/
public static function setGlobalTrendingHashtags(int $period, int $limit = 10)
{
+ // 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`
+ $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 ?",
- 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);
@@ -590,13 +617,21 @@ class Tag
*/
public static function setLocalTrendingHashtags(int $period, int $limit = 10)
{
+ // 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`
+ $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 ?",
- 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);