Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 18:23:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improved conversation performance

Browse source
This commit is contained in:
Michael 2021-08-01 12:57:50 +00:00
parent e89d0f2599
commit 9641944c4f
1 changed files with 102 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
include/conversation.php
View file

@ -612,19 +612,20 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
}
/**
* Fetch all comments from a query. Additionally set the newest resharer as thread owner.
* Adds some information (Causer, post reason, direction) to the fetched post row.
*
* @param mixed $thread_items Database statement with thread posts
* @param boolean $pinned Is the item pinned?
* @param array $row Post row
* @param array $activity Contact data of the resharer
*
* @return array items with parents and comments
*/
function conversation_fetch_comments($thread_items, bool $pinned, array $activity) {
function conversation_add_row_information(array $row, array $activity) {
DI::profiler()->startRecording('rendering');
$comments = [];
while ($row = Post::fetch($thread_items)) {
if ($row['uid'] == 0) {
$row['writable'] = in_array($row['network'], Protocol::FEDERATED);
}
if (!empty($activity)) {
if (($row['gravity'] == GRAVITY_PARENT)) {
$row['post-reason'] = Item::PR_ANNOUNCEMENT;
@ -635,7 +636,7 @@ function conversation_fetch_comments($thread_items, bool $pinned, array $activit
$row['causer-name'] = $contact['name'];
} elseif (($row['gravity'] == GRAVITY_ACTIVITY) && ($row['verb'] == Activity::ANNOUNCE) &&
($row['author-id'] == $activity['causer-id'])) {
continue;
return $row;
}
}
@ -690,17 +691,8 @@ function conversation_fetch_comments($thread_items, bool $pinned, array $activit
break;
}
if ($row['gravity'] == GRAVITY_PARENT) {
$row['pinned'] = $pinned;
}
$comments[] = $row;
}
DBA::close($thread_items);
DI::profiler()->stopRecording();
return $comments;
return $row;
}
/**
@ -725,70 +717,58 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
$max_comments = DI::config()->get('system', 'max_display_comments', 1000);
}
$params = ['order' => ['gravity', 'uid', 'commented' => true]];
$params = ['order' => ['uri-id' => true]];
if ($max_comments > 0) {
$params['limit'] = $max_comments;
}
$items = [];
$activities = [];
$uriids = [];
foreach ($parents AS $parent) {
if (!empty($parent['thr-parent-id']) && !empty($parent['gravity']) && ($parent['gravity'] == GRAVITY_ACTIVITY)) {
$condition = ["`parent-uri-id` = ? AND `uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)",
$parent['thr-parent-id'], $uid, Verb::getID(Activity::FOLLOW)];
$uriid = $parent['thr-parent-id'];
if (!empty($parent['author-id'])) {
$activity = ['causer-id' => $parent['author-id']];
$activities[$uriid] = ['causer-id' => $parent['author-id']];
foreach (['commented', 'received', 'created'] as $orderfields) {
if (!empty($parent[$orderfields])) {
$activity[$orderfields] = $parent[$orderfields];
$activities[$uriid][$orderfields] = $parent[$orderfields];
}
}
}
$uriids[] = $uriid;
} else {
$condition = ["`parent-uri-id` = ? AND `uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)",
$parent['uri-id'], $uid, Verb::getID(Activity::FOLLOW)];
$activity = [];
}
$items = conversation_fetch_items($parent, $items, $condition, $block_authors, $params, $activity);
}
foreach ($items as $index => $item) {
if ($item['uid'] == 0) {
$items[$index]['writable'] = in_array($item['network'], Protocol::FEDERATED);
$uriids[] = $parent['uri-id'];
}
}
$items = conv_sort($items, $order);
DI::profiler()->stopRecording();
return $items;
}
/**
* Fetch conversation items
*
* @param array $parent Parent Item array
* @param array $items Item array
* @param array $condition SQL condition
* @param boolean $block_authors Don't show posts from contacts that are hidden (used on the community page)
* @param array $params SQL parameters
* @param array $activity Contact data of the resharer
* @return array
*/
function conversation_fetch_items(array $parent, array $items, array $condition, bool $block_authors, array $params, array $activity) {
DI::profiler()->startRecording('rendering');
$condition = ['parent-uri-id' => $uriids];
if ($block_authors) {
$condition[0] .= " AND NOT `author-hidden`";
$condition['author-hidden'] = false;
}
$condition = DBA::mergeConditions($condition,
["`uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)", $uid, Verb::getID(Activity::FOLLOW)]);
$thread_items = Post::selectForUser(local_user(), array_merge(Item::DISPLAY_FIELDLIST, ['pinned', 'contact-uid', 'gravity', 'post-type', 'post-reason']), $condition, $params);
$comments = conversation_fetch_comments($thread_items, $parent['pinned'] ?? false, $activity);
$items = [];
$limitposts = [];
$limitactivities = [];
if (count($comments) != 0) {
$items = array_merge($items, $comments);
while ($row = Post::fetch($thread_items)) {
if ($max_comments > 0) {
if (($row['gravity'] == GRAVITY_COMMENT) && (++$limitposts[$row['parent-uri-id']] > $max_comments)) {
continue;
}
if (($row['gravity'] == GRAVITY_ACTIVITY) && (++$limitactivities[$row['parent-uri-id']] > $max_comments)) {
continue;
}
}
$items[] = conversation_add_row_information($row, $activities[$row['uri-id']] ?? []);
}
DBA::close($thread_items);
$items = conv_sort($items, $order);
DI::profiler()->stopRecording();
return $items;
}