X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpubsubpublish.php;h=2527963d4c786ec6029d90dbdd7197375ff424b6;hb=217a8ce6ee8fd163d81c71044d9497646296862f;hp=bc81fd78680c16cf0b429abeb557aa6b59727c87;hpb=e839e3e1ec4b4a56ecf9886d8e29e07d6e5a798c;p=friendica.git

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index bc81fd7868..2527963d4c 100644
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -1,113 +1,88 @@
 <?php
-require_once("boot.php");
 
-function handle_pubsubhubbub() {
-	global $a, $db;
+use Friendica\App;
+use Friendica\Core\Config;
 
-	logger('start');
+require_once('include/items.php');
+require_once('include/ostatus.php');
 
-	// We'll push to each subscriber that has push > 0,
-	// i.e. there has been an update (set in notifier.php).
-
-	$r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0");
+function pubsubpublish_run(&$argv, &$argc){
+	global $a;
 
-	foreach($r as $rr) {
-		$params = get_feed_for($a, '', $rr['nickname'], $rr['last_update'], 0, true);
-		$hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
+	if ($argc > 1) {
+		$pubsubpublish_id = intval($argv[1]);
+	} 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 ORDER BY `last_update` DESC");
+
+		foreach ($r as $rr) {
+			logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
+			proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
+					'include/pubsubpublish.php', (int)$rr["id"]);
+		}
+	}
 
-		$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);
+	handle_pubsubhubbub($pubsubpublish_id);
 
-		logger('POST '. print_r($headers, true)."\n".$params, LOGGER_DEBUG);
+	return;
+}
 
-		post_url($rr['callback_url'], $params, $headers);
-		$ret = $a->get_curl_code();
+function handle_pubsubhubbub($id) {
+	global $a;
 
-		if ($ret >= 200 && $ret <= 299) {
-			logger('successfully pushed to '.$rr['callback_url']);
+	$r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id));
+	if (!dbm::is_result($r)) {
+		return;
+	}
 
-			// 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']));
+	$rr = $r[0];
 
-		} else {
-			logger('error when pushing to '.$rr['callback_url'].' HTTP: '.$ret);
+	/// @todo Check server status with poco_check_server()
+	// Before this can be done we need a way to safely detect the server url.
 
-			// 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;
+	logger("Generate feed of user ".$rr['nickname']." to ".$rr['callback_url']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
 
-			if ($new_push > 30) // OK, let's give up
-				$new_push = 0;
+	$last_update = $rr['last_update'];
+	$params = ostatus::feed($a, $rr['nickname'], $last_update);
 
-			q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d",
-				$new_push,
-				intval($rr['id']));
-		}
+	if (!$params) {
+		return;
 	}
 
-	logger('done');
-}
+	$hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
 
+	$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);
 
-function pubsubpublish_run(&$argv, &$argc){
-	global $a, $db;
+	logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG);
 
-	if(is_null($a)){
-		$a = new App;
-	}
-
-	if(is_null($db)){
-		@include(".htconfig.php");
-		require_once("include/dba.php");
-		$db = new dba($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-	};
-
-	require_once('include/items.php');
-	require_once('include/pidfile.php');
-
-	load_config('config');
-	load_config('system');
-
-	$lockpath = get_lockpath();
-	if ($lockpath != '') {
-		$pidfile = new pidfile($lockpath, 'pubsubpublish');
-		if($pidfile->is_already_running()) {
-			logger("Already running");
-			if ($pidfile->running_time() > 9*60) {
-				$pidfile->kill();
-				logger("killed stale process");
-				// Calling a new instance
-				proc_run('php',"include/pubsubpublish.php");
-			}
-			return;
-		}
-	}
-
-	$a->set_baseurl(get_config('system','url'));
+	post_url($rr['callback_url'], $params, $headers);
+	$ret = $a->get_curl_code();
 
-	load_hooks();
+	if ($ret >= 200 && $ret <= 299) {
+		logger('successfully pushed to '.$rr['callback_url']);
 
-	if($argc > 1)
-		$pubsubpublish_id = intval($argv[1]);
-	else
-		$pubsubpublish_id = 0;
+		// set last_update to the "created" date of the last item, and reset push=0
+		q("UPDATE `push_subscriber` SET `push` = 0, last_update = '%s' WHERE id = %d",
+			dbesc($last_update),
+			intval($rr['id']));
 
-	handle_pubsubhubbub();
+	} else {
+		logger('error when pushing to '.$rr['callback_url'].' HTTP: '.$ret);
 
-	return;
+		// 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 (array_search(__file__,get_included_files())===0){
-  pubsubpublish_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
+		q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d",
+			$new_push,
+			intval($rr['id']));
+	}
 }
-