Merge pull request #8953 from annando/sync-directory

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 0eb94181f019fa5ad5c69d313a9b57291ac0f1f8..86af3b69d496902c71aab1c4a6c414056c1a9ded 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -34,12 +34,12 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Model\Tag;
+use Friendica\Model\Verb;
 use Friendica\Object\Post;
 use Friendica\Object\Thread;
 use Friendica\Protocol\Activity;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
@@ -315,7 +315,7 @@ function conv_get_blocklist()
                return [];
        }
 
-       $str_blocked = DI::pConfig()->get(local_user(), 'system', 'blocked');
+       $str_blocked = str_replace(["\n", "\r"], ",", DI::pConfig()->get(local_user(), 'system', 'blocked'));
        if (empty($str_blocked)) {
                return [];
        }
@@ -324,7 +324,7 @@ function conv_get_blocklist()
 
        foreach (explode(',', $str_blocked) as $entry) {
                // The 4th parameter guarantees that there always will be a public contact entry
-               $cid = Contact::getIdForURL(trim($entry), 0, true, ['url' => trim($entry)]);
+               $cid = Contact::getIdForURL(trim($entry), 0, false, ['url' => trim($entry)]);
                if (!empty($cid)) {
                        $blocklist[] = $cid;
                }
@@ -592,7 +592,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'name' => $profile_name,
                                        'sparkle' => $sparkle,
                                        'lock' => $lock,
-                                       'thumb' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
+                                       'thumb' => DI::baseUrl()->remove($item['author-avatar']),
                                        'title' => $title,
                                        'body' => $body,
                                        'tags' => $tags['tags'],
@@ -612,7 +612,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'indent' => '',
                                        'owner_name' => $owner_name,
                                        'owner_url' => $owner_url,
-                                       'owner_photo' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
+                                       'owner_photo' => DI::baseUrl()->remove($item['owner-avatar']),
                                        'plink' => Item::getPlink($item),
                                        'edpost' => false,
                                        'isstarred' => $isstarred,
@@ -670,7 +670,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 
                                $item['pagedrop'] = $page_dropping;
 
-                               if ($item['id'] == $item['parent']) {
+                               if ($item['gravity'] == GRAVITY_PARENT) {
                                        $item_object = new Post($item);
                                        $conv->addParent($item_object);
                                }
@@ -759,7 +759,11 @@ function conversation_fetch_comments($thread_items, $pinned) {
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
 function conversation_add_children(array $parents, $block_authors, $order, $uid) {
-       $max_comments = DI::config()->get('system', 'max_comments', 100);
+       if (count($parents) > 1) {
+               $max_comments = DI::config()->get('system', 'max_comments', 100);
+       } else {
+               $max_comments = DI::config()->get('system', 'max_display_comments', 1000);
+       }
 
        $params = ['order' => ['uid', 'commented' => true]];
 
@@ -769,11 +773,9 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 
        $items = [];
 
-       $follow = Item::activityToIndex(Activity::FOLLOW);
-
        foreach ($parents AS $parent) {
-               $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) AND (`activity` != ? OR `activity` IS NULL)",
-                       $parent['uri'], $uid, $follow];
+               $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)",
+                       $parent['uri'], $uid, Verb::getID(Activity::FOLLOW)];
                $items = conversation_fetch_items($parent, $items, $condition, $block_authors, $params);
        }
 
@@ -800,7 +802,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
  */
 function conversation_fetch_items(array $parent, array $items, array $condition, bool $block_authors, array $params) {
        if ($block_authors) {
-               $condition[0] .= "AND NOT `author`.`hidden`";
+               $condition[0] .= " AND NOT `author`.`hidden`";
        }
 
        $thread_items = Item::selectForUser(local_user(), array_merge(Item::DISPLAY_FIELDLIST, ['contact-uid', 'gravity']), $condition, $params);
@@ -824,7 +826,7 @@ function item_photo_menu($item) {
        $block_link = '';
        $ignore_link = '';
 
-       if (local_user() && local_user() == $item['uid'] && $item['parent'] == $item['id'] && !$item['self']) {
+       if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self']) {
                $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
        }
 
@@ -834,7 +836,7 @@ function item_photo_menu($item) {
        $sparkle = (strpos($profile_link, 'redir/') === 0);
 
        $cid = 0;
-       $pcid = Contact::getIdForURL($item['author-link'], 0, true);
+       $pcid = Contact::getIdForURL($item['author-link'], 0, false);
        $network = '';
        $rel = 0;
        $condition = ['uid' => local_user(), 'nurl' => Strings::normaliseLink($item['author-link'])];
@@ -949,7 +951,7 @@ function builtin_activity_puller($item, &$conv_responses) {
                                return;
                }
 
-               if (!empty($item['verb']) && DI::activity()->match($item['verb'], $verb) && ($item['id'] != $item['parent'])) {
+               if (!empty($item['verb']) && DI::activity()->match($item['verb'], $verb) && ($item['gravity'] != GRAVITY_PARENT)) {
                        $author = ['uid' => 0, 'id' => $item['author-id'],
                                'network' => $item['author-network'], 'url' => $item['author-link']];
                        $url = Contact::magicLinkByContact($author);
@@ -1219,7 +1221,7 @@ function get_item_children(array &$item_list, array $parent, $recursive = true)
 {
        $children = [];
        foreach ($item_list as $i => $item) {
-               if ($item['id'] != $item['parent']) {
+               if ($item['gravity'] != GRAVITY_PARENT) {
                        if ($recursive) {
                                // Fallback to parent-uri if thr-parent is not set
                                $thr_parent = $item['thr-parent'];
@@ -1367,7 +1369,7 @@ function conv_sort(array $item_list, $order)
 
        // Extract the top level items
        foreach ($item_array as $item) {
-               if ($item['id'] == $item['parent']) {
+               if ($item['gravity'] == GRAVITY_PARENT) {
                        $parents[] = $item;
                }
        }