double name

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 1ef7c67f4c4ccdaa9ca0d0167d300070a9f1a174..16fde6c351970c0bdad12e468362f2afdc8e2367 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -709,7 +709,7 @@ function networkThreadedView(App $a, $update, $parent)
                        }
                        if ($order === 'post') {
                                // Only show toplevel posts when updating posts in this order mode
-                               $sql_extra4 .= " AND `item`.`id` = `item`.`parent`";
+                               $sql_extra4 .= " AND `item`.`gravity` = " . GRAVITY_PARENT;
                        }
                }
 
@@ -786,6 +786,13 @@ function networkThreadedView(App $a, $update, $parent)
                        $top_limit = DateTimeFormat::utcNow();
                }
 
+               // Handle bad performance situations when the distance between top and bottom is too high
+               // See issue https://github.com/friendica/friendica/issues/8619
+               if (strtotime($top_limit) - strtotime($bottom_limit) > 86400) {
+                       // Set the bottom limit to one day in the past at maximum
+                       $bottom_limit = DateTimeFormat::utc(date('c', strtotime($top_limit) - 86400));
+               }
+
                $items = DBA::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date`, `author`.`url` AS `author-link` FROM `item`
                        STRAIGHT_JOIN (SELECT `uri-id` FROM `tag-search-view` WHERE `name` IN
                                (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `uid` = 0) AS `tag-search`