Catch exceptions for Worker::AddContact()

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

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 68f6cb1dd777d1f6ffcfa20aad83580efef62393..4a4f6a5710d306936d9058861fee379988f02e1b 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -27,7 +27,10 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
+use Friendica\Model\ItemURI;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 
 /**
@@ -262,21 +265,21 @@ class HTTPSignature
         */
 
        /**
-        * Transmit given data to a target for a user
+        * Post given data to a target for a user, returns the result class
         *
         * @param array   $data   Data that is about to be send
         * @param string  $target The URL of the inbox
         * @param integer $uid    User id of the sender
         *
-        * @return boolean Was the transmission successful?
+        * @return ICanHandleHttpResponses
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function transmit($data, $target, $uid)
+       public static function post(array $data, string $target, int $uid): ICanHandleHttpResponses
        {
                $owner = User::getOwnerDataById($uid);
 
                if (!$owner) {
-                       return;
+                       return null;
                }
 
                $content = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
@@ -303,16 +306,32 @@ class HTTPSignature
 
                $headers['Content-Type'] = 'application/activity+json';
 
-               $postResult = DI::httpClient()->post($target, $content, $headers);
+               $postResult = DI::httpClient()->post($target, $content, $headers, DI::config()->get('system', 'curl_timeout'));
                $return_code = $postResult->getReturnCode();
 
                Logger::info('Transmit to ' . $target . ' returned ' . $return_code);
 
-               $success = ($return_code >= 200) && ($return_code <= 299);
+               self::setInboxStatus($target, ($return_code >= 200) && ($return_code <= 299));
 
-               self::setInboxStatus($target, $success);
+               return $postResult;
+       }
 
-               return $success;
+       /**
+        * Transmit given data to a target for a user
+        *
+        * @param array   $data   Data that is about to be send
+        * @param string  $target The URL of the inbox
+        * @param integer $uid    User id of the sender
+        *
+        * @return boolean Was the transmission successful?
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       public static function transmit(array $data, string $target, int $uid): bool
+       {
+               $postResult = self::post($data, $target, $uid);
+               $return_code = $postResult->getReturnCode();
+
+               return ($return_code >= 200) && ($return_code <= 299);
        }
 
        /**
@@ -328,7 +347,7 @@ class HTTPSignature
 
                $status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
                if (!DBA::isResult($status)) {
-                       DBA::insert('inbox-status', ['url' => $url, 'created' => $now, 'shared' => $shared], Database::INSERT_IGNORE);
+                       DBA::insert('inbox-status', ['url' => $url, 'uri-id' => ItemURI::getIdByURI($url), 'created' => $now, 'shared' => $shared], Database::INSERT_IGNORE);
                        $status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
                }
 
@@ -368,6 +387,10 @@ class HTTPSignature
                        $fields['archive'] = false;
                }
 
+               if (empty($status['uri-id'])) {
+                       $fields['uri-id'] = ItemURI::getIdByURI($url);
+               }
+
                DBA::update('inbox-status', $fields, ['url' => $url]);
        }
 
@@ -415,7 +438,7 @@ class HTTPSignature
         * @return \Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses CurlResult
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function fetchRaw($request, $uid = 0, $opts = ['accept_content' => ['application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"']])
+       public static function fetchRaw($request, $uid = 0, $opts = [HttpClientOptions::ACCEPT_CONTENT => [HttpClientAccept::JSON_AS]])
        {
                $header = [];
 
@@ -453,7 +476,7 @@ class HTTPSignature
                if (!empty($opts['nobody'])) {
                        $curlResult = DI::httpClient()->head($request, $curl_opts);
                } else {
-                       $curlResult = DI::httpClient()->get($request, $curl_opts);
+                       $curlResult = DI::httpClient()->get($request, HttpClientAccept::JSON_AS, $curl_opts);
                }
                $return_code = $curlResult->getReturnCode();