Speed improvement

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 86af3b69d496902c71aab1c4a6c414056c1a9ded..faee8f5b3e8881b054a8f8941ffc689093ffb387 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -710,17 +710,24 @@ function conversation_fetch_comments($thread_items, $pinned) {
        $comments = [];
        $parentlines = [];
        $lineno = 0;
-       $actor = [];
+       $direction = [];
        $received = '';
 
        while ($row = Item::fetch($thread_items)) {
-               if (($row['verb'] == Activity::ANNOUNCE) && !empty($row['contact-uid']) && ($row['received'] > $received) && ($row['thr-parent'] == $row['parent-uri'])) {
-                       $actor = ['link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']];
+               if (!empty($parentlines) && ($row['verb'] == Activity::ANNOUNCE)
+                       && ($row['thr-parent'] == $row['parent-uri']) && ($row['received'] > $received)
+                       && Contact::isSharing($row['author-id'], $row['uid'])) {
+                       $direction = ['direction' => 3, 'title' => DI::l10n()->t('%s reshared this.', $row['author-name'])];
                        $received = $row['received'];
                }
 
-               if ((($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && !in_array($row['network'], [Protocol::DIASPORA])) &&
-                       (empty($row['contact-uid']) || !in_array($row['network'], Protocol::NATIVE_SUPPORT))) {
+               if (!empty($parentlines) && empty($direction) && ($row['gravity'] == GRAVITY_COMMENT)
+                       && Contact::isSharing($row['author-id'], $row['uid'])) {
+                       $direction = ['direction' => 2, 'title' => DI::l10n()->t('%s commented this.', $row['author-name'])];
+               }
+
+               if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id'])
+                       && !Contact::isSharing($row['author-id'], $row['uid'])) {
                        $parentlines[] = $lineno;
                }
 
@@ -734,11 +741,9 @@ function conversation_fetch_comments($thread_items, $pinned) {
 
        DBA::close($thread_items);
 
-       if (!empty($actor)) {
+       if (!empty($direction)) {
                foreach ($parentlines as $line) {
-                       $comments[$line]['owner-link'] = $actor['link'];
-                       $comments[$line]['owner-avatar'] = $actor['avatar'];
-                       $comments[$line]['owner-name'] = $actor['name'];
+                       $comments[$line]['direction'] = $direction;
                }
        }
        return $comments;
@@ -765,7 +770,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
                $max_comments = DI::config()->get('system', 'max_display_comments', 1000);
        }
 
-       $params = ['order' => ['uid', 'commented' => true]];
+       $params = ['order' => ['gravity', 'uid', 'commented' => true]];
 
        if ($max_comments > 0) {
                $params['limit'] = $max_comments;