Mark if post was received via relay

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 1d29be3de0f5b4f9950f0c75e45781068846ac9e..3f38eccd30c243b13cf3137f2a2a98e5b351e3a9 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -36,8 +36,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 function dfrn_notify_post(App $a) {
-       Logger::log(__function__, Logger::TRACE);
-
        $postdata = Network::postdata();
 
        if (empty($_POST) || !empty($postdata)) {
@@ -225,7 +223,7 @@ function dfrn_dispatch_public($postdata)
        Logger::log('Importing post from ' . $msg['author'] . ' with the public envelope.', Logger::DEBUG);
 
        // Now we should be able to import it
-       $ret = DFRN::import($msg['message'], $importer, Conversation::PARCEL_DIASPORA_DFRN, Conversation::PUSH);
+       $ret = DFRN::import($msg['message'], $importer, Conversation::PARCEL_DIASPORA_DFRN, Conversation::RELAY);
        System::xmlExit($ret, 'Done');
 }
 

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index febd6c508474548372e4383003eb6c522e1b915a..c51f19f171a92ab882562ebaa796aa50d289ef09 100644 (file)
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -57,6 +57,10 @@ class Conversation
         * The message had been fetched by our system
         */
        const PULL    = 2;
+       /**
+        * The message had been pushed to this system via a relay server
+        */
+       const RELAY   = 3;
 
        public static function getByItemUri($item_uri)
        {

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index aa0d145fc611dd839d33dfe303e874a7c7d2b1dd..52aaa9741efe3e1707546aa3d4e6e8109711e2d5 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -297,6 +297,10 @@ class Processor
                        }
                }
 
+               if (!empty($activity['from-relay'])) {
+                       $item['direction'] = Conversation::RELAY;
+               }
+
                $item['isForum'] = false;
 
                if (!empty($activity['thread-completion'])) {