Drop UpdateContact worker task if contact is blocked

# Conflicts:
#	src/Worker/UpdateContact.php

diff --git a/src/Worker/UpdateContact.php b/src/Worker/UpdateContact.php
index 8de3629cafdca24ce8b0d04c60024dd46ff0b09b..f83f47524d363f625ac54051c465114c92238fc3 100644 (file)
--- a/src/Worker/UpdateContact.php
+++ b/src/Worker/UpdateContact.php
@@ -23,6 +23,7 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Model\Contact;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 
 class UpdateContact
 {
@@ -34,8 +35,33 @@ class UpdateContact
         */
        public static function execute(int $contact_id)
        {
+               // Silently dropping the task if the contact is blocked
+               if (Contact::isBlocked($contact_id)) {
+                       return;
+               }
+
                $success = Contact::updateFromProbe($contact_id);
 
                Logger::info('Updated from probe', ['id' => $contact_id, 'success' => $success]);
        }
+
+       /**
+        * @param array|int $run_parameters Priority constant or array of options described in Worker::add
+        * @param int       $contact_id
+        * @return int
+        * @throws InternalServerErrorException
+        */
+       public static function add($run_parameters, int $contact_id): int
+       {
+               if (!$contact_id) {
+                       throw new \InvalidArgumentException('Invalid value provided for contact_id');
+               }
+
+               // Dropping the task if the contact is blocked
+               if (Contact::isBlocked($contact_id)) {
+                       return 0;
+               }
+
+               return Worker::add($run_parameters, 'UpdateContact', $contact_id);
+       }
 }