X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPushSubscriber.php;h=f6839307249c67542e605e71389e26279828fc2a;hb=f1d3f60499a325557be866fedd31b46093d477ae;hp=73bcb2a905ca36b4da27bdacff4554ed26b69220;hpb=4f2ae8868431952bd3acda1537ee899740cbf205;p=friendica.git diff --git a/src/Model/PushSubscriber.php b/src/Model/PushSubscriber.php index 73bcb2a905..f683930724 100644 --- a/src/Model/PushSubscriber.php +++ b/src/Model/PushSubscriber.php @@ -1,36 +1,54 @@ . + * */ + namespace Friendica\Model; +use Friendica\Core\Logger; use Friendica\Core\Worker; use Friendica\Database\DBA; -use Friendica\Database\DBM; 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 + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function publishFeed($uid, $default_priority = 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 + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function requeue($default_priority = PRIORITY_HIGH) { @@ -46,7 +64,7 @@ class PushSubscriber $priority = $default_priority; } - logger('Publish feed to ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' with priority ' . $priority, LOGGER_DEBUG); + Logger::log('Publish feed to ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' with priority ' . $priority, Logger::DEBUG); Worker::add($priority, 'PubSubPublish', (int)$subscriber['id']); } @@ -54,7 +72,7 @@ class PushSubscriber } /** - * @brief Renew the feed subscription + * Renew the feed subscription * * @param integer $uid User ID * @param string $nick Priority for push workers @@ -62,6 +80,7 @@ class PushSubscriber * @param string $hub_callback Callback address * @param string $hub_topic Feed topic * @param string $hub_secret Subscription secret + * @throws \Exception */ public static function renew($uid, $nick, $subscribe, $hub_callback, $hub_topic, $hub_secret) { @@ -74,7 +93,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 (DBM::is_result($subscriber)) { + if (DBA::isResult($subscriber)) { $last_update = $subscriber['last_update']; $push_flag = min($subscriber['push'], 1); } else { @@ -89,22 +108,23 @@ class PushSubscriber 'secret' => $hub_secret]; DBA::insert('push_subscriber', $fields); - logger("Successfully subscribed [$hub_callback] for $nick"); + Logger::log("Successfully subscribed [$hub_callback] for $nick"); } else { - logger("Successfully unsubscribed [$hub_callback] for $nick"); + Logger::log("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 + * @throws \Exception */ public static function delay($id) { $subscriber = DBA::selectFirst('push_subscriber', ['push', 'callback_url', 'renewed', 'nickname'], ['id' => $id]); - if (!DBM::is_result($subscriber)) { + if (!DBA::isResult($subscriber)) { return; } @@ -115,11 +135,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::log('Delivery error: Subscription ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as ended.', Logger::DEBUG); } 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::log('Delivery error: Giving up ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' for now.', Logger::DEBUG); } } else { // Calculate the delay until the next trial @@ -129,26 +149,35 @@ 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::log('Delivery error: Next try (' . $retrial . ') ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' at ' . $next, Logger::DEBUG); } } /** - * @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 + * @throws \Exception */ public static function reset($id, $last_update) { $subscriber = DBA::selectFirst('push_subscriber', ['callback_url', 'nickname'], ['id' => $id]); - if (!DBM::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::log('Subscriber ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as vital', Logger::DEBUG); + + $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); + } } }