Merge pull request #10969 from MrPetovan/task/remove-private-contacts

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

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index 80103b2dcc5e6a26ecf552e6522a90b4a3d7e28e..a485ac2d93e6b4ece8da8a613cb0877df7d1e2b1 100644 (file)
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,8 +21,8 @@
 
 namespace Friendica\Model;
 
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
@@ -33,11 +33,15 @@ class Conversation
         * It currently is stored in the "protocol" field for legacy reasons.
         */
        const PARCEL_ACTIVITYPUB        = 0;
-       const PARCEL_DFRN               = 1;
+       const PARCEL_DFRN               = 1; // Deprecated
        const PARCEL_DIASPORA           = 2;
        const PARCEL_SALMON             = 3;
        const PARCEL_FEED               = 4; // Deprecated
        const PARCEL_SPLIT_CONVERSATION = 6;
+       const PARCEL_LEGACY_DFRN        = 7; // @deprecated since version 2021.09
+       const PARCEL_DIASPORA_DFRN      = 8;
+       const PARCEL_LOCAL_DFRN         = 9;
+       const PARCEL_DIRECT             = 10;
        const PARCEL_TWITTER            = 67;
        const PARCEL_UNKNOWN            = 255;
 
@@ -53,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)
        {
@@ -100,40 +108,13 @@ class Conversation
                                $conversation['source'] = $arr['source'];
                        }
 
-                       $fields = ['item-uri', 'reply-to-uri', 'conversation-uri', 'conversation-href', 'protocol', 'source'];
-                       $old_conv = DBA::selectFirst('conversation', $fields, ['item-uri' => $conversation['item-uri']]);
-                       if (DBA::isResult($old_conv)) {
-                               // Don't update when only the source has changed.
-                               // Only do this when there had been no source before.
-                               if ($old_conv['source'] != '') {
-                                       unset($old_conv['source']);
-                               }
-                               // Update structure data all the time but the source only when its from a better protocol.
-                               if (
-                                       empty($conversation['source'])
-                                       || (
-                                               !empty($old_conv['source'])
-                                               && ($old_conv['protocol'] < (($conversation['protocol'] ?? '') ?: self::PARCEL_UNKNOWN))
-                                       )
-                               ) {
-                                       unset($conversation['protocol']);
-                                       unset($conversation['source']);
-                               }
-                               if (!DBA::update('conversation', $conversation, ['item-uri' => $conversation['item-uri']], $old_conv)) {
-                                       Logger::log('Conversation: update for ' . $conversation['item-uri'] . ' from ' . $old_conv['protocol'] . ' to ' . $conversation['protocol'] . ' failed',
-                                               Logger::DEBUG);
-                               }
-                       } else {
-                               if (!DBA::insert('conversation', $conversation, true)) {
-                                       Logger::log('Conversation: insert for ' . $conversation['item-uri'] . ' (protocol ' . $conversation['protocol'] . ') failed',
-                                               Logger::DEBUG);
-                               }
+                       if (!DBA::exists('conversation', ['item-uri' => $conversation['item-uri']])) {
+                               DBA::insert('conversation', $conversation, Database::INSERT_IGNORE);
                        }
                }
 
                unset($arr['conversation-uri']);
                unset($arr['conversation-href']);
-               unset($arr['protocol']);
                unset($arr['source']);
 
                return $arr;