X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPushSubscriber.php;h=f6839307249c67542e605e71389e26279828fc2a;hb=f1d3f60499a325557be866fedd31b46093d477ae;hp=e024878a5821d7f33d6777ec581501e3ba5d2abb;hpb=7ee8bdafc53a88fe51f233e14169bb4af0d376ab;p=friendica.git

diff --git a/src/Model/PushSubscriber.php b/src/Model/PushSubscriber.php
index e024878a58..f683930724 100644
--- a/src/Model/PushSubscriber.php
+++ b/src/Model/PushSubscriber.php
@@ -1,22 +1,40 @@
 <?php
 /**
- * @file src/Model/PushSubscriber.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 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
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function publishFeed($uid, $default_priority = PRIORITY_HIGH)
 	{
@@ -27,9 +45,10 @@ 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
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function requeue($default_priority = PRIORITY_HIGH)
 	{
@@ -45,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']);
 		}
 
@@ -53,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
@@ -61,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)
 	{
@@ -88,17 +108,18 @@ 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)
 	{
@@ -115,10 +136,10 @@ class PushSubscriber
 
 			if ($days > 60) {
 				DBA::update('push_subscriber', ['push' => -1, 'next_try' => DBA::NULL_DATETIME], ['id' => $id]);
-				logger('Delivery error: Subscription ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as ended.', LOGGER_DEBUG);
+				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' => DBA::NULL_DATETIME], ['id' => $id]);
-				logger('Delivery error: Giving up ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' for now.', LOGGER_DEBUG);
+				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,15 +149,16 @@ 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)
 	{
@@ -148,6 +170,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('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);
+		}
 	}
 }