From: Michael <heluecht@pirati.ca>
Date: Thu, 27 Sep 2018 15:26:20 +0000 (+0000)
Subject: Only communicate with contacts that aren't pending
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=793387e2b5496bf4ffd311250c86f5bed38e554a;p=friendica.git

Only communicate with contacts that aren't pending
---

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index c79bca6d7e..663b03e939 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -470,7 +470,8 @@ class ActivityPub
 			foreach ($permissions[$element] as $receiver) {
 				if ($receiver == $item_profile['followers']) {
 					$contacts = DBA::select('contact', ['notify', 'batch'], ['uid' => $uid,
-						'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::ACTIVITYPUB]);
+						'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::ACTIVITYPUB,
+						'archive' => false, 'pending' => false]);
 					while ($contact = DBA::fetch($contacts)) {
 						$contact = defaults($contact, 'batch', $contact['notify']);
 						$inboxes[$contact] = $contact;
@@ -1177,7 +1178,8 @@ class ActivityPub
 
 				if (($receiver == self::PUBLIC) && !empty($actor)) {
 					// This will most likely catch all OStatus connections to Mastodon
-					$condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]];
+					$condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]
+						, 'archive' => false, 'pending' => false];
 					$contacts = DBA::select('contact', ['uid'], $condition);
 					while ($contact = DBA::fetch($contacts)) {
 						if ($contact['uid'] != 0) {
@@ -1189,7 +1191,7 @@ class ActivityPub
 
 				if (in_array($receiver, [$followers, self::PUBLIC]) && !empty($actor)) {
 					$condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
-						'network' => Protocol::ACTIVITYPUB];
+						'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false];
 					$contacts = DBA::select('contact', ['uid'], $condition);
 					while ($contact = DBA::fetch($contacts)) {
 						if ($contact['uid'] != 0) {