bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

The "item-activity" is removed

Browse source
This commit is contained in:
Michael 2020-05-26 05:18:50 +00:00
commit ba9cf32f36
7 changed files with 55 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/conversation.php
View file

@ -34,6 +34,7 @@ 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;
@ -769,11 +770,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` != ?",
$parent['uri'], $uid, Verb::getID(Activity::FOLLOW)];
$items = conversation_fetch_items($parent, $items, $condition, $block_authors, $params);
}