Merge pull request #5139 from rabuzarus/20180527_-_frio_tos_background

[friendica.git] / src / Worker / Notifier.php

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index e22e8a1cd1b9521609f118bb79e93521ad31718d..11a6f6f68a6a2d90bc5978a748b08fc0530c91a1 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -11,6 +11,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
+use Friendica\Model\PushSubscriber;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
@@ -498,16 +499,10 @@ class Notifier {
 
                // Notify PuSH subscribers (Used for OStatus distribution of regular posts)
                if ($push_notify) {
-                       // Set push flag for PuSH subscribers to this topic,
-                       // they will be notified in queue.php
-                       $condition = ['push' => false, 'nickname' => $owner['nickname']];
-                       dba::update('push_subscriber', ['push' => true], $condition);
-
                        logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
 
                        // Handling the pubsubhubbub requests
-                       Worker::add(['priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true],
-                                       'PubSubPublish');
+                       PushSubscriber::publishFeed($owner['uid'], $a->queue['priority']);
                }
 
                logger('notifier: calling hooks for ' . $cmd . ' ' . $item_id, LOGGER_DEBUG);