Merge pull request #4589 from annando/issue-4369

OStatus: Only posts from followers will be imported (Issue 4369)

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index fe4572ed5d5e4c47c549368aa2d6d166d7e6969a..fed5cca98dd0d3a132ba8840d81ec03b31f06532 100644 (file)
--- 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);
                }