`item`.`bookmark`,
`item`.`unseen`,
`item`.`deleted`,
-`item`.`origin`,
`item`.`forum_mode`,
`item`.`mention`,
`item`.`global`,
`item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`content-warning`,
`item`.`commented`, `item`.`created`, `item`.`edited`, `item`.`received`,
`item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`,
- `item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`,
+ `item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`, `item`.`origin`,
`item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`,
`item`.`location`, `item`.`coord`, `item`.`app`, `item`.`attach`,
`item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
return sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND NOT `contact`.`blocked`
AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
- OR `contact`.`self` OR (`item`.`id` != `item`.`parent`))
+ OR `contact`.`self` OR (`item`.`id` != `item`.`parent`) OR `contact`.`uid` = 0)
INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` AND NOT `author`.`blocked`
INNER JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id` AND NOT `owner`.`blocked`
LEFT JOIN `event` ON `event-id` = `event`.`id`",
$block_sql = $block_authors ? "AND NOT `author`.`hidden` AND NOT `author`.`blocked`" : "";
foreach ($parents AS $parent) {
- $thread_items = dba::p(item_query()." AND `item`.`uid` = ?
- AND `item`.`parent-uri` = ? $block_sql
- ORDER BY `item`.`commented` DESC" . $limit,
- local_user(),
- $parent['uri']
- );
- $comments = dba::inArray($thread_items);
+ $thread_items = dba::p(item_query()."AND `item`.`parent-uri` = ?
+ AND `item`.`uid` IN (0, ?) $block_sql
+ ORDER BY `item`.`uid` ASC, `item`.`commented` DESC" . $limit,
+ $parent['uri'], local_user());
- // Check if the original item is in the result.
- // When commenting from the community page there can be incomplete threads
- if (count($comments) > 0) {
- $parent_found = false;
- foreach ($comments as $comment) {
- if ($comment['uri'] == $comment['parent-uri']) {
- $parent_found = true;
- break;
- }
- }
- if (!$parent_found) {
- $comments = [];
- }
- }
-
- if (count($comments) == 0) {
- $thread_items = dba::p(item_query()." AND `item`.`uid` = 0
- AND `item`.`parent-uri` = ?
- ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
- $parent['uri']
- );
- $comments = dba::inArray($thread_items);
- }
+ $comments = dba::inArray($thread_items);
if (count($comments) != 0) {
$items = array_merge($items, $comments);