Merge pull request #8464 from annando/notice

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

diff --git a/src/Model/Term.php b/src/Model/Term.php
index 713218e184e30bb392c655828e6734fb36b66bce..84cb1bea7a204d00c5b7aaa06130cd5076822bdd 100644 (file)
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -82,7 +82,7 @@ class Term
                                WHERE `thread`.`visible`
                                  AND NOT `thread`.`deleted`
                                  AND NOT `thread`.`moderated`
-                                 AND NOT `thread`.`private`
+                                 AND `thread`.`private` = ?
                                  AND t.`uid` = 0
                                  AND t.`otype` = ?
                                  AND t.`type` = ?
@@ -91,6 +91,7 @@ class Term
                                GROUP BY `term`
                                ORDER BY `score` DESC
                                LIMIT ?",
+                               Item::PUBLIC,
                                Term::OBJECT_TYPE_POST,
                                Term::HASHTAG,
                                $period,
@@ -122,11 +123,10 @@ class Term
                                FROM `term` t
                                JOIN `item` i ON i.`id` = t.`oid` AND i.`uid` = t.`uid`
                                JOIN `thread` ON `thread`.`iid` = i.`id`
-                               JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
                                WHERE `thread`.`visible`
                                  AND NOT `thread`.`deleted`
                                  AND NOT `thread`.`moderated`
-                                 AND NOT `thread`.`private`
+                                 AND `thread`.`private` = ?
                                  AND `thread`.`wall`
                                  AND `thread`.`origin`
                                  AND t.`otype` = ?
@@ -136,6 +136,7 @@ class Term
                                GROUP BY `term`
                                ORDER BY `score` DESC
                                LIMIT ?",
+                               Item::PUBLIC,
                                Term::OBJECT_TYPE_POST,
                                Term::HASHTAG,
                                $period,
@@ -344,7 +345,7 @@ class Term
                                'oid'      => $item_id,
                                'otype'    => self::OBJECT_TYPE_POST,
                                'type'     => $type,
-                               'term'     => $term,
+                               'term'     => substr($term, 0, 255),
                                'url'      => $link,
                                'guid'     => $item['guid'],
                                'created'  => $item['created'],