X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPushSubscriber.php;h=9680d359d09637c1007a302b46f3d36d221b4827;hb=3ed9e7fe1d76156606264499bd5cf1d925efe7b0;hp=925a461e2a54c55b74720244f6a55a8c69f5715e;hpb=5ae9193aa7df4dca484bc01057cfaccd08866509;p=friendica.git

diff --git a/src/Model/PushSubscriber.php b/src/Model/PushSubscriber.php
index 925a461e2a..9680d359d0 100644
--- a/src/Model/PushSubscriber.php
+++ b/src/Model/PushSubscriber.php
@@ -5,9 +5,8 @@
 namespace Friendica\Model;
 
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Database\DBM;
-use dba;
 
 require_once 'include/dba.php';
 
@@ -22,7 +21,7 @@ class PushSubscriber
 	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' => NULL_DATE], $condition);
 
 		self::requeue($default_priority);
 	}
@@ -36,9 +35,9 @@ class PushSubscriber
 	{
 		// 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` < UTC_TIMESTAMP()"]);
 
-		while ($subscriber = dba::fetch($subscribers)) {
+		while ($subscriber = DBA::fetch($subscribers)) {
 			// We always handle retries with low priority
 			if ($subscriber['push'] > 1) {
 				$priority = PRIORITY_LOW;
@@ -50,7 +49,7 @@ class PushSubscriber
 			Worker::add($priority, 'PubSubPublish', (int)$subscriber['id']);
 		}
 
-		dba::close($subscribers);
+		DBA::close($subscribers);
 	}
 
 	/**
@@ -66,15 +65,15 @@ class PushSubscriber
 	public static function renew($uid, $nick, $subscribe, $hub_callback, $hub_topic, $hub_secret)
 	{
 		// fetch the old subscription if it exists
-		$subscriber = dba::selectFirst('push_subscriber', ['last_update', 'push'], ['callback_url' => $hub_callback]);
+		$subscriber = DBA::selectFirst('push_subscriber', ['last_update', 'push'], ['callback_url' => $hub_callback]);
 
 		// delete old subscription if it exists
-		dba::delete('push_subscriber', ['callback_url' => $hub_callback]);
+		DBA::delete('push_subscriber', ['callback_url' => $hub_callback]);
 
 		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 {
@@ -87,7 +86,7 @@ class PushSubscriber
 				'topic' => $hub_topic, 'nickname' => $nick, 'push' => $push_flag,
 				'last_update' => $last_update, 'renewed' => DateTimeFormat::utcNow(),
 				'secret' => $hub_secret];
-			dba::insert('push_subscriber', $fields);
+			DBA::insert('push_subscriber', $fields);
 
 			logger("Successfully subscribed [$hub_callback] for $nick");
 		} else {
@@ -103,8 +102,8 @@ class PushSubscriber
 	 */
 	public static function delay($id)
 	{
-		$subscriber = dba::selectFirst('push_subscriber', ['push', 'callback_url', 'renewed', 'nickname'], ['id' => $id]);
-		if (!DBM::is_result($subscriber)) {
+		$subscriber = DBA::selectFirst('push_subscriber', ['push', 'callback_url', 'renewed', 'nickname'], ['id' => $id]);
+		if (!DBA::isResult($subscriber)) {
 			return;
 		}
 
@@ -115,10 +114,10 @@ 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]);
+				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);
 			} else {
-				dba::update('push_subscriber', ['push' => 0, 'next_try' => NULL_DATE], ['id' => $id]);
+				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);
 			}
 		} else {
@@ -128,7 +127,7 @@ class PushSubscriber
 
 			$retrial = $retrial + 1;
 
-			dba::update('push_subscriber', ['push' => $retrial, 'next_try' => $next], ['id' => $id]);
+			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);
 		}
 	}
@@ -141,14 +140,14 @@ class PushSubscriber
 	 */
 	public static function reset($id, $last_update)
 	{
-		$subscriber = dba::selectFirst('push_subscriber', ['callback_url', 'nickname'], ['id' => $id]);
-		if (!DBM::is_result($subscriber)) {
+		$subscriber = DBA::selectFirst('push_subscriber', ['callback_url', 'nickname'], ['id' => $id]);
+		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];
-		dba::update('push_subscriber', $fields, ['id' => $id]);
+		DBA::update('push_subscriber', $fields, ['id' => $id]);
 		logger('Subscriber ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as vital', LOGGER_DEBUG);
 	}
 }