From: Michael Date: Sun, 19 Nov 2017 17:36:20 +0000 (+0000) Subject: Now PubSubPublish moved as well X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5108115fc150b242abd1f61ba2d1931ba7ffd2e4;p=friendica.git Now PubSubPublish moved as well --- diff --git a/include/notifier.php b/include/notifier.php index 55f2986d21..58926b9359 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -602,7 +602,7 @@ function notifier_run(&$argv, &$argc){ // Handling the pubsubhubbub requests Worker::add(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true), - 'pubsubpublish'); + 'PubSubPublish'); } logger('notifier: calling hooks', LOGGER_DEBUG); diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php deleted file mode 100644 index 4a6c3b49e7..0000000000 --- a/include/pubsubpublish.php +++ /dev/null @@ -1,94 +0,0 @@ - 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); - Worker::add(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true), - 'pubsubpublish', (int)$rr["id"]); - } - } - - handle_pubsubhubbub($pubsubpublish_id); - - return; -} - -function handle_pubsubhubbub($id) { - global $a; - - $r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id)); - if (!DBM::is_result($r)) { - return; - } - - $rr = $r[0]; - - /// @todo Check server status with PortableContact::checkServer() - // Before this can be done we need a way to safely detect the server url. - - logger("Generate feed of user ".$rr['nickname']." to ".$rr['callback_url']." - last updated ".$rr['last_update'], LOGGER_DEBUG); - - $last_update = $rr['last_update']; - $params = OStatus::feed($a, $rr['nickname'], $last_update); - - if (!$params) { - return; - } - - $hmac_sig = hash_hmac("sha1", $params, $rr['secret']); - - $headers = array("Content-type: application/atom+xml", - sprintf("Link: <%s>;rel=hub,<%s>;rel=self", - System::baseUrl().'/pubsubhubbub/'.$rr['nickname'], - $rr['topic']), - "X-Hub-Signature: sha1=".$hmac_sig); - - logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG); - - post_url($rr['callback_url'], $params, $headers); - $ret = $a->get_curl_code(); - - if ($ret >= 200 && $ret <= 299) { - logger('successfully pushed to '.$rr['callback_url']); - - // 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'])); - - } 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; - - 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'])); - } -} diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php new file mode 100644 index 0000000000..e2ecedbdf0 --- /dev/null +++ b/src/Worker/PubSubPublish.php @@ -0,0 +1,97 @@ + 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); + Worker::add(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true), + 'PubSubPublish', (int)$rr["id"]); + } + } + + self::publish($pubsubpublish_id); + + return; + } + + private static function publish($id) { + global $a; + + $r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id)); + if (!DBM::is_result($r)) { + return; + } + + $rr = $r[0]; + + /// @todo Check server status with PortableContact::checkServer() + // Before this can be done we need a way to safely detect the server url. + + logger("Generate feed of user ".$rr['nickname']." to ".$rr['callback_url']." - last updated ".$rr['last_update'], LOGGER_DEBUG); + + $last_update = $rr['last_update']; + $params = OStatus::feed($a, $rr['nickname'], $last_update); + + if (!$params) { + return; + } + + $hmac_sig = hash_hmac("sha1", $params, $rr['secret']); + + $headers = array("Content-type: application/atom+xml", + sprintf("Link: <%s>;rel=hub,<%s>;rel=self", + System::baseUrl().'/pubsubhubbub/'.$rr['nickname'], + $rr['topic']), + "X-Hub-Signature: sha1=".$hmac_sig); + + logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG); + + post_url($rr['callback_url'], $params, $headers); + $ret = $a->get_curl_code(); + + if ($ret >= 200 && $ret <= 299) { + logger('successfully pushed to '.$rr['callback_url']); + + // 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'])); + + } 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; + + 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'])); + } + } +} diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php index 8c7a6839a9..530df0a7b0 100644 --- a/src/Worker/Queue.php +++ b/src/Worker/Queue.php @@ -28,7 +28,7 @@ class Queue { logger('queue: start'); // Handling the pubsubhubbub requests - Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'pubsubpublish'); + Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'PubSubPublish'); $r = q( "SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`