Merge pull request #10969 from MrPetovan/task/remove-private-contacts

[friendica.git] / src / Model / PushSubscriber.php

diff --git a/src/Model/PushSubscriber.php b/src/Model/PushSubscriber.php
index 2a7be3c35a1c6eb86f8264d6015f81e0f3aea4d4..8593478dea27812ec814a0f44397c08e9a8e471c 100644 (file)
--- a/src/Model/PushSubscriber.php
+++ b/src/Model/PushSubscriber.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,6 +25,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 
 class PushSubscriber
 {
@@ -63,7 +64,7 @@ class PushSubscriber
                                $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']);
                }
 
@@ -107,9 +108,9 @@ 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
                }
        }
@@ -135,10 +136,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
@@ -148,7 +149,7 @@ 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);
                }
        }
 
@@ -169,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::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);
+               }
        }
 }