From 2482072457b520af43dd486f552dd31283b14fdf Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 14 Jun 2019 05:25:10 +0000 Subject: [PATCH 1/2] Issue 5983: Central check for blocked and ignored contacts added --- src/Model/Item.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/Model/Item.php b/src/Model/Item.php index ba41f91d9d..67d051d4cf 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1453,6 +1453,16 @@ class Item extends BaseObject return 0; } + if (!empty($uid) && Contact::isBlockedByUser($item['author-link'], $uid)) { + Logger::notice('Author is blocked by user', ['author-link' => $item['author-link'], 'uid' => $uid, 'item-uri' => $item['uri']]); + return 0; + } + + if (!empty($uid) && ($item['parent-uri'] === $item['uri']) && Contact::isIgnoredByUser($item['author-link'], $uid)) { + Logger::notice('Author is ignored by user', ['author-link' => $item['author-link'], 'uid' => $uid, 'item-uri' => $item['uri']]); + return 0; + } + $default = ['url' => $item['owner-link'], 'name' => $item['owner-name'], 'photo' => $item['owner-avatar'], 'network' => $item['network']]; @@ -1468,6 +1478,16 @@ class Item extends BaseObject return 0; } + if (!empty($uid) && Contact::isBlockedByUser($item['owner-link'], $uid)) { + Logger::notice('Owner is blocked by user', ['owner-link' => $item['owner-link'], 'uid' => $uid, 'item-uri' => $item['uri']]); + return 0; + } + + if (!empty($uid) && ($item['parent-uri'] === $item['uri']) && Contact::isIgnoredByUser($item['owner-link'], $uid)) { + Logger::notice('Owner is ignored by user', ['owner-link' => $item['owner-link'], 'uid' => $uid, 'item-uri' => $item['uri']]); + return 0; + } + if ($item['network'] == Protocol::PHANTOM) { $item['network'] = Protocol::DFRN; Logger::notice('Missing network, setting to {network}.', [ From f6f22378f11903ace5305a80f4ff40e94cb46423 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 14 Jun 2019 18:34:17 +0000 Subject: [PATCH 2/2] Ignored stuff must be stored. --- src/Model/Item.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 67d051d4cf..4e0d48807e 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1458,11 +1458,6 @@ class Item extends BaseObject return 0; } - if (!empty($uid) && ($item['parent-uri'] === $item['uri']) && Contact::isIgnoredByUser($item['author-link'], $uid)) { - Logger::notice('Author is ignored by user', ['author-link' => $item['author-link'], 'uid' => $uid, 'item-uri' => $item['uri']]); - return 0; - } - $default = ['url' => $item['owner-link'], 'name' => $item['owner-name'], 'photo' => $item['owner-avatar'], 'network' => $item['network']]; @@ -1483,11 +1478,6 @@ class Item extends BaseObject return 0; } - if (!empty($uid) && ($item['parent-uri'] === $item['uri']) && Contact::isIgnoredByUser($item['owner-link'], $uid)) { - Logger::notice('Owner is ignored by user', ['owner-link' => $item['owner-link'], 'uid' => $uid, 'item-uri' => $item['uri']]); - return 0; - } - if ($item['network'] == Protocol::PHANTOM) { $item['network'] = Protocol::DFRN; Logger::notice('Missing network, setting to {network}.', [