From cc4347d72f12cd183299706c1bb4fba0116d8f21 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 11 Mar 2018 14:01:40 +0000 Subject: [PATCH] Issue 4497: Forum feeds had been empty --- src/Protocol/OStatus.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index c6f840a66e..710ce11e8f 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -2094,7 +2094,7 @@ class OStatus } $owner = dba::fetch_first( - "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags` + "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`self` AND `user`.`nickname` = ? LIMIT 1", $owner_nick @@ -2119,12 +2119,14 @@ class OStatus $sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT)); } + if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) { + $sql_extra .= sprintf(" AND `item`.`contact-id` = %d AND `item`.`author-id` = %d ", intval($owner["id"]), intval($authorid)); + } + $items = q( "SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`) STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent` WHERE `item`.`uid` = %d - AND `item`.`contact-id` = %d - AND `item`.`author-id` = %d AND `item`.`created` > '%s' AND NOT `item`.`deleted` AND NOT `item`.`private` @@ -2133,8 +2135,6 @@ class OStatus $sql_extra ORDER BY `item`.`created` DESC LIMIT %d", intval($owner["uid"]), - intval($owner["id"]), - intval($authorid), dbesc($check_date), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN),