X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPushSubscriber.php;h=2a2ce57ef3da3e35699b25df800508f53c30e741;hb=8b26d488add6859be8d3b865122dfb6a6401d24d;hp=07963760525ab26e97c918a210d5e1bc1a970053;hpb=0ec44f3e8a73229c3aadea86f61b5571a701c6b7;p=friendica.git diff --git a/src/Model/PushSubscriber.php b/src/Model/PushSubscriber.php index 0796376052..2a2ce57ef3 100644 --- a/src/Model/PushSubscriber.php +++ b/src/Model/PushSubscriber.php @@ -1,51 +1,72 @@ . + * */ + namespace Friendica\Model; +use Friendica\Core\Logger; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\Util\DateTimeFormat; - -require_once 'include/dba.php'; +use Friendica\Util\Network; class PushSubscriber { /** - * @brief Send subscription notifications for the given user + * Send subscription notifications for the given user * - * @param integer $uid User ID - * @param string $priority Priority for push workers + * @param integer $uid User ID + * @param int $default_priority + * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function publishFeed($uid, $default_priority = PRIORITY_HIGH) + public static function publishFeed(int $uid, int $default_priority = Worker::PRIORITY_HIGH) { $condition = ['push' => 0, 'uid' => $uid]; - DBA::update('push_subscriber', ['push' => 1, 'next_try' => NULL_DATE], $condition); + DBA::update('push_subscriber', ['push' => 1, 'next_try' => DBA::NULL_DATETIME], $condition); self::requeue($default_priority); } /** - * @brief start workers to transmit the feed data + * start workers to transmit the feed data * - * @param string $priority Priority for push workers + * @param int $default_priority + * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function requeue($default_priority = PRIORITY_HIGH) + public static function requeue(int $default_priority = Worker::PRIORITY_HIGH) { // We'll push to each subscriber that has push > 0, // i.e. there has been an update (set in notifier.php). - $subscribers = DBA::select('push_subscriber', ['id', 'push', 'callback_url', 'nickname'], ["`push` > 0 AND `next_try` < UTC_TIMESTAMP()"]); + $subscribers = DBA::select('push_subscriber', ['id', 'push', 'callback_url', 'nickname'], ["`push` > 0 AND `next_try` < ?", DateTimeFormat::utcNow()]); while ($subscriber = DBA::fetch($subscribers)) { // We always handle retries with low priority if ($subscriber['push'] > 1) { - $priority = PRIORITY_LOW; + $priority = Worker::PRIORITY_LOW; } else { $priority = $default_priority; } - logger('Publish feed to ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' with priority ' . $priority, LOGGER_DEBUG); + Logger::info('Publish feed to ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' with priority ' . $priority); Worker::add($priority, 'PubSubPublish', (int)$subscriber['id']); } @@ -53,7 +74,7 @@ class PushSubscriber } /** - * @brief Renew the feed subscription + * Renew the feed subscription * * @param integer $uid User ID * @param string $nick Priority for push workers @@ -61,8 +82,10 @@ class PushSubscriber * @param string $hub_callback Callback address * @param string $hub_topic Feed topic * @param string $hub_secret Subscription secret + * @return void + * @throws \Exception */ - public static function renew($uid, $nick, $subscribe, $hub_callback, $hub_topic, $hub_secret) + public static function renew(int $uid, string $nick, int $subscribe, string $hub_callback, string $hub_topic, string $hub_secret) { // fetch the old subscription if it exists $subscriber = DBA::selectFirst('push_subscriber', ['last_update', 'push'], ['callback_url' => $hub_callback]); @@ -73,7 +96,7 @@ class PushSubscriber if ($subscribe) { // if we are just updating an old subscription, keep the // old values for last_update but reset the push - if (DBA::is_result($subscriber)) { + if (DBA::isResult($subscriber)) { $last_update = $subscriber['last_update']; $push_flag = min($subscriber['push'], 1); } else { @@ -88,22 +111,24 @@ class PushSubscriber 'secret' => $hub_secret]; DBA::insert('push_subscriber', $fields); - logger("Successfully subscribed [$hub_callback] for $nick"); + Logger::notice("Successfully subscribed [$hub_callback] for $nick"); } else { - logger("Successfully unsubscribed [$hub_callback] for $nick"); + Logger::notice("Successfully unsubscribed [$hub_callback] for $nick"); // we do nothing here, since the row was already deleted } } /** - * @brief Delay the push subscriber + * Delay the push subscriber * * @param integer $id Subscriber ID + * @return void + * @throws \Exception */ - public static function delay($id) + public static function delay(int $id) { $subscriber = DBA::selectFirst('push_subscriber', ['push', 'callback_url', 'renewed', 'nickname'], ['id' => $id]); - if (!DBA::is_result($subscriber)) { + if (!DBA::isResult($subscriber)) { return; } @@ -114,11 +139,11 @@ class PushSubscriber $days = round((time() - strtotime($subscriber['renewed'])) / (60 * 60 * 24)); if ($days > 60) { - DBA::update('push_subscriber', ['push' => -1, 'next_try' => NULL_DATE], ['id' => $id]); - logger('Delivery error: Subscription ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as ended.', LOGGER_DEBUG); + DBA::update('push_subscriber', ['push' => -1, 'next_try' => DBA::NULL_DATETIME], ['id' => $id]); + Logger::info('Delivery error: Subscription ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as ended.'); } else { - DBA::update('push_subscriber', ['push' => 0, 'next_try' => NULL_DATE], ['id' => $id]); - logger('Delivery error: Giving up ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' for now.', LOGGER_DEBUG); + DBA::update('push_subscriber', ['push' => 0, 'next_try' => DBA::NULL_DATETIME], ['id' => $id]); + Logger::info('Delivery error: Giving up ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' for now.'); } } else { // Calculate the delay until the next trial @@ -128,26 +153,36 @@ class PushSubscriber $retrial = $retrial + 1; DBA::update('push_subscriber', ['push' => $retrial, 'next_try' => $next], ['id' => $id]); - logger('Delivery error: Next try (' . $retrial . ') ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' at ' . $next, LOGGER_DEBUG); + Logger::info('Delivery error: Next try (' . $retrial . ') ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' at ' . $next); } } /** - * @brief Reset the push subscriber + * Reset the push subscriber * * @param integer $id Subscriber ID - * @param date $last_update Date of last transmitted item + * @param string $last_update Date of last transmitted item + * @return void + * @throws \Exception */ - public static function reset($id, $last_update) + public static function reset(int $id, string $last_update) { $subscriber = DBA::selectFirst('push_subscriber', ['callback_url', 'nickname'], ['id' => $id]); - if (!DBA::is_result($subscriber)) { + if (!DBA::isResult($subscriber)) { return; } // set last_update to the 'created' date of the last item, and reset push=0 - $fields = ['push' => 0, 'next_try' => NULL_DATE, 'last_update' => $last_update]; + $fields = ['push' => 0, 'next_try' => DBA::NULL_DATETIME, 'last_update' => $last_update]; DBA::update('push_subscriber', $fields, ['id' => $id]); - logger('Subscriber ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as vital', LOGGER_DEBUG); + Logger::info('Subscriber ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as vital'); + + $parts = parse_url($subscriber['callback_url']); + unset($parts['path']); + $server_url = Network::unparseURL($parts); + $gsid = GServer::getID($server_url, true); + if (!empty($gsid)) { + GServer::setProtocol($gsid, Post\DeliveryData::OSTATUS); + } } }