From b798ad126adf93758ad44ea6eab8397c3032114a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 7 Apr 2018 02:42:42 -0400 Subject: [PATCH] Hide posts from recently ignored or unfollowed contact in mod/network --- mod/network.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mod/network.php b/mod/network.php index 4ab773bd32..af4195cbc1 100644 --- a/mod/network.php +++ b/mod/network.php @@ -771,6 +771,7 @@ 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`)) 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 @@ -783,6 +784,7 @@ 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`)) 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 @@ -827,6 +829,7 @@ 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`)) 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); -- 2.39.5