Issue 3857: There is the possibility of a bad handling of dislikes

[friendica.git] / include / pubsubpublish.php

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 3641bbcf74fc3d16f98ed67b13a687119e31739a..23348d6d702497e124f2da8deb35639235d87606 100644 (file)
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -1,21 +1,26 @@
 <?php
-use \Friendica\Core\Config;
+
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Core\Config;
 
 require_once('include/items.php');
 require_once('include/ostatus.php');
 
 function pubsubpublish_run(&$argv, &$argc){
+       global $a;
 
        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");
+               $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(PRIORITY_HIGH, 'include/pubsubpublish.php', $rr["id"]);
+                       proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
+                                       'include/pubsubpublish.php', (int)$rr["id"]);
                }
        }
 
@@ -28,19 +33,29 @@ function handle_pubsubhubbub($id) {
        global $a;
 
        $r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id));
-       if (!$r)
+       if (!dbm::is_result($r)) {
                return;
-       else
-               $rr = $r[0];
+       }
+
+       $rr = $r[0];
+
+       /// @todo Check server status with poco_check_server()
+       // 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);
 
-       $params = ostatus::feed($a, $rr['nickname'], $rr['last_update']);
+       $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",
-                               App::get_baseurl().'/pubsubhubbub',
+                               System::baseUrl().'/pubsubhubbub/'.$rr['nickname'],
                                $rr['topic']),
                        "X-Hub-Signature: sha1=".$hmac_sig);
 
@@ -52,10 +67,9 @@ function handle_pubsubhubbub($id) {
        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');
+               // 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($date_now),
+                       dbesc($last_update),
                        intval($rr['id']));
 
        } else {