Merge pull request #12813 from HankG/mastodon-status-post-with-title

[friendica.git] / src / Util / HTTPSignature.php

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 104ade55b0391938cea203424f5e37a3b8ef2255..f082fe32f79f7eb3f9f905a2f6bca2d22050b28e 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -22,11 +22,13 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
+use Friendica\Model\GServer;
 use Friendica\Model\ItemURI;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
@@ -332,21 +334,26 @@ class HTTPSignature
         * @param string  $url     The URL of the inbox
         * @param boolean $success Transmission status
         * @param boolean $shared  The inbox is a shared inbox
+        * @param int     $gsid    Server ID
         * @throws \Exception
         */
-       static public function setInboxStatus(string $url, bool $success, bool $shared = false)
+       static public function setInboxStatus(string $url, bool $success, bool $shared = false, int $gsid = null)
        {
                $now = DateTimeFormat::utcNow();
 
                $status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
                if (!DBA::isResult($status)) {
                        $insertFields = ['url' => $url, 'uri-id' => ItemURI::getIdByURI($url), 'created' => $now, 'shared' => $shared];
-                       if (!DBA::insert('inbox-status', $insertFields, Database::INSERT_IGNORE)) {
-                               Logger::warning('Unable to insert inbox-status row', $insertFields);
-                               return;
+                       if (!empty($gsid)) {
+                               $insertFields['gsid'] = $gsid;
                        }
+                       DBA::insert('inbox-status', $insertFields, Database::INSERT_IGNORE);
 
                        $status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
+                       if (empty($status)) {
+                               Logger::warning('Unable to insert inbox-status row', $insertFields);
+                               return;
+                       }
                }
 
                if ($success) {
@@ -355,6 +362,10 @@ class HTTPSignature
                        $fields = ['failure' => $now];
                }
 
+               if (!empty($gsid)) {
+                       $fields['gsid'] = $gsid;
+               }
+
                if ($status['failure'] > DBA::NULL_DATETIME) {
                        $new_previous_stamp = strtotime($status['failure']);
                        $old_previous_stamp = strtotime($status['previous']);
@@ -390,6 +401,14 @@ class HTTPSignature
                }
 
                DBA::update('inbox-status', $fields, ['url' => $url]);
+
+               if (!empty($status['gsid'])) {
+                       if ($success) {
+                               GServer::setReachableById($status['gsid'], Protocol::ACTIVITYPUB);
+                       } elseif ($status['shared']) {
+                               GServer::setFailureById($status['gsid']);
+                       }
+               }
        }
 
        /**