X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpubsubpublish.php;h=6bd90bfc21e083704f561c00ae03a6a9d533a36d;hb=0d32fce2df27b67be71382e6cbd88dc9558385f6;hp=4fbb505146e830b91e1dd96560ebe6da084b6c7a;hpb=cd0fbc5e9a262dfb46e8278da840a87c47eb3ff0;p=friendica.git

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 4fbb505146..6bd90bfc21 100644
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -2,60 +2,57 @@
 require_once("boot.php");
 require_once("include/ostatus.php");
 
-function handle_pubsubhubbub() {
-	global $a, $db;
-
-	logger('start');
-
-	// We'll push to each subscriber that has push > 0,
-	// i.e. there has been an update (set in notifier.php).
+use \Friendica\Core\Config;
+use \Friendica\Core\PConfig;
 
-	$r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0");
+function handle_pubsubhubbub($id) {
+	global $a, $db;
 
-	foreach($r as $rr) {
+	$r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id));
+	if (!$r)
+		return;
+	else
+		$rr = $r[0];
 
-		logger("Generate feed for user ".$rr['nickname']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
+	logger("Generate feed of user ".$rr['nickname']." to ".$rr['callback_url']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
 
-		$params = ostatus_feed($a, $rr['nickname'], $rr['last_update']);
-		$hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
+	$params = ostatus::feed($a, $rr['nickname'], $rr['last_update']);
+	$hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
 
-		$headers = array("Content-type: application/atom+xml",
-				sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
-					$a->get_baseurl().'/pubsubhubbub',
-					$rr['topic']),
-				"X-Hub-Signature: sha1=".$hmac_sig);
+	$headers = array("Content-type: application/atom+xml",
+			sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
+				App::get_baseurl().'/pubsubhubbub',
+				$rr['topic']),
+			"X-Hub-Signature: sha1=".$hmac_sig);
 
-		logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG);
+	logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG);
 
-		post_url($rr['callback_url'], $params, $headers);
-		$ret = $a->get_curl_code();
+	post_url($rr['callback_url'], $params, $headers);
+	$ret = $a->get_curl_code();
 
-		if ($ret >= 200 && $ret <= 299) {
-			logger('successfully pushed to '.$rr['callback_url']);
+	if ($ret >= 200 && $ret <= 299) {
+		logger('successfully pushed to '.$rr['callback_url']);
 
-			// set last_update to "now", and reset push=0
-			$date_now = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
-			q("UPDATE `push_subscriber` SET `push` = 0, last_update = '%s' WHERE id = %d",
-				dbesc($date_now),
-				intval($rr['id']));
+		// set last_update to "now", and reset push=0
+		$date_now = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+		q("UPDATE `push_subscriber` SET `push` = 0, last_update = '%s' WHERE id = %d",
+			dbesc($date_now),
+			intval($rr['id']));
 
-		} else {
-			logger('error when pushing to '.$rr['callback_url'].' HTTP: '.$ret);
+	} else {
+		logger('error when pushing to '.$rr['callback_url'].' HTTP: '.$ret);
 
-			// we use the push variable also as a counter, if we failed we
-			// increment this until some upper limit where we give up
-			$new_push = intval($rr['push']) + 1;
+		// we use the push variable also as a counter, if we failed we
+		// increment this until some upper limit where we give up
+		$new_push = intval($rr['push']) + 1;
 
-			if ($new_push > 30) // OK, let's give up
-				$new_push = 0;
+		if ($new_push > 30) // OK, let's give up
+			$new_push = 0;
 
-			q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d",
-				$new_push,
-				intval($rr['id']));
-		}
+		q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d",
+			$new_push,
+			intval($rr['id']));
 	}
-
-	logger('done');
 }
 
 
@@ -79,20 +76,42 @@ function pubsubpublish_run(&$argv, &$argc){
 	load_config('system');
 
 	// Don't check this stuff if the function is called by the poller
-	if (App::callstack() != "poller_run")
-		if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540))
+	if (App::callstack() != "poller_run") {
+		if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540)) {
 			return;
+		}
+	}
 
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();
 
-	if($argc > 1)
+	if ($argc > 1) {
 		$pubsubpublish_id = intval($argv[1]);
-	else
-		$pubsubpublish_id = 0;
+	}
+	else {
+		// We'll push to each subscriber that has push > 0,
+		// i.e. there has been an update (set in notifier.php).
+		$r = q("SELECT `id`, `callback_url` FROM `push_subscriber` WHERE `push` > 0");
+
+		// Use the delivery interval that is also used for the notifier
+		$interval = Config::get("system", "delivery_interval", 2);
+
+		// If we are using the worker we don't need a delivery interval
+		if (get_config("system", "worker")) {
+			$interval = false;
+		}
+
+		foreach ($r as $rr) {
+			logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
+			proc_run(PRIORITY_HIGH, 'include/pubsubpublish.php', $rr["id"]);
+
+			if($interval)
+				@time_sleep_until(microtime(true) + (float) $interval);
+		}
+	}
 
-	handle_pubsubhubbub();
+	handle_pubsubhubbub($pubsubpublish_id);
 
 	return;