From 4c1125562472ac509a478af7a40256687d3afa91 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Wed, 27 Feb 2019 11:41:57 +0100 Subject: [PATCH] Hide silenced authors from public timeline --- include/api.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/api.php b/include/api.php index e6fd2f22ba..9de054e0a0 100644 --- a/include/api.php +++ b/include/api.php @@ -1738,7 +1738,7 @@ function api_statuses_public_timeline($type) $start = $page * $count; if ($exclude_replies && !$conversation_id) { - $condition = ["`gravity` IN (?, ?) AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall`", + $condition = ["`gravity` IN (?, ?) AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND NOT `author`.`hidden`", GRAVITY_PARENT, GRAVITY_COMMENT, $since_id]; if ($max_id > 0) { @@ -1751,7 +1751,7 @@ function api_statuses_public_timeline($type) $r = Item::inArray($statuses); } else { - $condition = ["`gravity` IN (?, ?) AND `id` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND `item`.`origin`", + $condition = ["`gravity` IN (?, ?) AND `id` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND `item`.`origin` AND NOT `author`.`hidden`", GRAVITY_PARENT, GRAVITY_COMMENT, $since_id]; if ($max_id > 0) {