X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=e66fa9b0b0b2cf337b1b8e94bdb2de9028868c41;hb=143e7fc6b707f377d383a498999ce712d04dd102;hp=81f55f710190e3fc9a8499e374ccf81900d942b2;hpb=7097673fa19d21a631d4d7b22dab9e98382059ae;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index 81f55f7101..e66fa9b0b0 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -149,7 +149,8 @@ function notifier_run(&$argv, &$argc){
 		$relocate = true;
 		$uid = $item_id;
 
-		$recipients_relocate = q("SELECT * FROM contact WHERE uid = %d  AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
+		$recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')",
+					intval($uid), NETWORK_DFRN, NETWORK_DIASPORA);
 	} else {
 		// find ancestors
 		$r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
@@ -205,8 +206,6 @@ function notifier_run(&$argv, &$argc){
 
 	$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
 
-	$hub = get_config('system','huburl');
-
 	// Should the post be transmitted to Diaspora?
 	$diaspora_delivery = true;
 
@@ -216,6 +215,9 @@ function notifier_run(&$argv, &$argc){
 	// Do a PuSH
 	$push_notify = false;
 
+	// Deliver directly to a forum, don't PuSH
+	$direct_forum_delivery = false;
+
 	// fill this in with a single salmon slap if applicable
 	$slap = '';
 
@@ -286,6 +288,26 @@ function notifier_run(&$argv, &$argc){
 		if ($parent['origin']) {
 			$relay_to_owner = false;
 		}
+
+		// Special treatment for forum posts
+		if (($target_item['author-link'] != $target_item['owner-link']) &&
+			($owner['id'] != $target_item['contact-id']) &&
+			($target_item['uri'] === $target_item['parent-uri'])) {
+
+			$fields = array('forum', 'prv');
+			$condition = array('id' => $target_item['contact-id']);
+			$contact = dba::select('contact', $fields, $condition, array('limit' => 1));
+			if (!dbm::is_result($contact)) {
+				// Should never happen
+				return false;
+			}
+
+			// Is the post from a forum?
+			if ($contact['forum'] || $contact['prv']) {
+				$relay_to_owner = true;
+				$direct_forum_delivery = true;
+			}
+		}
 		if ($relay_to_owner) {
 			logger('notifier: followup '.$target_item["guid"], LOGGER_DEBUG);
 			// local followup to remote post
@@ -319,6 +341,11 @@ function notifier_run(&$argv, &$argc){
 					}
 				}
 			}
+
+			if ($direct_forum_delivery) {
+				$push_notify = false;
+			}
+
 			logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG);
 		} else {
 			$followup = false;
@@ -563,34 +590,13 @@ function notifier_run(&$argv, &$argc){
 	}
 
 	// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
-	if ($push_notify && strlen($hub)) {
-		$hubs = explode(',', $hub);
-		if (count($hubs)) {
-			foreach ($hubs as $h) {
-				$h = trim($h);
-				if (! strlen($h)) {
-					continue;
-				}
-
-				if ($h === '[internal]') {
-					// Set push flag for PuSH subscribers to this topic,
-					// they will be notified in queue.php
-					q("UPDATE `push_subscriber` SET `push` = 1 ".
-					  "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
-
-					logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
-
-				} else {
+	if ($push_notify) {
+		// Set push flag for PuSH subscribers to this topic,
+		// they will be notified in queue.php
+		q("UPDATE `push_subscriber` SET `push` = 1 ".
+		  "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
 
-					$params = 'hub.mode=publish&hub.url=' . urlencode( App::get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
-					post_url($h,$params);
-					logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
-				}
-				if (count($hubs) > 1) {
-					sleep(7);				// try and avoid multiple hubs responding at precisely the same time
-				}
-			}
-		}
+		logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
 
 		// Handling the pubsubhubbub requests
 		proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),