From c8b0520144a36bd0b7c188cf7f5a0b55400cddc3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 7 Apr 2018 08:09:13 -0400 Subject: [PATCH] Use CONTACT_IS_SHARING constant instead of `rel` value --- mod/network.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mod/network.php b/mod/network.php index af4195cbc1..613ad86038 100644 --- a/mod/network.php +++ b/mod/network.php @@ -771,11 +771,12 @@ function networkThreadedView(App $a, $update, $parent) FROM `item` $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`) - AND (`item`.`parent-uri` != `item`.`uri` OR NOT (`contact`.`rel` < 2 OR `contact`.`readonly`)) + AND (`item`.`parent-uri` != `item`.`uri` OR NOT (`contact`.`rel` < %d OR `contact`.`readonly`)) WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` AND $sql_extra4 $sql_extra3 $sql_extra $sql_range $sql_nets ORDER BY `order_date` DESC LIMIT 100", + intval(CONTACT_IS_SHARING), intval(local_user()) ); } else { @@ -784,11 +785,12 @@ function networkThreadedView(App $a, $update, $parent) STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`) STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid` - AND (`item`.`parent-uri` != `item`.`uri` OR NOT (`contact`.`rel` < 2 OR `contact`.`readonly`)) + AND (`item`.`parent-uri` != `item`.`uri` OR NOT (`contact`.`rel` < %d OR `contact`.`readonly`)) WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated` $sql_extra2 $sql_extra3 $sql_range $sql_extra $sql_nets ORDER BY `order_date` DESC $pager_sql", + intval(CONTACT_IS_SHARING), intval(local_user()) ); } @@ -829,10 +831,10 @@ function networkThreadedView(App $a, $update, $parent) (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term` ON `item`.`id` = `term`.`oid` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id` - AND (`item`.`parent-uri` != `item`.`uri` OR NOT (`contact`.`rel` < 2 OR `contact`.`readonly`)) + AND (`item`.`parent-uri` != `item`.`uri` OR NOT (`contact`.`rel` < ? OR `contact`.`readonly`)) WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ? AND NOT `contact`.`hidden` AND NOT `contact`.`blocked`" . $sql_tag_nets, - local_user(), TERM_OBJ_POST, TERM_HASHTAG, $top_limit, $bottom_limit); + local_user(), TERM_OBJ_POST, TERM_HASHTAG, intval(CONTACT_IS_SHARING), $top_limit, $bottom_limit); $data = dba::inArray($items); -- 2.39.5