Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

[friendica.git] / src / Model / Conversation.php

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index cb32c0f20eafa6043d714a88b913bdb07154497c..ba50dc25e4345d0aff29e720b8b82ee81d67be5c 100644 (file)
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -5,6 +5,7 @@
 
 namespace Friendica\Model;
 
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
@@ -21,6 +22,7 @@ class Conversation
        const PARCEL_DIASPORA           = 2;
        const PARCEL_SALMON             = 3;
        const PARCEL_FEED               = 4; // Deprecated
+       const PARCEL_ACTIVITYPUB        = 5;
        const PARCEL_SPLIT_CONVERSATION = 6;
        const PARCEL_TWITTER            = 67;
 
@@ -32,13 +34,14 @@ class Conversation
         */
        public static function insert(array $arr)
        {
-               if (in_array(defaults($arr, 'network', NETWORK_PHANTOM),
-                               [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_TWITTER]) && !empty($arr['uri'])) {
+               if (in_array(defaults($arr, 'network', Protocol::PHANTOM),
+                       [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::TWITTER]) && !empty($arr['uri'])) {
                        $conversation = ['item-uri' => $arr['uri'], 'received' => DateTimeFormat::utcNow()];
 
                        if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
                                $conversation['reply-to-uri'] = $arr['parent-uri'];
                        }
+
                        if (isset($arr['thr-parent']) && ($arr['thr-parent'] != $arr['uri'])) {
                                $conversation['reply-to-uri'] = $arr['thr-parent'];
                        }
@@ -68,7 +71,8 @@ class Conversation
                                        unset($old_conv['source']);
                                }
                                // Update structure data all the time but the source only when its from a better protocol.
-                               if (isset($conversation['protocol']) && isset($conversation['source']) && ($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
+                               if (isset($conversation['protocol']) && isset($conversation['source']) && ($old_conv['protocol'] < $conversation['protocol'])
+                                       && ($old_conv['protocol'] != 0) && ($old_conv['protocol'] != self::PARCEL_ACTIVITYPUB)) {
                                        unset($conversation['protocol']);
                                        unset($conversation['source']);
                                }