X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPushSubscriber.php;h=92d1dd21d1249a9bdbd103833aef0a2b61f1b710;hb=6c68b8359dfc7d5c4d87a7d7dc4397778f911f80;hp=9680d359d09637c1007a302b46f3d36d221b4827;hpb=ecea7425f8ad11ace4af39d476919e3203bff44f;p=friendica.git

diff --git a/src/Model/PushSubscriber.php b/src/Model/PushSubscriber.php
index 9680d359d0..92d1dd21d1 100644
--- a/src/Model/PushSubscriber.php
+++ b/src/Model/PushSubscriber.php
@@ -4,24 +4,24 @@
  */
 namespace Friendica\Model;
 
+use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 class PushSubscriber
 {
 	/**
 	 * @brief 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);
 	}
@@ -29,7 +29,8 @@ class PushSubscriber
 	/**
 	 * @brief 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)
 	{
@@ -45,7 +46,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']);
 		}
 
@@ -61,6 +62,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)
 	{
@@ -88,9 +90,9 @@ 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
 		}
 	}
@@ -99,6 +101,7 @@ class PushSubscriber
 	 * @brief Delay the push subscriber
 	 *
 	 * @param integer $id Subscriber ID
+	 * @throws \Exception
 	 */
 	public static function delay($id)
 	{
@@ -114,11 +117,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
@@ -128,7 +131,7 @@ 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);
 		}
 	}
 
@@ -136,7 +139,8 @@ class PushSubscriber
 	 * @brief 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)
 	{
@@ -146,8 +150,8 @@ class PushSubscriber
 		}
 
 		// 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);
 	}
 }