owner is now actor

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

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index 29ec4771d60a20a4abe6e2d3657c0dba1ea2dc61..be1eaf2295582a7e1bb1e0777cd7410a63e56f83 100644 (file)
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -17,13 +17,14 @@ class Conversation
         * These constants represent the parcel format used to transport a conversation independently of the message protocol.
         * It currently is stored in the "protocol" field for legacy reasons.
         */
-       const PARCEL_UNKNOWN            = 0;
+       const PARCEL_ACTIVITYPUB        = 0;
        const PARCEL_DFRN               = 1;
        const PARCEL_DIASPORA           = 2;
        const PARCEL_SALMON             = 3;
        const PARCEL_FEED               = 4; // Deprecated
        const PARCEL_SPLIT_CONVERSATION = 6;
        const PARCEL_TWITTER            = 67;
+       const PARCEL_UNKNOWN            = 255;
 
        /**
         * @brief Store the conversation data
@@ -34,12 +35,13 @@ class Conversation
        public static function insert(array $arr)
        {
                if (in_array(defaults($arr, 'network', Protocol::PHANTOM),
-                               [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::TWITTER]) && !empty($arr['uri'])) {
+                       [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'];
                        }
@@ -69,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 (empty($conversation['source']) || (!empty($old_conv['source']) &&
+                                       ($old_conv['protocol'] < defaults($conversation, 'protocol', PARCEL_UNKNOWN)))) {
                                        unset($conversation['protocol']);
                                        unset($conversation['source']);
                                }