X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPushSubscriber.php;h=5b6c8813a8d733602b8e3d5edc5b76febd992ca1;hb=9fbdcb5459e4acb158961427837612999253e046;hp=fb34bb55f43c2c02f78207462ee2f26dedd9d0bd;hpb=acaee626f5f23f4c1dc19c31896a0797a251b58f;p=friendica.git diff --git a/src/Model/PushSubscriber.php b/src/Model/PushSubscriber.php index fb34bb55f4..5b6c8813a8 100644 --- a/src/Model/PushSubscriber.php +++ b/src/Model/PushSubscriber.php @@ -1,23 +1,43 @@ . + * */ + namespace Friendica\Model; use Friendica\Core\Logger; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\Util\DateTimeFormat; +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' => DBA::NULL_DATETIME], $condition); @@ -26,25 +46,27 @@ class PushSubscriber } /** - * @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::log('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']); } @@ -52,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 @@ -60,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]); @@ -87,19 +111,21 @@ class PushSubscriber 'secret' => $hub_secret]; DBA::insert('push_subscriber', $fields); - Logger::log("Successfully subscribed [$hub_callback] for $nick"); + Logger::notice("Successfully subscribed [$hub_callback] for $nick"); } else { - Logger::log("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::isResult($subscriber)) { @@ -114,10 +140,10 @@ class PushSubscriber if ($days > 60) { 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); + Logger::info('Delivery error: Subscription ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as ended.'); } else { 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); + Logger::info('Delivery error: Giving up ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' for now.'); } } else { // Calculate the delay until the next trial @@ -127,17 +153,19 @@ class PushSubscriber $retrial = $retrial + 1; DBA::update('push_subscriber', ['push' => $retrial, 'next_try' => $next], ['id' => $id]); - Logger::log('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::isResult($subscriber)) { @@ -147,6 +175,14 @@ class PushSubscriber // set last_update to the 'created' date of the last item, and reset push=0 $fields = ['push' => 0, 'next_try' => DBA::NULL_DATETIME, 'last_update' => $last_update]; DBA::update('push_subscriber', $fields, ['id' => $id]); - Logger::log('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); + } } }