X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FConversation.php;h=d05f8af9fd86f734eb1a698152e0c80ea9b146cf;hb=9c0342b907c279fe335676a1cbeacae8a5ac5c85;hp=1dcb6b0c2d7cc8476d1a0038eb613579d092a487;hpb=aa0b485f3dca72c5448076e913fa54d948cd7731;p=friendica.git

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index 1dcb6b0c2d..d05f8af9fd 100644
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -23,6 +23,7 @@ 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 +34,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;
+	const PARCEL_DIASPORA_DFRN      = 8;
+	const PARCEL_LOCAL_DFRN         = 9;
+	const PARCEL_DIRECT             = 10;
 	const PARCEL_TWITTER            = 67;
 	const PARCEL_UNKNOWN            = 255;
 
@@ -124,7 +129,7 @@ class Conversation
 						Logger::DEBUG);
 				}
 			} else {
-				if (!DBA::insert('conversation', $conversation, true)) {
+				if (!DBA::insert('conversation', $conversation, Database::INSERT_UPDATE)) {
 					Logger::log('Conversation: insert for ' . $conversation['item-uri'] . ' (protocol ' . $conversation['protocol'] . ') failed',
 						Logger::DEBUG);
 				}
@@ -133,9 +138,7 @@ class Conversation
 
 		unset($arr['conversation-uri']);
 		unset($arr['conversation-href']);
-		unset($arr['protocol']);
 		unset($arr['source']);
-		unset($arr['direction']);
 
 		return $arr;
 	}