X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FNotifier.php;h=681fd13c8f57317d76716a002a0f7bca13584a82;hb=066ad8c01b25b7101ad6fb36878d85c97db51a6f;hp=512fbe88440d3d951ea758eef836e62ddd5799ad;hpb=bce8ab722752aa4262b571222c1e77a26cd6c9e1;p=friendica.git

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 512fbe8844..681fd13c8f 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -11,6 +11,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Group;
@@ -418,12 +419,17 @@ class Notifier
 			$condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false,
 				'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
 
-			$r2 = DBA::toArray(DBA::select('contact', ['id', 'name', 'network'], $condition));
+			$r2 = DBA::toArray(DBA::select('contact', ['id', 'url', 'name', 'network'], $condition));
 
 			$r = array_merge($r2, $relay_list);
 
 			if (DBA::isResult($r)) {
 				foreach ($r as $rr) {
+					if (Config::get('debug', 'total_ap_delivery') && !empty($rr['url']) && ($rr['network'] == Protocol::DFRN) && !empty(APContact::getByURL($rr['url'], false))) {
+						Logger::log('Skipping contact ' . $rr['url'] . ' since it will be delivered via AP', Logger::DEBUG);
+						continue;
+					}
+
 					$conversants[] = $rr['id'];
 
 					$delivery_queue_count++;
@@ -447,6 +453,11 @@ class Notifier
 
 		// delivery loop
 		while ($contact = DBA::fetch($delivery_contacts_stmt)) {
+			if (Config::get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) {
+				Logger::log('Skipping contact ' . $contact['url'] . ' since it will be delivered via AP', Logger::DEBUG);
+				continue;
+			}
+
 			// Don't deliver to Diaspora if it already had been done as batch delivery
 			if (($contact['network'] == Protocol::DIASPORA) && $batch_delivery) {
 				Logger::log('Already delivered  id ' . $target_id . ' via batch to ' . json_encode($contact), Logger::DEBUG);
@@ -603,15 +614,20 @@ class Notifier
 			return false;
 		}
 
+		return self::isForum($item['contact-id']);
+	}
+
+	private static function isForum($contactid)
+	{
 		$fields = ['forum', 'prv'];
-		$condition = ['id' => $item['contact-id']];
+		$condition = ['id' => $contactid];
 		$contact = DBA::selectFirst('contact', $fields, $condition);
 		if (!DBA::isResult($contact)) {
 			// Should never happen
 			return false;
 		}
 
-		// Is the post from a forum?
+		// Is it a forum?
 		return ($contact['forum'] || $contact['prv']);
 	}
 }