From 23718aeae372ce7469382c2f53303080a695b18c Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 12 Mar 2018 10:45:40 +0000 Subject: [PATCH] OStatus: Only posts from followers will be imported (Issue 4369) --- src/Protocol/OStatus.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index fe4572ed5d..fed5cca98d 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -72,8 +72,9 @@ class OStatus $contact = null; if ($aliaslink != '') { - $condition = ["`uid` = ? AND `alias` = ? AND `network` != ?", - $importer["uid"], $aliaslink, NETWORK_STATUSNET]; + $condition = ["`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)", + $importer["uid"], $aliaslink, NETWORK_STATUSNET, + CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; $contact = dba::selectFirst('contact', [], $condition); } @@ -82,14 +83,16 @@ class OStatus $aliaslink = $author["author-link"]; } - $condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ?", $importer["uid"], - normalise_link($author["author-link"]), normalise_link($aliaslink), NETWORK_STATUSNET]; + $condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)", + $importer["uid"], normalise_link($author["author-link"]), normalise_link($aliaslink), + NETWORK_STATUSNET, CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; $contact = dba::selectFirst('contact', [], $condition); } if (!DBM::is_result($contact) && ($addr != '')) { - $condition = ["`uid` = ? AND `addr` = ? AND `network` != ?", - $importer["uid"], $addr, NETWORK_STATUSNET]; + $condition = ["`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)", + $importer["uid"], $addr, NETWORK_STATUSNET, + CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; $contact = dba::selectFirst('contact', [], $condition); }