X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FHTTPSignature.php;h=4a4f6a5710d306936d9058861fee379988f02e1b;hb=036b565a7846916f763ce1dcbcaade0844ff1589;hp=2a48267191d4163d907cf9fe8984e32fc34ccf16;hpb=908d2594ed7cda13f2d46d62c8f23d2b8aa8b817;p=friendica.git

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 2a48267191..4a4f6a5710 100644
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -27,8 +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\Client\HttpClient;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 
 /**
@@ -263,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);
@@ -304,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);
 	}
 
 	/**
@@ -329,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]);
 		}
 
@@ -369,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]);
 	}
 
@@ -416,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 = [HttpClientOptions::ACCEPT_CONTENT => [HttpClient::ACCEPT_JSON_AS]])
+	public static function fetchRaw($request, $uid = 0, $opts = [HttpClientOptions::ACCEPT_CONTENT => [HttpClientAccept::JSON_AS]])
 	{
 		$header = [];
 
@@ -454,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();