Merge pull request #11392 from annando/new-acitivities

[friendica.git] / src / Protocol / Diaspora.php

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index ad4ed65f6a0dd60549ed39a92fd2978d5d8bc09b..154d65f6f985ba3aedfb282763b7a0642194bf35 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -41,6 +41,7 @@ use Friendica\Model\Mail;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClient;
 use Friendica\Network\Probe;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
@@ -454,7 +455,7 @@ class Diaspora
         * Dispatches public messages and find the fitting receivers
         *
         * @param array $msg       The post that will be dispatched
-        * @param int   $direction Indicates if the message had been fetched or pushed
+        * @param int   $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
         *
         * @return int The message id of the generated message, "true" or "false" if there was an error
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -485,7 +486,7 @@ class Diaspora
         * @param array            $importer  Array of the importer user
         * @param array            $msg       The post that will be dispatched
         * @param SimpleXMLElement $fields    SimpleXML object that contains the message
-        * @param int              $direction Indicates if the message had been fetched or pushed
+        * @param int              $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
         *
         * @return int The message id of the generated message, "true" or "false" if there was an error
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -1059,7 +1060,7 @@ class Diaspora
 
                Logger::info("Fetch post from ".$source_url);
 
-               $envelope = DI::httpClient()->fetch($source_url);
+               $envelope = DI::httpClient()->fetch($source_url, 0, HttpClient::ACCEPT_MAGIC);
                if ($envelope) {
                        Logger::info("Envelope was fetched.");
                        $x = self::verifyMagicEnvelope($envelope);
@@ -1449,7 +1450,7 @@ class Diaspora
         * @param string $sender    The sender of the message
         * @param object $data      The message object
         * @param string $xml       The original XML of the message
-        * @param int    $direction Indicates if the message had been fetched or pushed
+        * @param int    $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
         *
         * @return int The message id of the generated comment or "false" if there was an error
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -1705,7 +1706,7 @@ class Diaspora
         * @param array  $importer  Array of the importer user
         * @param string $sender    The sender of the message
         * @param object $data      The message object
-        * @param int    $direction Indicates if the message had been fetched or pushed
+        * @param int    $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
         *
         * @return int The message id of the generated like or "false" if there was an error
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -1892,7 +1893,7 @@ class Diaspora
         *
         * @param array  $importer  Array of the importer user
         * @param object $data      The message object
-        * @param int    $direction Indicates if the message had been fetched or pushed
+        * @param int    $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
         *
         * @return bool success
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -2385,7 +2386,7 @@ class Diaspora
         * @param array  $importer  Array of the importer user
         * @param object $data      The message object
         * @param string $xml       The original XML of the message
-        * @param int    $direction Indicates if the message had been fetched or pushed
+        * @param int    $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
         *
         * @return int the message id
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -2619,7 +2620,7 @@ class Diaspora
         * @param array  $item
         * @param string $author
         * @param string $body
-        * @param int    $direction Indicates if the message had been fetched or pushed
+        * @param int    $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
         *
         * @return boolean Is the message wanted?
         */
@@ -2672,7 +2673,7 @@ class Diaspora
         * @param array            $importer  Array of the importer user
         * @param SimpleXMLElement $data      The message object
         * @param string           $xml       The original XML of the message
-        * @param int              $direction Indicates if the message had been fetched or pushed
+        * @param int              $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
         *
         * @return int The message id of the newly created item
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException