spelling: protocol

[friendica.git] / src / Module / Diaspora / Receive.php

diff --git a/src/Module/Diaspora/Receive.php b/src/Module/Diaspora/Receive.php
index 498d1b13eda2ff14e05d1858573898f25025a4a2..4df2192d394c06dfe34cbf698342f89a2df476df 100644 (file)
--- a/src/Module/Diaspora/Receive.php
+++ b/src/Module/Diaspora/Receive.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -67,6 +67,7 @@ class Receive extends BaseModule
        /**
         * Receive a public Diaspora posting
         *
+        * @return void
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
@@ -78,12 +79,13 @@ class Receive extends BaseModule
 
                $this->logger->info('Diaspora: Dispatching.');
 
-               Diaspora::dispatchPublic($msg);
+               Diaspora::dispatchPublic($msg, Diaspora::PUSHED);
        }
 
        /**
         * Receive a Diaspora posting for a user
         *
+        * @return void
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
@@ -92,8 +94,19 @@ class Receive extends BaseModule
                $this->logger->info('Diaspora: Receiving post.');
 
                $importer = User::getByGuid($this->parameters['guid']);
+               if (empty($importer)) {
+                       // We haven't found the user.
+                       // To avoid the remote system trying again we send the message that we accepted the content.
+                       throw new HTTPException\AcceptedException();
+               }
+
+               if ($importer['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
+                       // Communities aren't working with the Diaspora protocol
+                       // We throw an "accepted" here, so that the sender doesn't repeat the delivery
+                       throw new HTTPException\AcceptedException();
+               }
 
-               $msg = $this->decodePost(false, $importer['prvkey'] ?? '');
+               $msg = $this->decodePost(false, $importer['prvkey']);
 
                $this->logger->info('Diaspora: Dispatching.');
 
@@ -116,7 +129,7 @@ class Receive extends BaseModule
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private function decodePost(bool $public = true, string $privKey = '')
+       private function decodePost(bool $public = true, string $privKey = ''): array
        {
                if (empty($_POST['xml'])) {