Merge remote-tracking branch 'upstream/develop' into post-delivery-data

[friendica.git] / src / Worker / UpdateGContact.php

diff --git a/src/Worker/UpdateGContact.php b/src/Worker/UpdateGContact.php
index 0d0d85fc01d57f172fb0cc0dc8c5f205f4a148b8..94e4d07d7b7c91370b8842f1217a407bc0188151 100644 (file)
--- a/src/Worker/UpdateGContact.php
+++ b/src/Worker/UpdateGContact.php
@@ -29,18 +29,19 @@ class UpdateGContact
 {
        /**
         * Update global contact via probe
-        * @param string $url     Global contact url
-        * @param string $command
+        * @param string  $url     Global contact url
+        * @param string  $command
         */
-       public static function execute($url, $command = '')
+       public static function execute(string $url, string $command = '')
        {
                $force = ($command == "force");
+               $nodiscover = ($command == "nodiscover");
 
                $success = GContact::updateFromProbe($url, $force);
 
                Logger::info('Updated from probe', ['url' => $url, 'force' => $force, 'success' => $success]);
 
-               if ($success && DI::config()->get('system', 'gcontact_discovery')) {
+               if ($success && !$nodiscover && (DI::config()->get('system', 'gcontact_discovery') == GContact::DISCOVERY_RECURSIVE)) {
                        GContact::discoverFollowers($url);
                }
        }