Merge branch '2023.03-rc' into stable

diff --cc src/Worker/UpdateGServer.php
index a17fca81c4002751fe37b7e4faeb812265567480,4b4e40d7666cadb639788c6c7d9123b96be3d749..a9f6ae4cd34e1c81207ef6f783ccb4cf3ef4e9bb
--- 1/src/Worker/UpdateGServer.php
--- 2/src/Worker/UpdateGServer.php
+++ b/src/Worker/UpdateGServer.php
@@@ -53,13 -59,8 +59,13 @@@ class UpdateGServe
                        return;
                }
  
 +              // Silently dropping the worker task if the server domain is blocked
 +              if (Network::isUrlBlocked($filtered)) {
 +                      return;
 +              }
 +
                if (($filtered != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
-                       GServer::setFailure($server_url);
+                       GServer::setFailureByUrl($server_url);
                        return;
                }
  

diff --cc src/Worker/UpdateGServers.php
Simple merge