Update src/Module/Magic.php

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

diff --git a/src/Worker/UpdateGServer.php b/src/Worker/UpdateGServer.php
index a17fca81c4002751fe37b7e4faeb812265567480..a9f6ae4cd34e1c81207ef6f783ccb4cf3ef4e9bb 100644 (file)
--- a/src/Worker/UpdateGServer.php
+++ b/src/Worker/UpdateGServer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -49,7 +49,13 @@ class UpdateGServer
 
                $filtered = filter_var($server_url, FILTER_SANITIZE_URL);
                if (substr(Strings::normaliseLink($filtered), 0, 7) != 'http://') {
-                       GServer::setFailure($server_url);
+                       GServer::setFailureByUrl($server_url);
+                       return;
+               }
+
+               // Silently dropping the worker task if the server domain is blocked
+               if (Network::isUrlBlocked($filtered)) {
+                       GServer::setBlockedByUrl($filtered);
                        return;
                }
 
@@ -59,13 +65,13 @@ class UpdateGServer
                }
 
                if (($filtered != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
-                       GServer::setFailure($server_url);
+                       GServer::setFailureByUrl($server_url);
                        return;
                }
 
                $cleaned = GServer::cleanURL($server_url);
                if (($cleaned != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
-                       GServer::setFailure($server_url);
+                       GServer::setFailureByUrl($server_url);
                        return;
                }
 
@@ -84,6 +90,7 @@ class UpdateGServer
        {
                // Dropping the worker task if the server domain is blocked
                if (Network::isUrlBlocked($serverUrl)) {
+                       GServer::setBlockedByUrl($serverUrl);
                        return 0;
                }