Merge pull request #9620 from annando/worker-command

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 6a8e5b3ae1c78e39433c1d25543fab4a02718616..37faf240ce1bc5efcf22826e7a4b5ba1b86c3cdf 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -32,6 +32,7 @@ use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\HTTPSignature;
 use Friendica\Util\JsonLD;
 use Friendica\Util\Network;
 
@@ -148,6 +149,7 @@ class APContact
 
                $data = ActivityPub::fetchContent($url);
                if (empty($data)) {
+                       self::markForArchival($fetched_contact ?: []);
                        return $fetched_contact;
                }
 
@@ -350,10 +352,54 @@ class APContact
                return $apcontact;
        }
 
+       /**
+        * Mark the given AP Contact as "to archive"
+        *
+        * @param array $apcontact
+        * @return void
+        */
+       public static function markForArchival(array $apcontact)
+       {
+               if (!empty($apcontact['inbox'])) {
+                       Logger::info('Set inbox status to failure', ['inbox' => $apcontact['inbox']]);
+                       HTTPSignature::setInboxStatus($apcontact['inbox'], false);
+               }
+
+               if (!empty($apcontact['sharedinbox'])) {
+                       // Check if there are any available inboxes
+                       $available = DBA::exists('apcontact', ["`sharedinbox` = ? AnD `inbox` IN (SELECT `url` FROM `inbox-status` WHERE `success` > `failure`)",
+                               $apcontact['sharedinbox']]);
+                       if (!$available) {
+                               // If all known personal inboxes are failing then set their shared inbox to failure as well
+                               Logger::info('Set shared inbox status to failure', ['sharedinbox' => $apcontact['sharedinbox']]);
+                               HTTPSignature::setInboxStatus($apcontact['sharedinbox'], false, true);
+                       }
+               }
+       }
+
+       /**
+        * Unmark the given AP Contact as "to archive"
+        *
+        * @param array $apcontact
+        * @return void
+        */
+       public static function unmarkForArchival(array $apcontact)
+       {
+               if (!empty($apcontact['inbox'])) {
+                       Logger::info('Set inbox status to success', ['inbox' => $apcontact['inbox']]);
+                       HTTPSignature::setInboxStatus($apcontact['inbox'], true);
+               }
+               if (!empty($apcontact['sharedinbox'])) {
+                       Logger::info('Set shared inbox status to success', ['sharedinbox' => $apcontact['sharedinbox']]);
+                       HTTPSignature::setInboxStatus($apcontact['sharedinbox'], true, true);
+               }
+       }
+
        /**
         * Unarchive inboxes
         *
-        * @param string $url inbox url
+        * @param string  $url    inbox url
+        * @param boolean $shared Shared Inbox
         */
        private static function unarchiveInbox($url, $shared)
        {
@@ -361,15 +407,6 @@ class APContact
                        return;
                }
 
-               $now = DateTimeFormat::utcNow();
-
-               $fields = ['archive' => false, 'success' => $now, 'shared' => $shared];
-
-               if (!DBA::exists('inbox-status', ['url' => $url])) {
-                       $fields = array_merge($fields, ['url' => $url, 'created' => $now]);
-                       DBA::replace('inbox-status', $fields);
-               } else {
-                       DBA::update('inbox-status', $fields, ['url' => $url]);
-               }
+               HTTPSignature::setInboxStatus($url, true, $shared);
        }
 }