spelling: calendar

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

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index cca1ab0bdb9d7f577f8a00b19b4a5a7310a2a012..1d57f5ea8095ff791750f6eec2e2ff875d715735 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;
@@ -345,12 +347,13 @@ class HTTPSignature
                        if (!empty($gsid)) {
                                $insertFields['gsid'] = $gsid;
                        }
-                       if (!DBA::insert('inbox-status', $insertFields, Database::INSERT_IGNORE)) {
+                       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;
                        }
-
-                       $status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
                }
 
                if ($success) {
@@ -398,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']);
+                       }
+               }
        }
 
        /**
@@ -411,7 +422,12 @@ class HTTPSignature
         */
        public static function fetch(string $request, int $uid): array
        {
-               $curlResult = self::fetchRaw($request, $uid);
+               try {
+                       $curlResult = self::fetchRaw($request, $uid);
+               } catch (\Exception $exception) {
+                       Logger::notice('Error fetching url', ['url' => $request, 'exception' => $exception]);
+                       return [];
+               }
 
                if (empty($curlResult)) {
                        return [];
@@ -611,7 +627,7 @@ class HTTPSignature
                }
 
                if (empty($algorithm)) {
-                       Logger::info('No alagorithm');
+                       Logger::info('No algorithm');
                        return false;
                }