X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FConversation.php;h=d05f8af9fd86f734eb1a698152e0c80ea9b146cf;hb=9f96f3ef347e44851a265b1d99e5bb6cf2f4514b;hp=661cfcd6af3770ee1dc6f2fb756b3879af577f97;hpb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;p=friendica.git

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index 661cfcd6af..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,14 +34,31 @@ 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;
 
+	/**
+	 * Unknown message direction
+	 */
+	const UNKNOWN = 0;
+	/**
+	 * The message had been pushed to this sytem
+	 */
+	const PUSH    = 1;
+	/**
+	 * The message had been fetched by our system
+	 */
+	const PULL    = 2;
+
 	public static function getByItemUri($item_uri)
 	{
 		return DBA::selectFirst('conversation', [], ['item-uri' => $item_uri]);
@@ -79,6 +97,10 @@ class Conversation
 				$conversation['protocol'] = $arr['protocol'];
 			}
 
+			if (isset($arr['direction'])) {
+				$conversation['direction'] = $arr['direction'];
+			}
+
 			if (isset($arr['source'])) {
 				$conversation['source'] = $arr['source'];
 			}
@@ -107,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);
 				}
@@ -116,7 +138,6 @@ class Conversation
 
 		unset($arr['conversation-uri']);
 		unset($arr['conversation-href']);
-		unset($arr['protocol']);
 		unset($arr['source']);
 
 		return $arr;