Merge branch 'develop' of https://github.com/friendica/friendica into develop

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

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index cde81090e4195e34c512b7c252701f90e42c19c1..0692a7341234f66f81530474270af6e4a64f85e8 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;
 
@@ -22,7 +23,7 @@ class Conversation
        const PARCEL_SALMON             = 3;
        const PARCEL_FEED               = 4; // Deprecated
        const PARCEL_SPLIT_CONVERSATION = 6;
-       const PARCEL_TWITTER            = 7;
+       const PARCEL_TWITTER            = 67;
 
        /**
         * @brief Store the conversation data
@@ -32,13 +33,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::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'];
                        }